Request 13 (accepted)

gpac.changes Changed

gpac.spec Changed

@@ -17,30 +17,14 @@
 
 %define soname		2
 
-# workaround for Tumbleweed. Because we can't detect it directly.
-%if 0%{?suse_version} >= 1210
-%define xulrunner_version %(rpm -q --qf '%%{VERSION}' xulrunner-devel | sed 's|\\..*$||')
-%else
-%define xulrunner192_version %(rpm -q --qf '%%{VERSION}' mozilla-xulrunner192-devel | sed 's|\\..*$||')
-%endif
-
-# obs@botter.cc - ugly hack to disable compilation with xulrunnner 17.0.2
-%if 0%{?xulrunner_version} == 17
-%define wo_applications 1
-%else
-%define wo_applications 0
-%endif
-
 Name:           gpac
-Version:        0.5.0.svn4296
+Version:        0.5.0.svn4668
 Release:        1.pm.1
 License:        LGPL-2.1+
 Summary:        A multimedia framework covering MPEG-4, VRML/X3D and SVG
 Group:          Productivity/Multimedia/Video/Editors and Convertors
-Source:         gpac-%{version}.tar.bz2
-Source1:        http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-b00.zip
-Source2:        http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-b00.zip
 Url:            http://gpac.sourceforge.net
+Source:		%{name}-%{version}.tar.bz2
 Source90:       %{name}-rpmlintrc
 #PATCH-FIX-openSUSE i@marguerite.su - openSUSE only fix for sf#3574796
 Patch0:         gpac-0.5.0-smjs_call_prop_stub.patch
@@ -50,10 +34,14 @@
 Patch2:		gpac-0.5.0-SVGGen_abuild.patch
 #PATCH-FIX-UPSTREAM wengxuetian@gmail.com - fix E: 64bit-portability-issue
 Patch3:		gpac-0.5.0-64bit-portability.patch
-#PATCH-FIX-UPSTREAM i@marguerite.su - export functions x264 needs
-Patch4:		gpac-0.5.0-x264-export.patch
-#PATCH-FIX-UPSTREAM obs@botter.cc - disable applications osmozilla, osmo4_wx
-Patch10:	gpac-0.5.0-disable-applications.patch
+#PATCH-FIX-OPENSUSE marguerite@opensuse.org - libpng15 include dir fix
+Patch4:		gpac-0.5.0-libpng15.patch
+#PATCH-FIX-OPENSUSE marguerite@opensuse.org - libpng14 include dir fix
+Patch5:		gpac-0.5.0-libpng14.patch
+#PATCH-FIX-OPENSUSE marguerite@opensuse.org - libpng12 include dir fix
+Patch6:		gpac-0.5.0-libpng12.patch
+#PATCH-FIX-UPSTREAM marguerite@opensuse.org - use system amrnb/amrwb
+Patch7:		gpac-0.5.0-system-amr.patch
 BuildRequires:  DirectFB-devel
 BuildRequires:  ImageMagick
 BuildRequires:  Mesa-devel
@@ -161,7 +149,6 @@
 
 Author:         Jean Le Feuvre <jeanlf@users.sourceforge.net>
 
-%if ! %{wo_applications}
 %package -n Osmo4
 Summary:        MPEG-4 Media player based on gpac
 Group:          Productivity/Multimedia/Video/Players
@@ -196,37 +183,25 @@
 %description browser-plugin
 Osmozilla is a GPAC plugin for Mozilla-based browsers.
 %endif
-%endif
 
 %prep
 %setup -q
 %if 0%{?suse_version} >= 1210
-%if 0%{?xulrunner_version} >= 16
-%patch0 -p1
-%endif
-%else
 %patch0 -p1
 %endif
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%if 0%{?suse_version} >= 1230
 %patch4 -p1
-%if %{wo_applications}
-%patch10 -p1
 %endif
-
-# unpack amr files
-install -dm 755 modules/amr_float_dec/amr_nb_ft
-pushd modules/amr_float_dec/amr_nb_ft
-    unzip -q %{SOURCE1}
-    unzip -qj 26104-b00_ANSI_C_source_code.zip
-popd
-
-install -dm 755 modules/amr_float_dec/amr_wb_ft
-pushd modules/amr_float_dec/amr_wb_ft
-    unzip -q %{SOURCE2}
-    unzip -qj 26204-b00_ANSI-C_source_code.zip
-popd
+%if 0%{?suse_version} == 1220 || 0%{?suse_version} == 1210
+%patch5 -p1
+%endif
+%if 0%{?suse_version} <= 1140
+%patch6 -p1
+%endif
+%patch7 -p1
 
 # Fix encoding warnings
 cp -p Changelog Changelog.origine
@@ -300,9 +275,6 @@
 %if ! 0%{?sles_version}
     --xulsdk-path=`pkg-config --variable=sdkdir libxul` \
 %endif
-%if %{wo_applications}
-    --disable-scenegraph \
-%endif
     --extra-cflags="%{optflags} -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DXP_UNIX -fPIC" 
 
 # make the beast (NO parallel build possible ...)
@@ -325,7 +297,6 @@
 make install-lib \
     DESTDIR=%{buildroot}
 
-%if ! %{wo_applications}
 # browser-plugin
 %if ! 0%{?sles_version}
 install -dm 755 %{buildroot}%{_libdir}/browser-plugins
@@ -334,7 +305,6 @@
 install -m 755 bin/gcc/nposmozilla.xpt \
     %{buildroot}%{_libdir}/browser-plugins
 %endif
-%endif
 
 # generated sggen binaries
 for i in MPEG4 SVG X3D; do
@@ -348,7 +318,6 @@
 install -m 755 bin/gcc/udptsseg \
     %{buildroot}%{_bindir}
 
-%if ! %{wo_applications}
 # Osmo4
 install -m 755 bin/gcc/Osmo4 \
     %{buildroot}%{_bindir}
@@ -359,9 +328,7 @@
     Osmo4.png
 install -m 644 Osmo4.png \
     %{buildroot}%{_datadir}/pixmaps
-%endif
 
-%if ! %{wo_applications}
 # menu-entry
 install -dm 755 %{buildroot}%{_datadir}/applications
 cat > Osmo4.desktop << EOF
@@ -375,7 +342,6 @@
 Terminal=false
 EOF
 %suse_update_desktop_file -i Osmo4 AudioVideo Player
-%endif
 
 # static lib
 rm -rf %{buildroot}%{_libdir}/*.a
@@ -390,10 +356,9 @@
 %defattr(-,root,root)
 %doc AUTHORS BUGS Changelog COPYING README TODO
 %doc doc/configuration.html
+%{_bindir}/DashCast
 %{_bindir}/MP4Box
-%if ! %{wo_applications}
 %{_bindir}/MP4Client
-%endif
 %{_bindir}/MPEG4Gen
 %{_bindir}/X3DGen
 %{_bindir}/SVGGen
@@ -415,7 +380,6 @@
 %{_includedir}/%{name}/
 %{_libdir}/*.so
 
-%if ! %{wo_applications}
 %files -n Osmo4
 %defattr(-,root,root)
 %{_bindir}/Osmo4
@@ -427,6 +391,5 @@
 %defattr(-,root,root)
 %{_libdir}/browser-plugins/nposmozilla.*
 %endif
-%endif
 
 %changelog

gpac-0.5.0-disable-applications.patch Deleted

gpac-0.5.0-libpng12.patch Added

@@ -0,0 +1,54 @@
+Index: gpac-0.5.0.svn4668/configure
+===================================================================
+--- gpac-0.5.0.svn4668.orig/configure
++++ gpac-0.5.0.svn4668/configure
+@@ -1150,12 +1150,12 @@ EOF
+ 
+ if test "$cross_prefix" = "" ; then
+     png_cflags="-I$prefix/include"
+-    png_lflags="-L$prefix/lib -lpng -lz"
++    png_lflags="-L$prefix/lib -lpng12 -lz"
+     #-nostdlib prevents from searching standard compiler libraries
+     #if $cc -o $TMPO $TMPC -nostdlib $png_cflags $png_lflags 2> /dev/null  ; then
+     if $cc -o $TMPO $TMPC $png_cflags $png_lflags $LDFLAGS 2> /dev/null  ; then
+         has_png="system"
+-    elif $cc -o $TMPO $TMPC $LDFLAGS -lpng -lz 2> /dev/null  ; then
++    elif $cc -o $TMPO $TMPC $LDFLAGS -lpng12 -lz 2> /dev/null  ; then
+         has_png="system"
+     elif test "$alt_macosx_dir" != "" ; then
+         if $cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -lpng 2> /dev/null ; then
+@@ -1164,7 +1164,7 @@ if test "$cross_prefix" = "" ; then
+     fi
+ fi
+ if test "$has_png" = "no" ; then
+-    if $cc -o $TMPO $TMPC -I$local_inc/png -L$local_lib -lpng 2> /dev/null  ; then
++    if $cc -o $TMPO $TMPC -I$local_inc/png -L$local_lib -lpng12 2> /dev/null  ; then
+         has_png="local"
+     fi
+ fi
+Index: gpac-0.5.0.svn4668/src/Makefile
+===================================================================
+--- gpac-0.5.0.svn4668.orig/src/Makefile
++++ gpac-0.5.0.svn4668/src/Makefile
+@@ -495,7 +495,7 @@ endif
+ #5 - PNG support
+ ifeq ($(CONFIG_PNG), no)
+ else
+-LINKLIBS+= -lpng
++LINKLIBS+= -lpng12
+ ifeq ($(CONFIG_PNG), local)
+ NEED_LOCAL_LIB="yes"
+ MEDIATOOLS_CFLAGS+=-I"$(LOCAL_INC_PATH)/png"
+Index: gpac-0.5.0.svn4668/src/media_tools/img.c
+===================================================================
+--- gpac-0.5.0.svn4668.orig/src/media_tools/img.c
++++ gpac-0.5.0.svn4668/src/media_tools/img.c
+@@ -33,7 +33,7 @@
+ #endif
+ 
+ /*include png.h before setjmp.h, otherwise we get compilation errors*/
+-#include <png.h>
++#include <libpng12/png.h>
+ 
+ #endif /*GPAC_HAS_PNG*/
+

gpac-0.5.0-libpng14.patch Added

@@ -0,0 +1,54 @@
+Index: gpac-0.5.0.svn4668/configure
+===================================================================
+--- gpac-0.5.0.svn4668.orig/configure
++++ gpac-0.5.0.svn4668/configure
+@@ -1150,12 +1150,12 @@ EOF
+ 
+ if test "$cross_prefix" = "" ; then
+     png_cflags="-I$prefix/include"
+-    png_lflags="-L$prefix/lib -lpng -lz"
++    png_lflags="-L$prefix/lib -lpng14 -lz"
+     #-nostdlib prevents from searching standard compiler libraries
+     #if $cc -o $TMPO $TMPC -nostdlib $png_cflags $png_lflags 2> /dev/null  ; then
+     if $cc -o $TMPO $TMPC $png_cflags $png_lflags $LDFLAGS 2> /dev/null  ; then
+         has_png="system"
+-    elif $cc -o $TMPO $TMPC $LDFLAGS -lpng -lz 2> /dev/null  ; then
++    elif $cc -o $TMPO $TMPC $LDFLAGS -lpng14 -lz 2> /dev/null  ; then
+         has_png="system"
+     elif test "$alt_macosx_dir" != "" ; then
+         if $cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -lpng 2> /dev/null ; then
+@@ -1164,7 +1164,7 @@ if test "$cross_prefix" = "" ; then
+     fi
+ fi
+ if test "$has_png" = "no" ; then
+-    if $cc -o $TMPO $TMPC -I$local_inc/png -L$local_lib -lpng 2> /dev/null  ; then
++    if $cc -o $TMPO $TMPC -I$local_inc/png -L$local_lib -lpng14 2> /dev/null  ; then
+         has_png="local"
+     fi
+ fi
+Index: gpac-0.5.0.svn4668/src/Makefile
+===================================================================
+--- gpac-0.5.0.svn4668.orig/src/Makefile
++++ gpac-0.5.0.svn4668/src/Makefile
+@@ -495,7 +495,7 @@ endif
+ #5 - PNG support
+ ifeq ($(CONFIG_PNG), no)
+ else
+-LINKLIBS+= -lpng
++LINKLIBS+= -lpng14
+ ifeq ($(CONFIG_PNG), local)
+ NEED_LOCAL_LIB="yes"
+ MEDIATOOLS_CFLAGS+=-I"$(LOCAL_INC_PATH)/png"
+Index: gpac-0.5.0.svn4668/src/media_tools/img.c
+===================================================================
+--- gpac-0.5.0.svn4668.orig/src/media_tools/img.c
++++ gpac-0.5.0.svn4668/src/media_tools/img.c
+@@ -33,7 +33,7 @@
+ #endif
+ 
+ /*include png.h before setjmp.h, otherwise we get compilation errors*/
+-#include <png.h>
++#include <libpng14/png.h>
+ 
+ #endif /*GPAC_HAS_PNG*/
+

gpac-0.5.0-libpng15.patch Added

@@ -0,0 +1,54 @@
+Index: gpac-0.5.0.svn4668/configure
+===================================================================
+--- gpac-0.5.0.svn4668.orig/configure
++++ gpac-0.5.0.svn4668/configure
+@@ -1150,12 +1150,12 @@ EOF
+ 
+ if test "$cross_prefix" = "" ; then
+     png_cflags="-I$prefix/include"
+-    png_lflags="-L$prefix/lib -lpng -lz"
++    png_lflags="-L$prefix/lib -lpng15 -lz"
+     #-nostdlib prevents from searching standard compiler libraries
+     #if $cc -o $TMPO $TMPC -nostdlib $png_cflags $png_lflags 2> /dev/null  ; then
+     if $cc -o $TMPO $TMPC $png_cflags $png_lflags $LDFLAGS 2> /dev/null  ; then
+         has_png="system"
+-    elif $cc -o $TMPO $TMPC $LDFLAGS -lpng -lz 2> /dev/null  ; then
++    elif $cc -o $TMPO $TMPC $LDFLAGS -lpng15 -lz 2> /dev/null  ; then
+         has_png="system"
+     elif test "$alt_macosx_dir" != "" ; then
+         if $cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -lpng 2> /dev/null ; then
+@@ -1164,7 +1164,7 @@ if test "$cross_prefix" = "" ; then
+     fi
+ fi
+ if test "$has_png" = "no" ; then
+-    if $cc -o $TMPO $TMPC -I$local_inc/png -L$local_lib -lpng 2> /dev/null  ; then
++    if $cc -o $TMPO $TMPC -I$local_inc/png -L$local_lib -lpng15 2> /dev/null  ; then
+         has_png="local"
+     fi
+ fi
+Index: gpac-0.5.0.svn4668/src/Makefile
+===================================================================
+--- gpac-0.5.0.svn4668.orig/src/Makefile
++++ gpac-0.5.0.svn4668/src/Makefile
+@@ -495,7 +495,7 @@ endif
+ #5 - PNG support
+ ifeq ($(CONFIG_PNG), no)
+ else
+-LINKLIBS+= -lpng
++LINKLIBS+= -lpng15
+ ifeq ($(CONFIG_PNG), local)
+ NEED_LOCAL_LIB="yes"
+ MEDIATOOLS_CFLAGS+=-I"$(LOCAL_INC_PATH)/png"
+Index: gpac-0.5.0.svn4668/src/media_tools/img.c
+===================================================================
+--- gpac-0.5.0.svn4668.orig/src/media_tools/img.c
++++ gpac-0.5.0.svn4668/src/media_tools/img.c
+@@ -33,7 +33,7 @@
+ #endif
+ 
+ /*include png.h before setjmp.h, otherwise we get compilation errors*/
+-#include <png.h>
++#include <libpng15/png.h>
+ 
+ #endif /*GPAC_HAS_PNG*/
+

gpac-0.5.0-smjs_call_prop_stub.patch Changed

gpac-0.5.0-system-amr.patch Added

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

gpac-0.5.0-x264-export.patch Deleted

@@ -1,30 +0,0 @@
-diff -urN gpac-0.5.0.svn4192.orig/src/isomedia/avc_ext.c gpac-0.5.0.svn4192/src/isomedia/avc_ext.c
---- gpac-0.5.0.svn4192.orig/src/isomedia/avc_ext.c	2012-11-01 07:44:25.104487689 +0800
-+++ gpac-0.5.0.svn4192/src/isomedia/avc_ext.c	2012-11-01 17:46:04.064318199 +0800
-@@ -191,6 +191,7 @@
- 
- 
- #ifndef GPAC_DISABLE_ISOM_WRITE
-+GF_EXPORT
- GF_Err gf_isom_avc_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_AVCConfig *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex)
- {
- 	GF_TrackBox *trak;
-diff -urN gpac-0.5.0.svn4192.orig/src/isomedia/isom_write.c gpac-0.5.0.svn4192/src/isomedia/isom_write.c
---- gpac-0.5.0.svn4192.orig/src/isomedia/isom_write.c	2012-11-01 07:44:25.102487699 +0800
-+++ gpac-0.5.0.svn4192/src/isomedia/isom_write.c	2012-11-01 17:45:30.020931257 +0800
-@@ -1141,6 +1141,7 @@
- 	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;
-@@ -1188,6 +1189,7 @@
- 	}
- }
- 
-+GF_EXPORT
- GF_Err gf_isom_set_pixel_aspect_ratio(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 hSpacing, u32 vSpacing)
- {
- 	GF_Err e;

26104-b00.zip Deleted

26204-b00.zip Deleted

gpac-0.5.0.svn4296.tar.bz2/bin/win32/release/nsis_install Deleted

gpac-0.5.0.svn4296.tar.bz2/bin/win32/release/nsis_install/default.out Deleted

gpac-0.5.0.svn4296.tar.bz2/bin/win32/release/nsis_install/gpac_installer.nsi Deleted

@@ -1,901 +0,0 @@
-;--------------------------------
-;General
-!define GPAC_VERSION	0.5.1-DEV
-!include default.out
-
-!define GPAC_ROOT ..\..\..\..
-
-InstallDir "$PROGRAMFILES\GPAC"
-InstallDirRegKey HKCU "SOFTWARE\GPAC" "InstallDir"
-
-RequestExecutionLevel user
-
-
-;--------------------------------
-;Include Modern UI
-
-  !include "MUI2.nsh"
-
-WindowIcon on
-Icon "..\..\..\..\doc\osmo4.ico"
-UninstallIcon "..\..\..\..\doc\osmo4.ico"
-
-
-;--------------------------------
-;Interface Settings
-
-  !define MUI_ABORTWARNING
-
-Var DIALOG
-Var Label
-Var Confirm
-
-LangString PAGE_TITLE ${LANG_ENGLISH} "Title"
-LangString PAGE_SUBTITLE ${LANG_ENGLISH} "Subtitle"
-
-Function EnableNext
-  Pop $R1
-  ${NSD_GetState} $Confirm $R1
-	GetDlgItem $0 $HWNDPARENT 1
-	${If} $R1 == ${BST_CHECKED}
-   EnableWindow $0 1
-  ${Else} 
-   EnableWindow $0 0
-  ${Endif} 
-FunctionEnd
-
-Function customPage
-	!insertmacro MUI_HEADER_TEXT "Patents and Royalties" "Please read carefully the following clause."
-	GetDlgItem $0 $HWNDPARENT 1
-	EnableWindow $0 0
-	nsDialogs::Create 1018
-	Pop $DIALOG
-
-  ${NSD_CreateLabel} 0 0 100% 120u "Multimedia technologies are often covered by various patents which are most of the time hard to identify. These patents may or may not apply in your local jurisdiction. By installing this software, you acknowledge that you may have to pay royaltee fees in order to legally use this software. Do not proceed with this setup if you do not understand or do not agree with these terms. In any case, the authors and/or distributors bears no liability for any infringing usage of this software, which is provided for educational or research purposes."
-	Pop $Label
-
-  ${NSD_CreateCheckBox} 0 -30 100% 12u "I understand and accept the conditions"
-  Pop $Confirm
-	GetFunctionAddress $0 EnableNext
-	nsDialogs::OnClick $Confirm $0
-  
-  
-  nsDialogs::Show
-FunctionEnd
-
-;--------------------------------
-;Pages
-
-  !insertmacro MUI_PAGE_WELCOME
-  !insertmacro MUI_PAGE_LICENSE "${GPAC_ROOT}\COPYING" 
-  Page custom customPage
-  !insertmacro MUI_PAGE_COMPONENTS
-  !insertmacro MUI_PAGE_DIRECTORY
-    
-  !insertmacro MUI_PAGE_INSTFILES
-  !insertmacro MUI_PAGE_FINISH
-  
-  !insertmacro MUI_UNPAGE_CONFIRM
-  !insertmacro MUI_UNPAGE_INSTFILES
-
-  !insertmacro MUI_LANGUAGE "English"
-
-ComponentText "This will install the GPAC Framework on your computer. Select which optional things you want installed."
-DirText "This will install the GPAC Framework on your computer. Choose a directory"
-
-
-Function FctWriteRegStrAuth
-   ;local var
-   Push $0
-   Push $R0
-   Push $R1
-   Push $R2
-   Push $R3
-   ;pop function arguments
-   Exch 5
-   Pop $R3
-   Exch 5
-   Pop $R2
-   Exch 5
-   Pop $R1
-   Exch 5
-   Pop $R0
-
-   ;test if calling HKCR
-   StrCmp $R0 "HKCR" +1 +3
-   WriteRegStr HKCR $R1 $R2 $R3
-   goto lbl_end
-   
-   #has current user admin privileges?
-   userInfo::getAccountType
-   Pop $0
-   StrCmp $0 "Admin" lbl_admin lbl_not_admin
-
-   lbl_admin:
-      WriteRegStr HKLM $R1 $R2 $R3
-      goto lbl_end
-
-   lbl_not_admin:
-      WriteRegStr HKCU $R1 $R2 $R3
-
-   lbl_end:
-      Pop $R3
-      Pop $R2
-      Pop $R1
-      Pop $R0
-      Pop $0
-FunctionEnd
-
-!macro WriteRegStrAuth HKREG SUBREG ENTRY VALUESTR
-    Push "${HKREG}"
-    Push "${SUBREG}"
-    Push "${ENTRY}"
-    Push "${VALUESTR}"
-    Call FctWriteRegStrAuth
-!macroend
- 
-!define WriteRegStrAuth "!insertmacro WriteRegStrAuth"
-
-
-Function un.FctDeleteRegKeyAuth
-   ;local var
-   Push $0
-   Push $R0
-   Push $R1
-   ;pop function arguments
-   Exch 3
-   Pop $R1
-   Exch 3
-   Pop $R0
-
-   ;test if calling HKCR
-   StrCmp $R0 "HKCR" +1 +3
-   DeleteRegKey HKCR $R1
-   goto lbl_end
-   
-   #has current user admin privileges?
-   userInfo::getAccountType
-   Pop $0
-   StrCmp $0 "Admin" lbl_admin lbl_not_admin
-   
-   lbl_admin:
-      DeleteRegKey HKLM $R1
-      goto lbl_end
-   
-   lbl_not_admin:
-      DeleteRegKey HKCU $R1
-
-   lbl_end:
-      Pop $0
-      Pop $R1
-      Pop $R0
-FunctionEnd
-
-!macro DeleteRegKeyAuth HKREG SUBREG
-    Push "${HKREG}"
-    Push "${SUBREG}"
-    Call un.FctDeleteRegKeyAuth
-!macroend
- 
-!define DeleteRegKeyAuth "!insertmacro DeleteRegKeyAuth"
-
-
-Function InsertGDIPLUS
-   Push $R0
-   Push $R1
-   ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
-   StrCmp $R0 "" 0 lbl_winnt
-
-   ;NOT NT
-   ReadRegStr $R0 HKLM SOFTWARE\Microsoft\Windows\CurrentVersion VersionNumber
-
-   StrCpy $R1 $R0 1
-   ; win95, NOT SUPPORTED
-   StrCmp $R1 '4' 0 lbl_err_95
-   StrCpy $R1 $R0 3
-   StrCmp $R1 '4.0' lbl_err_95
-   ;winME or 98 otherwise
-   StrCmp $R1 '4.9' lbl_add lbl_add
-
-lbl_err_nt:
-   MessageBox MB_OK "Microsoft GDI+ cannot be installed on NT 3 Systems"
-   Goto lbl_done
-
-lbl_err_95:
-   MessageBox MB_OK "Microsoft GDI+ cannot be installed on Windows 95 and older Systems"
-   Goto lbl_done
-
-lbl_winnt:
-   StrCpy $R1 $R0 1
-   StrCmp $R1 '3' lbl_err_nt
-   StrCmp $R1 '4' lbl_add
-   StrCpy $R1 $R0 3
-   StrCmp $R1 '5.0' lbl_add	;2000
-   StrCmp $R1 '5.1' lbl_xp	;XP
-   StrCmp $R1 '5.2' lbl_done	;.NET server
-
-lbl_add:
-   File ".\Gdiplus.dll"
-
-lbl_xp:
-   File "..\gm_gdip_raster.dll"
-
-lbl_done:
-FunctionEnd
-
-
-;osmo4 install
-Section "Osmo4/GPAC Player" SecOsmo4
-  SectionIn RO
-  SetOutPath $INSTDIR
-
-  File /oname=ReadMe.txt "${GPAC_ROOT}\README"
-  File /oname=License.txt "${GPAC_ROOT}\COPYING"
-  File /oname=Changelog.txt "${GPAC_ROOT}\Changelog"
-  File "${GPAC_ROOT}\doc\configuration.html"
-  File "${GPAC_ROOT}\doc\gpac.mp4"
-
-  File "..\Osmo4.exe"
-  File "..\..\..\..\doc\osmo4.ico"
-  File "..\libgpac.dll"
-  File "..\gm_dummy_in.dll"
-  File "..\gm_dx_hw.dll"
-  File "..\js32.dll"
-  File "..\gm_gpac_js.dll"
-  File "..\libeay32.dll"
-  File "..\ssleay32.dll"
-  File "..\gm_ismacryp.dll"
-
-  ;create default cache
-  SetOutPath $INSTDIR\cache
-
-
-  ;copy GUI
-  SetOutPath $INSTDIR\gui
-  File "..\..\..\..\gui\gui.bt"
-  File "..\..\..\..\gui\gui.js"
-  File "..\..\..\..\gui\gwlib.js"
-  File "..\..\..\..\gui\mpegu-core.js"
-  SetOutPath $INSTDIR\gui\icons
-  File /r /x .svn ..\..\..\..\gui\icons\*
-  SetOutPath $INSTDIR\gui\extensions
-  File /r /x .svn ..\..\..\..\gui\extensions\*
-
-  SetOutPath $INSTDIR
-  
-  ${WriteRegStrAuth} HKCU "SOFTWARE\GPAC" "InstallDir" "$INSTDIR"
-  ${WriteRegStrAuth} HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Osmo4" "DisplayName" "Osmo4/GPAC (remove only)"
-  ${WriteRegStrAuth} HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Osmo4" "UninstallString" "$INSTDIR\uninstall.exe"
-  WriteUninstaller "uninstall.exe"
-
-SectionEnd
-
-SubSection "GPAC Plugins" SecPlugins
-
-
-;
-;	2 install modes, normal one and full one
-
-Section "MPEG-4 BIFS Decoder" SecBIFS
-  SectionIn 1
-  File "..\gm_bifs_dec.dll"
-SectionEnd
-
-Section "MPEG-4 ODF Decoder" SecODF
-  SectionIn 1
-  File "..\gm_odf_dec.dll"
-SectionEnd
-
-Section "MPEG-4 LASeR Decoder" SecLASeR
-  SectionIn 1
-  File "..\gm_laser_dec.dll"
-SectionEnd
-
-Section "MPEG-4 SAF Demultiplexer" SecSAF
-  SectionIn 1
-  File "..\gm_saf_in.dll"
-SectionEnd
-
-Section "Textual MPEG-4 Loader" SecTextLoad
-  SectionIn 1
-  File "..\gm_ctx_load.dll"
-SectionEnd
-
-Section "Image Package (PNG, JPEG, BMP)" SecIMG
-  SectionIn 1
-  File "..\gm_img_in.dll"
-SectionEnd
-
-Section "AAC Audio" SecAAC
-  SectionIn 1
-  File "..\gm_aac_in.dll"
-SectionEnd
-
-Section "MP3 Audio" SecMP3
-  SectionIn 1
-  File "..\gm_mp3_in.dll"
-SectionEnd
-
-Section "AC3 Audio" SecAC3
-  SectionIn 1
-  File "..\gm_ac3_in.dll"
-SectionEnd
-
-Section "FFMPEG" SecFFMPEG
-  SectionIn 1
-  File "..\gm_ffmpeg_in.dll"
-  File "..\avcodec-*.dll"
-  File "..\avformat-*.dll"
-  File "..\avutil-*.dll"
-  File "..\swscale-*.dll"
-SectionEnd
-
-Section "XviD Video Decoder" SecXVID
-  SectionIn 1
-  File "..\gm_xvid_dec.dll"
-SectionEnd
-
-;Section "AMR NB & WB" SecAMRFT
-;  SectionIn 1
-;  File "..\gm_amr_float_dec.dll"
-;SectionEnd
-
-Section "Subtitles" SecSUBS
-  SectionIn 1
-  File "..\gm_timedtext.dll"
-SectionEnd
-
-Section "ISO File Format" SecISOFF
-  SectionIn 1
-  File "..\gm_isom_in.dll"
-SectionEnd
-
-Section "MPEG-2 TS" SecM2TS
-  SectionIn 1
-  File "..\gm_mpegts_in.dll"
-SectionEnd
-
-Section "RTP/RTSP" SecRTP
-  SectionIn 1
-  File "..\gm_rtp_in.dll"
-SectionEnd
-
-Section "SVG" SecSVG
-  SectionIn 1
-  File "..\gm_svg_in.dll"
-SectionEnd
-
-
-Section "GDI+" SecGDIP
-  SectionIn 1
-  call InsertGDIPLUS
-SectionEnd
-
-Section "GPAC 2D Raster" SecG2DS
-  SectionIn 1
-  File "..\gm_soft_raster.dll"
-SectionEnd
-
-Section "FreeType" SecFT
-  SectionIn 1
-  File "..\gm_ft_font.dll"
-SectionEnd
-
-Section "Windows MME Audio" SecWAVE
-  SectionIn 1
-  File "..\gm_wav_out.dll"
-SectionEnd
-
-Section "Xiph" SecXIPH
-  SectionIn 1
-  File "..\gm_ogg.dll"
-SectionEnd
-
-Section "OpenSVC Decoder" SecOSVC
-  SectionIn 1
-  File "..\OpenSVCdecoder.plg"
-  File "..\gm_opensvc_dec.dll"
-SectionEnd
-
-Section "MPEG DASH Suppport" SecDASH
-  SectionIn 1
-  File "..\gm_mpd_in.dll"
-SectionEnd
-
-Section "UPnP Support" SecUPnP
-  SectionIn 1
-  File "..\gm_platinum.dll"
-SectionEnd
-
-Section "Widget Manager" SecMPEGU
-  SectionIn 1
-  File "..\gm_widgetman.dll"
-SectionEnd
-
-;Section "MobileIP Framework" SecMobIP
-;  SectionIn 1
-;  File "..\gm_mobile_ip.dll"
-;  File "..\MobileSession.dll"
-;SectionEnd
-
-
-;Section "OFFIS Audio compressor" SecOffisComp
-;  SectionIn 1
-;  ;copy GUI
-;  File "..\gm_offis_compressor.dll"
-;  File "..\QtCore4.dll"
-;  File "..\QtGui4.dll"
-;  SetOutPath $INSTDIR\gui\extensions
-;  File /r /x .svn ..\..\..\..\gui\extensions\offis*
-;  SetOutPath $INSTDIR
-;SectionEnd
-
-SubSectionEnd
-
-
-Section "MP4Box" SecMP4B
-  SectionIn 1
-  SetOutPath $INSTDIR
-  File "..\MP4Box.exe"
-  File "..\MP42TS.exe"
-
-  Push $INSTDIR
-  Call AddToPath
-SectionEnd
-
-
-Section "GPAC SDK" SecSDK
-  SectionIn 1
-  SetOutPath $INSTDIR\sdk\include
-  File /r /x CVS ..\..\..\..\include\*.h
-  SetOutPath $INSTDIR\sdk\lib
-  File ..\libgpac.lib
-  File ..\..\..\..\extra_lib\lib\win32\release\js32.lib
-SectionEnd
-
-
-!define HK_MOZ "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0"
-
-Section "Osmozilla" SecZILLA
-  SectionIn 1
-  SetOutPath $INSTDIR
-  File "..\nposmozilla.dll"
-  File "..\nposmozilla.xpt"
-
-  ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "Path" "$INSTDIR\nposmozilla.dll"
-  ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "XPTPath" "$INSTDIR\nposmozilla.xpt"
-  ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "Version" "${GPAC_VERSION}"
-  ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "Vendor" "GPAC"
-  ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "Description" "GPAC plugin"
-  ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "ProductName" "Osmozilla"
-SectionEnd
-
-
-Section "GPAX" SecGPAX
-  SectionIn 1
-  SetOutPath $INSTDIR
-  File "..\GPAX.dll"
-  RegDLL "$INSTDIR\GPAX.dll"
-SectionEnd
-
-
-Section "MP4Client" SecMP4C
-  SectionIn 1
-  SetOutPath $INSTDIR
-  File "..\MP4Client.exe"
-SectionEnd   
-                 
-                 
-                  
-Section "Windows Runtime Libraries" SecMSVCRT
-  SectionIn 1
-  File "..\Microsoft.VC90.CRT.manifest"
-  File "..\Microsoft.VC90.MFC.manifest"       
-  File "..\msvcr90.dll"
-  File "..\mfc90.dll"
-SectionEnd
-
-
-
-
-SubSection "Osmo4 Shortcuts"
-
-Section "Add Start Menu Shortcuts"
-  SectionIn 1
-  #has current user admin privileges?
-  userInfo::getAccountType
-  Pop $0
-  StrCmp $0 "Admin" +1 +2
-  SetShellVarContext all
-  CreateDirectory "$SMPROGRAMS\Osmo4"
-  CreateShortCut "$SMPROGRAMS\Osmo4\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
-  CreateShortCut "$SMPROGRAMS\Osmo4\Osmo4 (Classic UI).lnk" "$INSTDIR\Osmo4.exe" ""
-  CreateShortCut "$SMPROGRAMS\Osmo4\Osmo4 (New UI).lnk" "$INSTDIR\MP4Client.exe" "-gui" 
-  CreateShortCut "$SMPROGRAMS\Osmo4\Osmo4 (New UI With Console).lnk" "$INSTDIR\MP4Client.exe" ""
-  CreateShortCut "$SMPROGRAMS\Osmo4\Readme.lnk" "$INSTDIR\ReadMe.txt"
-  CreateShortCut "$SMPROGRAMS\Osmo4\License.lnk" "$INSTDIR\License.txt"
-  CreateShortCut "$SMPROGRAMS\Osmo4\History.lnk" "$INSTDIR\changelog.txt"
-  CreateShortCut "$SMPROGRAMS\Osmo4\Configuration Info.lnk" "$INSTDIR\configuration.html"
-SectionEnd
-
-Section "Add shortcut to QuickLaunch"
-  SectionIn 1
-  CreateShortCut "$QUICKLAUNCH\Osmo4.lnk" "$INSTDIR\Osmo4.exe" "" "$INSTDIR\Osmo4.exe" 0
-SectionEnd
-
-Section "Add shortcut to Desktop"
-  SectionIn 1
-  CreateShortCut "$DESKTOP\Osmo4.lnk" "$INSTDIR\Osmo4.exe" "" "$INSTDIR\Osmo4.exe" 0
-SectionEnd
-
-!define SHCNE_ASSOCCHANGED 0x08000000
-!define SHCNF_IDLIST 0
-
-Section "Make Osmo4 the default MPEG-4 Player"
-  SectionIn 1
-  ;write file association
-  ${WriteRegStrAuth} HKCR GPAC\mp4\DefaultIcon "" "$INSTDIR\Osmo4.ico, 0"
-  ${WriteRegStrAuth} HKCR GPAC\mp4\Shell\open\command "" "$INSTDIR\Osmo4.exe %L"
-  ${WriteRegStrAuth} HKCR .mp4 "" "GPAC\mp4"
-  !system 'shell32.dll::SHChangeNotify(i, i, i, i) v (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)'
-
-SectionEnd
-
-Section "Associate 3GPP files (3GP) with Osmo4"
-  SectionIn 1
-  ;write file association
-  ${WriteRegStrAuth} HKCR GPAC\3gp\DefaultIcon "" "$INSTDIR\Osmo4.ico, 0"
-  ${WriteRegStrAuth} HKCR GPAC\3gp\Shell\open\command "" "$INSTDIR\Osmo4.exe %L"
-  ${WriteRegStrAuth} HKCR .3gp "" "GPAC\3gp"
-  !system 'shell32.dll::SHChangeNotify(i, i, i, i) v (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)'
-SectionEnd
-
-Section "Associate 3GPP2 files (3G2) with Osmo4"
-  SectionIn 1
-  ;write file association
-  ${WriteRegStrAuth} HKCR GPAC\3g2\DefaultIcon "" "$INSTDIR\Osmo4.ico, 0"
-  ${WriteRegStrAuth} HKCR GPAC\3g2\Shell\open\command "" "$INSTDIR\Osmo4.exe %L"
-  ${WriteRegStrAuth} HKCR .3g2 "" "GPAC\3g2"
-  !system 'shell32.dll::SHChangeNotify(i, i, i, i) v (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)'
-SectionEnd
-
-SubSectionEnd
-
-
-
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecOsmo4} "Osmo4 player"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecPlugins} "GPAC Plugins"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecBIFS} "MPEG-4 BIFS Scene Decoder"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecODF} "MPEG-4 Object Descriptor Decoder"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecLASeR} "MPEG-4 LASeR Scene Decoder"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecTextLoad} "Support for uncompressed MPEG-4 (BT and XMT), VRML and X3D textual formats"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSAF} "MPEG-4 SAF Demultiplexer"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecIMG} "Support for PNG, JPEG, BMP and JPEG2000 images"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecAAC} "Support for MPEG-4 Audio HE-AAC decoder and web radios"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecMP3} "Support for MPEG-1/2 Audio (inc. MP3) decoder and web radios"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecAC3} "Support for Dolby AC3 decoder and web radios"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecFFMPEG} "Support for FFMPEG libraries for various format decoding and demultiplexing"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecXVID} "Support for XVID library for MPEG-4 Video Part 2 decoding"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecAMRFT} "Support for AMR and AMR WideBand decoder and web radios"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSUBS} "Subtitle support include SRT, SUB, 3GPP and MPEG-4 Text formats"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecISOFF} "Support for ISO-based file formats (3GP, MP4, MJ2K)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecM2TS} "Support for MPEG-2 Transport Stream"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecRTP} "Support for RTP and RTSP IP streaming"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSVG} "Support for SVG including progressive loading"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecGDIP} "GDIPlus-based rasterizer"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecG2DS} "GPAC software rasterizer"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecFT} "FreeType font parsing"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecWAVE} "Windows MME Audio output support"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecXIPH} "Support for XIPP OGG, Vorbis and Theora media"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecOSVC} "Support for SVC decoding through OpenSVC Decoder"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecDASH} "HTTP Streaming using MPEG DASH"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecUPnP} "Support for UPnP based on Platinum"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecMPEGU} "Support for W3C and MPEG-U Widgets"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecMobIP} "UNIGE Mobile IP Framework"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecOffisComp} "OFFIS Audio Compressor"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecMP4B} "MP4Box command-line tool for various multimedia operations"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSDK} "GPAC SDK: headers and library files needed to develop modules for GPAC or appllication based on GPAC"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecZILLA} "GPAC playback support NPAPI-based browsers (FireFox/Gecko, Safari/WebKit)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecGPAX} "GPAC playback support using ActiveX component (Internet Explorer)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecMP4C} "GPAC command-line player and AVI dumper"
-  
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
-
-
-Function .onInstSuccess
-;  MessageBox MB_YESNO "GPAC Framework installation complete. Do you want to launch the Osmo4 player?" IDNO NoLaunch
-;  Exec $INSTDIR\Osmo4.exe
-;  NoLaunch:
-FunctionEnd
-
-
-
-
-
-; uninstall stuff
-
-UninstallText "This will uninstall OSMO4/GPAC from your computer. Hit next to continue."
-
-; special uninstall section.
-Section "Uninstall"
-  ; remove registry keys
-  ${DeleteRegKeyAuth} HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Osmo4"
-  ${DeleteRegKeyAuth} HKCU "SOFTWARE\GPAC"
-  ${DeleteRegKeyAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0"
-  ${DeleteRegKeyAuth} HKCR GPAC\mp4\DefaultIcon
-  ${DeleteRegKeyAuth} HKCR GPAC\mp4\shell\open\command
-  ${DeleteRegKeyAuth} HKCR GPAC\mp4
-  ${DeleteRegKeyAuth} HKCR .mp4
-  ${DeleteRegKeyAuth} HKCR GPAC\3gp\DefaultIcon
-  ${DeleteRegKeyAuth} HKCR GPAC\3gp\shell\open\command
-  ${DeleteRegKeyAuth} HKCR GPAC\3gp
-  ${DeleteRegKeyAuth} HKCR .3gp
-  ${DeleteRegKeyAuth} HKCR GPAC\3g2\DefaultIcon
-  ${DeleteRegKeyAuth} HKCR GPAC\3g2\shell\open\command
-  ${DeleteRegKeyAuth} HKCR GPAC\3g2
-  ${DeleteRegKeyAuth} HKCR .3g2
-  ${DeleteRegKeyAuth} HKCR GPAC
-
-  UnRegDLL "$INSTDIR\GPAX.dll"
-  RMDir /r $INSTDIR
-  Push $INSTDIR
-  Call un.RemoveFromPath
-  #has current user admin privileges?
-  userInfo::getAccountType
-  Pop $0
-  StrCmp $0 "Admin" +1 +2
-  SetShellVarContext all
-  Delete "$SMPROGRAMS\Osmo4\*.*"
-  RMDir "$SMPROGRAMS\Osmo4"
-  Delete "$QUICKLAUNCH\Osmo4.lnk"
-  Delete "$DESKTOP\Osmo4.lnk"
-
-SectionEnd
-
-;path modif functions
-!verbose 3
-!include "WinMessages.NSH"
-!verbose 4
-
-!ifndef WriteEnvStr_RegKey
-  !ifdef ALL_USERS
-    !define WriteEnvStr_RegKey \
-       'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
-  !else
-    !define WriteEnvStr_RegKey 'HKCU "Environment"'
-  !endif
-!endif
-
-; AddToPath - Adds the given dir to the search path.
-;        Input - head of the stack
-;        Note - Win9x systems requires reboot
-
-Function AddToPath
-  Exch $0
-  Push $1
-  Push $2
-  Push $3
- 
-  # don't add if the path doesn't exist
-  IfFileExists "$0\*.*" "" AddToPath_done
- 
-  ReadEnvStr $1 PATH
-  Push "$1;"
-  Push "$0;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
-  Push "$1;"
-  Push "$0\;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
-  GetFullPathName /SHORT $3 $0
-  Push "$1;"
-  Push "$3;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
-  Push "$1;"
-  Push "$3\;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
- 
-  Call IsNT
-  Pop $1
-  StrCmp $1 1 AddToPath_NT
-    ; Not on NT
-    StrCpy $1 $WINDIR 2
-    FileOpen $1 "$1\autoexec.bat" a
-    FileSeek $1 -1 END
-    FileReadByte $1 $2
-    IntCmp $2 26 0 +2 +2 # DOS EOF
-      FileSeek $1 -1 END # write over EOF
-    FileWrite $1 "$\r$\nSET PATH=%PATH%;$3$\r$\n"
-    FileClose $1
-    SetRebootFlag true
-    Goto AddToPath_done
- 
-  AddToPath_NT:
-    ReadRegStr $1 ${WriteEnvStr_RegKey} "PATH"
-    StrCpy $2 $1 1 -1 # copy last char
-    StrCmp $2 ";" 0 +2 # if last char == ;
-      StrCpy $1 $1 -1 # remove last char
-    StrCmp $1 "" AddToPath_NTdoIt
-      StrCpy $0 "$1;$0"
-    AddToPath_NTdoIt:
-      WriteRegExpandStr ${WriteEnvStr_RegKey} "PATH" $0
-      SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
- 
-  AddToPath_done:
-    Pop $3
-    Pop $2
-    Pop $1
-    Pop $0
-FunctionEnd
-
-; RemoveFromPath - Remove a given dir from the path
-;     Input: head of the stack
-
-Function un.RemoveFromPath
-  Exch $0
-  Push $1
-  Push $2
-  Push $3
-  Push $4
-  Push $5
-  Push $6
- 
-  IntFmt $6 "%c" 26 # DOS EOF
- 
-  Call un.IsNT
-  Pop $1
-  StrCmp $1 1 unRemoveFromPath_NT
-    ; Not on NT
-    StrCpy $1 $WINDIR 2
-    FileOpen $1 "$1\autoexec.bat" r
-    GetTempFileName $4
-    FileOpen $2 $4 w
-    GetFullPathName /SHORT $0 $0
-    StrCpy $0 "SET PATH=%PATH%;$0"
-    Goto unRemoveFromPath_dosLoop
- 
-    unRemoveFromPath_dosLoop:
-      FileRead $1 $3
-      StrCpy $5 $3 1 -1 # read last char
-      StrCmp $5 $6 0 +2 # if DOS EOF
-        StrCpy $3 $3 -1 # remove DOS EOF so we can compare
-      StrCmp $3 "$0$\r$\n" unRemoveFromPath_dosLoopRemoveLine
-      StrCmp $3 "$0$\n" unRemoveFromPath_dosLoopRemoveLine
-      StrCmp $3 "$0" unRemoveFromPath_dosLoopRemoveLine
-      StrCmp $3 "" unRemoveFromPath_dosLoopEnd
-      FileWrite $2 $3
-      Goto unRemoveFromPath_dosLoop
-      unRemoveFromPath_dosLoopRemoveLine:
-        SetRebootFlag true
-        Goto unRemoveFromPath_dosLoop
- 
-    unRemoveFromPath_dosLoopEnd:
-      FileClose $2
-      FileClose $1
-      StrCpy $1 $WINDIR 2
-      Delete "$1\autoexec.bat"
-      CopyFiles /SILENT $4 "$1\autoexec.bat"
-      Delete $4
-      Goto unRemoveFromPath_done
- 
-  unRemoveFromPath_NT:
-    ReadRegStr $1 ${WriteEnvStr_RegKey} "PATH"
-    StrCpy $5 $1 1 -1 # copy last char
-    StrCmp $5 ";" +2 # if last char != ;
-      StrCpy $1 "$1;" # append ;
-    Push $1
-    Push "$0;"
-    Call un.StrStr ; Find `$0;` in $1
-    Pop $2 ; pos of our dir
-    StrCmp $2 "" unRemoveFromPath_done
-      ; else, it is in path
-      # $0 - path to add
-      # $1 - path var
-      StrLen $3 "$0;"
-      StrLen $4 $2
-      StrCpy $5 $1 -$4 # $5 is now the part before the path to remove
-      StrCpy $6 $2 "" $3 # $6 is now the part after the path to remove
-      StrCpy $3 $5$6
- 
-      StrCpy $5 $3 1 -1 # copy last char
-      StrCmp $5 ";" 0 +2 # if last char == ;
-        StrCpy $3 $3 -1 # remove last char
- 
-      WriteRegExpandStr ${WriteEnvStr_RegKey} "PATH" $3
-      SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
- 
-  unRemoveFromPath_done:
-    Pop $6
-    Pop $5
-    Pop $4
-    Pop $3
-    Pop $2
-    Pop $1
-    Pop $0
-FunctionEnd
-
-###########################################
-#            Utility Functions            #
-###########################################
-
-; IsNT
-; no input
-; output, top of the stack = 1 if NT or 0 if not
-;
-; Usage:
-;   Call IsNT
-;   Pop $R0
-;  ($R0 at this point is 1 or 0)
-
-!macro IsNT un
-Function ${un}IsNT
-  Push $0
-  ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
-  StrCmp $0 "" 0 IsNT_yes
-  ; we are not NT.
-  Pop $0
-  Push 0
-  Return
- 
-  IsNT_yes:
-    ; NT!!!
-    Pop $0
-    Push 1
-FunctionEnd
-!macroend
-!insertmacro IsNT ""
-!insertmacro IsNT "un."
-
-; StrStr
-; input, top of stack = string to search for
-;        top of stack-1 = string to search in
-; output, top of stack (replaces with the portion of the string remaining)
-; modifies no other variables.
-;
-; Usage:
-;   Push "this is a long ass string"
-;   Push "ass"
-;   Call StrStr
-;   Pop $R0
-;  ($R0 at this point is "ass string")
-
-!macro StrStr un
-Function ${un}StrStr
-Exch $R1 ; st=haystack,old$R1, $R1=needle
-  Exch    ; st=old$R1,haystack
-  Exch $R2 ; st=old$R1,old$R2, $R2=haystack
-  Push $R3
-  Push $R4
-  Push $R5
-  StrLen $R3 $R1
-  StrCpy $R4 0
-  ; $R1=needle
-  ; $R2=haystack
-  ; $R3=len(needle)
-  ; $R4=cnt
-  ; $R5=tmp
-  loop:
-    StrCpy $R5 $R2 $R3 $R4
-    StrCmp $R5 $R1 done
-    StrCmp $R5 "" done
-    IntOp $R4 $R4 + 1
-    Goto loop
-done:
-  StrCpy $R1 $R2 "" $R4
-  Pop $R5
-  Pop $R4
-  Pop $R3
-  Pop $R2
-  Exch $R1
-FunctionEnd
-!macroend
-!insertmacro StrStr ""
-!insertmacro StrStr "un."

gpac-0.5.0.svn4296.tar.bz2/bin/win32/release/nsis_install/readme.txt Deleted

gpac-0.5.0.svn4296.tar.bz2/build/xcode/empty.c Deleted

gpac-0.5.0.svn4296.tar.bz2/build/xcode/libgpac_symbols.h Deleted

@@ -1,291 +0,0 @@
-/*
- *  libgpac_hack.h
- *  mp4client
- *
- *  Created by bouqueau on 17/06/10.
- *  Copyright 2010 Telecom ParisTech. All rights reserved.
- *
- */
-
-
-/*exports for dlopen*/
-#define gf_log_lt _gf_log_lt
-#define AVI_close _AVI_close
-#define gf_term_del _gf_term_del
-#define gf_sleep _gf_sleep
-#define gf_sc_release_screen_buffer _gf_sc_release_screen_buffer
-#define gf_log_set_callback _gf_log_set_callback
-#define gf_prompt_get_char _gf_prompt_get_char
-#define gf_set_progress _gf_set_progress
-#define gf_term_new _gf_term_new
-#define gf_term_process_step _gf_term_process_step
-#define gf_sc_get_screen_buffer _gf_sc_get_screen_buffer
-#define gf_iphone_set_sdl_audio_module _gf_iphone_set_sdl_audio_module
-#define gf_term_step_clocks _gf_term_step_clocks
-#define gf_prompt_set_echo_off _gf_prompt_set_echo_off
-#define gf_log_tool_level_on _gf_log_tool_level_on
-#define gf_cfg_set_key _gf_cfg_set_key
-#define gf_cfg_get_section_count _gf_cfg_get_section_count
-#define gf_term_get_service_info _gf_term_get_service_info
-#define gf_term_set_size _gf_term_set_size
-#define gf_sys_get_rti _gf_sys_get_rti
-#define gf_term_play_from_time _gf_term_play_from_time
-#define gf_malloc _gf_malloc
-#define gf_log_set_tools_levels _gf_log_set_tools_levels
-#define gf_log_set_tool_level _gf_log_set_tool_level
-#define gf_log_modify_tools_levels _gf_log_modify_tools_levels
-#define gf_iphone_set_sdl_video_module _gf_iphone_set_sdl_video_module
-#define gf_term_get_option _gf_term_get_option
-#define gf_term_user_event _gf_term_user_event
-#define gf_modules_get_file_name _gf_modules_get_file_name
-#define gf_mx_new _gf_mx_new
-#define gf_list_count _gf_list_count
-#define gf_free _gf_free
-#define gf_term_get_world_info _gf_term_get_world_info
-#define gf_cfg_get_section_name _gf_cfg_get_section_name
-#define gf_term_navigate_to _gf_term_navigate_to
-#define gf_modules_del _gf_modules_del
-#define gf_modules_new _gf_modules_new
-#define gf_sys_init _gf_sys_init
-#define gf_log _gf_log
-#define gf_term_get_object_info _gf_term_get_object_info
-#define gf_mx_p _gf_mx_p
-#define gf_mx_v _gf_mx_v
-#define gf_mx_del _gf_mx_del
-#define gf_term_process_flush _gf_term_process_flush
-#define gf_cfg_get_key_name _gf_cfg_get_key_name
-#define AVI_write_frame _AVI_write_frame
-#define gf_cfg_del _gf_cfg_del
-#define gf_term_get_channel_net_info _gf_term_get_channel_net_info
-#define gf_term_process_shortcut _gf_term_process_shortcut
-#define gf_cfg_init _gf_cfg_init
-#define gf_term_get_download_info _gf_term_get_download_info
-#define gf_sys_clock _gf_sys_clock
-#define gf_term_get_object _gf_term_get_object
-#define gf_term_set_option _gf_term_set_option
-#define gf_sys_close _gf_sys_close
-#define gf_term_connect_from_time _gf_term_connect_from_time
-#define AVI_open_output_file _AVI_open_output_file
-#define gf_cfg_get_key _gf_cfg_get_key
-#define AVI_set_video _AVI_set_video
-#define gf_term_set_speed _gf_term_set_speed
-#define gf_cfg_get_key_count _gf_cfg_get_key_count
-#define gf_term_object_subscene_type _gf_term_object_subscene_type
-#define gf_term_get_framerate _gf_term_get_framerate
-#define gf_error_to_string _gf_error_to_string
-#define gf_stretch_bits _gf_stretch_bits
-#define gf_list_del _gf_list_del
-#define gf_list_get _gf_list_get
-#define gf_term_disconnect _gf_term_disconnect
-#define gf_term_is_supported_url _gf_term_is_supported_url
-#define gf_list_new _gf_list_new
-#define gf_modules_get_option _gf_modules_get_option
-#define gf_term_dump_scene _gf_term_dump_scene
-#define gf_prompt_has_input _gf_prompt_has_input
-#define gf_term_scene_update _gf_term_scene_update
-#define gf_term_connect _gf_term_connect
-#define gf_term_get_object_count _gf_term_get_object_count
-#define gf_modules_get_count _gf_modules_get_count
-#define gf_term_get_root_object _gf_term_get_root_object
-#define gf_term_get_time_in_ms _gf_term_get_time_in_ms
-#define gf_term_connect_with_path _gf_term_connect_with_path
-#define gf_term_switch_quality _gf_term_switch_quality
-#define gf_term_release_screen_buffer _gf_term_release_screen_buffer
-#define gf_term_get_screen_buffer _gf_term_get_screen_buffer
-#define gf_f64_open _gf_f64_open
-#define gf_fwrite _gf_fwrite
-#define gf_img_png_enc _gf_img_png_enc
-#define utf8_to_ucs4 _utf8_to_ucs4
-
-/*includes both terminal and od browser*/
-#include <gpac/terminal.h>
-#include <gpac/term_info.h>
-#include <gpac/constants.h>
-#include <gpac/options.h>
-#include <gpac/modules/service.h>
-
-/*ISO 639 languages*/
-#include <gpac/iso639.h>
-#include "sdl_out.h"
-#include "dlfcn.h"
-
-
-/*exports for dlopen*/
-#include <gpac/internal/avilib.h>
-#include <gpac/internal/terminal_dev.h>
-#include <gpac/internal/compositor_dev.h>
-#undef gf_log_lt
-extern void (*gf_log_lt)(u32 ll, u32 lt);
-#undef AVI_close
-extern int (*AVI_close)(avi_t *AVI);
-#undef gf_term_del
-extern GF_Err (*gf_term_del)(GF_Terminal *term);
-#undef gf_sleep
-extern void (*gf_sleep)(u32 ms);
-#undef gf_sc_release_screen_buffer
-extern GF_Err (*gf_sc_release_screen_buffer)(GF_Compositor *sr, GF_VideoSurface *framebuffer);
-#undef gf_prompt_get_char
-extern char (*gf_prompt_get_char)();
-#undef gf_set_progress
-extern void (*gf_set_progress)(char *title, u32 done, u32 total);
-#undef gf_term_new
-extern GF_Terminal *(*gf_term_new)(GF_User *user);
-#undef gf_term_process_step
-extern GF_Err (*gf_term_process_step)(GF_Terminal *term);
-#undef gf_sc_get_screen_buffer
-extern GF_Err (*gf_sc_get_screen_buffer)(GF_Compositor *sr, GF_VideoSurface *framebuffer, Bool depth_buffer);
-#undef gf_iphone_set_sdl_audio_module
-extern void (*gf_iphone_set_sdl_audio_module)(void* (*SDL_Module) (void));
-#undef gf_term_step_clocks
-extern GF_Err (*gf_term_step_clocks)(GF_Terminal * term, u32 ms_diff);
-#undef gf_prompt_set_echo_off
-extern void (*gf_prompt_set_echo_off)(Bool echo_off);
-#undef gf_log_tool_level_on
-extern u32 (*gf_log_tool_level_on)();
-#undef gf_cfg_set_key
-extern GF_Err (*gf_cfg_set_key)(GF_Config *cfgFile, const char *secName, const char *keyName, const char *keyValue);
-#undef gf_cfg_get_section_count
-extern u32 (*gf_cfg_get_section_count)(GF_Config *cfgFile);
-#undef gf_term_get_service_info
-extern GF_Err (*gf_term_get_service_info)(GF_Terminal *term, GF_ObjectManager *odm, NetInfoCommand *netcom);
-#undef gf_term_set_size
-extern GF_Err (*gf_term_set_size)(GF_Terminal *term, u32 NewWidth, u32 NewHeight);
-#undef gf_sys_get_rti
-extern Bool (*gf_sys_get_rti)(u32 refresh_time_ms, GF_SystemRTInfo *rti, u32 flags);
-#undef gf_term_play_from_time
-extern u32 (*gf_term_play_from_time)(GF_Terminal *term, u64 from_time, u32 pause_at_first_frame);
-#undef gf_malloc
-extern void *(*gf_malloc)(size_t size);
-#undef gf_log_set_tools_levels
-extern void (*gf_log_set_tools_levels)(const char *tools);
-#undef gf_log_set_tool_level
-extern void (*gf_log_set_tool_level)(u32 tool, u32 level);
-#undef gf_log_modify_tools_levels
-extern GF_Err (*gf_log_modify_tools_levels)(const char *val);
-#undef gf_iphone_set_sdl_video_module
-extern void (*gf_iphone_set_sdl_video_module)(void* (*SDL_Module) (void));
-#undef gf_term_get_option
-extern u32 (*gf_term_get_option)(GF_Terminal *term, u32 opt_type);
-#undef gf_term_user_event
-extern Bool (*gf_term_user_event)(GF_Terminal *term, GF_Event *event);
-#undef gf_modules_get_file_name
-extern const char *(*gf_modules_get_file_name)(GF_ModuleManager *pm, u32 index);
-#undef gf_mx_new
-extern GF_Mutex *(*gf_mx_new)(const char *name);
-#undef gf_list_count
-extern u32 (*gf_list_count)(GF_List *ptr);
-#undef gf_free
-extern void (*gf_free)(void *ptr);
-#undef gf_term_get_world_info
-extern const char *(*gf_term_get_world_info)(GF_Terminal *term, GF_ObjectManager *scene_od, GF_List *descriptions);
-#undef gf_cfg_get_section_name
-extern const char *(*gf_cfg_get_section_name)(GF_Config *cfgFile, u32 secIndex);
-#undef gf_term_navigate_to
-extern void (*gf_term_navigate_to)(GF_Terminal *term, const char *toURL);
-#undef gf_modules_del
-extern void (*gf_modules_del)(GF_ModuleManager *pm);
-#undef gf_modules_new
-extern GF_ModuleManager *(*gf_modules_new)(const char *directory, GF_Config *cfgFile);
-#undef gf_sys_init
-extern void (*gf_sys_init)(Bool enable_memory_tracker);
-#undef gf_log
-extern void (*gf_log)(const char *fmt, ...);
-#undef gf_term_get_object_info
-extern GF_Err (*gf_term_get_object_info)(GF_Terminal *term, GF_ObjectManager *odm, GF_MediaInfo *info);
-#undef gf_mx_p
-extern u32 (*gf_mx_p)(GF_Mutex *mx);
-#undef gf_mx_v
-extern u32 (*gf_mx_v)(GF_Mutex *mx);
-#undef gf_mx_del
-extern void (*gf_mx_del)(GF_Mutex *mx);
-#undef gf_term_process_flush
-extern GF_Err (*gf_term_process_flush)(GF_Terminal *term);
-#undef gf_cfg_get_key_name
-extern const char *(*gf_cfg_get_key_name)(GF_Config *cfgFile, const char *secName, u32 keyIndex);
-#undef AVI_write_frame
-extern int (*AVI_write_frame)(avi_t *AVI, char *data, long bytes, int keyframe);
-#undef gf_cfg_del
-extern void (*gf_cfg_del)(GF_Config *iniFile);
-#undef gf_term_get_channel_net_info
-extern Bool (*gf_term_get_channel_net_info)(GF_Terminal *term, GF_ObjectManager *odm, u32 *d_enum, u32 *chid, NetStatCommand *netcom, GF_Err *ret_code);
-#undef gf_term_process_shortcut
-extern void (*gf_term_process_shortcut)(GF_Terminal *term, GF_Event *ev);
-#undef gf_cfg_init
-extern GF_Config *(*gf_cfg_init)(const char *fileName, Bool *is_new);
-#undef gf_term_get_download_info
-extern Bool (*gf_term_get_download_info)(GF_Terminal *term, GF_ObjectManager *odm, u32 *d_enum, const char **server, const char **path, u32 *bytes_done, u32 *total_bytes, u32 *bytes_per_sec);
-#undef gf_sys_clock
-extern u32 (*gf_sys_clock)();
-#undef gf_term_get_object
-extern GF_ObjectManager *(*gf_term_get_object)(GF_Terminal *term, GF_ObjectManager *scene_od, u32 index);
-#undef gf_term_set_option
-extern GF_Err (*gf_term_set_option)(GF_Terminal *term, u32 opt_type, u32 opt_value);
-#undef gf_sys_close
-extern void (*gf_sys_close)();
-#undef gf_term_connect_from_time
-extern void (*gf_term_connect_from_time)(GF_Terminal *term, const char *URL, u64 time_in_ms, Bool pause_at_first_frame);
-#undef AVI_open_output_file
-extern avi_t* (*AVI_open_output_file)(char * filename);
-#undef gf_cfg_get_key
-extern const char *(*gf_cfg_get_key)(GF_Config *cfgFile, const char *secName, const char *keyName);
-#undef AVI_set_video
-extern void (*AVI_set_video)(avi_t *AVI, int width, int height, double fps, char *compressor);
-#undef gf_term_set_speed
-extern void (*gf_term_set_speed)(GF_Terminal *term, Fixed speed);
-#undef gf_cfg_get_key_count
-extern u32 (*gf_cfg_get_key_count)(GF_Config *cfgFile, const char *secName);
-#undef gf_term_object_subscene_type
-extern u32 (*gf_term_object_subscene_type)(GF_Terminal *term, GF_ObjectManager *odm);
-#undef gf_term_get_framerate 
-extern Double (*gf_term_get_framerate)(GF_Terminal *term, Bool absoluteFPS);
-#undef gf_error_to_string
-extern const char *(*gf_error_to_string)(GF_Err e);
-#undef gf_stretch_bits
-extern 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);
-#undef gf_list_del
-extern void (*gf_list_del)(GF_List *ptr);
-#undef gf_list_get
-extern void *(*gf_list_get)(GF_List *ptr, u32 itemNumber);
-#undef gf_term_disconnect
-extern void (*gf_term_disconnect)(GF_Terminal *term);
-#undef gf_term_is_supported_url
-extern Bool (*gf_term_is_supported_url)(GF_Terminal *term, const char *fileName, Bool use_parent_url, Bool no_mime_check);
-#undef gf_list_new
-extern GF_List *(*gf_list_new)(void);
-#undef gf_modules_get_option
-extern const char *(*gf_modules_get_option)(GF_BaseInterface *interface_obj, const char *secName, const char *keyName);
-#undef gf_term_dump_scene
-extern GF_Err (*gf_term_dump_scene)(GF_Terminal *term, char *rad_name, char **filename, Bool xml_dump, Bool skip_proto, GF_ObjectManager *odm);
-#undef gf_prompt_has_input
-extern Bool (*gf_prompt_has_input)();
-#undef gf_term_scene_update
-extern GF_Err (*gf_term_scene_update)(GF_Terminal *term, char *type, char *com);
-#undef gf_term_connect
-extern void (*gf_term_connect)(GF_Terminal *term, const char *URL);
-#undef gf_term_get_object_count
-extern u32 (*gf_term_get_object_count)(GF_Terminal *term, GF_ObjectManager *scene_od);
-#undef gf_modules_get_count
-extern u32 (*gf_modules_get_count)(GF_ModuleManager *pm);
-#undef gf_term_get_root_object
-extern GF_ObjectManager *(*gf_term_get_root_object)(GF_Terminal *term);
-#undef gf_term_get_time_in_ms
-extern u32 (*gf_term_get_time_in_ms)(GF_Terminal *term);
-#undef gf_term_connect_with_path
-extern void (*gf_term_connect_with_path)(GF_Terminal *term, const char *URL, const char *parent_URL);
-#undef gf_log_set_callback
-extern gf_log_cbk (*gf_log_set_callback)(void *usr_cbk, gf_log_cbk cbk);
-#undef gf_term_switch_quality
-extern void (*gf_term_switch_quality)(GF_Terminal *term, Bool up);
-#undef gf_term_release_screen_buffer
-extern GF_Err (*gf_term_release_screen_buffer)(GF_Terminal *term, GF_VideoSurface *framebuffer);
-#undef gf_term_get_screen_buffer
-extern GF_Err (*gf_term_get_screen_buffer)(GF_Terminal *term, GF_VideoSurface *framebuffer);
-#undef gf_f64_open
-extern FILE *(*gf_f64_open)(const char *file_name, const char *mode);
-#undef gf_fwrite
-extern size_t (*gf_fwrite)(const void *ptr, size_t size, size_t nmemb, FILE *stream);
-#undef gf_img_png_enc
-extern GF_Err (*gf_img_png_enc)(char *data, u32 width, u32 height, s32 stride, u32 pixel_format, char *dst, u32 *dst_size);
-#undef utf8_to_ucs4
-extern u32 (*utf8_to_ucs4)(u32 *ucs4_buf, u32 utf8_len, unsigned char *utf8_buf);
-

gpac-0.5.0.svn4296.tar.bz2/build/xcode/module_av_generic.c Deleted

@@ -1,58 +0,0 @@
-/*
-*			GPAC - Multimedia Framework C SDK
-*
-*           Author: Romain Bouqueau
-*			Copyright (c) Telecom ParisTech 2010-20XX
-*					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. 
-*		
-*/
-
-#include <gpac/tools.h>
-#include <gpac/modules/audio_out.h>
-#include <gpac/modules/video_out.h>
-
-/*interface query*/
-const u32 *QueryInterfaces() 
-{
-	static u32 si [] = {
-		GF_VIDEO_OUTPUT_INTERFACE,
-		GF_AUDIO_OUTPUT_INTERFACE,
-		0
-	};
-	return si; 
-}
-/*interface create*/
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	/*Hack: return invalid pointers*/
-	if (InterfaceType == GF_VIDEO_OUTPUT_INTERFACE) return 0x1;
-	if (InterfaceType == GF_AUDIO_OUTPUT_INTERFACE) return 0x2;
-	return NULL;
-}
-/*interface destroy*/
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	/*Hack: don't clean anything*/
-	switch (ifce->InterfaceType) {
-		case GF_VIDEO_OUTPUT_INTERFACE:
-			/*SDL_DeleteVideo(ifce);*/
-			break;
-		case GF_AUDIO_OUTPUT_INTERFACE:
-			/*SDL_DeleteAudio(ifce);*/
-			break;
-	}
-}
\ No newline at end of file

gpac-0.5.0.svn4296.tar.bz2/build/xcode/module_av_sdl.c Deleted

gpac-0.5.0.svn4296.tar.bz2/modules/ismacryp/ismacryp.c Deleted

@@ -1,363 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre 
- *			Copyright (c) Telecom ParisTech 2005-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / LASeR decoder module
- *
- *  GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-#include <gpac/modules/ipmp.h>
-#include <gpac/crypt.h>
-#include <gpac/ismacryp.h>
-#include <gpac/base_coding.h>
-#include <gpac/download.h>
-#include <gpac/internal/terminal_dev.h>
-
-#ifndef GPAC_DISABLE_MCRYPT
-
-#define OMA_DRM_MP4MC
-
-
-enum
-{
-	ISMAEA_STATE_ERROR,
-	ISMAEA_STATE_SETUP,
-	ISMAEA_STATE_PLAY,
-};
-
-typedef struct 
-{
-	GF_Crypt *crypt;
-	char key[16], salt[8];
-	u64 last_IV;
-	u32 state;
-	u32 nb_allow_play;
-	Bool is_oma;
-	u32 preview_range;
-} ISMAEAPriv;
-
-
-static void ISMA_KMS_NetIO(void *cbck, GF_NETIO_Parameter *par)
-{
-}
-
-static GF_Err ISMA_GetGPAC_KMS(ISMAEAPriv *priv, GF_Channel *ch, const char *kms_url)
-{
-	GF_Err e;
-	FILE *t;
-	GF_DownloadSession * sess;
-	if (!strnicmp(kms_url, "(ipmp)", 6)) return GF_NOT_SUPPORTED;
-	else if (!strnicmp(kms_url, "(uri)", 5)) kms_url += 5;
-	else if (!strnicmp(kms_url, "file://", 7)) kms_url += 7;
-
-	e = GF_OK;
-	/*try local*/
-	t = (strstr(kms_url, "://") == NULL) ? gf_f64_open(kms_url, "r") : NULL;
-	if (t) {
-		fclose(t);
-		return gf_ismacryp_gpac_get_info(ch->esd->ESID, (char *)kms_url, priv->key, priv->salt);
-	}
-	/*note that gpac doesn't have TLS support -> not really usefull. As a general remark, ISMACryp
-	is supported as a proof of concept, crypto and IPMP being the last priority on gpac...*/
-	GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ISMA E&A] 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;
-	/*start our download (threaded)*/
-	gf_dm_sess_process(sess);
-
-	while (1) {
-		e = gf_dm_sess_get_stats(sess, NULL, NULL, NULL, NULL, NULL, NULL);
-		if (e) break;
-	}
-	if (e==GF_EOS) {
-		e = gf_ismacryp_gpac_get_info(ch->esd->ESID, (char *) gf_dm_sess_get_cache_name(sess), priv->key, priv->salt);
-	}
-	gf_term_download_del(sess);
-	return e;
-}
-
-
-static GF_Err ISMA_Setup(ISMAEAPriv *priv, GF_IPMPEvent *evt)
-{
-	GF_Err e;
-	GF_ISMACrypConfig *cfg = (GF_ISMACrypConfig*)evt->config_data;
-
-	priv->state = ISMAEA_STATE_ERROR;
-
-	if (cfg->scheme_type != GF_4CC('i','A','E','C')) return GF_NOT_SUPPORTED;
-	if (cfg->scheme_version != 1) return GF_NOT_SUPPORTED;
-
-	if (!cfg->kms_uri) return GF_NON_COMPLIANT_BITSTREAM;
-
-	/*try to fetch the keys*/
-	/*base64 inband encoding*/
-	if (!strnicmp(cfg->kms_uri, "(key)", 5)) {
-		char data[100];
-		gf_base64_decode((char*)cfg->kms_uri+5, strlen(cfg->kms_uri)-5, data, 100);
-		memcpy(priv->key, data, sizeof(char)*16);
-		memcpy(priv->salt, data+16, sizeof(char)*8);
-	}
-	/*hexadecimal inband encoding*/
-	else if (!strnicmp(cfg->kms_uri, "(key-hexa)", 10)) {
-		u32 v;
-		char szT[3], *k;
-		u32 i;
-		szT[2] = 0;
-		if (strlen(cfg->kms_uri) < 10+32+16) return GF_NON_COMPLIANT_BITSTREAM;
-
-		k = (char *)cfg->kms_uri + 10;
-		for (i=0; i<16; i++) { 
-			szT[0] = k[2*i]; szT[1] = k[2*i + 1];
-			sscanf(szT, "%X", &v); 
-			priv->key[i] = v;
-		}
-
-		k = (char *)cfg->kms_uri + 10 + 32;
-		for (i=0; i<8; i++) { 
-			szT[0] = k[2*i]; szT[1] = k[2*i + 1];
-			sscanf(szT, "%X", &v); 
-			priv->salt[i] = v;
-		}
-	}
-	/*MPEG4-IP KMS*/
-	else if (!stricmp(cfg->kms_uri, "AudioKey") || !stricmp(cfg->kms_uri, "VideoKey")) {
-		if (!gf_ismacryp_mpeg4ip_get_info((char *) cfg->kms_uri, priv->key, priv->salt)) {
-			return GF_BAD_PARAM;
-		}
-	}
-	/*gpac default scheme is used, fetch file from KMS and load keys*/
-	else if (cfg->scheme_uri && !stricmp(cfg->scheme_uri, "urn:gpac:isma:encryption_scheme")) {
-		e = ISMA_GetGPAC_KMS(priv, evt->channel, cfg->kms_uri);
-		if (e) return e;
-	}
-	/*hardcoded keys*/
-	else {
-		static u8 mysalt[] = { 8,7,6,5,4,3,2,1, 0,0,0,0,0,0,0,0 };
-		static u8 mykey[][16]  = {
-	{ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-	  0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 } };
-		memcpy(priv->salt, mysalt, sizeof(char)*8);
-		memcpy(priv->key, mykey, sizeof(char)*16);
-	}
-	priv->state = ISMAEA_STATE_SETUP;
-	//priv->nb_allow_play = 1;
-	return GF_OK;
-}
-
-static GF_Err ISMA_Access(ISMAEAPriv *priv, GF_IPMPEvent *evt)
-{
-	GF_Err e;
-	char IV[16];
-	
-	if (evt->event_type==GF_IPMP_TOOL_GRANT_ACCESS) {
-		if (priv->state != ISMAEA_STATE_SETUP) return GF_SERVICE_ERROR;
-		assert(!priv->crypt);
-
-		//if (!priv->nb_allow_play) return GF_AUTHENTICATION_FAILURE;
-		//priv->nb_allow_play--;
-		
-		/*init decrypter*/
-		priv->crypt = gf_crypt_open("AES-128", "CTR");
-		if (!priv->crypt) return GF_IO_ERR;
-
-		memset(IV, 0, sizeof(char)*16);
-		memcpy(IV, priv->salt, sizeof(char)*8);
-		e = gf_crypt_init(priv->crypt, priv->key, 16, IV);
-		if (e) return e;
-
-		priv->state = ISMAEA_STATE_PLAY;
-		return GF_OK;
-	}
-	if (evt->event_type==GF_IPMP_TOOL_RELEASE_ACCESS) {
-		if (priv->state != ISMAEA_STATE_PLAY) return GF_SERVICE_ERROR;
-		if (priv->crypt) gf_crypt_close(priv->crypt);
-		priv->crypt = NULL;
-		priv->state = ISMAEA_STATE_SETUP;
-		return GF_OK;
-	}
-	return GF_BAD_PARAM;
-}
-
-static GF_Err ISMA_ProcessData(ISMAEAPriv *priv, GF_IPMPEvent *evt)
-{
-	if (!priv->crypt) return GF_SERVICE_ERROR;
-	
-	if (!evt->is_encrypted) return GF_OK;
-
-	/*resync IV*/
-	if (!priv->last_IV || (priv->last_IV != evt->isma_BSO)) {
-		char IV[17];
-		u64 count;
-		u32 remain;
-		GF_BitStream *bs;
-		count = evt->isma_BSO / 16;
-		remain = (u32) (evt->isma_BSO % 16);
-
-		/*format IV to begin of counter*/
-		bs = gf_bs_new(IV, 17, GF_BITSTREAM_WRITE);
-		gf_bs_write_u8(bs, 0);	/*begin of counter*/
-		gf_bs_write_data(bs, priv->salt, 8);
-		gf_bs_write_u64(bs, (s64) count);
-		gf_bs_del(bs);
-		gf_crypt_set_state(priv->crypt, IV, 17);
-
-		/*decrypt remain bytes*/
-		if (remain) {
-			char dummy[20];
-			gf_crypt_decrypt(priv->crypt, dummy, remain);
-		}
-		priv->last_IV = evt->isma_BSO;
-	}
-	/*decrypt*/
-	gf_crypt_decrypt(priv->crypt, evt->data, evt->data_size);
-	priv->last_IV += evt->data_size;
-	return GF_OK;
-}
-
-
-#ifdef OMA_DRM_MP4MC
-static GF_Err OMA_DRM_Setup(ISMAEAPriv *priv, GF_IPMPEvent *evt)
-{
-	u32 hdr_pos;
-	GF_OMADRM2Config *cfg = (GF_OMADRM2Config*)evt->config_data;
-
-	priv->state = ISMAEA_STATE_ERROR;
-
-	if (cfg->scheme_type != GF_4CC('o','d','k','m')) return GF_NOT_SUPPORTED;
-	if (cfg->scheme_version != 0x00000200) return GF_NOT_SUPPORTED;
-
-	hdr_pos = 0;
-	while (hdr_pos<cfg->oma_drm_textual_headers_len) {
-		u32 len;
-		char *sep;
-		if (!strncmp(cfg->oma_drm_textual_headers + hdr_pos, "PreviewRange", 12)) {
-			sep = strchr(cfg->oma_drm_textual_headers + hdr_pos, ':');
-			if (sep) priv->preview_range = atoi(sep+1);
-		}
-		len = strlen(cfg->oma_drm_textual_headers + hdr_pos);
-		hdr_pos += len+1;
-	}
-	priv->is_oma = 1;
-
-	/*TODO: call DRM agent, fetch keys*/
-	if (!cfg->kms_uri) return GF_NON_COMPLIANT_BITSTREAM;
-	priv->state = ISMAEA_STATE_SETUP;
-	//priv->nb_allow_play = 1;
-	
-	/*we have preview*/
-	if (priv->preview_range) return GF_OK;
-	return GF_NOT_SUPPORTED;
-}
-#endif
-
-static GF_Err ISMA_Process(GF_IPMPTool *plug, GF_IPMPEvent *evt)
-{
-	ISMAEAPriv *priv = (ISMAEAPriv *)plug->udta;
-
-	switch (evt->event_type) {
-	case GF_IPMP_TOOL_SETUP:
-		if (evt->config_data_code == GF_4CC('i','s','m','a')) return ISMA_Setup(priv, evt);
-#ifdef OMA_DRM_MP4MC
-		if (evt->config_data_code == GF_4CC('o','d','r','m')) return OMA_DRM_Setup(priv, evt);
-#endif
-		return GF_NOT_SUPPORTED;
-		
-	case GF_IPMP_TOOL_GRANT_ACCESS:
-	case GF_IPMP_TOOL_RELEASE_ACCESS:
-		if (priv->is_oma) {
-		} else {
-			return ISMA_Access(priv, evt);
-		}
-		break;
-	case GF_IPMP_TOOL_PROCESS_DATA:
-		if (priv->is_oma) {
-			if (evt->is_encrypted) {
-				evt->restart_requested = 1;
-				return GF_EOS;
-			}
-			return GF_OK;
-		}
-		return ISMA_ProcessData(priv, evt);
-	}
-	return GF_OK;
-}
-
-void DeleteISMACrypTool(GF_IPMPTool *plug)
-{
-	ISMAEAPriv *priv = (ISMAEAPriv *)plug->udta;
-	/*in case something went wrong*/
-	if (priv->crypt) gf_crypt_close(priv->crypt);
-	gf_free(priv);
-	gf_free(plug);
-}
-
-GF_IPMPTool *NewISMACrypTool()
-{
-	ISMAEAPriv *priv;
-	GF_IPMPTool *tmp;
-	
-	GF_SAFEALLOC(tmp, GF_IPMPTool);
-	if (!tmp) return NULL;
-	GF_SAFEALLOC(priv, ISMAEAPriv);
-	tmp->udta = priv;
-	tmp->process = ISMA_Process;
-	GF_REGISTER_MODULE_INTERFACE(tmp, GF_IPMP_TOOL_INTERFACE, "GPAC ISMACryp tool", "gpac distribution")
-	return (GF_IPMPTool *) tmp;
-}
-
-#endif /*GPAC_DISABLE_MCRYPT*/
-
-GF_EXPORT
-const u32 *QueryInterfaces() 
-{
-	static u32 si [] = {
-#ifndef GPAC_DISABLE_MCRYPT
-		GF_IPMP_TOOL_INTERFACE,
-#endif
-		0
-	};
-	return si;
-}
-
-GF_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	switch (InterfaceType) {
-#ifndef GPAC_DISABLE_MCRYPT
-	case GF_IPMP_TOOL_INTERFACE:
-		return (GF_BaseInterface *)NewISMACrypTool();
-#endif
-	default:
-		return NULL;
-	}
-}
-
-GF_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-#ifndef GPAC_DISABLE_MCRYPT
-	case GF_IPMP_TOOL_INTERFACE:
-		DeleteISMACrypTool((GF_IPMPTool *)ifce);
-		break;
-#endif
-	}
-}

gpac-0.5.0.svn4296.tar.bz2/modules/isom_in/cache.c Deleted

@@ -1,268 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre 
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / MP4 cache module
- *
- *  GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
- */
-
-#include "isom_in.h"
-
-#ifndef GPAC_DISABLE_ISOM_WRITE
-
-static GF_Err ISOW_Open(GF_StreamingCache *mc, GF_ClientService *serv, const char *location_and_name, Bool keep_existing_files)
-{
-	char szRoot[GF_MAX_PATH], szPath[GF_MAX_PATH], *ext;
-	ISOMReader *cache = (ISOMReader *)mc->priv;
-	if (cache->mov || cache->service) return GF_BAD_PARAM;
-
-	strcpy(szRoot, location_and_name);
-	ext = strrchr(szRoot, '.');
-	if (ext) ext[0] = 0;
-	strcpy(szPath, szRoot);
-	strcat(szPath, ".mp4");
-	if (keep_existing_files) {
-		FILE *f = gf_f64_open(szPath, "rb");
-		if (f) {
-			u32 i=0;
-			fclose(f);
-			while (1) {
-				sprintf(szPath, "%s_%04d.mp4", szRoot, i);
-				f = gf_f64_open(szPath, "rb");
-				if (!f) break;
-				fclose(f);
-				i++;
-			}
-		}
-	}
-	
-	/*create a new movie in write mode (eg no editing)*/
-	cache->mov = gf_isom_open(szPath, GF_ISOM_OPEN_WRITE, NULL);
-	if (!cache->mov) return gf_isom_last_error(NULL);
-	cache->service = serv;
-	return GF_OK;
-}
-
-static GF_Err ISOW_Close(GF_StreamingCache *mc, Bool delete_cache)
-{
-	GF_Err e;
-	ISOMReader *cache = (ISOMReader *)mc->priv;
-	if (!cache->mov || !cache->service) return GF_BAD_PARAM;
-
-	while (gf_list_count(cache->channels)) {
-		ISOMChannel *ch = (ISOMChannel *)gf_list_get(cache->channels, 0);
-		gf_list_rem(cache->channels, 0);
-		if (ch->cache_sample) {
-			gf_isom_add_sample(cache->mov, ch->track, 1, ch->cache_sample);
-			gf_isom_sample_del(&ch->cache_sample);
-		}
-		gf_free(ch);
-	}
-	if (delete_cache) {
-		gf_isom_delete(cache->mov);
-		e = GF_OK;
-	} else {
-		e = gf_isom_close(cache->mov);
-	}
-	cache->mov = NULL;
-	cache->service = NULL;
-	return e;
-}
-static GF_Err ISOW_Write(GF_StreamingCache *mc, LPNETCHANNEL ch, char *data, u32 data_size, GF_SLHeader *sl_hdr)
-{
-	ISOMChannel *mch;
-	GF_ESD *esd;
-	u32 di, mtype;
-	u64 DTS, CTS;
-	ISOMReader *cache = (ISOMReader *)mc->priv;
-	if (!cache->mov || !cache->service) return GF_BAD_PARAM;
-
-	mch = isor_get_channel(cache, ch);
-	if (!mch) {
-		Bool mapped;
-		GF_NetworkCommand com;
-		com.base.on_channel = ch;
-		com.base.command_type = GF_NET_CHAN_GET_ESD;
-		gf_term_on_command(cache->service, &com, GF_OK);
-		if (!com.cache_esd.esd) return GF_SERVICE_ERROR;
-
-		esd = (GF_ESD *)com.cache_esd.esd;
-		switch (esd->decoderConfig->streamType) {
-		case GF_STREAM_OD: mtype = GF_ISOM_MEDIA_OD; break;
-		case GF_STREAM_SCENE: mtype = GF_ISOM_MEDIA_SCENE; break;
-		case GF_STREAM_VISUAL: mtype = GF_ISOM_MEDIA_VISUAL; break;
-		case GF_STREAM_AUDIO: mtype = GF_ISOM_MEDIA_AUDIO; break;
-		case GF_STREAM_MPEG7: mtype = GF_ISOM_MEDIA_MPEG7; break;
-		case GF_STREAM_OCI: mtype = GF_ISOM_MEDIA_OCI; break;
-		case GF_STREAM_IPMP: mtype = GF_ISOM_MEDIA_IPMP; break;
-		case GF_STREAM_MPEGJ: mtype = GF_ISOM_MEDIA_MPEGJ; break;
-		case GF_STREAM_TEXT: mtype = GF_ISOM_MEDIA_TEXT; break;
-		default: return GF_NOT_SUPPORTED;
-		}
-		GF_SAFEALLOC(mch, ISOMChannel);
-		mch->time_scale = esd->slConfig->timestampResolution;
-		mch->streamType = esd->decoderConfig->streamType;
-		mch->track = gf_isom_new_track(cache->mov, com.cache_esd.esd->ESID, mtype, mch->time_scale);
-		mch->is_playing = 1;
-		mch->channel = ch;
-		mch->owner = cache;
-		gf_isom_set_track_enabled(cache->mov, mch->track, 1);
-		/*translate 3GP streams to MP4*/
-		mapped = 0;
-		if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_MEDIA_GENERIC) {
-			char szCode[5];
-			strncpy(szCode, esd->decoderConfig->decoderSpecificInfo->data, 4);
-			szCode[4]=0;
-			if (!stricmp(szCode, "samr") || !stricmp(szCode, "amr ") || !stricmp(szCode, "sawb")) {
-				GF_3GPConfig amrc;
-				mapped = 1;
-				memset(&amrc, 0, sizeof(GF_3GPConfig));
-
-				amrc.frames_per_sample = (u32) esd->decoderConfig->decoderSpecificInfo->data[13];
-				amrc.type = (!stricmp(szCode, "sawb")) ? GF_ISOM_SUBTYPE_3GP_AMR_WB : GF_ISOM_SUBTYPE_3GP_AMR;
-				amrc.vendor = GF_4CC('G','P','A','C');
-				gf_isom_3gp_config_new(cache->mov, mch->track, &amrc, NULL, NULL, &di);
-			} else if (!stricmp(szCode, "h263")) {
-				GF_3GPConfig h263c;
-				memset(&h263c, 0, sizeof(GF_3GPConfig));
-				h263c.type = GF_ISOM_SUBTYPE_3GP_H263;
-				h263c.vendor = GF_4CC('G','P','A','C');
-				gf_isom_3gp_config_new(cache->mov, mch->track, &h263c, NULL, NULL, &di);
-				mapped = 1;
-			}
-		} 
-		if (!mapped) gf_isom_new_mpeg4_description(cache->mov, mch->track, esd, NULL, NULL, &di);
-		if (com.cache_esd.is_iod_stream) gf_isom_add_track_to_root_od(cache->mov, mch->track);
-		gf_list_add(cache->channels, mch);
-	}
-
-	/*first sample, cache it*/
-	if (!mch->cache_sample) {
-		mch->cache_seed_ts = sl_hdr->decodingTimeStamp;
-		mch->cache_sample = gf_isom_sample_new();
-		mch->cache_sample->IsRAP = sl_hdr->randomAccessPointFlag;
-		mch->cache_sample->dataLength = data_size;
-		mch->cache_sample->data = (char*)gf_malloc(sizeof(char)*data_size);
-		memcpy(mch->cache_sample->data, data, sizeof(char)*data_size);
-		return GF_OK;
-	}
-
-	/*adjust DTS/CTS*/
-	DTS = sl_hdr->decodingTimeStamp - mch->cache_seed_ts;
-
-	if ((mch->streamType==GF_STREAM_VISUAL) && (DTS<=mch->cache_sample->DTS)) {
-		assert(DTS>mch->prev_dts);
-		CTS = mch->cache_sample->DTS + mch->cache_sample->CTS_Offset;
-		mch->cache_sample->CTS_Offset = 0;
-
-		/*first time, shift all CTS*/
-		if (!mch->frame_cts_offset) {
-			u32 i, count = gf_isom_get_sample_count(cache->mov, mch->track);
-			mch->frame_cts_offset = (u32) (DTS-mch->prev_dts);
-			for (i=0; i<count; i++) {
-				gf_isom_modify_cts_offset(cache->mov, mch->track, i+1, mch->frame_cts_offset);
-			}
-			mch->cache_sample->CTS_Offset += mch->frame_cts_offset;
-		}
-		mch->cache_sample->DTS = mch->prev_dts + mch->frame_cts_offset;
-		mch->cache_sample->CTS_Offset += (u32) (CTS-mch->cache_sample->DTS);
-	}
-	/*deal with reference picture insertion: if no CTS offset and biggest CTS until now, this is 
-	a reference insertion - we must check that in order to make sure we have strictly increasing DTSs*/
-	if (mch->max_cts && !mch->cache_sample->CTS_Offset && (mch->cache_sample->DTS+mch->cache_sample->CTS_Offset > mch->max_cts)) {
-		assert(mch->cache_sample->DTS > mch->prev_dts + mch->frame_cts_offset);
-		CTS = mch->cache_sample->DTS + mch->cache_sample->CTS_Offset;
-		mch->cache_sample->DTS = mch->prev_dts + mch->frame_cts_offset;
-		mch->cache_sample->CTS_Offset = (u32) (CTS-mch->cache_sample->DTS);
-	}
-	if (mch->cache_sample->CTS_Offset) 
-		mch->max_cts = mch->cache_sample->DTS+mch->cache_sample->CTS_Offset;
-
-	/*add cache*/
-	gf_isom_add_sample(cache->mov, mch->track, 1, mch->cache_sample);
-	assert(!mch->prev_dts || (mch->prev_dts < mch->cache_sample->DTS));
-	mch->prev_dts = mch->cache_sample->DTS;
-	mch->duration = MAX(mch->max_cts, mch->prev_dts);
-	gf_isom_sample_del(&mch->cache_sample);
-
-	/*store sample*/
-	mch->cache_sample = gf_isom_sample_new();
-	mch->cache_sample->IsRAP = sl_hdr->randomAccessPointFlag;
-	mch->cache_sample->DTS = DTS + mch->frame_cts_offset;
-	mch->cache_sample->CTS_Offset = (u32) (sl_hdr->compositionTimeStamp - mch->cache_seed_ts - DTS);
-	mch->cache_sample->dataLength = data_size;
-	mch->cache_sample->data = (char*)gf_malloc(sizeof(char)*data_size);
-	memcpy(mch->cache_sample->data, data, sizeof(char)*data_size);
-	return GF_OK;
-}
-static GF_Err ISOW_ServiceCommand(GF_StreamingCache *mc, GF_NetworkCommand *com)
-{
-	ISOMReader *cache = (ISOMReader *)mc->priv;
-	if (!cache->mov || !cache->service) return GF_BAD_PARAM;
-
-	return GF_OK;
-}
-static GF_Err ISOW_ChannelGetSLP(GF_StreamingCache *mc, LPNETCHANNEL channel, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr, Bool *sl_compressed, GF_Err *out_reception_status, Bool *is_new_data)
-{
-	ISOMReader *cache = (ISOMReader *)mc->priv;
-	if (!cache->mov || !cache->service) return GF_BAD_PARAM;
-
-	return GF_OK;
-}
-static GF_Err ISOW_ChannelReleaseSLP(GF_StreamingCache *mc, LPNETCHANNEL channel)
-{
-	ISOMReader *cache = (ISOMReader *)mc->priv;
-	if (!cache->mov || !cache->service) return GF_BAD_PARAM;
-
-	return GF_OK;
-}
-
-
-GF_BaseInterface *isow_load_cache()
-{
-	ISOMReader *cache;
-	GF_StreamingCache *plug;
-	GF_SAFEALLOC(plug, GF_StreamingCache);
-	GF_REGISTER_MODULE_INTERFACE(plug, GF_STREAMING_MEDIA_CACHE, "GPAC IsoMedia Cache", "gpac distribution")
-
-	plug->Open = ISOW_Open;
-	plug->Close = ISOW_Close;
-	plug->Write = ISOW_Write;
-	plug->ChannelGetSLP = ISOW_ChannelGetSLP;
-	plug->ChannelReleaseSLP = ISOW_ChannelReleaseSLP;
-	plug->ServiceCommand = ISOW_ServiceCommand;
-
-	GF_SAFEALLOC(cache, ISOMReader);
-	cache->channels = gf_list_new();
-	plug->priv = cache;
-	return (GF_BaseInterface *) plug;
-}
-
-void isow_delete_cache(GF_BaseInterface *bi)
-{
-	GF_StreamingCache *mc = (GF_StreamingCache*) bi;
-	ISOMReader *cache = (ISOMReader *)mc->priv;
-	gf_list_del(cache->channels);
-	gf_free(cache);
-	gf_free(bi);
-}
-
-#endif /*GPAC_DISABLE_ISOM_WRITE*/
-

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

gpac-0.5.0.svn4296.tar.bz2/applications/GPAX/GPAXPlugin.cpp -> gpac-0.5.0.svn4668.tar.bz2/applications/GPAX/GPAXPlugin.cpp Changed

@@ -68,7 +68,7 @@
 Bool CGPAXPlugin::EventProc(GF_Event *evt)
 {
 	char msg[1024];
-	if (!m_term) return 0;
+	if (!m_term) return GF_FALSE;
 
     switch (evt->type) {
 	case GF_EVENT_MESSAGE:
@@ -131,9 +131,9 @@
 		SetStatusText(msg);
 		break;
 	case GF_EVENT_NAVIGATE:
-		if (gf_term_is_supported_url(m_term, evt->navigate.to_url, 1, 1)) {
+		if (gf_term_is_supported_url(m_term, evt->navigate.to_url, GF_TRUE, GF_TRUE)) {
 			gf_term_navigate_to(m_term, evt->navigate.to_url);
-			return 1;
+			return GF_TRUE;
 		} 
 #ifndef _WIN32_WCE
 		else if (m_pBrowser) {
@@ -158,12 +158,12 @@
 			sz_ptr = & evt->navigate.to_url;
 			gf_utf8_mbstowcs(w_szURL, 1024, (const char **)sz_ptr);
 			m_pBrowser->Navigate((BSTR) w_szURL, &flags, &target, NULL, NULL);;
-			return 1;
+			return GF_TRUE;
 		}
 #endif
 		break;
     }
-    return 0;
+    return GF_FALSE;
 }
 
 Bool GPAX_EventProc(void *ptr, GF_Event *evt)
@@ -178,7 +178,7 @@
 {
     VARIANT v;
     HRESULT hr;
-    Bool retval=0;
+    Bool retval = GF_FALSE;
 
     v.vt = VT_EMPTY;
     v.bstrVal = NULL;
@@ -190,10 +190,10 @@
 //            USES_CONVERSION;
 //            lstrcpyn(buf,OLE2T(v.bstrVal),bufsize);
 			const u16 *srcp = (const u16 *) v.bstrVal;
-			u32 len = gf_utf8_wcstombs(buf, bufsize, &srcp);
+			size_t len = gf_utf8_wcstombs(buf, bufsize, &srcp);
 			if (len>=0) {
-				buf[len] = 0;
-				retval=1;
+				buf[(u32) len] = 0;
+				retval = GF_TRUE;
 			}
         }
         VariantClear(&v);
@@ -251,8 +251,8 @@
 		BSTR data = NULL;
 		if ((pObjectElem->get_data(&data) == S_OK) && data) {
 			const u16 *srcp = (const u16 *) data;
-			u32 len = gf_utf8_wcstombs(m_url, MAXLEN_URL, &srcp);
-			if (len>=0) m_url[len] = 0;
+			size_t len = gf_utf8_wcstombs(m_url, MAXLEN_URL, &srcp);
+			if (len>=0) m_url[(u32) len] = 0;
 		}
 		SysFreeString(data);
 		break;
@@ -312,7 +312,7 @@
 
     if (m_hWnd==NULL) return 0;
 
-	gf_sys_init(0);
+	gf_sys_init(GF_FALSE);
 
 	//Create a structure m_user for initialize the terminal. the parameters to set:
 	//1)config file path
@@ -345,7 +345,7 @@
 	
 
     str = gf_cfg_get_key(m_user.config, "General", "ModulesDirectory");
-    m_user.modules = gf_modules_new(str, m_user.config);
+    m_user.modules = gf_modules_new(NULL, m_user.config);
     if(!gf_modules_get_count(m_user.modules)) goto err_exit;
 
     m_user.os_window_handler = m_hWnd;
@@ -414,7 +414,7 @@
 HRESULT CGPAXPlugin::OnDraw(ATL_DRAWINFO& di)
 {
 	if (m_term && m_bInitialDraw) {
-		m_bInitialDraw = FALSE;
+		m_bInitialDraw = GF_FALSE;
 		if (m_bAutoStart) Play();
 	}
     return S_OK;
@@ -433,10 +433,10 @@
 	    ReadParamString(pPropBag,pErrorLog,L"data", m_url, MAXLEN_URL);
 
     if (ReadParamString(pPropBag,pErrorLog,L"autostart", szOpt, 1024))
-		m_bAutoStart = (!stricmp(szOpt, "false") || !stricmp(szOpt, "no")) ? 0 : 1;
+		m_bAutoStart = (!stricmp(szOpt, "false") || !stricmp(szOpt, "no")) ? GF_FALSE : GF_TRUE;
 
     if (ReadParamString(pPropBag,pErrorLog,L"use3d", szOpt, 1024))
-		m_bUse3D = (!stricmp(szOpt, "true") || !stricmp(szOpt, "yes")) ? 1 : 0;
+		m_bUse3D = (!stricmp(szOpt, "true") || !stricmp(szOpt, "yes")) ? GF_TRUE : GF_FALSE;
 
     if (ReadParamString(pPropBag,pErrorLog,L"aspectratio", szOpt, 1024)) {
 		if (!stricmp(szOpt, "keep")) m_AR = GF_ASPECT_RATIO_KEEP;
@@ -446,10 +446,10 @@
 	}
 
     if (ReadParamString(pPropBag,pErrorLog,L"loop", szOpt, 1024))
-		m_bLoop = !stricmp(szOpt, "true") ? 0 : 1;
+		m_bLoop = !stricmp(szOpt, "true") ? GF_FALSE : GF_TRUE;
 
 	if (ReadParamString(pPropBag,pErrorLog,L"gui", szOpt, 1024))
-		m_bUseGUI = (!stricmp(szOpt, "true") || !stricmp(szOpt, "yes")) ? 1 : 0;
+		m_bUseGUI = (!stricmp(szOpt, "true") || !stricmp(szOpt, "yes")) ? GF_TRUE : GF_FALSE;
 
 	UpdateURL();
 
@@ -514,7 +514,7 @@
     V_VT(&value) = VT_BSTR;
 
 	sptr = (const char *)m_url;
-	len = gf_utf8_mbstowcs(wurl, MAXLEN_URL, &sptr);
+	len = (u16) gf_utf8_mbstowcs(wurl, MAXLEN_URL, &sptr);
     V_BSTR(&value) = SysAllocStringLen(NULL, len+1);
 	memcpy(V_BSTR(&value) , wurl, len*sizeof(u16));
 	V_BSTR(&value) [len] = 0;
@@ -566,7 +566,7 @@
 
 STDMETHODIMP CGPAXPlugin::QualitySwitch(int switch_up)
 {
-	if (m_term) gf_term_switch_quality(m_term, switch_up ? 1 : 0);     
+	if (m_term) gf_term_switch_quality(m_term, switch_up ? GF_TRUE : GF_FALSE);     
     return S_OK;
 }
 
@@ -578,11 +578,11 @@
 		char *url;
 
 		srcp = (u16 *)_url;
-		len = gf_utf8_wcstombs(NULL, 0, (const u16 **)&srcp);
+		len = (u32) gf_utf8_wcstombs(NULL, 0, (const u16 **)&srcp);
 		if (len) {
 			url = (char *) gf_malloc(sizeof(char) * (len+1));
 			srcp = (u16 *)_url;
-			len = gf_utf8_wcstombs(url, len, (const u16 **)&srcp);
+			len = (u32) gf_utf8_wcstombs(url, len, (const u16 **)&srcp);
 			url[len] = 0;
 			strcpy(m_url, url);
 			gf_term_connect(m_term, url);     
@@ -600,15 +600,15 @@
 		char mtype[1024], *updates;
 
 		srcp = (u16 *) _mtype;
-		len = gf_utf8_wcstombs(mtype, 1024, (const u16 **)&srcp);
+		len = (u32) gf_utf8_wcstombs(mtype, 1024, (const u16 **)&srcp);
 		mtype[len] = 0;
 
 		srcp = (u16 *)_updates;
-		len = gf_utf8_wcstombs(NULL, 0, (const u16 **)&srcp);
+		len = (u32) gf_utf8_wcstombs(NULL, 0, (const u16 **)&srcp);
 		if (len) {
 			updates = (char *) gf_malloc(sizeof(char) * (len+1));
 			srcp = (u16 *)_updates;
-			len = gf_utf8_wcstombs(updates, len, (const u16 **)&srcp);
+			len = (u32) gf_utf8_wcstombs(updates, len, (const u16 **)&srcp);
 			updates[len] = 0;
 			gf_term_scene_update(m_term, mtype, updates);
 			gf_free(updates);
@@ -625,7 +625,7 @@
     if (url==NULL) return E_POINTER;
 
 	sptr = (const char *)m_url;
-	len = gf_utf8_mbstowcs(wurl, MAXLEN_URL, &sptr);
+	len = (u32) gf_utf8_mbstowcs(wurl, MAXLEN_URL, &sptr);
     *url = SysAllocStringLen(NULL, len+1);
 	memcpy(*url, wurl, len*sizeof(u16));
 	*url[len] = 0;
@@ -634,7 +634,7 @@
 STDMETHODIMP CGPAXPlugin::put_src(BSTR url)
 {
 	const u16 *srcp = (const u16 *)url;
-	u32 len = gf_utf8_wcstombs(m_url, MAXLEN_URL, &srcp);
+	u32 len = (u32) gf_utf8_wcstombs(m_url, MAXLEN_URL, &srcp);
 	m_url[len] = 0;
 	UpdateURL();
     return S_OK;
@@ -648,7 +648,7 @@
 }
 STDMETHODIMP CGPAXPlugin::put_AutoStart(VARIANT_BOOL as)
 {
-    m_bAutoStart = (as !=VARIANT_FALSE) ? TRUE: FALSE;
+    m_bAutoStart = (as !=VARIANT_FALSE) ? GF_TRUE : GF_FALSE;
     return S_OK;
 }

gpac-0.5.0.svn4296.tar.bz2/applications/GPAX/GPAXPlugin.h -> gpac-0.5.0.svn4668.tar.bz2/applications/GPAX/GPAXPlugin.h Changed

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

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast Added

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/Makefile Added

@@ -0,0 +1,73 @@
+include ../../config.mak
+
+vpath %.c $(SRC_PATH)/applications/dashcast
+
+CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include" -I../../
+
+LINKLIBS=$(GPAC_SH_FLAGS)
+
+ifeq ($(DEBUGBUILD), yes)
+CFLAGS+=-g
+LDFLAGS+=-g
+endif
+
+ifeq ($(GPROFBUILD), yes)
+CFLAGS+=-pg
+LDFLAGS+=-pg
+endif
+
+ifeq ($(GPACREADONLY), yes)
+CFLAGS+=-DGPAC_READ_ONLY
+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
+
+ifeq ($(CONFIG_WIN32),yes)
+EXE=.exe
+PROG=DashCast$(EXE)
+else
+EXT=
+PROG=DashCast
+endif
+
+LINKLIBS+=-lz -lpthread -lavcodec -lavformat -lswscale -lavutil -lavdevice 
+
+ifeq ($(CONFIG_DARWIN), yes)
+#fixme - use proper detection of libavdevice dependencies
+LINKLIBS+=-lavfilter -lswresample -lbz2 
+endif
+
+
+SRCS := $(OBJS:.o=.c) 
+
+all: $(PROG)
+
+DashCast$(EXE): $(OBJS)
+	$(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc  -lgpac $(LINKLIBS)
+
+clean: 
+	rm -f $(OBJS) ../../bin/gcc/$(PROG)
+
+install: clean
+	install -m 755 $(INSTFLAGS) ../../bin/gcc/DashCast "$(DESTDIR)$(prefix)/bin"
+
+uninstall:
+	rm -rf $(DESTDIR)$(prefix)/bin/DashCast
+
+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

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/audio_data.c Added

@@ -0,0 +1,104 @@
+/*
+ *			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 "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_init(AudioData * adata, char * psz_name, char * psz_format) {
+
+	if(psz_name != NULL && strlen(psz_name) > 0)
+		strcpy(adata->psz_name, psz_name);
+	else
+		strcpy(adata->psz_name, "");
+
+	if(psz_format != NULL && strlen(psz_format) > 0)
+		strcpy(adata->psz_format, psz_format);
+	else
+		strcpy(adata->psz_format, "");
+}
+
+int dc_audio_input_data_init(AudioInputData * p_aid, int i_channels, int i_samplerate,
+		int i_maxcon, 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);
+
+	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));
+
+	}
+
+	p_aid->p_aframe = avcodec_alloc_frame();
+
+	if(p_aid->p_aframe == NULL) {
+		fprintf(stderr, "Cannot initialize AudioInputData");
+		return -1;
+	}
+
+	p_aid->i_channels = i_channels;
+	p_aid->i_samplerate = i_samplerate;
+
+	return 0;
+}
+
+void dc_audio_input_data_destroy(AudioInputData * p_aid) {
+
+	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);
+	}
+
+	dc_circular_buffer_destroy(&p_aid->p_cb);
+
+}
+
+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);
+
+}

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/audio_data.h Added

@@ -0,0 +1,143 @@
+/*
+ *			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.
+ *
+ */
+
+
+#ifndef AUDIO_DATA_H_
+#define AUDIO_DATA_H_
+
+#define AUDIO_CB_SIZE 3
+
+#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 "circular_buffer.h"
+
+#include <time.h>
+
+
+/*
+ * 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 p_cb;
+
+	/*
+	 * The user of circular buffer has an index to it,
+	 * which is in this variable.
+	 */
+	Producer pro;
+
+	AVFrame * p_aframe;
+
+	int64_t next_pts;
+
+	int i_channels;
+	int i_samplerate;
+
+} AudioInputData;
+
+/*
+ * This structure corresponds to an
+ * entry of audio configuration in the
+ * configuration file
+ */
+typedef struct {
+	/* audio file name */
+	char psz_name[256];
+	/* audio format */
+	char psz_format[256];
+	/* audio bitrate */
+	int i_bitrate;
+	/* audio samplerate */
+	int i_samplerate;
+	/* audio channel number */
+	int i_channels;
+	/* audio codec */
+	char psz_codec[256];
+
+	/* used for source switching */
+	char psz_source_id[256];
+	time_t start_time;
+	time_t end_time;
+
+} AudioData;
+
+
+
+/*
+ * Each node in a circular buffer is a pointer.
+ * To use the circular buffer for audio frame we must
+ * define the node. AudioDataNode simply contains
+ * an AVFrame.
+ */
+typedef struct {
+
+	uint8_t * p_abuf;
+	int i_abuf_size;
+
+} AudioDataNode;
+
+void dc_audio_data_set_default(AudioData * adata);
+
+/*
+ * 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;
+ * which means the number of audio encoders.
+ * @param live [in] indicates the system is live
+ *
+ * @return 0 on success, -1 on failure.
+ *
+ * @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);
+
+/*
+ * Destroy an AudioInputData
+ *
+ * @param ain [in] the structure to be destroyed.
+ */
+void dc_audio_input_data_destroy(AudioInputData * ain);
+
+/*
+ * 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.
+ */
+void dc_audio_inout_data_end_signal(AudioInputData * ain);
+
+#endif /* AUDIO_DATA_H_ */

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/audio_decoder.c Added

@@ -0,0 +1,263 @@
+/*
+ *			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 "audio_decoder.h"
+
+int dc_audio_decoder_open(AudioInputFile * p_ain, AudioData * p_adata, int i_mode, int i_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);
+			return -1;
+		}
+
+	}
+
+	p_ain->p_fmt = NULL;
+
+	/*
+	 * Open audio
+	 */
+	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;
+	}
+
+	/*
+	 * Retrieve stream information
+	 */
+	if (avformat_find_stream_info(p_ain->p_fmt, NULL) < 0) {
+		fprintf(stderr, "Cannot find stream information\n");
+		return -1;
+	}
+
+	av_dump_format(p_ain->p_fmt, 0, p_adata->psz_name, 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;
+			break;
+		}
+	}
+	if (p_ain->i_astream_idx == -1) {
+		fprintf(stderr, "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;
+
+	/*
+	 * 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);
+		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);
+		return -1;
+	}
+
+	p_ain->p_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;
+
+	p_ain->i_mode = i_mode;
+	p_ain->i_no_loop = i_no_loop;
+
+	return 0;
+}
+
+int dc_audio_decoder_read(AudioInputFile * p_ain, AudioInputData * p_ad) {
+
+	int ret;
+	AVPacket packet;
+	int i_got_frame = 0;
+	//int locked_already = 0;
+	AVCodecContext * p_codec_ctx;
+	AudioDataNode * p_adn;
+
+	/* 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;
+
+	/* Read frames */
+	while (1) {
+
+		ret = av_read_frame(p_ain->p_fmt, &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);
+				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) {
+
+				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);
+				
+				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);
+
+				dc_producer_advance(&p_ad->pro);
+				return 0;
+			}
+
+			dc_producer_end_signal(&p_ad->pro, &p_ad->p_cb);
+			dc_producer_unlock_previous(&p_ad->pro, &p_ad->p_cb);
+			return -2;
+		}
+
+		else if (ret < 0) {
+			fprintf(stderr, "Cannot read audio frame.\n");
+			continue;
+		}
+
+		/* Is this a packet from the audio stream? */
+		if (packet.stream_index == p_ain->i_astream_idx) {
+
+			/* Set audio frame to default */
+			avcodec_get_frame_defaults(p_ad->p_aframe);
+
+			/* Decode audio frame */
+			if (avcodec_decode_audio4(p_codec_ctx, p_ad->p_aframe, &i_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);
+				return -1;
+			}
+
+			if (p_ad->p_aframe->pts != AV_NOPTS_VALUE)
+				p_ad->next_pts = p_ad->p_aframe->pts;
+
+			p_ad->next_pts += ((int64_t) AV_TIME_BASE
+					* p_ad->p_aframe->nb_samples) / p_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 (/*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);
+
+					/* Unlock the previous node in the circular buffer. */
+					dc_producer_unlock_previous(&p_ad->pro, &p_ad->p_cb);
+
+					/* 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);
+				} else {
+
+					while (av_fifo_size(p_ain->p_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");
+							continue;
+						}
+
+						/* Unlock the previous node in the circular buffer. */
+						dc_producer_unlock_previous(&p_ad->pro, &p_ad->p_cb);
+
+						/* 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 = LIVE_FRAME_SIZE;
+						av_fifo_generic_read(p_ain->p_fifo, p_adn->p_abuf, p_adn->i_abuf_size, NULL);
+
+						dc_producer_advance(&p_ad->pro);
+					}
+
+				}
+
+				return 0;
+
+			}
+		}
+
+		/*
+		 * Free the packet that was allocated by av_read_frame
+		 */
+		av_free_packet(&packet);
+
+	}
+
+	fprintf(stderr, "Unknown error while reading audio frame.\n");
+	return -1;
+
+}
+
+void dc_audio_decoder_close(AudioInputFile * p_ain) {
+
+	/*
+	 * Close the audio format context
+	 */
+	avformat_close_input(&p_ain->p_fmt);
+
+	av_fifo_free(p_ain->p_fifo);
+
+}

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/audio_decoder.h Added

@@ -0,0 +1,94 @@
+/*
+ *			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.
+ *
+ */
+
+#ifndef AUDIO_DECODER_H_
+#define AUDIO_DECODER_H_
+
+#include "audio_data.h"
+
+#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 * p_fmt;
+
+	/*
+	 * The index of the audio stream
+	 * in the file
+	 */
+	int i_astream_idx;
+
+	AVFifoBuffer * p_fifo;
+
+	int i_mode;
+	int i_no_loop;
+
+} AudioInputFile;
+
+/*
+ * Open the input audio
+ *
+ * @param cmdd [in] contains information about the file name
+ * and the audio format.
+ *
+ * @param ainf [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);
+
+/*
+ * Read and decode audio and put samples on circular buffer
+ *
+ * @param ainf [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
+ * 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);
+
+/*
+ * Close the input audio
+ *
+ * @param ainf [in] the audio file to be closed
+ *
+ */
+void dc_audio_decoder_close(AudioInputFile * ainf);
+
+#endif /* AUDIO_DECODER_H_ */

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/audio_encoder.c Added

@@ -0,0 +1,261 @@
+/*
+ *			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 "audio_encoder.h"
+
+int dc_audio_encoder_open(AudioOutputFile * p_aout, AudioData * p_adata) {
+
+	int i_osize;
+
+	//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);
+
+	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");
+		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;
+	{
+		AVRational time_base;
+		time_base.num = 1;
+		time_base.den = p_adata->i_samplerate;
+		p_aout->p_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;
+
+	/* open the audio codec */
+	if (avcodec_open2(p_aout->p_codec_ctx, p_aout->p_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");
+		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));
+
+	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");
+		return -1;
+	}
+
+	//p_aout->acc_samples = 0;
+	p_aout->i_frame_size = p_aout->p_codec_ctx->frame_size;
+
+	return 0;
+}
+
+int dc_audio_encoder_read(AudioOutputFile * p_aout, AudioInputData * p_aind) {
+
+	int ret;
+	AudioDataNode * p_adn;
+
+	ret = dc_consumer_lock(&p_aout->acon, &p_aind->p_cb);
+
+	if (ret < 0) {
+#ifdef DEBUG
+		printf("Audio encoder got to end of buffer!\n");
+#endif
+
+		return -2;
+	}
+
+	dc_consumer_unlock_previous(&p_aout->acon, &p_aind->p_cb);
+
+	p_adn = (AudioDataNode *) dc_consumer_consume(&p_aout->acon, &p_aind->p_cb);
+
+	/* 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);
+
+	dc_consumer_advance(&p_aout->acon);
+
+	return 0;
+}
+
+int dc_audio_encoder_flush(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;
+
+	av_init_packet(&p_aout->packet);
+	p_aout->packet.data = NULL;
+	p_aout->packet.size = 0;
+
+	/* Set PTS (method 1) */
+	p_aout->p_aframe->pts = p_aind->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");
+		return -1;
+	}
+	if (i_got_pkt) {
+		//p_aout->acc_samples += p_aout->p_aframe->nb_samples;
+		return 0;
+	}
+	av_free_packet(&p_aout->packet);
+	return 1;
+}
+
+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);
+
+
+		p_aout->p_aframe->data[0] = p_aout->p_adata_buf;
+		p_aout->p_aframe->linesize[0] = p_aout->i_frame_bytes;
+
+		av_init_packet(&p_aout->packet);
+		p_aout->packet.data = NULL;
+		p_aout->packet.size = 0;
+
+		/* 
+		 * Set PTS (method 1)
+		 */
+
+		//p_aout->p_aframe->pts = p_aind->next_pts;
+
+		/*
+		 * Set PTS (method 2)
+		 */
+		//{
+		//	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);
+		//}
+
+
+		/* 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");
+			return -1;
+		}
+
+		if (i_got_pkt) {
+
+			//p_aout->acc_samples += p_aout->p_aframe->nb_samples;
+			return 0;
+
+		}
+
+		av_free_packet(&p_aout->packet);
+	}
+
+	return 1;
+}
+
+void dc_audio_encoder_close(AudioOutputFile * p_aoutf) {
+
+//	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);
+//	}
+
+	av_fifo_free(p_aoutf->p_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);
+
+}
+

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/audio_encoder.h Added

@@ -0,0 +1,67 @@
+/*
+ *			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.
+ *
+ */
+
+#ifndef AUDIO_ENCODER_H_
+#define AUDIO_ENCODER_H_
+
+#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
+ * with the parameters already passed to open_audio_output
+ * 
+ * @return 0 on success, -1 on failure 
+ */
+
+int dc_audio_encoder_read(AudioOutputFile * p_aout, AudioInputData * p_aind);
+
+
+int dc_audio_encoder_flush(AudioOutputFile * p_aout, AudioInputData * p_aind);
+
+/*
+ * Read the decoded audio sample from circular buffer (which is in aind) 
+ * 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
+ * 
+ * @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);
+
+
+/*
+ * Close the output audio file
+ * 
+ * @param aoutf [in] audio output file
+ */
+void dc_audio_encoder_close(AudioOutputFile * aoutf);
+
+
+#endif /* AUDIO_ENCODER_H_ */

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/audio_muxer.c Added

@@ -0,0 +1,473 @@
+/*
+ *			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 "audio_muxer.h"
+#include "libavformat/avio.h"
+
+int dc_gpac_audio_moov_create(AudioOutputFile * p_aoutf, char * psz_name) {
+
+	GF_Err ret;
+
+	AVCodecContext * p_audio_codec_ctx = p_aoutf->p_codec_ctx;
+	u32 di;
+	u32 track;
+	u8 bpsample;
+	GF_ESD * p_esd;
+	GF_M4ADecSpecInfo acfg;
+
+	p_aoutf->p_isof = gf_isom_open(psz_name,
+			GF_ISOM_OPEN_WRITE, NULL);
+
+	if (!p_aoutf->p_isof) {
+		fprintf(stderr, "Cannot open iso file %s\n",
+				psz_name);
+		return -1;
+	}
+
+	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.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);
+	if (!track) {
+		fprintf(stderr, "Cannot create new track\n");
+		return -1;
+	}
+
+	ret = gf_isom_set_track_enabled(p_aoutf->p_isof, track, 1);
+	if (ret != GF_OK) {
+		fprintf(stderr, "%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);
+
+	ret = gf_isom_new_mpeg4_description(p_aoutf->p_isof, track, p_esd, NULL,
+			NULL, &di);
+	if (ret != GF_OK) {
+		fprintf(stderr, "%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;
+
+	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);
+
+	if (ret != GF_OK) {
+		fprintf(stderr, "%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);
+
+	if (ret != GF_OK) {
+		fprintf(stderr, "%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);
+
+	ret = gf_isom_setup_track_fragment(p_aoutf->p_isof, track, 1,
+			p_aoutf->p_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));
+		return -1;
+	}
+
+	//gf_isom_add_track_to_root_od(p_voutf->p_isof,1);
+
+	ret = gf_isom_finalize_for_fragment(p_aoutf->p_isof, 1);
+	if (ret != GF_OK) {
+		fprintf(stderr, "%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) {
+
+	GF_Err ret;
+
+	ret = gf_isom_start_segment(p_aoutf->p_isof, psz_name, 1);
+	if (ret != GF_OK) {
+		fprintf(stderr, "%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;
+
+	return 0;
+}
+
+int dc_gpac_audio_isom_write(AudioOutputFile * p_aoutf) {
+
+	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;
+
+	p_aoutf->p_sample->data = (char *) p_aoutf->packet.data;
+	p_aoutf->p_sample->dataLength = p_aoutf->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);
+
+	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;
+	if (ret != GF_OK) {
+		fprintf(stderr, "%s: gf_isom_fragment_add_sample\n",
+				gf_error_to_string(ret));
+		return -1;
+	}
+
+//	ret = gf_isom_flush_fragments(p_voutf->p_isof, 1);
+//	if (ret != GF_OK) {
+//		fprintf(stderr, "%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) {
+
+	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);
+	if (ret != GF_OK) {
+		fprintf(stderr, "%s: gf_isom_close_segment\n", gf_error_to_string(ret));
+		return -1;
+	}
+
+	//p_aoutf->acc_samples = 0;
+
+	return 0;
+}
+
+int dc_gpac_audio_isom_close(AudioOutputFile * p_aoutf) {
+
+	GF_Err ret;
+
+	ret = gf_isom_close(p_aoutf->p_isof);
+	if (ret != GF_OK) {
+		fprintf(stderr, "%s: gf_isom_close\n", gf_error_to_string(ret));
+		return -1;
+	}
+
+	//p_aoutf->acc_samples = 0;
+
+	return 0;
+}
+
+int dc_ffmpeg_audio_muxer_open(AudioOutputFile * p_aoutf, char * psz_name) {
+
+	AVStream * p_audio_stream;
+	AVOutputFormat * p_output_fmt;
+
+	AVCodecContext * p_audio_codec_ctx = p_aoutf->p_codec_ctx;
+	p_aoutf->p_fmt = NULL;
+
+//	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");
+		return -1;
+	}
+
+	p_aoutf->p_fmt = avformat_alloc_context();
+	if (!p_aoutf->p_fmt) {
+		fprintf(stderr, "Cannot allocate memory for pOutVideoFormatCtx\n");
+		return -1;
+	}
+
+	p_aoutf->p_fmt->oformat = p_output_fmt;
+	strcpy(p_aoutf->p_fmt->filename, psz_name);
+
+	/*  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);
+			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");
+		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;
+
+//	if (p_aoutf->p_fmt->oformat->flags & AVFMT_GLOBALHEADER)
+//		p_aoutf->p_codec_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
+
+	//p_video_stream->codec = p_voutf->p_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");
+		return -1;
+	}
+
+	avformat_write_header(p_aoutf->p_fmt, 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;
+
+	p_aout->packet.stream_index = p_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 (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 (pkt.pts != AV_NOPTS_VALUE)
+	 * 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) {
+
+		fprintf(stderr, "Writing frame is not successful\n");
+		av_free_packet(&p_aout->packet);
+		return -1;
+	}
+
+	av_free_packet(&p_aout->packet);
+
+	return 0;
+}
+
+int dc_ffmpeg_audio_muxer_close(AudioOutputFile * p_aoutf) {
+
+	u32 i;
+
+	av_write_trailer(p_aoutf->p_fmt);
+
+	avio_close(p_aoutf->p_fmt->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);
+	}
+
+	//p_voutf->p_fmt->streams[p_voutf->i_vstream_idx]->codec = NULL;
+	avformat_free_context(p_aoutf->p_fmt);
+
+	//p_aoutf->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);
+
+	p_aoutf->p_sample = gf_isom_sample_new();
+	p_aoutf->p_isof = NULL;
+	p_aoutf->muxer_type = muxer_type;
+
+	p_aoutf->i_frame_per_seg = frame_per_seg;
+	p_aoutf->i_frame_per_frag = frame_per_frag;
+
+	p_aoutf->i_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);
+	}
+
+	gf_isom_sample_del(&p_aoutf->p_sample);
+}
+
+GF_Err dc_audio_muxer_open(AudioOutputFile * p_aoutf, char * psz_directory, char * psz_id, int i_seg) {
+
+	GF_Err ret;
+	char psz_name[256];
+
+	switch (p_aoutf->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);
+	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);
+	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;
+		}
+		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);
+		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) {
+
+	case FFMPEG_AUDIO_MUXER:
+		return dc_ffmpeg_audio_muxer_write(p_aoutf);
+	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;
+		}
+		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);
+		}
+		if(i_frame_nb + 1 == p_aoutf->i_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) {
+
+	case FFMPEG_AUDIO_MUXER:
+		return dc_ffmpeg_audio_muxer_close(p_aoutf);
+	case GPAC_AUDIO_MUXER:
+		dc_gpac_audio_isom_close_seg(p_aoutf);
+		return dc_gpac_audio_isom_close(p_aoutf);
+	case GPAC_INIT_AUDIO_MUXER:
+		return dc_gpac_audio_isom_close_seg(p_aoutf);
+	default:
+		return GF_BAD_PARAM;
+	};
+
+	return GF_BAD_PARAM;
+}

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/audio_muxer.h Added

@@ -0,0 +1,128 @@
+/*
+ *			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.
+ *
+ */
+
+#ifndef AUDIO_MUXER_H_
+#define AUDIO_MUXER_H_
+
+#include <stdlib.h>
+#include "../../modules/ffmpeg_in/ffmpeg_in.h"
+#include "libavutil/fifo.h"
+#include "libavformat/avformat.h"
+#ifndef WIN32
+#include "libavdevice/avdevice.h"
+#endif
+#include "libavutil/mathematics.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;
+
+/*
+ * AudioOutputFile structure has the data needed
+ * to encode audio samples 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 {
+
+	//AudioData * p_adata;
+
+	/* File format context structure */
+	AVFormatContext * p_fmt;
+	AVCodec * p_codec;
+	AVCodecContext * p_codec_ctx;
+
+	GF_ISOFile * p_isof;
+	GF_ISOSample * p_sample;
+	int dts;
+
+	/* The index to the audio stream in the file */
+	int i_astream_idx;
+
+	/* It keeps the index with which encoder access to the circular buffer (as a consumer) */
+	Consumer acon;
+
+	/* Variables that encoder needs to encode data */
+	AVFrame * p_aframe;
+	uint8_t * p_adata_buf;
+	int i_frame_bytes;
+	AVPacket packet;
+
+	/*
+	 * Audio samples stored in the AVFrame are not always
+	 * complete. Which means more than 1 AVFrame is needed
+	 * to complete an access unit. This fifo is provided
+	 * to store audio samples in the fifo and once an access unit
+	 * is complete we can encode it.
+	 */
+	AVFifoBuffer * p_fifo;
+
+	AudioMuxerType muxer_type;
+
+	/* Accumulated sample */
+	//int acc_samples;
+
+	int i_frame_per_seg;
+	int i_frame_per_frag;
+	int i_first_dts;
+
+	u32 i_seg_marker;
+
+	int i_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);
+
+/*
+ * Open the output audio
+ *
+ * @param aoutf [out] open the audio output on this file
+ *
+ * @param aconf [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);
+
+
+#endif /* AUDIO_MUXER_H_ */

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/circular_buffer.c Added

@@ -0,0 +1,334 @@
+/*
+ *			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 "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
+
+		p_cb->p_list[i].mux = 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);
+
+	}
+
+	gf_free(p_cb->p_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_consume(Consumer * p_con, CircularBuffer * p_cb) {
+	return p_cb->p_list[p_con->i_idx].p_data;
+}
+
+int dc_consumer_lock(Consumer * p_con, CircularBuffer * p_cb) {
+
+	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);
+		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
+
+		if (p_node->i_marked == 2) {
+			gf_mx_v(p_node->mux);
+			return -1;
+		}
+	}
+	p_node->i_con_waiting--;
+
+	if (p_node->i_marked == 2) {
+		gf_mx_v(p_node->mux);
+		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);
+
+	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];
+
+	gf_mx_p(p_node->mux);
+	p_node->i_con_nb--;
+
+	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;
+	}
+
+#ifdef SEM
+	gf_sema_notify(p_node->pro_sem, 1);
+#else
+	gf_cond_signal(p_node->pro_cond);
+#endif
+
+#ifdef DEBUG
+	printf("consumer %s unlock %d \n", p_con->psz_name, p_con->i_idx);
+#endif
+	gf_mx_v(p_node->mux);
+
+	return i_last_con;
+}
+
+int dc_consumer_unlock_previous(Consumer * p_con, CircularBuffer * p_cb) {
+
+	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(p_node->mux);
+
+	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;
+	}
+
+#ifdef SEM
+	gf_sema_notify(p_node->pro_sem, 1);
+#else
+	gf_cond_signal(p_node->pro_cond);
+#endif
+
+#ifdef DEBUG
+	printf("consumer %s unlock %d \n", p_con->psz_name, node_idx);
+#endif
+	gf_mx_v(p_node->mux);
+
+	return i_last_con;
+}
+
+void dc_consumer_advance(Consumer * p_con) {
+	p_con->i_idx = (p_con->i_idx + 1) % p_con->i_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_produce(Producer * p_pro, CircularBuffer * p_cb) {
+	return p_cb->p_list[p_pro->i_idx].p_data;
+
+}
+
+int dc_producer_lock(Producer * p_pro, CircularBuffer * p_cb) {
+
+	Node * p_node = &p_cb->p_list[p_pro->i_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);
+		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
+
+	}
+
+	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);
+
+	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_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_advance(Producer * p_pro) {
+	p_pro->i_idx = (p_pro->i_idx + 1) % p_pro->i_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;
+
+#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);
+}
+
+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;
+
+	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);
+}
+

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/circular_buffer.h Added

@@ -0,0 +1,285 @@
+/*
+ *			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.
+ *
+ */
+
+#ifndef CIRCULAR_BUFFER_H_
+#define CIRCULAR_BUFFER_H_
+
+#include <stdlib.h>
+#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.
+ * OFFLINE means that the system is working offline, so the producer can
+ * wait for the consumers to finish their job.
+ */
+typedef enum {
+	LIVE_CAMERA,
+	LIVE_MEDIA,
+	ON_DEMAND
+} LockMode;
+
+/*
+ * Every node of the circular buffer has a data, plus
+ * all the variables needed for multithread management. 
+ */
+typedef struct {
+
+	/* Pointer to the data on the node */
+	void * p_data;
+
+	/* The number of the producer currently using this node */
+	int i_pro_nb;
+
+	/* The number of consumer currently using this node */
+	int i_con_nb;
+
+	int i_con_waiting;
+
+	/* Mutex used for synchronizing the users of this node. */
+	GF_Mutex * mux;
+
+#ifdef SEM
+	/* Semaphore for producer */
+	GF_Semaphore * pro_sem;
+
+	/* 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
+
+	/* 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;
+
+} Node;
+
+/*
+ * The circular buffer has a size, a list of nodes and it
+ * has the number of consumers using it. Also it needs to know which
+ * locking mechanism it needs to use. (LIVE or OFFLINE)
+ */
+typedef struct {
+
+	/* The size of circular buffer */
+	int i_size;
+	
+	/* A list of all the nodes */
+	Node * p_list;
+	
+	/* The mode for multithread management. */
+	LockMode mode;
+	
+	/* The maximum number of the consumers using the circular buffer */
+	int i_max_con_nb;
+
+} CircularBuffer;
+
+/*
+ * Producer has an index to the circular buffer.
+ */ 
+typedef struct {
+	/* The index where the producer is using */
+	int i_idx;
+	/* The maximum of the index. (Which means the size of circular buffer) */
+	int i_max_idx;
+
+	char psz_name[256];
+} Producer;
+
+/*
+ * Consumer has an index to the circular buffer.
+ */
+typedef struct {
+	/* The index where the consumer is using */
+	int i_idx;
+	/* The maximum of the index. (Which means the size of circular buffer) */
+	int i_max_idx;
+
+	char psz_name[256];
+} Consumer;
+
+/*
+ * Create a circular buffer
+ * 
+ * @param cb [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
+ *
+ */
+void dc_circular_buffer_create(CircularBuffer * cb, int size, LockMode mode,int maxcon);
+
+/*
+ * Destroy the circular buffer
+ *
+ * @param cb [in] circular buffer to be destroyed
+ *
+ */
+void dc_circular_buffer_destroy(CircularBuffer * cb);
+
+/* 
+ * Initialize a consumer
+ * 
+ * @param con [out] the consumer to be initialize
+ * @param maxcon [in] maximum number of the consumers
+ *
+ */
+void dc_consumer_init(Consumer * con, int maxcon, char * name);
+
+/*
+ * Return the data in the node in question. (cb[con index])
+ * @param con [in] consumer
+ * @param cb [in] circular buffer
+ *  
+ */
+void * dc_consumer_consume(Consumer * con, CircularBuffer * cb);
+
+/*
+ * Consumer lock on circular buffer
+ * 
+ * @param con [in] consumer
+ * @param cb [in] circular buffer
+ *
+ * @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);
+
+/*
+ * Consumer unlock on circular buffer
+ *
+ * @param con [in] consumer
+ * @param cb [in] circular buffer
+ *
+ * @return 0 on normal exit, 1 if the consumer unlocking this node
+ * is the last consumer.
+ */
+int dc_consumer_unlock(Consumer * con, CircularBuffer * cb);
+
+/*
+ * Consumer unlock on previous node of the circular buffer
+ *
+ * @param con [in] consumer
+ * @param cb [in] circular buffer
+ *
+ * @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);
+
+/*
+ * Consumer leads its index
+ * 
+ * @param con [in] consumer
+ */
+void dc_consumer_advance(Consumer * con);
+
+/* 
+ * Initialize a producer
+ * 
+ * @param pro [out] the producer to be initialize
+ * @param maxpro [in] maximum number of the producers
+ *
+ */
+void dc_producer_init(Producer * pro, int maxpro, char * name);
+
+/*
+ * Return the data in the node in question. (cb[con index])
+ * @param pro [in] producer
+ * @param cb [in] circular buffer
+ *  
+ */
+void * dc_producer_produce(Producer * pro, CircularBuffer * cb);
+
+/*
+ * Producer lock on circular buffer
+ * 
+ * @param pro [in] producer
+ * @param cb [in] circular buffer
+ *
+ * @return 0 on success, -1 if the mode is live and cannot wait.
+ *
+ */ 
+int dc_producer_lock(Producer * pro, CircularBuffer * cb);
+
+/*
+ * Producer unlock on circular buffer
+ *
+ * @param pro [in] producer
+ * @param cb [in] circular buffer
+ *
+ */
+void dc_producer_unlock(Producer * pro, CircularBuffer * cb);
+
+/*
+ * Producer unlock on the previous node of the circular buffer
+ *
+ * @param pro [in] producer
+ * @param cb [in] circular buffer
+ *
+ */
+void dc_producer_unlock_previous(Producer *, CircularBuffer *);
+
+/*
+ * Producer leads its index
+ * 
+ * @param pro [in] producer
+ *
+ */
+void dc_producer_advance(Producer * pro);
+
+/*
+ * Producer signal that the current node is the last node
+ * 
+ * @param pro [in] producer
+ * @param cb [in] circular buffer
+ */
+void dc_producer_end_signal(Producer * pro, CircularBuffer * cb);
+
+void dc_producer_end_signal_previous(Producer * p_pro, CircularBuffer * p_cb);
+
+
+#endif /* CIRCULAR_BUFFER_H_ */

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/cmd_data.c Added

@@ -0,0 +1,794 @@
+/*
+ *			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-0.5.0.svn4668.tar.bz2/applications/dashcast/cmd_data.h Added

@@ -0,0 +1,126 @@
+/*
+ *			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.
+ *
+ */
+
+#ifndef CMD_DATA_H_
+#define CMD_DATA_H_
+
+#define MAX_SOURCE_NUMBER 20
+
+#define _XOPEN_SOURCE
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <time.h>
+#include <gpac/config_file.h>
+#include <gpac/list.h>
+#include "audio_data.h"
+#include "video_data.h"
+#include "task.h"
+
+/*
+ * This structure corresponds to
+ * the data in command line
+ */
+typedef struct  {
+	/* input video */
+	VideoData vdata;
+	/* audio input data */
+	AudioData adata;
+	/* Configuration file */
+	GF_Config * p_conf;
+	/* Switch source configuration file */
+	GF_Config * p_switch_conf;
+	/* MPD file */
+	char psz_mpd[GF_MAX_PATH];
+	/* segment duration */
+	int i_seg_dur;
+	/* fragment duration */
+	int i_frag_dur;
+	/* Exit signal emitting from user to end the program */
+	int i_exit_signal;
+	/* List of entries for video in configuration file */
+	GF_List * p_video_lst;
+	/* List of entries for audio in configuration file */
+	GF_List * p_audio_lst;
+	/* Indicates that the system is live */
+	/* List of video input sources */
+	GF_List * p_vsrc;
+	/* List of audio input sources */
+	GF_List * p_asrc;
+	//int i_live;
+	/* Indicates that the system is live from a media input */
+	//int i_live_media;
+	/* The mode of the system: ON_DEMAND, LIVE_CAMERA, LIVE_MEDIA */
+	int i_mode;
+	/* Does not loop on input */
+	int i_no_loop;
+	/* MPD AvailabilityStartTime offset in milliseconds. Default is 1000 milliseconds delay */
+	int i_ast_offset;
+	/* MPD time shift buffer depth in seconds */
+	int i_time_shift;
+	/* Send message on port 1234 once fragment is ready */
+	int i_send_message;
+	/* End of Segment Box name */
+	u32 i_seg_marker;
+	/* GDR */
+	int i_gdr;
+	/* MPD min buffer time */
+	float f_minbuftime;
+	/* output directory name */
+	char psz_out[GF_MAX_PATH];
+	/* switch source configuration file */
+	//char psz_switch[GF_MAX_PATH];
+	FILE *p_logfile;
+	TaskList task_list;
+
+} CmdData;
+/*
+ * Initilize the command data structure
+ * 
+ * @param cmdd [out] structure to be initilize
+ *
+ */
+void dc_cmd_data_init(CmdData * cmdd);
+/*
+ * Destroy the command data structure
+ *
+ * @param cmdd [out] structure to be destroyed
+ *
+ */
+void dc_cmd_data_destroy(CmdData * cmdd);
+/*
+ * 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
+ *
+ */
+int dc_parse_command(int argc, char ** argv, CmdData * cmdd);
+
+
+#endif /* CMD_DATA_H_ */

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/controler.c Added

@@ -0,0 +1,1606 @@
+/*
+ *			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-0.5.0.svn4668.tar.bz2/applications/dashcast/controler.h Added

@@ -0,0 +1,121 @@
+/*
+ *			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.
+ *
+ */
+
+#ifndef CONTROLER_H_
+#define CONTROLER_H_
+
+#include <gpac/tools.h>
+#include <gpac/thread.h>
+#include <gpac/media_tools.h>
+
+#include "register.h"
+#include "video_decoder.h"
+#include "video_encoder.h"
+#include "audio_decoder.h"
+#include "audio_encoder.h"
+#include "cmd_data.h"
+#include "message_queue.h"
+
+/* General thread parameters */
+typedef struct {
+	/* command data */
+	CmdData * p_in_data;
+	/* handle to thread */
+	GF_Thread * p_thread;
+
+	MessageQueue * p_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.
+	 */
+	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;
+	/* handle to the thread */
+	GF_Thread * p_thread;
+
+	MessageQueue * p_mq;
+	MessageQueue * p_delete_seg_mq;
+	MessageQueue * p_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
+	 */
+	int audio_conf_idx;
+	/* Audio input data
+	 * (This data is shared between audio 
+	 * decoder and audio encoder
+	 */
+	AudioInputData * p_aind;
+	/* Audio input file structure */
+	AudioInputFile * p_ainf;
+	/* handle to the thread */
+	GF_Thread * p_thread;
+
+	MessageQueue * p_mq;
+	MessageQueue * p_delete_seg_mq;
+	MessageQueue * p_send_seg_mq;
+
+} AudioThreadParam;
+
+/* 
+ * Run controler runs all decoder, scalers, and encoders
+ * of audio and video
+ * 
+ * @param cmdd [in] command data 
+ * 
+ * @return 0 on success, -1 on failure
+ */
+int dc_run_controler(CmdData *);
+
+#endif /* CONTROLER_H_ */

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/dashcast.c Added

@@ -0,0 +1,50 @@
+/*
+ *			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"
+#include "controler.h"
+
+
+int main(int argc, char ** argv) {
+
+	CmdData cmd_data;
+
+	/* Initialize command data */
+	dc_cmd_data_init(&cmd_data);
+
+	/* Read command line and parse input */
+	if ( dc_parse_command(argc, argv, &cmd_data) < 0) {
+		dc_cmd_data_destroy(&cmd_data);
+		return -1;
+	}
+
+	dc_run_controler(&cmd_data);
+
+	/* Destroy command data */
+	dc_cmd_data_destroy(&cmd_data);
+
+	return 0;
+}
+

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/libav_compat.h Added

@@ -0,0 +1,34 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Romain Bouqueau
+ *			Copyright (c) Telecom ParisTech 2000-2013 - Romain Bouqueau 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.
+ *
+ */
+
+#ifndef LIBAV_COMPAT_H_
+#define LIBAV_COMPAT_H_
+
+#ifndef URL_WRONLY
+#define URL_WRONLY AVIO_FLAG_WRITE
+#endif
+
+#endif
+

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/message_queue.c Added

@@ -0,0 +1,184 @@
+/*
+ *			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 "message_queue.h"
+
+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->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));
+	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
+
+	if (!mq->last_node)
+		mq->first_node = mqn;
+	else
+		mq->last_node->next = mqn;
+
+	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
+
+}
+
+int dc_message_queue_get(MessageQueue *mq, void * data) {
+
+	int ret = 0;
+	MessageQueueNode * mqn;
+
+#ifdef GPAC_THREAD
+	gf_mx_p(mq->mux);
+#else
+	pthread_mutex_lock(&mq->mux);
+#endif
+
+	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
+
+		mqn = mq->first_node;
+
+		if (!mqn)
+			return -1;
+	}
+	if (mqn) {
+		mq->first_node = mqn->next;
+		if (!mq->first_node)
+			mq->last_node = NULL;
+		mq->nb_nodes--;
+		memcpy(data, mqn->data, mqn->size);
+		ret = mqn->size;
+		gf_free(mqn->data);
+		gf_free(mqn);
+	}
+
+#ifdef GPAC_THREAD
+	gf_mx_v(mq->mux);
+#else
+	pthread_mutex_unlock(&mq->mux);
+#endif
+
+	return ret;
+
+}
+
+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
+
+	for (mqn = mq->first_node; mqn != NULL; mqn = mqn1) {
+		mqn1 = mqn->next;
+		gf_free(mqn);
+	}
+	mq->last_node = NULL;
+	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
+
+}
+
+void dc_message_queue_free(MessageQueue *mq) {
+	dc_message_queue_flush(mq);
+#ifdef GPAC_THREAD
+	gf_mx_del(mq->mux);
+#ifdef SEM
+	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 Added

@@ -0,0 +1,76 @@
+/*
+ *			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.
+ *
+ */
+
+#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;
+
+} MessageQueueNode;
+
+typedef struct MessageQueue {
+
+	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
+
+} 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_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 Added

@@ -0,0 +1,59 @@
+/*
+ *			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 "register.h"
+
+int lock_call_back(void ** mutex, enum AVLockOp op) {
+	switch (op) {
+	case AV_LOCK_CREATE:
+		*mutex = gf_mx_new("AVLIB callback mutex");
+		break;
+	case AV_LOCK_OBTAIN:
+		gf_mx_p(*mutex);
+		break;
+	case AV_LOCK_RELEASE:
+		gf_mx_v(*mutex);
+		break;
+	case AV_LOCK_DESTROY:
+		gf_mx_del(*mutex);
+		break;
+	}
+
+	return 0;
+
+}
+
+void dc_register_libav() {
+
+	av_register_all();
+	avcodec_register_all();
+#ifndef WIN32
+	avdevice_register_all();
+#endif
+	avformat_network_init();
+
+	av_lockmgr_register(&lock_call_back);
+
+}

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/register.h Added

@@ -0,0 +1,45 @@
+/*
+ *			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.
+ *
+ */
+
+#ifndef REGISTER_H_
+#define REGISTER_H_
+
+//#include <pthread.h>
+#include "../../modules/ffmpeg_in/ffmpeg_in.h"
+#include "libavcodec/avcodec.h"
+#ifndef WIN32
+#include "libavdevice/avdevice.h"
+#endif
+#include "libavformat/avformat.h"
+
+#include <gpac/thread.h>
+
+/* 
+ * Register all codecs and define
+ * the lock manager on top of avlib
+ */
+void dc_register_libav();
+
+#endif /* REGISTER_H_ */

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/task.c Added

@@ -0,0 +1,78 @@
+/*
+ *			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 "task.h"
+
+
+void dc_task_init(TaskList * list) {
+
+	list->tasks = gf_list_new();
+	list->size = 0;
+}
+
+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));
+
+	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));
+	task->start_time_t = start;
+	task->end_time_t = end;
+	gf_list_add(list->tasks, task);
+	list->size ++;
+}
+
+int dc_task_get_current(TaskList * list, Task * task) {
+
+	int 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) {
+
+			//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));
+			task->source_number = cur_task->source_number;
+			return 0;
+		}
+	}
+
+	task->source_number = 0;
+	return -1;
+}
+
+

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/task.h Added

@@ -0,0 +1,66 @@
+/*
+ *			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.
+ *
+ */
+
+#ifndef TASK_H_
+#define TASK_H_
+
+#define MAX_ID_SIZE 512
+
+#include <stdio.h>
+#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;
+
+} TaskList;
+
+/* initialize a list of task */
+void dc_task_init(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);
+
+/* 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 Added

@@ -0,0 +1,93 @@
+/*
+ *			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 "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_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);
+
+}
+
+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 i;
+
+	dc_producer_init(&p_vin_data->pro, 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;
+
+	p_vin_data->p_vprop = gf_malloc(max_source * sizeof(VideoInputProp));
+
+	dc_circular_buffer_create(&p_vin_data->p_cb, VIDEO_CB_SIZE, mode,
+				i_con_nb);
+
+	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();
+	}
+
+	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_destroy(VideoInputData * p_vd) {
+
+	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);
+	}
+
+	dc_circular_buffer_destroy(&p_vd->p_cb);
+
+}

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/video_data.h Added

@@ -0,0 +1,164 @@
+/*
+ *			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.
+ *
+ */
+
+#ifndef VIDEO_DATA_H_
+#define VIDEO_DATA_H_
+
+#include "../../modules/ffmpeg_in/ffmpeg_in.h"
+#include "libavcodec/avcodec.h"
+#include "libswscale/swscale.h"
+
+#include "circular_buffer.h"
+
+#include <time.h>
+
+#define VIDEO_CB_SIZE 3
+
+/*
+ * This structure corresponds to an
+ * entry of video configuration in the
+ * configuration file.
+ */
+typedef struct {
+
+	/* video file name */
+	char psz_name[256];
+	/* video format */
+	char psz_format[256];
+	/* v4l2 format */
+	char psz_v4l2f[256];
+	/* video width */
+	int i_width;
+	/* video height */
+	int i_height;
+	/* video bitrate */
+	int i_bitrate;
+	/* video frame rate */
+	int i_framerate;
+	/* video codec */
+	char psz_codec[256];
+
+	/* used for source switching */
+	char psz_source_id[256];
+	time_t start_time;
+	time_t end_time;
+
+} VideoData;
+
+
+typedef struct {
+
+	/*
+	 * Width, height and pixel format
+	 * of the input video
+	 */
+	int i_width;
+	int i_height;
+	int i_pix_fmt;
+
+} VideoInputProp;
+
+/*
+ * VideoInputData is designed to keep the data
+ * 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;
+
+} VideoInputData;
+
+
+/*
+ * Each node in a circular buffer is a pointer.
+ * To use the circular buffer for video frame we must
+ * define the node. VideoDataNode simply contains
+ * an AVFrame.
+ */
+typedef struct {
+
+	AVFrame * p_vframe;
+
+	int source_number;
+
+} VideoDataNode;
+
+void dc_video_data_set_default(VideoData * vdata);
+
+/*
+ * Initialize a VideoInputData.
+ *
+ * @param vind [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;
+ * which means the number of video encoders.
+ * @param live [in] indicates the system is live
+ *
+ * @return 0 on success, -1 on failure.
+ *
+ * @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);
+
+void dc_video_input_data_set_prop(VideoInputData * vind, int index, int width, int height, int pix_fmt);
+/*
+ * Destroy a VideoInputData
+ *
+ * @param vind [in] the structure to be destroyed.
+ */
+void dc_video_input_data_destroy(VideoInputData * vind);
+
+/*
+ * 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.
+ */
+void dc_video_input_data_end_signal(VideoInputData * vind);
+
+#endif /* VIDEO_DATA_H_ */

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/video_decoder.c Added

@@ -0,0 +1,302 @@
+/*
+ *			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 "video_decoder.h"
+#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) {
+
+	u32 i;
+	AVInputFormat * p_in_fmt = NULL;
+	AVDictionary * p_options = NULL;
+	AVCodecContext * p_codec_ctx;
+	AVCodec * p_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);
+	}
+
+	if (strcmp(p_vdata->psz_v4l2f, "") != 0) {
+		av_dict_set(&p_options, "input_format", p_vdata->psz_v4l2f, 0);
+	}
+
+	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 (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);
+			return -1;
+		}
+	}
+
+	p_vin->p_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);
+		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");
+		return -1;
+	}
+
+	av_dump_format(p_vin->p_fmt_ctx, 0, p_vdata->psz_name, 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;
+			break;
+		}
+	}
+	if (p_vin->i_vstream_idx == -1) {
+		fprintf(stderr, "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;
+
+	//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);
+		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);
+		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;
+
+		}
+
+	}
+
+	if (p_vdata->i_framerate <= 1 || p_vdata->i_framerate > 30) {
+		printf("Invalid input framerate.\n");
+		return -1;
+	}
+
+	p_vin->i_mode = i_mode;
+	p_vin->i_no_loop = i_no_loop;
+
+	return 0;
+}
+
+int dc_video_decoder_read(VideoInputFile * p_in_ctx, VideoInputData * p_vd,
+		int source_number) {
+
+#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;
+
+	/*  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;
+
+	/*  Read frames */
+	while (1) {
+
+#ifdef DASHCAST_DEBUG_TIME_
+		gettimeofday(&start, NULL);
+#endif
+
+		ret = av_read_frame(p_in_ctx->p_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);
+#endif
+
+		if (ret == AVERROR_EOF) {
+
+			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);
+				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;
+			/* 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);
+				return 0;
+			}
+
+			dc_producer_end_signal(&p_vd->pro, &p_vd->p_cb);
+			dc_producer_unlock(&p_vd->pro, &p_vd->p_cb);
+			return -2;
+		}
+
+		else if (ret < 0) {
+			fprintf(stderr, "Cannot read video frame.\n");
+			continue;
+		}
+
+		/*  Is this a packet from the video stream? */
+		if (packet.stream_index == p_in_ctx->i_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");
+					continue;
+				}
+
+				dc_producer_unlock_previous(&p_vd->pro, &p_vd->p_cb);
+
+				already_locked = 1;
+			}
+
+			p_vdn = (VideoDataNode *) dc_producer_produce(&p_vd->pro,
+					&p_vd->p_cb);
+
+			p_vdn->source_number = source_number;
+
+			/*  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) {
+				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);
+				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.
+				// 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)
+					av_free_packet(&packet);
+				dc_producer_advance(&p_vd->pro);
+				return 0;
+			}
+		}
+
+		/*  Free the packet that was allocated by av_read_frame */
+		av_free_packet(&packet);
+
+	}
+
+	fprintf(stderr, "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);
+
+}

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/video_decoder.h Added

@@ -0,0 +1,96 @@
+/*
+ *			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.
+ *
+ */
+
+#ifndef VIDEO_DECODER_H_
+#define VIDEO_DECODER_H_
+
+#include "video_data.h"
+
+#include "libavformat/avformat.h"
+#ifndef WIN32
+#include "libavdevice/avdevice.h"
+#endif
+
+
+/*
+ * The structure which keeps the data of
+ * input video file.
+ */
+typedef struct {
+
+	/*
+	 * 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;
+
+} VideoInputFile;
+
+/*
+ * Open the input video
+ *
+ * @param cmdd [in] contains information about the file name
+ * and the video format.
+ *
+ * @param vinf [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);
+/*
+ * 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
+ * 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);
+/*
+ * Close the input video
+ *
+ * @param vinf [in] the video file to be closed
+ *
+ */
+void dc_video_decoder_close(VideoInputFile *);
+
+#endif /* VIDEO_DECODER_H_ */

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/video_encoder.c Added

@@ -0,0 +1,240 @@
+/*
+ *			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 "video_encoder.h"
+
+#include "libavutil/opt.h"
+
+//#define DEBUG 1
+
+int dc_video_encoder_open(VideoOutputFile * p_voutf, VideoData * p_vdata) {
+
+	//AVCodec * p_video_codec;
+	//AVStream * p_video_stream;
+
+	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);
+
+//	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");
+		return -1;
+	}
+
+	p_voutf->p_codec_ctx = avcodec_alloc_context3(p_voutf->p_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");
+//		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);
+	}
+
+//	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;
+//
+//	av_opt_set(p_video_stream->codec->priv_data, "preset", "ultrafast", 0);
+//	av_opt_set(p_video_stream->codec->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;
+	 */
+
+	/*
+	 * p_video_stream->codec->gop_size = p_voutf->i_vfr;
+	 * videoStream->codec->gop_size = 1;
+	 * p_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);
+	 * videoStream->codec->me_range = 16;
+	 * videoStream->codec->max_qdiff = 4;
+	 * videoStream->codec->qmin = 10;
+	 * videoStream->codec->qmax = 51;
+	 * videoStream->codec->qcompress = 0.6;
+	 * videoStream->codec->profile = FF_PROFILE_H264_BASELINE;
+	 * videoStream->codec->level = 10;
+	 *
+	 */
+
+//	if (p_voutf->p_fmt->oformat->flags & AVFMT_GLOBALHEADER)
+//		p_video_stream->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
+
+	p_voutf->i_vstream_idx = 0;//p_video_stream->index;
+
+	/* 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");
+		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");
+//		return -1;
+//	}
+
+	return 0;
+}
+
+int dc_video_encoder_encode(VideoOutputFile * p_voutf, VideoScaledData * p_vsd) {
+
+	//AVPacket pkt;
+	VideoDataNode * p_vn;
+	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;
+
+
+	ret = dc_consumer_lock(&p_voutf->vcon, &p_vsd->p_cb);
+
+	if (ret < 0) {
+#ifdef DEBUG
+		printf("Video encoder got to end of buffer!\n");
+#endif
+
+		return -2;
+	}
+
+	dc_consumer_unlock_previous(&p_voutf->vcon, &p_vsd->p_cb);
+
+	p_vn = (VideoDataNode *) dc_consumer_consume(&p_voutf->vcon, &p_vsd->p_cb);
+
+	/*
+	 * 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);
+
+
+	/* 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);
+
+	dc_consumer_advance(&p_voutf->vcon);
+
+	if (p_voutf->i_encoded_frame_size < 0) {
+		fprintf(stderr, "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() ));
+
+	/* if zero size, it means the image was buffered */
+//	if (i_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 (p_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;
+//
+//		// 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");
+//			return -1;
+//		}
+//
+//		av_free_packet(&pkt);
+//
+//	}
+
+	return p_voutf->i_encoded_frame_size;
+}
+
+void dc_video_encoder_close(VideoOutputFile * p_voutf) {
+
+//	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);
+//	}
+
+	av_free(p_voutf->p_vbuf);
+
+	avcodec_close(p_voutf->p_codec_ctx);
+	av_free(p_voutf->p_codec_ctx);
+
+}

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/video_encoder.h Added

@@ -0,0 +1,65 @@
+/*
+ *			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.
+ *
+ */
+
+#ifndef VIDEO_ENCODER_H_
+#define VIDEO_ENCODER_H_
+
+#include "video_muxer.h"
+
+
+/*
+ * Open an video stream
+ *
+ * @param voutf [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);
+
+/*
+ * 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
+ * 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);
+
+
+/*
+ * Close the output video file
+ *
+ * @param voutf [in] video output file
+ */
+void dc_video_encoder_close(VideoOutputFile * voutf);
+
+
+#endif /* VIDEO_ENCODER_H_ */

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/video_muxer.c Added

@@ -0,0 +1,503 @@
+/*
+ *			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 "video_muxer.h"
+#include "libavutil/opt.h"
+
+int dc_gpac_video_moov_create(VideoOutputFile * p_voutf, char * psz_name) {
+
+	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;
+	GF_AVCConfig *avccfg;
+	u32 di;
+	u32 track;
+
+	// T0D0: For the moment it is fixed
+	//u32 sample_dur = p_voutf->p_codec_ctx->time_base.den;
+
+	avccfg = gf_odf_avc_cfg_new();
+
+	if (!avccfg) {
+		fprintf(stderr, "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;
+
+	p_voutf->p_isof = gf_isom_open(psz_name, GF_ISOM_OPEN_WRITE, NULL);
+
+	if (!p_voutf->p_isof) {
+		fprintf(stderr, "Cannot open iso file %s\n", psz_name);
+		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);
+
+	if (!track) {
+		fprintf(stderr, "Cannot create new track\n");
+		return -1;
+	}
+
+	ret = gf_isom_set_track_enabled(p_voutf->p_isof, 1, 1);
+	if (ret != GF_OK) {
+		fprintf(stderr, "%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);
+	if (ret != GF_OK) {
+		fprintf(stderr, "%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);
+
+	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;
+	}
+
+	ret = gf_isom_setup_track_fragment(p_voutf->p_isof, 1, 1, 1, 0, 0, 0, 0);
+	if (ret != GF_OK) {
+		fprintf(stderr, "%s: gf_isom_setup_track_fragment\n",
+				gf_error_to_string(ret));
+		return -1;
+	}
+
+	//gf_isom_add_track_to_root_od(p_voutf->p_isof,1);
+
+	ret = gf_isom_finalize_for_fragment(p_voutf->p_isof, 1);
+	if (ret != GF_OK) {
+		fprintf(stderr, "%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) {
+
+	GF_Err ret;
+
+	ret = gf_isom_start_segment(p_voutf->p_isof, psz_name, 1);
+	if (ret != GF_OK) {
+		fprintf(stderr, "%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);
+//	if (ret != GF_OK) {
+//		fprintf(stderr, "%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;
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DashCast] Opening new segment %s at UTC "LLU" ms\n", psz_name, gf_net_get_utc() ));
+	return 0;
+}
+
+int dc_gpac_video_isom_write(VideoOutputFile * p_voutf) {
+
+	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;
+
+	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);
+
+	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);
+		}
+
+		buf_ptr += nalu_size;
+
+		if (!sc_size || (buf_len < nalu_size + sc_size))
+			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);
+
+	ret = gf_isom_fragment_add_sample(p_voutf->p_isof, 1, p_voutf->p_sample, 1,
+			1, 0, 0, 0);
+
+	if (ret != GF_OK) {
+		fprintf(stderr, "%s: gf_isom_fragment_add_sample\n",
+				gf_error_to_string(ret));
+		return -1;
+	}
+
+	return 0;
+}
+
+int dc_gpac_video_isom_close_seg(VideoOutputFile * p_voutf) {
+
+	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);
+	if (ret != GF_OK) {
+		fprintf(stderr, "%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() ));
+
+	return 0;
+}
+
+int dc_gpac_video_isom_close(VideoOutputFile * p_voutf) {
+
+	GF_Err ret;
+
+	ret = gf_isom_close(p_voutf->p_isof);
+	if (ret != GF_OK) {
+		fprintf(stderr, "%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");
+	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);
+	return 0;
+}
+
+int dc_raw_h264_close(VideoOutputFile * p_voutf) {
+
+	fclose(p_voutf->p_file);
+	return 0;
+}
+
+int dc_ffmpeg_video_muxer_open(VideoOutputFile * p_voutf, char * psz_name) {
+
+	AVStream * p_video_stream;
+	AVOutputFormat * p_output_fmt;
+
+	AVCodecContext * p_video_codec_ctx = p_voutf->p_codec_ctx;
+	p_voutf->p_fmt = 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);
+
+	/* 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");
+		return -1;
+	}
+
+	p_voutf->p_fmt = avformat_alloc_context();
+	if (!p_voutf->p_fmt) {
+		fprintf(stderr, "Cannot allocate memory for pOutVideoFormatCtx\n");
+		return -1;
+	}
+
+	p_voutf->p_fmt->oformat = p_output_fmt;
+	strcpy(p_voutf->p_fmt->filename, psz_name);
+
+	/* 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);
+			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");
+		return -1;
+	}
+
+	//p_video_stream->codec = p_voutf->p_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;
+
+	av_opt_set(p_video_stream->codec->priv_data, "preset", "ultrafast", 0);
+	av_opt_set(p_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");
+		return -1;
+	}
+
+	avformat_write_header(p_voutf->p_fmt, NULL);
+
+	return 0;
+}
+
+int dc_ffmpeg_video_muxer_write(VideoOutputFile * p_voutf) {
+
+	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;
+
+	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 (p_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;
+
+	// 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");
+		return -1;
+	}
+
+	av_free_packet(&pkt);
+
+	return 0;
+}
+
+int dc_ffmpeg_video_muxer_close(VideoOutputFile * p_voutf) {
+
+	u32 i;
+
+	av_write_trailer(p_voutf->p_fmt);
+
+	avio_close(p_voutf->p_fmt->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);
+	}
+
+	//p_voutf->p_fmt->streams[p_voutf->i_vstream_idx]->codec = NULL;
+	avformat_free_context(p_voutf->p_fmt);
+
+	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) {
+
+	char name[256];
+	sprintf(name, "video encoder %s", p_vdata->psz_name);
+	dc_consumer_init(&p_voutf->vcon, VIDEO_CB_SIZE, name);
+
+	p_voutf->p_sample = gf_isom_sample_new();
+	p_voutf->p_isof = NULL;
+	p_voutf->muxer_type = muxer_type;
+
+	p_voutf->frame_per_segment = frame_per_segment;
+	p_voutf->frame_per_fragment = frame_per_fragment;
+
+	p_voutf->i_seg_marker = seg_marker;
+	p_voutf->i_gdr = gdr;
+
+	return 0;
+}
+
+int dc_video_muxer_free(VideoOutputFile * p_voutf) {
+
+	if (p_voutf->p_isof != NULL) {
+		gf_isom_close(p_voutf->p_isof);
+	}
+
+	gf_isom_sample_del(&p_voutf->p_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) {
+
+	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);
+	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);
+	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;
+		}
+		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);
+	default:
+		return GF_BAD_PARAM;
+	};
+
+	return -2;
+}
+
+int dc_video_muxer_write(VideoOutputFile * p_voutf, int i_frame_nb) {
+
+	//GF_Err ret;
+	switch (p_voutf->muxer_type) {
+
+	case FFMPEG_VIDEO_MUXER:
+		return dc_ffmpeg_video_muxer_write(p_voutf);
+	case RAW_VIDEO_H264:
+		return dc_raw_h264_write(p_voutf);
+	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);
+
+			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;
+		}
+		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));
+		}
+		if (i_frame_nb + 1 == p_voutf->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) {
+
+	case FFMPEG_VIDEO_MUXER:
+		return dc_ffmpeg_video_muxer_close(p_voutf);
+	case RAW_VIDEO_H264:
+		return dc_raw_h264_close(p_voutf);
+	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);
+	default:
+		return -2;
+	};
+
+	return -2;
+}

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/video_muxer.h Added

@@ -0,0 +1,105 @@
+/*
+ *			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.
+ *
+ */
+
+#ifndef VIDEO_MUXER_H_
+#define VIDEO_MUXER_H_
+
+#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
+
+} 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
+ * available in Consumer data structure.
+ *
+ */
+typedef struct {
+
+	//VideoData * p_vdata;
+
+	VideoMuxerType muxer_type;
+
+	/* file format context structure */
+	AVFormatContext * p_fmt;
+	AVCodecContext * p_codec_ctx;
+	AVCodec * p_codec;
+
+	FILE * p_file;
+
+	GF_ISOFile * p_isof;
+	GF_ISOSample * p_sample;
+
+	/* Index of the video stream in the file */
+	int i_vstream_idx;
+	/* keeps the index with which encoder access to the circular buffer (as a consumer) */
+	Consumer vcon;
+
+	/* Variables that encoder needs to encode data */
+	uint8_t * p_vbuf;
+	int i_vbuf_size;
+	int i_encoded_frame_size;
+
+	int frame_per_fragment;
+	int frame_per_segment;
+	u64 first_dts;
+
+	u32 i_seg_marker;
+
+	int i_gop_size;
+	int i_gdr;
+
+} 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_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);
+
+#endif /* VIDEO_MUXER_H_ */

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/video_scaler.c Added

@@ -0,0 +1,244 @@
+/*
+ *			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 "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();
+
+	if (p_vsdn->p_vframe == NULL) {
+		fprintf(stderr, "Cannot allocate VideoNode!\n");
+		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);
+
+	return p_vsdn;
+}
+
+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_list_init(VideoScaledDataList * p_vsdl,
+		GF_List * p_video_lst) {
+
+	u32 i;
+	int j;
+	int found;
+
+	p_vsdl->i_size = 0;
+	p_vsdl->p_vsd = NULL;
+
+	for (i = 0; i < gf_list_count(p_video_lst); i++) {
+
+		VideoData * p_vconf = (VideoData*)gf_list_get(p_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) {
+
+				found = 1;
+
+				p_vsdl->p_vsd[j]->i_maxcon++;
+
+				break;
+			}
+		}
+		if (!found) {
+
+			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;
+
+			p_vsdl->i_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]);
+
+	gf_free(p_vsdl->p_vsd);
+}
+
+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);
+}
+
+int dc_video_scaler_data_init(VideoInputData * p_vin, VideoScaledData * p_vsd, int max_source) {
+
+	int i;
+
+	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_circular_buffer_create(&p_vsd->p_cb, VIDEO_CB_SIZE, p_vin->p_cb.mode,
+			p_vsd->i_maxcon);
+
+	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);
+	}
+
+	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");
+		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);
+
+	if (ret < 0) {
+#ifdef DEBUG
+		printf("Video scaler got to end of buffer!\n");
+#endif
+		return -2;
+	}
+
+	dc_consumer_unlock_previous(&p_vsd->svcon, &p_vin->p_cb);
+
+	dc_producer_lock(&p_vsd->svpro, &p_vsd->p_cb);
+	dc_producer_unlock_previous(&p_vsd->svpro, &p_vsd->p_cb);
+
+
+	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);
+
+	index = p_vdn->source_number;
+
+	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);
+
+	dc_consumer_advance(&p_vsd->svcon);
+	dc_producer_advance(&p_vsd->svpro);
+
+	return 0;
+}
+
+int dc_video_scaler_data_destroy(VideoScaledData * p_vsd) {
+
+	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<p_vsd->i_maxsource ; i++) {
+		av_free(p_vsd->p_vsprop[i].p_sws_ctx);
+	}
+	gf_free(p_vsd->p_vsprop);
+	//av_free(p_vsd->p_sws_ctx);
+
+	dc_circular_buffer_destroy(&p_vsd->p_cb);
+
+	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];
+	}
+
+	return NULL;
+}
+

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/video_scaler.h Added

@@ -0,0 +1,173 @@
+/*
+ *			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.
+ *
+ */
+
+#ifndef VIDEO_SCALER_H_
+#define VIDEO_SCALER_H_
+
+#include <stdlib.h>
+#include <gpac/list.h>
+
+#include "video_data.h"
+
+typedef struct {
+	/* scaler of the libav */
+	struct SwsContext * p_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;
+} VideoScaledProp;
+/*
+ * VideoScaledData keeps a circular buffer
+ * of video frame with a defined resolution.
+ *
+ */
+typedef struct {
+
+	VideoScaledProp * p_vsprop;
+
+	int i_out_width;
+	int i_out_height;
+	int i_out_pix_fmt;
+
+	/* scaler of the libav */
+	//struct SwsContext * p_sws_ctx;
+	/* width, height, and the pixel format of the scaled video */
+	//int i_width;
+	//int i_height;
+	//int i_pix_fmt;
+
+	/* circular buffer containing the scaled video frames */
+	CircularBuffer p_cb;
+	/* 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;
+
+} 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.
+ */
+
+typedef struct {
+
+	AVFrame * p_vframe;
+	uint8_t * p_pic_data_buf;
+
+} VideoScaledDataNode;
+
+/*
+ * A list of pointers to scaled video data.
+ */
+typedef struct {
+
+	VideoScaledData ** p_vsd;
+	int i_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
+ *
+ */
+void dc_video_scaler_list_init(VideoScaledDataList * vsdl, GF_List * video_lst);
+
+/*
+ * Destroy a video scaled data list
+ *
+ * @param vsdl [in] the list to be destroyed
+ *
+ */
+void dc_video_scaler_list_destroy(VideoScaledDataList * vsdl);
+
+/*
+ * 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.
+ */
+void dc_video_scaler_end_signal(VideoScaledData * vsd);
+/*
+ * Initialize a VideoScaledData.
+ *
+ * @param vind [in] contains the info of the input video
+ * @param vsd [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_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
+ *
+ * return 0 on success, -2 if the node is the last node to scale
+ */
+int dc_video_scaler_scale(VideoInputData * vind, VideoScaledData * vsd);
+/*
+ * Destroy a VideoScaledData
+ *
+ * @param vsd [in] structure to be destroyed.
+ */
+int dc_video_scaler_data_destroy(VideoScaledData * vsd);
+/*
+ * Return the VideoScaledData from the list which has width and height
+ *
+ * @param vsdl [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);
+
+#endif /* VIDEO_SCALER_H_ */

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

@@ -56,7 +56,7 @@
 
 #define UDP_BUFFER_SIZE	0x40000
 
-#define MP42TS_PRINT_FREQ 634 /*refresh printed info every CLOCK_REFRESH ms*/
+#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) 
@@ -72,16 +72,18 @@
 					"\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-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-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"
@@ -98,6 +100,10 @@
                     "\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"
@@ -293,6 +299,7 @@
 			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));
 		}
 
 		gf_isom_sample_del(&priv->sample);
@@ -352,6 +359,7 @@
 	char _lan[4];
 	GF_DecoderConfig *dcd;
 	u64 avg_rate, duration;
+	s32 ref_count;
 
 	GF_SAFEALLOC(priv, GF_ESIMP4);
 
@@ -385,12 +393,12 @@
 			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_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_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;
@@ -415,7 +423,6 @@
 			gf_odf_avc_cfg_del(avccfg);
 #endif
 
-		}
 			break;
 		}
 	}
@@ -464,6 +471,14 @@
 	    gf_free(ifce->input_udta);
 	  ifce->input_udta = priv;
 	}
+
+	ref_count = gf_isom_get_reference_count(mp4, track_num, GF_ISOM_REF_SCAL);
+	if (ref_count > 0) {
+		gf_isom_get_reference_ID(mp4, track_num, GF_ISOM_REF_SCAL, (u32) ref_count, &ifce->depends_on_stream);
+	}
+	else {
+		ifce->depends_on_stream = 0;
+	}
 }
 
 
@@ -727,6 +742,7 @@
 			rtp->cat_dsi = 1;
 			break;
 		case GPAC_OTI_VIDEO_AVC:
+		case GPAC_OTI_VIDEO_SVC:
 			rtp->is_264 = 1;
 			rtp->depacketizer->flags |= GF_RTP_AVC_USE_ANNEX_B;
 		{
@@ -1020,7 +1036,7 @@
 
 #ifndef GPAC_DISABLE_SENG
 
-static Bool seng_output(void *param)
+static u32 seng_output(void *param)
 {
 	GF_Err e;
 	u64 last_src_modif, mod_time;
@@ -1402,7 +1418,7 @@
 		gf_f64_seek(_sdp, 0, SEEK_SET);
 		sdp_buf = (char*)gf_malloc(sizeof(char)*sdp_size);
 		memset(sdp_buf, 0, sizeof(char)*sdp_size);
-		sdp_size = fread(sdp_buf, 1, sdp_size, _sdp);
+		sdp_size = (u32) fread(sdp_buf, 1, sdp_size, _sdp);
 		fclose(_sdp);
 
 		sdp = gf_sdp_info_new();
@@ -1428,7 +1444,7 @@
 			buf64 = strstr(iod_str, ",");
 			if (!buf64) break;
 			buf64 += 1;
-			size64 = strlen(buf64) - 1;
+			size64 = (u32) strlen(buf64) - 1;
 			size = gf_base64_decode(buf64, size64, buf, 2000);
 
 			gf_odf_desc_read(buf, size, &prog->iod);
@@ -1619,7 +1635,7 @@
 								  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, Bool *split_rap)
+								  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)
 {
 	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;
@@ -1661,9 +1677,9 @@
 			assert(*video_buffer_size);
 			*video_buffer = (char*) gf_malloc(*video_buffer_size);
 			{
-				s32 readen = fread(*video_buffer, sizeof(char), *video_buffer_size, f);
-				if (readen != *video_buffer_size)
-					fprintf(stderr, "Error while reading video file, has readen %u chars instead of %u.\n", readen, *video_buffer_size);
+				s32 read = (u32) fread(*video_buffer, sizeof(char), *video_buffer_size, f);
+				if (read != *video_buffer_size)
+					fprintf(stderr, "Error while reading video file, has readen %u chars instead of %u.\n", read, *video_buffer_size);
 			}
 			fclose(f);
 		} else if (!strnicmp(arg, "-audio=", 7)) {
@@ -1724,7 +1740,7 @@
 		} else if (!strcmp(arg, "-mem-track")) {
 #ifdef GPAC_MEMORY_TRACKING
 			gf_sys_close();
-			gf_sys_init(1);
+			gf_sys_init(GF_TRUE);
 			gf_log_set_tool_level(GF_LOG_MEMORY, GF_LOG_DEBUG);
 #else
 			fprintf(stderr, "WARNING - GPAC not compiled with Memory Tracker - ignoring \"-mem-track\"\n"); 
@@ -1736,7 +1752,7 @@
 				goto error;
 			}
 			rate_found = 1;
-			*mux_rate = 1024*atoi(arg+6);
+			*mux_rate = 1000*atoi(arg+6);
 		} else if (!strnicmp(arg, "-mpeg4-carousel=", 16)) {
 			if (mpeg4_carousel_found) {
 				error_msg = "multiple '-mpeg4-carousel' found";
@@ -1763,6 +1779,13 @@
 			*single_au_pes = 1;
 		} else if (!stricmp(arg, "-rap")) {
 			*split_rap = 1;
+		} else if (!stricmp(arg, "-flush-rap")) {
+			*split_rap = 2;
+		}
+		else if (!strnicmp(arg, "-dst-udp=", 9)) {
+			*real_time = 1;
+		} else if (!strnicmp(arg, "-dst-rtp=", 9)) {
+			*real_time = 1;
 		}
 	}
 	if (*real_time) force_real_time = 1;
@@ -1824,7 +1847,13 @@
 				src_found = 1;
 				*src_name = arg+5;
 			}
-			else if (!strnicmp(arg, "-dst-file=", 10)) {
+			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);
 			}
@@ -1964,11 +1993,13 @@
 	/*   declarations   */
 	/********************/
 	const char *ts_pck;
+	char *ts_pack_buffer = NULL;
 	GF_Err e;
 	u32 run_time;
-	Bool real_time, single_au_pes, split_rap;
+	Bool real_time, single_au_pes, is_stdout;
 	u64 pcr_init_val=0;
-	u32 i, j, mux_rate, nb_progs, cur_pid, carrousel_rate, last_print_time, last_video_time, bifs_use_pes, psi_refresh_rate;
+	u32 usec_till_next, ttl, split_rap;
+	u32 i, j, mux_rate, nb_progs, cur_pid, carrousel_rate, last_print_time, last_video_time, bifs_use_pes, psi_refresh_rate, nb_pck_pack, nb_pck_in_pack;
 	char *ts_out = NULL, *udp_out = NULL, *rtp_out = NULL, *audio_input_ip = NULL;
 	FILE *ts_output_file = NULL;
 	GF_Socket *ts_output_udp_sk = NULL, *audio_input_udp_sk = NULL;
@@ -1990,19 +2021,21 @@
 	char *segment_manifest, *segment_http_prefix, *segment_dir;
 	char segment_prefix[GF_MAX_PATH];
 	char segment_name[GF_MAX_PATH];
+	const char *ip_ifce = NULL;
 	GF_M2TS_Time prev_seg_time;
 	GF_M2TS_Mux *muxer;
 	
 	/*****************/
 	/*   gpac init   */
 	/*****************/
-	gf_sys_init(0);
+	gf_sys_init(GF_FALSE);
 	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_WARNING);
 	
 	/***********************/
 	/*   initialisations   */
 	/***********************/
 	real_time = 0;	
+	is_stdout = 0;
 	ts_output_file = NULL;
 	video_buffer = NULL;
 	last_video_time = 0;
@@ -2029,6 +2062,7 @@
 	prev_seg_time.sec = 0;
 	prev_seg_time.nanosec = 0;
 	video_buffer_size = 0;
+	nb_pck_pack = 1;
 #ifndef GPAC_DISABLE_PLAYER
 	aac_reader = AAC_Reader_new();
 #endif
@@ -2036,6 +2070,7 @@
 	single_au_pes = 0;
 	bifs_use_pes = 0;
 	split_rap = 0;
+	ttl = 1;
 	psi_refresh_rate = GF_M2TS_PSI_DEFAULT_REFRESH_RATE;
 	pcr_offset = DEFAULT_PCR_OFFSET;
 
@@ -2046,7 +2081,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)) {
+							&segment_dir, &segment_duration, &segment_manifest, &segment_number, &segment_http_prefix, &split_rap, &nb_pck_pack, &ttl, &ip_ifce)) {
 		goto exit;
 	}
 	
@@ -2084,7 +2119,13 @@
 			}
 			//write_manifest(segment_manifest, segment_dir, segment_duration, segment_prefix, segment_http_prefix, segment_index, 0, 0);
 		} 
-		ts_output_file = fopen(ts_out, "wb");
+		if (!strcmp(ts_out, "stdout") || !strcmp(ts_out, "-") ) {
+			ts_output_file = stdout;
+			is_stdout = GF_TRUE;
+		} else {
+			ts_output_file = fopen(ts_out, "wb");
+			is_stdout = GF_FALSE;
+		}
 		if (!ts_output_file) {
 			fprintf(stderr, "Error opening %s\n", ts_out);
 			goto exit;
@@ -2093,9 +2134,9 @@
 	if (udp_out != NULL) {
 		ts_output_udp_sk = gf_sk_new(GF_SOCK_TYPE_UDP);
 		if (gf_sk_is_multicast_address((char *)udp_out)) {
-			e = gf_sk_setup_multicast(ts_output_udp_sk, (char *)udp_out, output_port, 32, 0, NULL);
+			e = gf_sk_setup_multicast(ts_output_udp_sk, (char *)udp_out, output_port, ttl, 0, (char *) ip_ifce);
 		} else {
-			e = gf_sk_bind(ts_output_udp_sk, NULL, output_port, (char *)udp_out, output_port, GF_SOCK_REUSE_PORT);
+			e = gf_sk_bind(ts_output_udp_sk, ip_ifce, output_port, (char *)udp_out, output_port, GF_SOCK_REUSE_PORT);
 		}
 		if (e) {
 			fprintf(stderr, "Error initializing UDP socket: %s\n", gf_error_to_string(e));
@@ -2121,13 +2162,14 @@
 			tr.client_port_last = output_port+1;
 		} else {
 			tr.source = (char *)rtp_out;
+			tr.TTL = ttl;
 		}
 		e = gf_rtp_setup_transport(ts_output_rtp, &tr, (char *)ts_out);
 		if (e != GF_OK) {
 			fprintf(stderr, "Cannot setup RTP transport info : %s\n", gf_error_to_string(e));
 			goto exit;
 		}
-		e = gf_rtp_initialize(ts_output_rtp, 0, 1, 1500, 0, 0, NULL);
+		e = gf_rtp_initialize(ts_output_rtp, 0, 1, 1500, 0, 0, (char *) ip_ifce);
 		if (e != GF_OK) {
 			fprintf(stderr, "Cannot initialize RTP sockets : %s\n", gf_error_to_string(e));
 			goto exit;
@@ -2212,8 +2254,13 @@
 		while (cur_pid % 10)
 			cur_pid ++;
 	}
+	muxer->flush_pes_at_rap = (split_rap == 2) ? GF_TRUE : GF_FALSE;
 
 	gf_m2ts_mux_update_config(muxer, 1);
+	
+	if (nb_pck_pack>1) {
+		ts_pack_buffer = gf_malloc(sizeof(char) * 188 * nb_pck_pack);
+	}
 
 	/*****************/
 	/*   main loop   */
@@ -2256,9 +2303,24 @@
 		}
 
 		/*flush all packets*/
-		while ((ts_pck = gf_m2ts_mux_process(muxer, &status)) != NULL) {
+		nb_pck_in_pack=0;
+		while ((ts_pck = gf_m2ts_mux_process(muxer, &status, &usec_till_next)) != NULL) {
+
+			if (ts_pack_buffer ) {
+				memcpy(ts_pack_buffer + 188 * nb_pck_in_pack, ts_pck, 188);
+				nb_pck_in_pack++;
+
+				if (nb_pck_in_pack < nb_pck_pack)
+					continue;
+
+				ts_pck = (const char *) ts_pack_buffer;
+			} else {
+				nb_pck_in_pack = 1;
+			}
+
+call_flush:
 			if (ts_output_file != NULL) {
-				gf_fwrite(ts_pck, 1, 188, ts_output_file); 
+				gf_fwrite(ts_pck, 1, 188 * nb_pck_in_pack, ts_output_file); 
 				if (segment_duration && (muxer->time.sec > prev_seg_time.sec + segment_duration)) {
 					prev_seg_time = muxer->time;
 					fclose(ts_output_file);
@@ -2298,7 +2360,7 @@
 			}
 
 			if (ts_output_udp_sk != NULL) {
-				e = gf_sk_send(ts_output_udp_sk, (char*)ts_pck, 188); 
+				e = gf_sk_send(ts_output_udp_sk, (char*)ts_pck, 188 * nb_pck_in_pack); 
 				if (e) {
 					fprintf(stderr, "Error %s sending UDP packet\n", gf_error_to_string(e));
 				}
@@ -2312,16 +2374,23 @@
 				/*FIXME - better discontinuity check*/
 				hdr.Marker = (ts < hdr.TimeStamp) ? 1 : 0;
 				hdr.TimeStamp = ts;
-				e = gf_rtp_send_packet(ts_output_rtp, &hdr, (char*)ts_pck, 188, 0);
+				e = gf_rtp_send_packet(ts_output_rtp, &hdr, (char*)ts_pck, 188 * nb_pck_in_pack, 0);
 				if (e) {
 					fprintf(stderr, "Error %s sending RTP packet\n", gf_error_to_string(e));
 				}
 			}
 #endif
+
+			nb_pck_in_pack = 0;
+
 			if (status>=GF_M2TS_STATE_PADDING) {
 				break;
 			}
 		}
+		if (nb_pck_in_pack) {
+			ts_pck = (const char *) ts_pack_buffer;
+			goto call_flush;
+		}
 
 		/*push video*/
 		{
@@ -2335,14 +2404,24 @@
 		}
 
 		if (real_time) {
-			/*refresh every MP42TS_PRINT_FREQ ms*/
+			/*refresh every MP42TS_PRINT_TIME_MS ms*/
 			u32 now=gf_sys_clock();
-			if (now/MP42TS_PRINT_FREQ != last_print_time/MP42TS_PRINT_FREQ) {
+			if (now > last_print_time + MP42TS_PRINT_TIME_MS) {
 				last_print_time = now;
-				fprintf(stderr, "M2TS: time %d - TS time %d - avg bitrate %d\r", gf_m2ts_get_sys_clock(muxer), gf_m2ts_get_ts_clock(muxer), muxer->avg_br);
+				fprintf(stderr, "M2TS: time %d - TS time %d - avg bitrate %d\r", gf_m2ts_get_sys_clock(muxer), gf_m2ts_get_ts_clock(muxer), muxer->average_birate_kbps);
+
+				if (gf_prompt_has_input()) {
+					char c = gf_prompt_get_char();
+					if (c=='q') break;
+				}
+			}
+			if (status == GF_M2TS_STATE_IDLE) {
+				/*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);
+				}
 			}
-			/*cpu load regulation*/
-			gf_sleep(1);
 		}
 
 
@@ -2365,11 +2444,12 @@
 	}
 
 exit:
+	if (ts_pack_buffer) gf_free(ts_pack_buffer);
 	run = 0;
 	if (segment_duration) {
 		write_manifest(segment_manifest, segment_dir, segment_duration, segment_prefix, segment_http_prefix, segment_index - segment_number, segment_index, 1);
 	}
-	if (ts_output_file) fclose(ts_output_file);
+	if (ts_output_file && !is_stdout) fclose(ts_output_file);
 	if (ts_output_udp_sk) gf_sk_del(ts_output_udp_sk);
 #ifndef GPAC_DISABLE_STREAMING
 	if (ts_output_rtp) gf_rtp_del(ts_output_rtp);
@@ -2411,6 +2491,6 @@
 		if (progs[i].th) gf_th_del(progs[i].th);
 	}
 	gf_sys_close();
-	return 1;
+	return 0;
 }

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

@@ -92,7 +92,7 @@
 {
 	u32 i;
 	Bool check_2cc = 0;
-	i = strlen(lang);
+	i = (u32) strlen(lang);
 	if (i==3) return lang;
 	if (i==2) check_2cc = 1;
 
@@ -144,7 +144,7 @@
 	tag_len = (u32) gf_f64_tell(t);
 	gf_f64_seek(t, 0, SEEK_SET);
 	tag = gf_malloc(sizeof(char) * tag_len);
-	tag_len = fread(tag, sizeof(char), tag_len, t);
+	tag_len = (u32) fread(tag, sizeof(char), tag_len, t);
 	fclose(t);
 	
 	ext = strrchr(inName, '.');
@@ -881,6 +881,7 @@
 	u32 data_offset, sps_id, pps_id;
 	
 	if (is_hevc) {
+#ifndef GPAC_DISABLE_HEVC
 		type = (ptr[0]  & 0x7E) >> 1;
 		fprintf(dump, "code=\"%d\" type=\"", type);
 		switch (type) {
@@ -914,6 +915,7 @@
 			fputs("UNKNOWN", dump); break;
 		}
 		fputs("\"", dump);
+#endif //GPAC_DISABLE_HEVC
 		return;
 	} 
 	
@@ -1010,7 +1012,7 @@
 	if (arr) {\
 		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);\
+			fprintf(dump, "  <%s number=\"%d\" size=\"%d\" ", name, i+1, slc->size);\
 			dump_nalu(dump, slc->data, slc->size, svccfg ? 1 : 0, is_hevc);\
 			fprintf(dump, "/>\n");\
 		}\
@@ -1031,10 +1033,12 @@
 		DUMP_ARRAY(svccfg->pictureParameterSets, "SVCPPSArray")
 	}
 	if (hevccfg) {
+#ifndef GPAC_DISABLE_HEVC
+		u32 idx;
 		nalh_size = hevccfg->nal_unit_size;
 		is_hevc = 1;
-		for (i=0; i<gf_list_count(hevccfg->param_array); i++) {
-			GF_HEVCParamArray *ar = gf_list_get(hevccfg->param_array, i);
+		for (idx=0; idx<gf_list_count(hevccfg->param_array); idx++) {
+			GF_HEVCParamArray *ar = gf_list_get(hevccfg->param_array, idx);
 			if (ar->type==GF_HEVC_NALU_SEQ_PARAM) {
 				DUMP_ARRAY(ar->nalus, "HEVCSPSArray")
 			} else if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
@@ -1045,6 +1049,7 @@
 				DUMP_ARRAY(ar->nalus, "HEVCUnknownPSArray")
 			}
 		}
+#endif
 	}
 #endif
 	fprintf(dump, " </NALUConfig>\n");
@@ -1421,22 +1426,27 @@
 				w = h = 0;
 				if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_MPEG4_PART2) {
 #ifndef GPAC_DISABLE_AV_PARSERS
-					GF_M4VDecSpecInfo dsi;
-					gf_m4v_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
-					if (full_dump) fprintf(stderr, "\t");
-					w = dsi.width;
-					h = dsi.height;
-					fprintf(stderr, "MPEG-4 Visual Size %d x %d - %s\n", w, h, gf_m4v_get_profile_name(dsi.VideoPL));
-					if (dsi.par_den && dsi.par_num) {
-						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\n", dsi.par_num, dsi.par_den, tw, th);
-					}
+					if (!esd->decoderConfig->decoderSpecificInfo) {
 #else
-					gf_isom_get_visual_info(file, trackNum, 1, &w, &h);
-					fprintf(stderr, "MPEG-4 Visual Size %d x %d\n", w, h);
+						gf_isom_get_visual_info(file, trackNum, 1, &w, &h);
+						fprintf(stderr, "MPEG-4 Visual Size %d x %d\n", w, h);
+#endif
+						fprintf(stderr, "\tNon-compliant MPEG-4 Visual track: video_object_layer infos not found in sample description\n");
+#ifndef GPAC_DISABLE_AV_PARSERS
+					} else {
+						GF_M4VDecSpecInfo dsi;
+						gf_m4v_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
+						if (full_dump) fprintf(stderr, "\t");
+						w = dsi.width;
+						h = dsi.height;
+						fprintf(stderr, "MPEG-4 Visual Size %d x %d - %s\n", w, h, gf_m4v_get_profile_name(dsi.VideoPL));
+						if (dsi.par_den && dsi.par_num) {
+							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\n", dsi.par_num, dsi.par_den, tw, th);
+						}
+					}
 #endif
-
 				} else if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) {
 #ifndef GPAC_DISABLE_AV_PARSERS
 					GF_AVCConfig *avccfg, *svccfg;
@@ -1491,14 +1501,14 @@
 #endif /*GPAC_DISABLE_AV_PARSERS*/
 
 				} else if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_HEVC) {
-#ifndef GPAC_DISABLE_AV_PARSERS
+#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_HEVC)
 					GF_HEVCConfig *hevccfg;
 #endif
 
 					gf_isom_get_visual_info(file, trackNum, 1, &w, &h);
 					if (full_dump) fprintf(stderr, "\t");
 					fprintf(stderr, "HEVC Video - Visual Size %d x %d\n", w, h);
-#ifndef GPAC_DISABLE_AV_PARSERS
+#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");
@@ -1522,7 +1532,7 @@
 						fprintf(stderr, "\n\tBit Depth luma %d - Chroma %d - %d temporal layers\n", hevccfg->luma_bit_depth, hevccfg->chroma_bit_depth, hevccfg->numTemporalLayers);
 						gf_odf_hevc_cfg_del(hevccfg);
 					}
-#endif /*GPAC_DISABLE_AV_PARSERS*/
+#endif /*GPAC_DISABLE_AV_PARSERS  && defined(GPAC_DISABLE_HEVC)*/
 				} 
 
 				/*OGG media*/
@@ -1803,7 +1813,7 @@
 		s16 l;
 		s32 tx, ty;
 		gf_isom_get_track_layout_info(file, trackNum, &w, &h, &tx, &ty, &l);
-		fprintf(stderr, "3GPP/MPEG-4 Timed Text - Size %d x %d - Translation X=%d Y=%d - Layer %d\n", w, h, tx, ty, l);
+		fprintf(stderr, "Timed Text - Size %d x %d - Translation X=%d Y=%d - Layer %d\n", w, h, tx, ty, l);
 	} else if (mtype == GF_ISOM_MEDIA_META) {
 		Bool is_xml = 0;
 		const char *mime_or_namespace = NULL;
@@ -2366,7 +2376,7 @@
 
 	/* first loop to process all packets between two PAT, and assume all signaling was found between these 2 PATs */
 	while (!feof(src)) {
-		size = fread(data, 1, 188, src);
+		size = (u32) fread(data, 1, 188, src);
 		if (size<188) break;
 
 		gf_m2ts_process_data(ts, data, size);
@@ -2390,7 +2400,7 @@
 
 
 	while (!feof(src)) {
-		size = fread(data, 1, 188, src);
+		size = (u32) fread(data, 1, 188, src);
 		if (size<188) break;
 
 		gf_m2ts_process_data(ts, data, size);

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

@@ -179,7 +179,7 @@
 
 GF_Err import_file(GF_ISOFile *dest, char *inName, u32 import_flags, Double force_fps, u32 frames_per_sample)
 {
-	u32 track_id, i, timescale, track, stype, profile, level, new_timescale, rescale, svc_mode;
+	u32 track_id, i, timescale, track, stype, profile, level, new_timescale, rescale, svc_mode, tile_mode;
 	s32 par_d, par_n, prog_id, delay;
 	s32 tw, th, tx, ty, txtw, txth, txtx, txty;
 	Bool do_audio, do_video, do_all, disable, track_layout, text_layout, chap_ref, is_chap, is_chap_file, keep_handler, negative_cts_offset;
@@ -219,6 +219,7 @@
 	stype = 0;
 	profile = level = 0;
 	negative_cts_offset = 0;
+	tile_mode = 0;
 
 	tw = th = tx = ty = txtw = txth = txtx = txty = 0;
 	par_d = par_n = -2;
@@ -337,14 +338,16 @@
 		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"))
+			if (!stricmp(ext+9, "splitall") || !stricmp(ext+9, "split"))
 				svc_mode = 2;
 			else if (!stricmp(ext+9, "splitbase"))
 				svc_mode = 1;
 			else if (!stricmp(ext+9, "merged"))
 				svc_mode = 0;
 		}
-
+		else if (!strnicmp(ext+1, "tiles", 5)) {
+			tile_mode = 1;
+		}
 		/*unrecognized, assume name has colon in it*/
 		else {
 		 ext = ext2;
@@ -514,6 +517,15 @@
 
 			if (gf_isom_get_avc_svc_type(import.dest, i+1, 1)>=GF_ISOM_AVCTYPE_AVC_SVC)
 				check_track_for_svc = i+1;
+
+			if (tile_mode) {
+				switch (gf_isom_get_media_subtype(import.dest, i+1, 1)) {
+				case GF_ISOM_SUBTYPE_HVC1:
+				case GF_ISOM_SUBTYPE_HEV1:
+					tile_mode = 2;
+					break;
+				}
+			}
 		}
 	} else {
 		for (i=0; i<import.nb_tracks; i++) {
@@ -637,6 +649,15 @@
 
 			if (gf_isom_get_avc_svc_type(import.dest, track, 1)>=GF_ISOM_AVCTYPE_AVC_SVC)
 				check_track_for_svc = track;
+
+			if (tile_mode) {
+				switch (gf_isom_get_media_subtype(import.dest, track, 1)) {
+				case GF_ISOM_SUBTYPE_HVC1:
+				case GF_ISOM_SUBTYPE_HEV1:
+					tile_mode = 2;
+					break;
+				}
+			}
 		}
 		if (track_id) fprintf(stderr, "WARNING: Track ID %d not found in file\n", track_id);
 		else if (do_video) fprintf(stderr, "WARNING: Video track not found\n");
@@ -670,6 +691,10 @@
 			if (e) goto exit;
 		}
 	}
+	if (tile_mode == 2) {
+		gf_media_split_hevc_tiles(import.dest);
+	}
+
 
 exit:
 	if (handler_name) gf_free(handler_name);
@@ -1276,9 +1301,9 @@
 	return e;
 }
 
-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);
+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);
 
-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)
+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;
 	GF_ISOFile *orig;
@@ -1292,9 +1317,9 @@
 	GF_ISOSample *samp;
 	Double aligned_to_DTS = 0;
 
-	if (strchr(fileName, '*')) return cat_multiple_files(dest, fileName, import_flags, force_fps, frames_per_sample, tmp_dir, force_cat, align_timelines);
+	if (strchr(fileName, '*')) return cat_multiple_files(dest, fileName, import_flags, force_fps, frames_per_sample, tmp_dir, force_cat, align_timelines, allow_add_in_command);
 	
-	multi_cat = strchr(fileName, '+');
+	multi_cat = allow_add_in_command ? strchr(fileName, '+') : NULL;
 	if (multi_cat) {
 		multi_cat[0] = 0;
 		multi_cat = &multi_cat[1];
@@ -1661,8 +1686,7 @@
 
 			gf_isom_set_edit_segment(dest, dst_tk, 0, (u64) (s64) (insert_dts*rescale), 0, GF_ISOM_EDIT_EMPTY);
 			gf_isom_set_edit_segment(dest, dst_tk, (u64) (s64) (insert_dts*rescale), (u64) (s64) (media_dur*rescale), 0, GF_ISOM_EDIT_NORMAL);
-		}
-		else if (merge_edits) {
+		} else if (merge_edits) {
 			/*convert from media time to track time*/
 			Double rescale = (Float) gf_isom_get_timescale(dest);
 			rescale /= (Float) gf_isom_get_media_timescale(dest, dst_tk);
@@ -1701,8 +1725,25 @@
 			u32 j, count;
 			
 			count = gf_isom_get_edit_segment_count(dest, dst_tk);
-			gf_isom_get_edit_segment(dest, dst_tk, count, &editTime, &segmentDuration, &mediaTime, &editMode);
-
+			if (count) {
+				e = gf_isom_get_edit_segment(dest, dst_tk, count, &editTime, &segmentDuration, &mediaTime, &editMode);
+				if (e) {
+					fprintf(stderr, "Error: edit segment error on destination track %u could not be retrieved.\n", dst_tk);
+					goto err_exit;
+				}
+			} else if (gf_isom_get_edit_segment_count(orig, i+1)) {
+				/*fake empty edit segment*/
+				/*convert from media time to track time*/
+				Double rescale = (Float) gf_isom_get_timescale(dest);
+				rescale /= (Float) gf_isom_get_media_timescale(dest, dst_tk);
+				segmentDuration = (u64) (dest_track_dur_before_cat * rescale);
+				editTime = 0;
+				mediaTime = 0;
+				gf_isom_set_edit_segment(dest, dst_tk, editTime, segmentDuration, mediaTime, GF_ISOM_EDIT_NORMAL);
+			} else {
+				editTime = 0;
+				segmentDuration = 0;
+			}
 
 			/*convert to dst time scale*/
 			ts_scale = (Float) gf_isom_get_timescale(dest);
@@ -1715,7 +1756,9 @@
 				t = (Double) (s64) editTime; t *= ts_scale; t += (s64) edit_offset; editTime = (s64) t;
 				t = (Double) (s64) segmentDuration; t *= ts_scale; segmentDuration = (s64) t;
 				t = (Double) (s64) mediaTime; t *= ts_scale; t+= (s64) dest_track_dur_before_cat; mediaTime = (s64) t;
-
+				if ((editMode == GF_ISOM_EDIT_EMPTY) && (mediaTime > 0)) {
+					editMode = GF_ISOM_EDIT_NORMAL;
+				}
 				gf_isom_set_edit_segment(dest, dst_tk, editTime, segmentDuration, mediaTime, editMode);
 			}
 		}
@@ -1761,7 +1804,7 @@
 	Double force_fps;
 	u32 frames_per_sample;
 	char *tmp_dir;
-	Bool force_cat, align_timelines;
+	Bool force_cat, align_timelines, allow_add_in_command;
 } CATEnum;
 
 Bool cat_enumerate(void *cbk, char *szName, char *szPath)
@@ -1770,19 +1813,19 @@
 	u32 len_rad1;
 	char szFileName[GF_MAX_PATH];
 	CATEnum *cat_enum = (CATEnum *)cbk;
-	len_rad1 = strlen(cat_enum->szRad1);
+	len_rad1 = (u32) strlen(cat_enum->szRad1);
 	if (strnicmp(szName, cat_enum->szRad1, len_rad1)) return 0;
 	if (strlen(cat_enum->szRad2) && !strstr(szName + len_rad1, cat_enum->szRad2) ) return 0;
 
 	strcpy(szFileName, szName);
 	strcat(szFileName, cat_enum->szOpt);
 
-	e = cat_isomedia_file(cat_enum->dest, szFileName, cat_enum->import_flags, cat_enum->force_fps, cat_enum->frames_per_sample, cat_enum->tmp_dir, cat_enum->force_cat, cat_enum->align_timelines);
+	e = cat_isomedia_file(cat_enum->dest, szFileName, cat_enum->import_flags, cat_enum->force_fps, cat_enum->frames_per_sample, cat_enum->tmp_dir, cat_enum->force_cat, cat_enum->align_timelines, cat_enum->allow_add_in_command);
 	if (e) return 1;
 	return 0;
 }
 
-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)
+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)
 {
 	CATEnum cat_enum;
 	char *sep;
@@ -1794,6 +1837,7 @@
 	cat_enum.tmp_dir = tmp_dir;
 	cat_enum.force_cat = force_cat;
 	cat_enum.align_timelines = align_timelines;
+	cat_enum.allow_add_in_command = allow_add_in_command;
 
 	strcpy(cat_enum.szPath, fileName);
 	sep = strrchr(cat_enum.szPath, GF_PATH_SEPARATOR);
@@ -2381,7 +2425,7 @@
 	e = gf_isom_set_meta_xml(file, 1, 0, file_name, !ascii);
 	if (e) goto exit;
 
-	skip_chars = strlen(root_dir);
+	skip_chars = (u32) strlen(root_dir);
 	count = gf_list_count(imports);
 	for (i=0; i<count; i++) {
 		char *ext, *mime, *encoding, *name = NULL;

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

@@ -37,6 +37,12 @@
 #include <gpac/rtp_streamer.h>
 #endif
 
+#include <gpac/mpegts.h>
+
+#ifndef GPAC_DISABLE_STREAMING
+#include <gpac/internal/ietf_dev.h>
+#endif
+
 #if defined(GPAC_DISABLE_ISOM) || defined(GPAC_DISABLE_ISOM_WRITE)
 
 #error "Cannot compile MP4Box if GPAC is not built with ISO File Format support"
@@ -65,6 +71,13 @@
 		);
 }
 
+static void on_logs(void *cbk, u32 ll, u32 lm, const char *fmt, va_list list)
+{
+	FILE *logs = cbk;
+	vfprintf(logs, fmt, list);
+	fflush(logs);
+}
+
 int stream_file_rtp(int argc, char **argv) 
 {
 	GF_ISOMRTPStreamer *file_streamer;
@@ -72,9 +85,12 @@
 	char *ip_dest = "127.0.0.1";
 	char *ifce_addr = NULL;
 	char *inName = NULL;
+	char *logs=NULL; 
+	FILE *logfile=NULL;
 	u16 port = 7000;
 	u32 ttl = 1;
 	Bool loop = 1;
+	Bool mem_track = 0;
 	Bool force_mpeg4 = 0;
 	u32 path_mtu = 1450;
 	u32 i;
@@ -94,17 +110,27 @@
 		else if (!strnicmp(arg, "-ttl=", 5)) ttl = atoi(arg+5);
 		else if (!strnicmp(arg, "-ifce=", 6)) ifce_addr = arg+6;
 		else if (!strnicmp(arg, "-sdp=", 5)) sdp_file = arg+5;
+		else if (!stricmp(arg, "-mem-track")) mem_track = 1;
+		else if (!strnicmp(arg, "-logs=", 6)) logs = arg+6;
+		else if (!strnicmp(arg, "-lf=", 4)) logfile = gf_f64_open(arg+4, "wt");
+	}
+
+	gf_sys_init(mem_track);
+	if (logs) 
+		gf_log_set_tools_levels(logs);
+	else 
+		gf_log_set_tool_level(GF_LOG_RTP, GF_LOG_INFO); //set to debug to have packet list
+	if (logfile) {
+		gf_log_set_callback(logfile, on_logs);
 	}
 
 	if (!gf_isom_probe_file(inName)) {
 		fprintf(stderr, "File %s is not a valid ISO Media file and cannot be streamed\n", inName);
+		if (logfile) fclose(logfile);
+		gf_sys_close();
 		return 1;
 	}
 
-	gf_sys_init(0);
-
-	gf_log_set_tool_level(GF_LOG_RTP, GF_LOG_WARNING);	//set to debug to have packet list
-
 	file_streamer = gf_isom_streamer_new(inName, ip_dest, port, loop, force_mpeg4, path_mtu, ttl, ifce_addr);
 	if (!file_streamer) {
 		fprintf(stderr, "Cannot create file streamer\n");
@@ -126,6 +152,7 @@
 		}
 		gf_isom_streamer_del(file_streamer);
 	}
+	if (logfile) fclose(logfile);
 	gf_sys_close();
 	return 0;
 }
@@ -261,7 +288,7 @@
 				fprintf(stderr, "Stream %d: Sending update at TS "LLD", %d bytes - RAP %d - critical %d\n", ESID, ts, size, rap, critical);
 				rtpch->rap = rtpch->critical = 0;
 
-				if (rtpch->manual_rtcp) gf_rtp_streamer_send_rtcp(rtpch->rtp, 0, 0);
+				if (rtpch->manual_rtcp) gf_rtp_streamer_send_rtcp(rtpch->rtp, 0, 0, 0, 0, 0);
 			}
 			return;
 		}
@@ -282,7 +309,7 @@
 
 			if (ch->manual_rtcp) {
 				ts = ch->carousel_ts + ch->timescale * ( gf_sys_clock() - ch->init_time + ch->ts_delta)/1000;
-				gf_rtp_streamer_send_rtcp(ch->rtp, 1, (u32) ts);
+				gf_rtp_streamer_send_rtcp(ch->rtp, 1, (u32) ts, 0, 0, 0);
 			}
 		}
 	} else {
@@ -300,7 +327,7 @@
 
 				if (ch->manual_rtcp) {
 					ts = ch->carousel_ts + ch->timescale*(gf_sys_clock()-ch->init_time + ch->ts_delta)/1000;
-					gf_rtp_streamer_send_rtcp(ch->rtp, 1, (u32) ts);
+					gf_rtp_streamer_send_rtcp(ch->rtp, 1, (u32) ts, 0, 0, 0);
 				}
 			}
 		}
@@ -459,7 +486,7 @@
 	aggregate_au = 1;
 	es_id = 0;
 	no_rap = 0;
-	gf_sys_init(0);
+	gf_sys_init(GF_FALSE);
 
 	memset(&livesess, 0, sizeof(LiveSession));
 	
@@ -813,3 +840,95 @@
 #endif /*!defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_SENG)*/
 
 #endif /*defined(GPAC_DISABLE_ISOM) || defined(GPAC_DISABLE_ISOM_WRITE)*/
+
+u32 grab_live_m2ts(const char *grab_m2ts, const char *outName)
+{
+	char data[0x80000];
+	u32 check = 50;
+	u64 nb_pck;
+	Bool first_run, is_rtp;
+	FILE *output;
+#ifndef GPAC_DISABLE_STREAMING
+	u16 seq_num;
+	GF_RTPReorder *ch = NULL;
+#endif
+	GF_Socket *sock;
+	GF_Err e = gf_m2ts_get_socket(grab_m2ts, NULL, 0x80000, &sock);
+
+	if (e) {
+		fprintf(stderr, "Cannot open %s: %s\n", grab_m2ts, gf_error_to_string(e));
+		return 1;
+	}
+	output = gf_f64_open(outName, "wb");
+	if (!output) {
+		fprintf(stderr, "Cannot open %s: check path and rights\n", outName);
+		gf_sk_del(sock);
+		return 1;
+	}
+	
+	fprintf(stderr, "Dumping %s stream to %s - press q to abort\n", grab_m2ts, outName);
+
+	first_run = 1;
+	is_rtp = 0;
+	while (1) {
+		u32 size = 0;
+
+		check--;
+		if (!check) {
+			if (gf_prompt_has_input()) {
+				char c = (char) gf_prompt_get_char(); 
+				if (c=='q') break;
+			}
+			check = 50;
+		}
+
+		/*m2ts chunks by chunks*/
+		e = gf_sk_receive(sock, data, 0x40000, 0, &size);
+		if (!size || e) {
+			gf_sleep(1);
+			continue;
+		}
+		if (first_run) {
+			first_run = 0;
+			/*FIXME: we assume only simple RTP packaging (no CSRC nor extensions)*/
+			if ((data[0] != 0x47) && ((data[1] & 0x7F) == 33) ) {
+				is_rtp = 1;
+#ifndef GPAC_DISABLE_STREAMING
+				ch = gf_rtp_reorderer_new(100, 500);
+#endif
+			}
+		}
+		/*process chunk*/
+		if (is_rtp) {
+#ifndef GPAC_DISABLE_STREAMING
+			char *pck;				
+			seq_num = ((data[2] << 8) & 0xFF00) | (data[3] & 0xFF);				
+			gf_rtp_reorderer_add(ch, (void *) data, size, seq_num);
+
+			pck = (char *) gf_rtp_reorderer_get(ch, &size);
+			if (pck) {
+				fwrite(pck+12, size-12, 1, output);
+				gf_free(pck);
+			}
+#else
+			fwrite(data+12, size-12, 1, output);			
+#endif
+		} else {
+			fwrite(data, size, 1, output);
+		}
+	}
+	nb_pck = gf_f64_tell(output);
+	nb_pck /= 188;
+	fprintf(stderr, "Captured "LLU" TS packets\n", nb_pck );
+	fclose(output);
+	gf_sk_del(sock);
+
+#ifndef GPAC_DISABLE_STREAMING
+	if (ch)
+		gf_rtp_reorderer_del(ch);
+#endif
+	return 0;
+}
+
+
+

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

@@ -71,7 +71,7 @@
 
 GF_Err import_file(GF_ISOFile *dest, char *inName, u32 import_flags, Double force_fps, u32 frames_per_sample);
 GF_Err split_isomedia_file(GF_ISOFile *mp4, Double split_dur, u32 split_size_kb, char *inName, Double interleaving_time, Double chunk_start, Bool adjust_split_end, char *outName, const char *tmpdir);
-GF_Err cat_isomedia_file(GF_ISOFile *mp4, char *fileName, u32 import_flags, Double force_fps, u32 frames_per_sample, char *tmp_dir, Bool force_cat, Bool align_timelines);
+GF_Err cat_isomedia_file(GF_ISOFile *mp4, char *fileName, u32 import_flags, Double force_fps, u32 frames_per_sample, char *tmp_dir, Bool force_cat, Bool align_timelines, Bool allow_add_in_command);
 
 #if !defined(GPAC_DISABLE_SCENE_ENCODER)
 GF_Err EncodeFile(char *in, GF_ISOFile *mp4, GF_SMEncodeOptions *opts, FILE *logs);
@@ -134,6 +134,10 @@
 void PrintLiveUsage();
 #endif
 
+#if !defined(GPAC_DISABLE_STREAMING)
+u32 grab_live_m2ts(const char *grab_m2ts, const char *outName);
+#endif
+
 int mp4boxTerminal(int argc, char **argv);
 
 u32 quiet = 0;
@@ -297,6 +301,8 @@
 			"                       If not set (default), segments are concatenated in output file\n"
 			"                        except in \"live\" profile where dash_%%s is used\n"
 			" -segment-ext name    sets the segment extension. Default is m4s, \"null\" means no extension\n"
+			" -segment-timeline    Uses SegmentTimeline when generating segments. NOT SUPPORTED BY LIVE/CTX MODE YET.\n"
+			" -segment-marker MARK Adds a box of type \'MARK\' at the end of each DASH segment. MARK shall be a 4CC identifier\n"
 			" -base-url string     sets Base url at MPD level. Can be used several times.\n"
 			" -mpd-title string    sets MPD title.\n"
 			" -mpd-source string   sets MPD source.\n"
@@ -313,6 +319,8 @@
 			"                       NOTE: This does not change the segment duration: dashing stops once segments produced exceeded the duration.\n"
 			" -min-buffer TIME     specifies MPD min buffer time in milliseconds\n"
 			" -ast-offset TIME     specifies MPD AvailabilityStartTime offset in seconds. Default is 1 sec delay\n"
+			" -dash-scale SCALE    specifies that timing for -dash and -frag are expressed in SCALE units per seconds\n"
+			" -mem-frags           fragments will be produced in memory rather than on disk before flushing to disk\n"
 			"\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"
@@ -427,7 +435,8 @@
 			" -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."
-			"                         * Note: new tracks can be imported before concatenation by specifying '+ADD_COMMAND'\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"
 			"                        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"
@@ -576,6 +585,10 @@
 			"                       * Note: can be used when encoding scene descriptions\n"
 			" -raw-layer ID        same as -raw but skips SVC/MVC extractors when extracting\n" 
 			" -diod                extracts file IOD in raw format when supported\n" 
+			"\n"
+#if !defined(GPAC_DISABLE_STREAMING)
+			" -grab-ts IP:port     grabs TS over UDP or RTP at IP:port location to output TS file\n"
+#endif
 			"\n");
 }
 void PrintDumpUsage()
@@ -927,7 +940,7 @@
 			GF_M4VDecSpecInfo dsi;
 			gf_m4v_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
 			if (dsi.VideoPL > PL) gf_isom_set_pl_indication(file, GF_ISOM_PL_VISUAL, dsi.VideoPL);
-		} else if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) {
+		} else if ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_SVC)) {
 			gf_isom_set_pl_indication(file, GF_ISOM_PL_VISUAL, 0x15);
 		} else if (!PL) {
 			gf_isom_set_pl_indication(file, GF_ISOM_PL_VISUAL, 0xFE);
@@ -1256,6 +1269,7 @@
 	6: enables track
 	7: disables track
 	8: referenceTrack
+	9: raw extraction
 	*/
 	u32 act_type;
 	/*track ID*/
@@ -1265,6 +1279,7 @@
 	const char *kms;
 	const char *hdl_name;
 	s32 par_num, par_den;
+	u32 dump_type, sample_num;
 } TrackAction;
 
 enum
@@ -1348,6 +1363,7 @@
 	u32 ast_shift_sec = 1;
 	char **mpd_base_urls = NULL;
 	u32 nb_mpd_base_urls=0;
+	u32 dash_scale = 1000;
 
 #ifndef GPAC_DISABLE_MPD
 	Bool do_mpd = 0;
@@ -1369,11 +1385,14 @@
 	Bool single_segment=0;
 	Bool single_file=0;
 	Bool segment_timeline=0;
+	u32 segment_marker = 0;
 	GF_DashProfile dash_profile = GF_DASH_PROFILE_UNKNOWN;
 	Bool use_url_template=0;
 	Bool seg_at_rap=0;
 	Bool frag_at_rap=0;
 	Bool adjust_split_end = 0;
+	Bool memory_frags = 1;
+	const char *do_wget = NULL;
 	GF_DashSegmenterInput *dash_inputs = NULL;
 	u32 nb_dash_inputs = 0;
 	char *gf_logs = NULL;
@@ -1381,7 +1400,10 @@
 	const char *dash_title = NULL;
 	const char *dash_source = NULL;
 	const char *dash_more_info = NULL;
-
+#if !defined(GPAC_DISABLE_STREAMING)
+	const char *grab_m2ts = NULL;
+#endif
+	
 	nb_tsel_acts = nb_add = nb_cat = nb_track_act = nb_sdp_ex = max_ptime = raw_sample_num = nb_meta_act = rtp_rate = major_brand = nb_alt_brand_add = nb_alt_brand_rem = car_dur = minor_version = 0;
 	e = GF_OK;
 	split_duration = 0.0;
@@ -1476,7 +1498,7 @@
 		else if (!stricmp(arg, "-sdp")) print_sdp = 1;
 		else if (!stricmp(arg, "-quiet")) quiet = 2;
 		else if (!strcmp(argv[i], "-mem-track")) continue;
-
+		
 		else if (!stricmp(arg, "-logs")) {
 			CHECK_NEXT_ARG
 			gf_logs = argv[i+1];
@@ -1494,6 +1516,18 @@
 				info_track_id=0;
 			}
 		}
+#if !defined(GPAC_DISABLE_STREAMING)
+		else if (!stricmp(arg, "-grab-ts")) {
+			CHECK_NEXT_ARG
+			grab_m2ts = argv[i+1];
+			i++;
+		}		
+#endif
+		else if (!stricmp(arg, "-wget")) {
+			CHECK_NEXT_ARG
+			do_wget = argv[i+1];
+			i++;
+		}		
 		/*******************************************************************************/
 		else if (!stricmp(arg, "-dvbhdemux")) {
 			dvbhdemux = 1;
@@ -1501,21 +1535,44 @@
 		/********************************************************************************/
 #ifndef GPAC_DISABLE_MEDIA_EXPORT
 		else if (!stricmp(arg, "-raw")) {
+            char *raw_params;
 			CHECK_NEXT_ARG
 			track_dump_type = GF_EXPORT_NATIVE;
-			trackID = atoi(argv[i+1]);
+			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++;
 			i++;
 		}
 		else if (!stricmp(arg, "-raw-layer")) {
 			CHECK_NEXT_ARG
-				track_dump_type = GF_EXPORT_NATIVE | GF_EXPORT_SVC_LAYER;
-			trackID = atoi(argv[i+1]);
+			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++;
 			i++;
 		}
 		else if (!stricmp(arg, "-qcp")) {
 			CHECK_NEXT_ARG
 			track_dump_type = GF_EXPORT_NATIVE | GF_EXPORT_USE_QCP;
-			trackID = atoi(argv[i+1]);
+			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++;
 			i++;
 		}
 		else if (!stricmp(arg, "-aviraw")) {
@@ -1527,39 +1584,56 @@
 			}
 			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", &trackID, &raw_sample_num);
+				sscanf(argv[i+1], "%u:%u", &tracks[nb_track_act].trackID, &tracks[nb_track_act].sample_num);
 			} else {
-				trackID = atoi(argv[i+1]);
+				tracks[nb_track_act].trackID = atoi(argv[i+1]);
 			}
+			tracks[nb_track_act].dump_type = GF_EXPORT_RAW_SAMPLES;
+			nb_track_act++;
 			i++;
 		}
 		else if (!stricmp(arg, "-nhnt")) {
 			CHECK_NEXT_ARG
 			track_dump_type = GF_EXPORT_NHNT;
-			trackID = atoi(argv[i+1]);
+			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++;
 			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;
-				trackID = atoi(argv[i+1] + 1);
+				tracks[nb_track_act].trackID = atoi(argv[i+1] + 1);
 			} else {
-				trackID = atoi(argv[i+1]);
+				tracks[nb_track_act].trackID = atoi(argv[i+1]);
 			}
+			nb_track_act++;
 			i++;
 		}
 		else if (!stricmp(arg, "-avi")) {
 			CHECK_NEXT_ARG
 			track_dump_type = GF_EXPORT_AVI;
-			trackID = atoi(argv[i+1]);
+			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++;
 			i++;
 		}
 #endif /*GPAC_DISABLE_MEDIA_EXPORT*/
@@ -1700,11 +1774,19 @@
 			Frag = 1;
 		} else if (!stricmp(arg, "-dash")) {
 			CHECK_NEXT_ARG
-			dash_duration = atof(argv[i+1]) /	 1000;
+			dash_duration = atof(argv[i+1]) / 1000;
 			i++;
 		} else if (!stricmp(arg, "-subdur")) {
 			CHECK_NEXT_ARG
-			dash_subduration = atof(argv[i+1]) /	 1000;
+			dash_subduration = atof(argv[i+1]) / 1000;
+			i++;
+		} else if (!stricmp(arg, "-dash-scale")) {
+			CHECK_NEXT_ARG
+			dash_scale = atoi(argv[i+1]);
+			if (!dash_scale) {
+				fprintf(stderr, "\tERROR: \"-dash-scale\": invalid parameter %s\n", argv[i+1]);
+				MP4BOX_EXIT_WITH_CODE(1);
+			}
 			i++;
 		} else if (!stricmp(arg, "-dash-ts-prog")) {
 			CHECK_NEXT_ARG
@@ -1795,6 +1877,13 @@
 			}
 		} else if (!stricmp(arg, "-segment-timeline")) {
 			segment_timeline = 1;
+		} else if (!stricmp(arg, "-mem-frags")) {
+			memory_frags = 1;
+		} else if (!stricmp(arg, "-segment-marker")) {
+			char *m;
+			CHECK_NEXT_ARG
+			m = argv[i+1];
+			segment_marker = GF_4CC(m[0], m[1], m[2], m[3]);
 		} else if (!stricmp(arg, "-itags")) { CHECK_NEXT_ARG itunes_tags = argv[i+1]; i++; open_edit = 1; }
 #ifndef GPAC_DISABLE_ISOM_HINTING
 		else if (!stricmp(arg, "-hint")) { open_edit = 1; HintIt = 1; }
@@ -1871,7 +1960,11 @@
 #ifndef GPAC_DISABLE_MEDIA_EXPORT
 			CHECK_NEXT_ARG
 			track_dump_type = GF_EXPORT_MP4;
-			trackID = atoi(argv[i+1]);
+			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_MP4;
+			nb_track_act++;
 			i++;
 #endif
 		}
@@ -1885,7 +1978,7 @@
 			nb_add++;
 			i++;
 		}
-		else if (!stricmp(arg, "-cat")) {
+		else if (!stricmp(arg, "-cat") || !stricmp(arg, "-catx")) {
 			CHECK_NEXT_ARG
 			nb_cat++;
 			i++;
@@ -2458,7 +2551,7 @@
 		gf_f64_seek(fin, 0, SEEK_SET);
 		done = 0;
 		while (1) {
-			u32 nb_bytes = fread(chunk, 1, 4096, fin);
+			u32 nb_bytes = (u32) fread(chunk, 1, 4096, fin);
 			gf_fwrite(chunk, 1, nb_bytes, fout);
 			done += nb_bytes;
 			fprintf(stderr, "Appending file %s - %02.2f done\r", raw_cat, 100.0*done/to_copy);
@@ -2468,7 +2561,11 @@
 		fclose(fout);
 		MP4BOX_EXIT_WITH_CODE(0);
 	}
-
+#if !defined(GPAC_DISABLE_STREAMING) 
+	if (grab_m2ts) {
+		return grab_live_m2ts(grab_m2ts, inName);
+	}
+#endif
 	/*init libgpac*/
 	if (enable_mem_tracker) {
 		gf_sys_close();
@@ -2495,6 +2592,14 @@
 		}
 	}
 
+	if (do_wget != NULL) {
+		e = gf_dm_wget(do_wget, inName, 0, 0);
+		if (e != GF_OK) {
+			fprintf(stderr, "Cannot retrieve %s: %s\n", do_wget, gf_error_to_string(e) );
+		}
+		MP4BOX_EXIT_WITH_CODE(1);
+	}
+
 #ifndef GPAC_DISABLE_MPD
 	if (do_mpd) {
 		Bool remote = 0;
@@ -2663,8 +2768,8 @@
 			}
 		}
 		for (i=0; i<(u32)argc; i++) {
-			if (!strcmp(argv[i], "-cat")) {
-				e = cat_isomedia_file(file, argv[i+1], import_flags, import_fps, agg_samples, tmpdir, force_cat, align_cat);
+			if (!strcmp(argv[i], "-cat") || !strcmp(argv[i], "-catx")) {
+				e = cat_isomedia_file(file, argv[i+1], import_flags, import_fps, agg_samples, tmpdir, force_cat, align_cat, !strcmp(argv[i], "-catx") ? GF_TRUE : GF_FALSE);
 				if (e) {
 					fprintf(stderr, "Error appending %s: %s\n", argv[i+1], gf_error_to_string(e));
 					gf_isom_delete(file);
@@ -2742,6 +2847,7 @@
 
 
 	if (dash_duration) {
+		Bool del_file = GF_FALSE;
 		char szMPD[GF_MAX_PATH], *sep;
 		GF_Config *dash_ctx = NULL;
 		u32 do_abort = 0;
@@ -2777,14 +2883,19 @@
 			fprintf(stderr, "Using default MPD refresh of %d seconds\n", mpd_update_time);
 		}
 
+		if (file && needSave) {
+			gf_isom_close(file);
+			file = NULL;
+			del_file = GF_TRUE;
+		}
 		while (!do_abort) {
 
 			e = gf_dasher_segment_files(szMPD, dash_inputs, nb_dash_inputs, dash_profile, dash_title, dash_source, cprt, dash_more_info,
 										(const char **) mpd_base_urls, nb_mpd_base_urls, 
-									   use_url_template, segment_timeline,  single_segment, single_file, bitstream_switching_mode,
-									   seg_at_rap, dash_duration, seg_name, seg_ext,
+									   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_ctx, dash_dynamic, mpd_update_time, time_shift_depth, dash_subduration, min_buffer, ast_shift_sec, dash_scale, memory_frags);
 			if (e) break;
 
 			if (dash_live) {
@@ -2823,7 +2934,10 @@
 			gf_cfg_del(dash_ctx);
 		}
 		if (e) fprintf(stderr, "Error DASHing file: %s\n", gf_error_to_string(e));
-
+		if (file) gf_isom_delete(file);
+		if (del_file) 
+			gf_delete_file(inName);
+	
 		MP4BOX_EXIT_WITH_CODE( (e!=GF_OK) ? 1 : 0 );
 	}
 
@@ -2971,13 +3085,27 @@
 	}
 	if (!open_edit && !gf_isom_probe_file(inName) && track_dump_type) {
 		GF_MediaExporter mdump;
-		memset(&mdump, 0, sizeof(mdump));
-		mdump.in_name = inName;
-		mdump.flags = track_dump_type;
-		mdump.trackID = trackID;
-		mdump.out_name = outfile;
-		e = gf_media_export(&mdump);
-		if (e) goto err_exit;
+		char szFile[1024];
+		for (i=0; i<nb_track_act; i++) {
+			TrackAction *tka = &tracks[i];
+			if (tka->act_type != 9) continue;
+			memset(&mdump, 0, sizeof(mdump));
+			mdump.in_name = inName;
+			mdump.flags = tka->dump_type;
+			mdump.trackID = tka->trackID;
+			mdump.sample_num = raw_sample_num;
+			if (outName) {
+				mdump.out_name = outName;
+				mdump.flags |= GF_EXPORT_MERGE;
+			} else if (nb_track_act>1) {
+				sprintf(szFile, "%s_track%d", outfile, mdump.trackID);
+				mdump.out_name = szFile;
+			} else {
+				mdump.out_name = outfile;
+			}
+			e = gf_media_export(&mdump);
+			if (e) goto err_exit;
+		}
 		MP4BOX_EXIT_WITH_CODE(0);
 	} 
 
@@ -3067,25 +3195,33 @@
 #endif
 
 #ifndef GPAC_DISABLE_MEDIA_EXPORT
-	if (do_saf || track_dump_type) {
+	if (track_dump_type) {
 		char szFile[1024];
 		GF_MediaExporter mdump;
-		memset(&mdump, 0, sizeof(mdump));
-		mdump.file = file;
-		mdump.flags = do_saf ? GF_EXPORT_SAF : track_dump_type;
-		if (!do_saf) {
-			mdump.trackID = trackID;
+		for (i=0; i<nb_track_act; i++) {
+			TrackAction *tka = &tracks[i];
+			if (tka->act_type != 9) continue;
+			memset(&mdump, 0, sizeof(mdump));
+			mdump.file = file;
+			mdump.flags = tka->dump_type;
+			mdump.trackID = tka->trackID;
 			mdump.sample_num = raw_sample_num;
 			if (outName) {
 				mdump.out_name = outName;
 				mdump.flags |= GF_EXPORT_MERGE;
 			} else {
-				sprintf(szFile, "%s_track%d", outfile, trackID);
+				sprintf(szFile, "%s_track%d", outfile, mdump.trackID);
 				mdump.out_name = szFile;
 			}
-		} else {
-			mdump.out_name = outfile;
+			e = gf_media_export(&mdump);
+			if (e) goto err_exit;
 		}
+	} else if (do_saf) {
+		GF_MediaExporter mdump;
+		memset(&mdump, 0, sizeof(mdump));
+		mdump.file = file;
+		mdump.flags = GF_EXPORT_SAF;
+		mdump.out_name = outfile;
 		e = gf_media_export(&mdump);
 		if (e) goto err_exit;
 	}
@@ -3473,7 +3609,7 @@
 				if ((val[0]==':') || !val[0] || !stricmp(val, "NULL") ) val = NULL;
 			}
 
-			tlen = val ? strlen(val) : 0;
+			tlen = val ? (u32) strlen(val) : 0;
 			switch (itag) {
 			case GF_ISOM_ITUNE_COVER_ART:
 			{
@@ -3483,7 +3619,7 @@
 				tlen = (u32) gf_f64_tell(t);
 				gf_f64_seek(t, 0, SEEK_SET);
 				d = gf_malloc(sizeof(char) * tlen);
-				tlen = fread(d, sizeof(char), tlen, t);
+				tlen = (u32) fread(d, sizeof(char), tlen, t);
 				fclose(t);
 				
 				ext = strrchr(val, '.');
@@ -3501,7 +3637,7 @@
 				if (_v) {
 					gf_isom_apple_set_tag(file, itag, NULL, _v);
 				} else {
-					gf_isom_apple_set_tag(file, itag, val, strlen(val) );
+					gf_isom_apple_set_tag(file, itag, val, (u32) strlen(val) );
 				}
 			}
 				break;

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

@@ -59,22 +59,22 @@
 void ViewODs(GF_Terminal *term, Bool show_timing);
 void PrintGPACConfig();
 
-static Bool gui_mode = 0;
+static Bool gui_mode = GF_FALSE;
 
-static Bool restart = 0;
-static Bool reload = 0;
+static Bool restart = GF_FALSE;
+static Bool reload = GF_FALSE;
 #if defined(__DARWIN__) || defined(__APPLE__)
 //we keep no decoder thread because of JS_GC deadlocks between threads ...
 static u32 threading_flags = GF_TERM_NO_COMPOSITOR_THREAD | GF_TERM_NO_DECODER_THREAD;
 #else
 static u32 threading_flags = 0;
 #endif
-static Bool no_audio = 0;
-static Bool term_step = 0;
-static Bool no_regulation = 0;
-static Bool bench_mode = 0;
-Bool is_connected = 0;
-Bool startup_file = 0;
+static Bool no_audio = GF_FALSE;
+static Bool term_step = GF_FALSE;
+static Bool no_regulation = GF_FALSE;
+static Bool bench_mode = GF_FALSE;
+Bool is_connected = GF_FALSE;
+Bool startup_file = GF_FALSE;
 GF_User user;
 GF_Terminal *term;
 u64 Duration;
@@ -82,20 +82,21 @@
 
 static Fixed bench_speed = FLT2FIX(20);
 
-static Bool request_next_playlist_item = 0;
+static Bool request_next_playlist_item = GF_FALSE;
 FILE *playlist = NULL;
-static Bool readonly_playlist = 0;
+static Bool readonly_playlist = GF_FALSE;
 
 static GF_Config *cfg_file;
-static Bool display_rti = 0;
+static Bool display_rti = GF_FALSE;
 static Bool Run;
-static Bool CanSeek = 0;
+static Bool CanSeek = GF_FALSE;
 static char the_url[GF_MAX_PATH];
 static char pl_path[GF_MAX_PATH];
-static Bool no_mime_check = 1;
-static Bool be_quiet = 0;
+static Bool no_mime_check = GF_TRUE;
+static Bool be_quiet = GF_FALSE;
 static u32 log_time_start = 0;
-static Bool loop_at_end = 0;
+static Bool log_utc_time = GF_FALSE;
+static Bool loop_at_end = GF_FALSE;
 static u32 forced_width=0;
 static u32 forced_height=0;
 
@@ -104,7 +105,7 @@
 u32 init_w = 0;
 u32 init_h = 0;
 u32 last_x, last_y;
-Bool right_down = 0;
+Bool right_down = GF_FALSE;
 
 void dump_frame(GF_Terminal *term, char *rad_path, u32 dump_type, u32 frameNum);
 Bool dump_file(char *the_url, u32 dump_mode, Double fps, u32 width, u32 height, Float scale, u32 *times, u32 nb_times);
@@ -175,6 +176,8 @@
 		"\t        \"mutex\"      : mutex\n"
 		"\t        \"all\"        : all tools logged - other tools can be specified afterwards.\n"
 		"\n"
+		"\t-log-clock or -lc      : logs time in ms since start time of GPAC before each log line.\n"
+		"\t-log-utc or -lu        : logs UTC time in ms before each log line.\n"
 		"\t-size WxH:      specifies visual size (default: scene size)\n"
 #if defined(__DARWIN__) || defined(__APPLE__)
 		"\t-thread:        enables thread usage for terminal and compositor \n"
@@ -325,7 +328,7 @@
 
 		if (rti.total_cpu_usage) {
 			sprintf(szMsg, "FPS %02.2f - CPU %02d (%02d) - Mem %d kB", 
-					gf_term_get_framerate(term, 0), rti.total_cpu_usage, rti.process_cpu_usage, (u32) (rti.gpac_memory / 1024) );
+					gf_term_get_framerate(term, 1), 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) );
@@ -850,6 +853,7 @@
 		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() );
 		vfprintf(logs, fmt, list);
 		fflush(logs);
 	}
@@ -911,16 +915,16 @@
 	const char *str;
 	u32 i, times[100], nb_times, dump_mode;
 	u32 simulation_time_in_ms = 0;
-	Bool auto_exit = 0;
-	Bool logs_set = 0;
-	Bool start_fs = 0;
-	Bool use_rtix = 0;
-	Bool rgbds_dump = 0;
-	Bool rgbd_dump = 0;
-	Bool depth_dump = 0;
-	Bool pause_at_first = 0;
+	Bool auto_exit = GF_FALSE;
+	Bool logs_set = GF_FALSE;
+	Bool start_fs = GF_FALSE;
+	Bool use_rtix = GF_FALSE;
+	Bool rgbds_dump = GF_FALSE;
+	Bool rgbd_dump = GF_FALSE;
+	Bool depth_dump = GF_FALSE;
+	Bool pause_at_first = GF_FALSE;
 #ifdef GPAC_MEMORY_TRACKING
-	Bool enable_mem_tracker = 0;
+	Bool enable_mem_tracker = GF_FALSE;
 #endif
 	Double fps = GF_IMPORT_DEFAULT_FPS;
 	Bool fill_ar, visible;
@@ -937,7 +941,7 @@
 	memset(&user, 0, sizeof(GF_User));
 
 	dump_mode = 0;
-	fill_ar = visible = 0;
+	fill_ar = visible = GF_FALSE;
 	url_arg = the_cfg = rti_file = views = NULL;
 	nb_times = 0;
 	times[0] = 0;
@@ -951,7 +955,7 @@
 		}
 		else if (!strcmp(arg, "-mem-track")) {
 #ifdef GPAC_MEMORY_TRACKING
-			enable_mem_tracker = 1;
+			enable_mem_tracker = GF_TRUE;
 #else
 			fprintf(stderr, "WARNING - GPAC not compiled with Memory Tracker - ignoring \"-mem-track\"\n"); 
 #endif
@@ -965,7 +969,7 @@
 #ifdef GPAC_MEMORY_TRACKING
 	gf_sys_init(enable_mem_tracker);
 #else
-	gf_sys_init(0);
+	gf_sys_init(GF_FALSE);
 #endif
 
 	cfg_file = gf_cfg_init(the_cfg, NULL);
@@ -979,7 +983,7 @@
 	}
 
 	if( gf_cfg_get_key(cfg_file, "General", "Logs") != NULL ){
-		logs_set = 1;
+		logs_set = GF_TRUE;
 	}
 
 	for (i=1; i<(u32) argc; i++) {
@@ -996,11 +1000,11 @@
 		} else if (!strcmp(arg, "-rtix")) {
 			rti_file = argv[i+1];
 			i++;
-			use_rtix = 1;
+			use_rtix = GF_TRUE;
 		} else if (!strcmp(arg, "-fill")) {
-			fill_ar = 1;
+			fill_ar = GF_TRUE;
 		} else if (!strcmp(arg, "-gui")) {
-			gui_mode = 1;
+			gui_mode = GF_TRUE;
 		} else if (!strcmp(arg, "-guid")) {
 			gui_mode = 2;
 		} else if (!strcmp(arg, "-show")) {
@@ -1059,10 +1063,12 @@
 			if (gf_log_set_tools_levels(argv[i+1]) != GF_OK) {
 				return 1;
 			}
-			logs_set = 1;
+			logs_set = GF_TRUE;
 			i++;
 		} else if (!strcmp(arg, "-log-clock") || !strcmp(arg, "-lc")) {
 			log_time_start = 1;
+		} else if (!strcmp(arg, "-log-utc") || !strcmp(arg, "-lu")) {
+			log_utc_time = 1;
 		} else if (!strcmp(arg, "-align")) {
 			if (argv[i+1][0]=='m') align_mode = 1;
 			else if (argv[i+1][0]=='b') align_mode = 2;
@@ -1153,27 +1159,17 @@
 		init_h = forced_height;
 	}
 
-	fprintf(stderr, "Loading modules\n");
-	str = gf_cfg_get_key(cfg_file, "General", "ModulesDirectory");
-	if (! str ) {
-		fprintf(stderr, "Mmodule directory not found - check the configuration file exit and the \"ModulesDirectory\" key is set\n");
-		gf_cfg_del(cfg_file);
-		gf_sys_close();
-		if (logfile) fclose(logfile);
-		return 1;
-	}
-
-	user.modules = gf_modules_new((const unsigned char *) str, cfg_file);
+	user.modules = gf_modules_new(NULL, cfg_file);
 	if (user.modules) i = gf_modules_get_count(user.modules);
 	if (!i || !user.modules) {
-		fprintf(stderr, "Error: no modules found in %s - exiting\n", str);
+		fprintf(stderr, "Error: no modules found - exiting\n");
 		if (user.modules) gf_modules_del(user.modules);
 		gf_cfg_del(cfg_file);
 		gf_sys_close();
 		if (logfile) fclose(logfile);
 		return 1;
 	}
-	fprintf(stderr, "Modules Found (%d in dir %s)\n", i, str);
+	fprintf(stderr, "Modules Found : %d \n", i);
 
 	user.config = cfg_file;
 	user.EventProc = GPAC_EventProc;
@@ -1678,6 +1674,17 @@
 		}
 			break;
 
+		case 'H':
+		{
+			u32 http_bitrate = gf_term_get_option(term, GF_OPT_HTTP_MAX_RATE);	
+			do {
+				fprintf(stderr, "Enter new http bitrate in bps (0 for none) - current limit: %d\n", http_bitrate);
+			} while (1 > scanf("%ud", &http_bitrate));
+
+			gf_term_set_option(term, GF_OPT_HTTP_MAX_RATE, http_bitrate);
+		}
+			break;
+
 		case 'E':
 			gf_term_set_option(term, GF_OPT_RELOAD_CONFIG, 1); 
 			break;

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_android/.classpath -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_android/.classpath Changed

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_android/AndroidManifest.xml -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_android/AndroidManifest.xml Changed

@@ -8,24 +8,28 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.CAMERA" />
+	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+
+	 <uses-feature android:name="lge.hardware.real3d.barrier.landscape" android:required="false"/> 
 
     <uses-sdk
-        android:minSdkVersion="4"
+        android:minSdkVersion="8"
         android:targetSdkVersion="8" />
 
     <uses-feature
-        android:name="android.hardware.camera" />
-    <uses-feature
-        android:name="android.hardware.camera.autofocus" />
-    <uses-feature
-        android:name="android.hardware.sensor.gyroscope" />
+        android:name="android.hardware.camera" android:required="false"/>
     <uses-feature
-        android:name="android.hardware.sensor.accelerometer" />
+        android:name="android.hardware.camera.autofocus" android:required="false"/> 
+     <uses-feature
+        android:name="android.hardware.sensor.gyroscope" android:required="false"/> 
+     <uses-feature
+        android:name="android.hardware.sensor.accelerometer" android:required="false"/>
 
     <application
-        android:debuggable="true"
         android:icon="@drawable/icon"
-        android:label="@string/app_name" >
+        android:label="@string/app_name">
+        <uses-library android:name="com.lge.real3d" android:required="false"/>
         <activity
             android:name=".Osmo4"
             android:configChanges="orientation"
@@ -104,4 +108,4 @@
         </activity>
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_android/build.xml -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_android/build.xml Changed

@@ -28,6 +28,15 @@
          -->
     <property file="ant.properties" />
 
+    
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
     
     <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
             unless="sdk.dir"
     />

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_android/jni/wrapper.cpp -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_android/jni/wrapper.cpp Changed

@@ -147,14 +147,14 @@
 	int res;
 	int jniV;
 	int allowedVersions[NUM_JNI_VERSIONS];
-        const char * className = "com/gpac/Osmo4/GPACInstance";
+	const char * className = "com/gpac/Osmo4/GPACInstance";
 	allowedVersions[0] = JNI_VERSION_1_6;
 	allowedVersions[1] = JNI_VERSION_1_4;
 	allowedVersions[2] = JNI_VERSION_1_2;
 	allowedVersions[3] = JNI_VERSION_1_1;
-        JNIEnv * env;
-        if (!vm)
-          return -1;
+	JNIEnv * env;
+	if (!vm)
+		return -1;
 	for (int i = 0 ; i < NUM_JNI_VERSIONS; i++){
 		jniV = allowedVersions[i];
 		if (vm->GetEnv((void**)(&env), jniV) == JNI_OK){
@@ -168,19 +168,19 @@
 		}
 		
 	}
-        javaVM = vm;
-        LOGI("Registering %s natives\n", className);
+	javaVM = vm;
+	LOGI("Registering %s natives\n", className);
 	res = jniRegisterNativeMethods(env, className, sMethods, (sizeof(sMethods) - 1)/sizeof(JNINativeMethod));
-        if (res < 0){
-          LOGE("Failed to register native methods, result was = %d, try to continue anyway...\n", res);
-          /*return -1;*/
-        }
-        LOGI("Registering natives DONE, now registering pthread_keys with destructor=%p\n", &jni_destroy_env_func);
-        int ret = pthread_key_create(&jni_thread_env_key, &jni_destroy_env_func);
-        if (ret){
-          LOGE("Failed to register jni_thread_env_key jni_thread_env_key=%p\n", jni_thread_env_key);
-        }
-        return jniV;
+	if (res < 0){
+		LOGE("Failed to register native methods, result was = %d, try to continue anyway...\n", res);
+					/*return -1;*/
+	}
+	LOGI("Registering natives DONE, now registering pthread_keys with destructor=%p\n", &jni_destroy_env_func);
+	int ret = pthread_key_create(&jni_thread_env_key, &jni_destroy_env_func);
+	if (ret){
+		LOGE("Failed to register jni_thread_env_key jni_thread_env_key=%p\n", jni_thread_env_key);
+	}
+	return jniV;
 }
 
 //---------------------------------------------------------------------------------------------------
@@ -311,7 +311,7 @@
 
 //-------------------------------
 int CNativeWrapper::MessageBox(const char* msg, const char* title, GF_Err status){
-        LOGV("MessageBox start %s", msg);
+	LOGV("MessageBox start %s", msg);
 	JavaEnvTh * env = getEnv();
 	if (!env || !env->cbk_displayMessage)
 		return 0;
@@ -320,7 +320,7 @@
 	jstring mes = env->env->NewStringUTF(msg?msg:"null");
 	env->env->CallVoidMethod(env->cbk_obj, env->cbk_displayMessage, mes, tit, status);
 	env->env->PopLocalFrame(NULL);
-        LOGV("MessageBox done %s", msg);
+	LOGV("MessageBox done %s", msg);
 	return 1;
 }
 //-------------------------------
@@ -506,7 +506,7 @@
                           strcat(msg, gf_error_to_string(evt->message.error));
 
                           ptr->debug_log(msg);
-                          ptr->MessageBox(msg, evt->message.service ? evt->message.service : "GF_EVENT_MESSAGE", evt->message.error);
+                          //ptr->MessageBox(msg, evt->message.service ? evt->message.service : "GF_EVENT_MESSAGE", evt->message.error);
                           ptr->debug_log("GPAC_EventProc end");
                   };
                   break;
@@ -536,7 +536,7 @@
                   {
                       JavaEnvTh * env = ptr->getEnv();
                       if (!env || !env->cbk_showKeyboard)
-                              return 0;
+                              return GF_FALSE;
                       LOGI("Needs to display/hide the Virtual Keyboard (%d)", evt->type);
                       env->env->CallVoidMethod(env->cbk_obj, env->cbk_showKeyboard, GF_EVENT_TEXT_EDITING_START == evt->type);
                       LOGV("Done showing virtual keyboard (%d)", evt->type);
@@ -557,12 +557,12 @@
                     LOGI("Unknown Message %d", evt->type);
                 }
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 void CNativeWrapper::navigate( GF_Event* evt)
 {	
-	if (gf_term_is_supported_url(m_term, evt->navigate.to_url, 1, 1)) 
+	if (gf_term_is_supported_url(m_term, evt->navigate.to_url, GF_TRUE, GF_TRUE)) 
 	{
 		gf_term_navigate_to(m_term, evt->navigate.to_url);
 	} 
@@ -701,7 +701,7 @@
         }
 
         LOGD("Loading GPAC terminal, m_user=%p...", &m_user);
-    	gf_sys_init(0);
+    	gf_sys_init(GF_FALSE);
 	gf_fm_request_set_callback(this, on_fm_request);
 	SetupLogs();
 	m_term = gf_term_new(&m_user);
@@ -753,7 +753,7 @@
 		}
 		if( url )
 		{
-			gf_term_connect_from_time(m_term, url, 0, false);		
+			gf_term_connect_from_time(m_term, url, 0, GF_FALSE);		
 		}
 	}
 	debug_log("connected ...");
@@ -888,76 +888,75 @@
         }
 }
 //-----------------------------------------------------
-void CNativeWrapper::translate_key(ANDROID_KEYCODE keycode, GF_EventKey *evt){
-	evt->flags = 0;
-	switch (keycode) {
-	case ANDROID_KEYCODE_BACK: evt->key_code = GF_KEY_BACKSPACE; break;
-	case ANDROID_KEYCODE_TAB: evt->key_code = GF_KEY_TAB; break;
-	case ANDROID_KEYCODE_CLEAR: evt->key_code = GF_KEY_CLEAR; break;
-	case ANDROID_KEYCODE_ENTER: evt->key_code = GF_KEY_ENTER; break;
-	case ANDROID_KEYCODE_SHIFT_LEFT: evt->key_code = GF_KEY_SHIFT; break;
-	case ANDROID_KEYCODE_SHIFT_RIGHT: evt->key_code = GF_KEY_SHIFT; break;
-	case ANDROID_KEYCODE_ALT_LEFT: evt->key_code = GF_KEY_ALT; break;
-	case ANDROID_KEYCODE_ALT_RIGHT: evt->key_code = GF_KEY_ALT; break;
-	case ANDROID_KEYCODE_SPACE: evt->key_code = GF_KEY_SPACE; break;
-	case ANDROID_KEYCODE_HOME: evt->key_code = GF_KEY_HOME; break;
-	case ANDROID_KEYCODE_DPAD_LEFT: evt->key_code = GF_KEY_LEFT; break;
-	case ANDROID_KEYCODE_DPAD_UP: evt->key_code = GF_KEY_UP; break;
-	case ANDROID_KEYCODE_DPAD_RIGHT: evt->key_code = GF_KEY_RIGHT; break;
-	case ANDROID_KEYCODE_DPAD_DOWN: evt->key_code = GF_KEY_DOWN; break;
-	case ANDROID_KEYCODE_DEL: evt->key_code = GF_KEY_DEL; break;
-	case ANDROID_KEYCODE_0:
-		evt->key_code = GF_KEY_0;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case ANDROID_KEYCODE_1:
-		evt->key_code = GF_KEY_1;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case ANDROID_KEYCODE_2:
-		evt->key_code = GF_KEY_2;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case ANDROID_KEYCODE_3:
-		evt->key_code = GF_KEY_3;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case ANDROID_KEYCODE_4:
-		evt->key_code = GF_KEY_4;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case ANDROID_KEYCODE_5:
-		evt->key_code = GF_KEY_5;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case ANDROID_KEYCODE_6:
-		evt->key_code = GF_KEY_6;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case ANDROID_KEYCODE_7:
-		evt->key_code = GF_KEY_7;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case ANDROID_KEYCODE_8:
-		evt->key_code = GF_KEY_8;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case ANDROID_KEYCODE_9:
-		evt->key_code = GF_KEY_9;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
+	void CNativeWrapper::translate_key(ANDROID_KEYCODE keycode, GF_EventKey *evt){
+		evt->flags = 0;
+		switch (keycode) {
+			case ANDROID_KEYCODE_BACK: evt->key_code = GF_KEY_BACKSPACE; evt->hw_code = 8; break;
+			case ANDROID_KEYCODE_TAB: evt->key_code = GF_KEY_TAB; evt->hw_code = 9; break;
+			case ANDROID_KEYCODE_CLEAR: evt->key_code = GF_KEY_CLEAR; break;
+			case ANDROID_KEYCODE_ENTER: evt->key_code = GF_KEY_ENTER; evt->hw_code = 13; break;
+			case ANDROID_KEYCODE_SHIFT_LEFT: evt->key_code = GF_KEY_SHIFT; break;
+			case ANDROID_KEYCODE_SHIFT_RIGHT: evt->key_code = GF_KEY_SHIFT; break;
+			case ANDROID_KEYCODE_ALT_LEFT: evt->key_code = GF_KEY_ALT; break;
+			case ANDROID_KEYCODE_ALT_RIGHT: evt->key_code = GF_KEY_ALT; break;
+			case ANDROID_KEYCODE_SPACE: evt->key_code = GF_KEY_SPACE; evt->hw_code = 32; break;
+			case ANDROID_KEYCODE_HOME: evt->key_code = GF_KEY_HOME; break;
+			case ANDROID_KEYCODE_DPAD_LEFT: evt->key_code = GF_KEY_LEFT; break;
+			case ANDROID_KEYCODE_DPAD_UP: evt->key_code = GF_KEY_UP; break;
+			case ANDROID_KEYCODE_DPAD_RIGHT: evt->key_code = GF_KEY_RIGHT; break;
+			case ANDROID_KEYCODE_DPAD_DOWN: evt->key_code = GF_KEY_DOWN; break;
+			case ANDROID_KEYCODE_DEL: evt->key_code = GF_KEY_BACKSPACE; evt->hw_code = 8; break;
+			case ANDROID_KEYCODE_0:
+			evt->key_code = GF_KEY_0;
+			evt->flags = GF_KEY_EXT_NUMPAD;
+			break;
+			case ANDROID_KEYCODE_1:
+			evt->key_code = GF_KEY_1;
+			evt->flags = GF_KEY_EXT_NUMPAD;
+			break;
+			case ANDROID_KEYCODE_2:
+			evt->key_code = GF_KEY_2;
+			evt->flags = GF_KEY_EXT_NUMPAD;
+			break;
+			case ANDROID_KEYCODE_3:
+			evt->key_code = GF_KEY_3;
+			evt->flags = GF_KEY_EXT_NUMPAD;
+			break;
+			case ANDROID_KEYCODE_4:
+			evt->key_code = GF_KEY_4;
+			evt->flags = GF_KEY_EXT_NUMPAD;
+			break;
+			case ANDROID_KEYCODE_5:
+			evt->key_code = GF_KEY_5;
+			evt->flags = GF_KEY_EXT_NUMPAD;
+			break;
+			case ANDROID_KEYCODE_6:
+			evt->key_code = GF_KEY_6;
+			evt->flags = GF_KEY_EXT_NUMPAD;
+			break;
+			case ANDROID_KEYCODE_7:
+			evt->key_code = GF_KEY_7;
+			evt->flags = GF_KEY_EXT_NUMPAD;
+			break;
+			case ANDROID_KEYCODE_8:
+			evt->key_code = GF_KEY_8;
+			evt->flags = GF_KEY_EXT_NUMPAD;
+			break;
+			case ANDROID_KEYCODE_9:
+			evt->key_code = GF_KEY_9;
+			evt->flags = GF_KEY_EXT_NUMPAD;
+			break;
 	/*thru VK_9 are the same as ASCII '0' thru '9' (0x30 - 0x39) */
 	/* VK_A thru VK_Z are the same as ASCII 'A' thru 'Z' (0x41 - 0x5A) */
-	default:
-		if ((keycode>=ANDROID_KEYCODE_A) && (keycode<=ANDROID_KEYCODE_Z)){
-                  evt->key_code = GF_KEY_A + keycode - ANDROID_KEYCODE_A;
-                } else {
-                  evt->key_code = GF_KEY_UNIDENTIFIED;
-                }
-		break;
+			default:
+			if ((keycode>=ANDROID_KEYCODE_A) && (keycode<=ANDROID_KEYCODE_Z)){
+				evt->key_code = GF_KEY_A + keycode - ANDROID_KEYCODE_A;
+			} else {
+				evt->key_code = GF_KEY_UNIDENTIFIED;
+			}
+			break;
+		}
 	}
-	evt->hw_code = evt->key_code;
-}
 
 //-----------------------------------------------------
 void CNativeWrapper::setGpacLogs(const char *tools_at_level)

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_android/jni/wrapper_jni.c -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_android/jni/wrapper_jni.c Changed

@@ -120,34 +120,34 @@
 //-----------------------------------
 JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpaceventmousedown(JNIEnv * env, jobject obj, jfloat x, jfloat y){
         CAST_HANDLE(wr);
-        jniLOGV("mouseDown::start");
+        //jniLOGV("mouseDown::start");
         if (wr)
           wr->onMouseDown(x, y);
-        jniLOGV("mouseDown::end");
+        //jniLOGV("mouseDown::end");
 }
 //-----------------------------------
 JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpaceventmouseup(JNIEnv * env, jobject obj, jfloat x, jfloat y){
         CAST_HANDLE(wr);
-        jniLOGV("mouseUp::start");
+        //jniLOGV("mouseUp::start");
         if (wr)
           wr->onMouseUp(x, y);
-        jniLOGV("mouseUp::end");
+        //jniLOGV("mouseUp::end");
 }
 //-----------------------------------
 JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpaceventmousemove(JNIEnv * env, jobject obj, jfloat x, jfloat y){
         CAST_HANDLE(wr);
-        jniLOGV("mouseMouv::start");
+        //jniLOGV("mouseMouv::start");
         if (wr)
           wr->onMouseMove(x, y);
-        jniLOGV("mouseMouv::end");
+        //jniLOGV("mouseMouv::end");
 }
 //-----------------------------------
 JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpaceventkeypress(JNIEnv * env, jobject obj, jint keycode, jint rawkeycode, jint up, jint flag, jint unicode){
         CAST_HANDLE(wr);
-        jniLOGV("keypress::start");
+        //jniLOGV("keypress::start");
         if (wr)
           wr->onKeyPress(keycode, rawkeycode, up, flag, unicode);
-        jniLOGV("keypress::end");
+        //jniLOGV("keypress::end");
 }
 /*
 JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_getdpi(JNIEnv * env, jobject obj, jint keycode,jfloat x, jfloat y){

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_android/res/layout/about_dialog.xml -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_android/res/layout/about_dialog.xml Changed

gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_android/res/layout/main.xml Added

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/main_view"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+    
+    <LinearLayout
+	    android:id="@+id/surface_gl"
+	    android:orientation="vertical"
+	    android:layout_width="fill_parent"
+	    android:layout_height="fill_parent"
+        android:gravity="center"
+        />
+
+    
+ 
+    <SurfaceView 
+        android:id="@+id/surface_camera"
+        android:orientation="vertical"
+        android:gravity="center"
+        android:layout_width="1px" 
+        android:layout_height="1px"
+        android:visibility="gone" />
+
+ 
+    
+</FrameLayout>
\ No newline at end of file

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/GPACInstance.java -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/GPACInstance.java Changed

@@ -1,7 +1,7 @@
 /**
- * $URL: https://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac/applications/osmo4_android/src/com/gpac/Osmo4/GPACInstance.java $
+ * $URL: svn://svn.code.sf.net/p/gpac/code/trunk/gpac/applications/osmo4_android/src/com/gpac/Osmo4/GPACInstance.java $
  *
- * $LastChangedBy: jeanlf $ - $LastChangedDate: 2012-04-13 17:14:30 +0200 (Fri, 13 Apr 2012) $
+ * $LastChangedBy: jeanlf $ - $LastChangedDate: 2013-03-15 00:54:01 +0800 (五, 2013-03-15) $
  */
 package com.gpac.Osmo4;
 
@@ -16,7 +16,7 @@
 import android.view.MotionEvent;
 
 /**
- * @version $Revision: 4019 $
+ * @version $Revision: 4366 $
  * 
  */
 public class GPACInstance implements GPACInstanceInterface {
@@ -59,9 +59,9 @@
                                  "jpegdroid", "javaenv", //$NON-NLS-1$ //$NON-NLS-2$ 
                                  "mad", "editline", "ft2", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                                  "js_osmo", "openjpeg", "png", "z", //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$
-                                 "ffmpeg", "faad", "gpac", //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+                                 "stlport_shared", "stdc++", "ffmpeg", "faad", "gpac", //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
                                  "gm_droid_cam", "gm_droid_mpegv", //$NON-NLS-1$ //$NON-NLS-2$
-                                 "stdc++", "gpacWrapper" }; // //$NON-NLS-1$ //$NON-NLS-2$
+                                 "gpacWrapper" }; // //$NON-NLS-1$ //$NON-NLS-2$
         HashMap<String, Throwable> exceptions = new HashMap<String, Throwable>();
         for (String s : toLoad) {
             try {
@@ -86,7 +86,7 @@
         if (!exceptions.isEmpty()) {
             try {
                 PrintStream out = new PrintStream(config.getGpacConfigDirectory() + "debug_libs.txt", "UTF-8"); //$NON-NLS-1$//$NON-NLS-2$
-                out.println("$Revision: 4019 $"); //$NON-NLS-1$
+                out.println("$Revision: 4366 $"); //$NON-NLS-1$
                 out.println(new Date());
                 out.println("\n*** Configuration\n"); //$NON-NLS-1$
                 out.println(config.getConfigAsText());
@@ -192,6 +192,7 @@
     @Override
     public void disconnect() {
         checkCurrentThread();
+        gpacrender();
         gpacdisconnect();
     }
 
@@ -199,6 +200,7 @@
     public void connect(String url) {
         Log.i(LOG_LIB, "connect(" + url + ")"); //$NON-NLS-1$ //$NON-NLS-2$
         checkCurrentThread();
+        gpacrender();
         gpacconnect(url);
     }

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/GPACInstanceInterface.java -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/GPACInstanceInterface.java Changed

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/GpacCallback.java -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/GpacCallback.java Changed

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/GpacConfig.java -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/GpacConfig.java Changed

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/MPEGVSensor.java -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/MPEGVSensor.java Changed

@@ -1,9 +1,14 @@
 package com.gpac.Osmo4;
 
+import android.app.Activity;
 import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
+import android.os.Bundle;
 
 /**
  * Handle Physical sensors
@@ -12,11 +17,14 @@
  * @version $Revision$
  * 
  */
-public class MPEGVSensor implements SensorEventListener {
+public class MPEGVSensor implements SensorEventListener, LocationListener {
+
+    public static Activity myAct = null;
 
     private native void sendData(int ptr, String data);
 
     private static SensorManager mySensorManager = null;
+    private static LocationManager myLocationManager = null;
 
     private static Sensor sensor = null;
 
@@ -39,6 +47,16 @@
     }
 
     /**
+     * Init the location Manager
+     * 
+     * @param mgr The manager to set
+     * @return the location manager set
+     */
+    public static LocationManager initLocationManager(LocationManager mgr) {
+        return myLocationManager = mgr;
+    }
+
+    /**
      * Starts the given sensor and register the listener
      * 
      * @param ptr The pointer
@@ -46,205 +64,440 @@
      */
     public void startSensor(int ptr, int type) {
         InternalPtr = ptr;
-        SensorType = type;
-        switch (SensorType) {
-            case Sensor.TYPE_ORIENTATION: {
-                sensor = mySensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
-                mySensorManager.registerListener(this, sensor, SensorManager.SENSOR_DELAY_GAME);
-                sensor1 = mySensorManager.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD);
-                mySensorManager.registerListener(this, sensor1, SensorManager.SENSOR_DELAY_GAME);
-                run = true;
-            }
-        }
+		SensorType = type;
+		
+		switch (SensorType) {
+			case Sensor.TYPE_ORIENTATION: {
+				sensor = mySensorManager
+						.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
+				if ( !mySensorManager.registerListener(MPEGVSensor.this, sensor,
+						SensorManager.SENSOR_DELAY_GAME))
+					return;
+				sensor1 = mySensorManager
+						.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD);
+				if ( !mySensorManager.registerListener(MPEGVSensor.this, sensor1,
+						SensorManager.SENSOR_DELAY_GAME))
+				{
+					mySensorManager.unregisterListener(MPEGVSensor.this);
+					return;
+				}
+				run = true;
+				break;
+			}
+			case Sensor.TYPE_ACCELEROMETER: {
+				sensor = mySensorManager
+						.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
+				if( !mySensorManager.registerListener(MPEGVSensor.this, sensor,
+						SensorManager.SENSOR_DELAY_GAME))
+					return;
+				run = true;
+				break;
+			}
+			case Sensor.TYPE_GYROSCOPE: {
+				sensor = mySensorManager.getDefaultSensor(Sensor.TYPE_GYROSCOPE);
+				if ( !mySensorManager.registerListener(MPEGVSensor.this, sensor,
+						SensorManager.SENSOR_DELAY_GAME))
+					return;
+				run = true;
+				break;
+			}
+			case Sensor.TYPE_MAGNETIC_FIELD: {
+				sensor = mySensorManager
+						.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD);
+				if ( !mySensorManager.registerListener(MPEGVSensor.this, sensor,
+						SensorManager.SENSOR_DELAY_GAME))
+					return;
+				run = true;
+				break;
+			}
+			case Sensor.TYPE_LIGHT: {
+				sensor = mySensorManager.getDefaultSensor(Sensor.TYPE_LIGHT);
+				if ( !mySensorManager.registerListener(MPEGVSensor.this, sensor,
+						SensorManager.SENSOR_DELAY_UI))
+					return;
+				run = true;
+				break;
+			}
+			case Sensor.TYPE_PRESSURE: {
+				sensor = mySensorManager.getDefaultSensor(Sensor.TYPE_PRESSURE);
+				if ( !mySensorManager.registerListener(MPEGVSensor.this, sensor,
+						SensorManager.SENSOR_DELAY_UI))
+					return;
+				run = true;
+				break;
+			}
+			//case Sensor.TYPE_ROTATION_VECTOR: {
+			case 11: {
+				sensor = mySensorManager
+						.getDefaultSensor(11);
+				if ( !mySensorManager.registerListener(MPEGVSensor.this, sensor,
+						SensorManager.SENSOR_DELAY_GAME))
+					return;
+				run = true;
+				break;
+			}
+			case 100: { // Type for the GPS sensor
+				myAct.runOnUiThread(new Runnable() {
+					
+					@Override
+					public void run() {
+						myLocationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, MPEGVSensor.this);
+						run = true;
+					}
+				});
+			}
+		}
     }
 
     /**
      * Stops the sensor and unregister listener
      */
     public void stopSensor() {
-        mySensorManager.unregisterListener(this);
-        run = false;
-    }
-
-    @Override
-    public void onAccuracyChanged(Sensor arg0, int arg1) {
-        // TODO Auto-generated method stub
-
-    }
-
-    private double azzimuth = 0;
-
-    private double pitch = 0;
-
-    private double roll = 0;
-
-    private double x, y, z, angle;
-
-    private float[] mGData = new float[3];
-
-    private float[] mMData = new float[3];
-
-    private float[] mR = new float[16];
-
-    private float[] mI = new float[16];
-
-    private float[] mOrientation = new float[3];
-
-    int buffsize = 8;
+        if (SensorType == 100)
+			myAct.runOnUiThread(new Runnable() {
 
-    private final double[] al = new double[buffsize];
+				@Override
+				public void run() {
 
-    private final double[] pl = new double[buffsize];
+					myLocationManager.removeUpdates(MPEGVSensor.this);
 
-    private final double[] rl = new double[buffsize];
-
-    int ind = 0;
-
-    @Override
-    public void onSensorChanged(SensorEvent event) {
-
-        if (!run)
-            return;
-
-        switch (SensorType) {
-            case Sensor.TYPE_ORIENTATION: {
-                int type = event.sensor.getType();
-                if (type == Sensor.TYPE_ACCELEROMETER) {
-                    for (int i = 0; i < 3; i++)
-                        mGData[i] = event.values[i];
-
-                    lowPass(mGData, accel);
-                    // filterAccData();
-                    // Log.i("Acc: ", "" + event.values[0] + " " + event.values[1] + " " + event.values[2]);
-                } else if (type == Sensor.TYPE_MAGNETIC_FIELD) {
-                    for (int i = 0; i < 3; i++)
-                        mMData[i] = event.values[i];
-
-                    lowPass(mMData, mag);
-                    // filterMagData();
-                    // Log.i("Mag: ", "" + event.values[0] + " " + event.values[1] + " " + event.values[2]);
-                } else {
-                    if (event.sensor.getType() == Sensor.TYPE_ORIENTATION) {
-                        azzimuth = event.values[0];
-                        pitch = event.values[1];
-                        roll = event.values[2];
-                    }
-                    return;
-                }
-
-                SensorManager.getRotationMatrix(mR, mI, mGData, mMData);
-                SensorManager.getOrientation(mR, mOrientation);
-
-                lowPass(mOrientation, ordata);
-                // filterOrientationData();
-
-                al[ind] = mOrientation[0];
-                pl[ind] = mOrientation[1];
-                rl[ind] = mOrientation[2];
-
-                if (++ind == buffsize)
-                    ind = 0;
-
-                double a = 0, p = 0, r = 0;
-                for (int i = 0; i < buffsize; i++) {
-                    a += al[i];
-                    p += pl[i];
-                    r += rl[i];
-                }
-
-                a /= buffsize;
-                p /= buffsize;
-                r /= buffsize;
-
-                final float rad2deg = (float) (180.0f / Math.PI);
-                azzimuth = a * rad2deg;// mOrientation[0]*rad2deg;
-                pitch = p * rad2deg;// mOrientation[1]*rad2deg;
-                roll = r * rad2deg;// mOrientation[2]*rad2deg;
-
-                // mOrientation[0] = (float)azzimuth;
-                // mOrientation[1] = (float)pitch;
-                // mOrientation[2] = (float)roll;
-                //
-                // filterOrientationData();
-                //
-                // azzimuth = mOrientation[0];
-                // pitch = mOrientation[1];
-                // roll = mOrientation[2];
-
-                final String separator = ";"; //$NON-NLS-1$
-                final String res = azzimuth + separator + pitch + separator + roll + separator;
-                sendData(InternalPtr, res);
-            }
-        }
-    }
-
-    static final float ALPHA = 0.01f;
-
-    private float[] lowPass(float[] input, float[] output) {
-        if (output == null)
-            return input;
-
-        for (int i = 0; i < input.length; i++) {
-            output[i] = output[i] + ALPHA * (input[i] - output[i]);
-        }
-        return output;
+				}
+			});
+		else
+			mySensorManager.unregisterListener(MPEGVSensor.this);
+		run = false;
     }
 
-    Boolean accinited = false;
-
-    float[] accel = new float[3];
-
-    private void filterData(float[] data, float[] filter) {
-        float kFilteringFactor = 0.1f;
-
-        filter[0] = data[0] * kFilteringFactor + filter[0] * (1.0f - kFilteringFactor);
-        filter[1] = data[1] * kFilteringFactor + filter[1] * (1.0f - kFilteringFactor);
-        filter[2] = data[2] * kFilteringFactor + filter[2] * (1.0f - kFilteringFactor);
-        data[0] = data[0] - filter[0];
-        data[1] = data[1] - filter[1];
-        data[2] = data[2] - filter[2];
-
-        filter[0] = data[0];
-        filter[1] = data[1];
-        filter[2] = data[2];
-    }
-
-    private void filterAccData() {
-        if (!accinited) {
-            accel[0] = mGData[0];
-            accel[1] = mGData[1];
-            accel[2] = mGData[2];
-            accinited = true;
-        }
-        filterData(mGData, accel);
-    }
-
-    Boolean maginited = false;
-
-    float[] mag = new float[3];
+    @Override
+    public void onAccuracyChanged(Sensor arg0, int arg1) {
+        // TODO Auto-generated method stub
 
-    private void filterMagData() {
-        if (!maginited) {
-            mag[0] = mMData[0];
-            mag[1] = mMData[1];
-            mag[2] = mMData[2];
-            maginited = true;
-        }
-        filterData(mMData, mag);
     }
 
-    Boolean orinited = false;
-
-    float[] ordata = new float[3];
-
-    private void filterOrientationData() {
-        if (!orinited) {
-            ordata[0] = mOrientation[0];
-            ordata[1] = mOrientation[1];
-            ordata[2] = mOrientation[2];
-            orinited = true;
-        }
-        filterData(mOrientation, ordata);
-    }
+	public double azzimuth = 0;
+	public double pitch = 0;
+	public double roll = 0;
+
+	public double x, y, z, angle;
+
+	private float[] mGData = new float[3];
+	private float[] mMData = new float[3];
+	private float[] mR = new float[16];
+	private float[] mI = new float[16];
+	private float[] mOrientation = new float[3];
+
+	int buffsize = 8;
+
+	public double[] al = new double[buffsize];
+	public double[] pl = new double[buffsize];
+	public double[] rl = new double[buffsize];
+	int ind = 0;
+
+	double rotangle = 0;
+
+	@Override
+	public void onSensorChanged(SensorEvent event) {
+		
+		if ( !run )
+			return;
+		
+		switch (SensorType)
+		{
+			case Sensor.TYPE_ORIENTATION:
+			{
+				int type = event.sensor.getType();
+		        if (type == Sensor.TYPE_ACCELEROMETER) {
+		            for (int i=0 ; i<3 ; i++)
+		            	mGData[i] = event.values[i];
+			        
+		            lowPass(mGData, accel);
+			        //filterAccData();
+		            //Log.i("Acc: ", "" + event.values[0] + " " + event.values[1] + " " + event.values[2]);
+		        } else if (type == Sensor.TYPE_MAGNETIC_FIELD) {
+		            for (int i=0 ; i<3 ; i++)
+		            	mMData[i] = event.values[i];
+			        
+		            lowPass(mMData, mag);
+			        //filterMagData();
+		            //Log.i("Mag: ", "" + event.values[0] + " " + event.values[1] + " " + event.values[2]);
+		        } else {
+		        	if ( event.sensor.getType() == Sensor.TYPE_ORIENTATION )
+		    		{
+		    			azzimuth = event.values[0];
+		    			pitch = event.values[1];
+		    			roll = event.values[2];
+		    		}
+		        	return;
+		        }
+		        
+		        SensorManager.getRotationMatrix(mR, mI, mGData, mMData);
+		        SensorManager.getOrientation(mR, mOrientation);
+		        
+		        lowPass(mOrientation, ordata);
+		        //filterOrientationData();
+		        
+		        al[ind] = mOrientation[0];
+		        pl[ind] = mOrientation[1];
+		        rl[ind] = mOrientation[2];
+		        
+		        if ( ++ind == buffsize )
+		        	ind = 0;
+		        
+		        double a = 0, p = 0, r = 0;
+		        for ( int i =0; i < buffsize; i++ )
+		        {
+		        	a += al[i];
+		        	p += pl[i];
+		        	r += rl[i];
+		        }
+		        
+		        a /= buffsize;
+		        p /= buffsize;
+		        r /= buffsize;
+		        
+		        final float rad2deg = (float)(180.0f/Math.PI);
+		        azzimuth = a*rad2deg;//mOrientation[0]*rad2deg;
+				pitch = p*rad2deg;//mOrientation[1]*rad2deg;
+				roll = r*rad2deg;//mOrientation[2]*rad2deg;
+				
+//				mOrientation[0] = (float)azzimuth;
+//				mOrientation[1] = (float)pitch;
+//				mOrientation[2] = (float)roll;
+//				
+//				filterOrientationData();
+//				
+//				azzimuth = mOrientation[0];
+//		        pitch = mOrientation[1];
+//		        roll = mOrientation[2];
+				
+				String res = "";
+				res += azzimuth+";" + pitch + ";" + roll + ";";
+				sendData(InternalPtr, res);
+				break;
+			}
+			case Sensor.TYPE_ACCELEROMETER:
+			{
+				for (int i=0 ; i<3 ; i++)
+	            	mGData[i] = event.values[i];
+				
+				lowPass(mGData, accel);
+				
+				al[ind] = mGData[0];
+		        pl[ind] = mGData[1];
+		        rl[ind] = mGData[2];
+		        
+		        if ( ++ind == buffsize )
+		        	ind = 0;
+		        
+		        double a = 0, p = 0, r = 0;
+		        for ( int i =0; i < buffsize; i++ )
+		        {
+		        	a += al[i];
+		        	p += pl[i];
+		        	r += rl[i];
+		        }
+		        
+		        a /= buffsize;
+		        p /= buffsize;
+		        r /= buffsize;
+		        
+		        String res = "";
+				res += a+";" + p + ";" + r + ";";
+				sendData(InternalPtr, res);
+				break;
+			}
+			case Sensor.TYPE_GYROSCOPE:
+			{
+				for (int i=0 ; i<3 ; i++)
+	            	mGData[i] = event.values[i];
+				
+				lowPass(mGData, accel);
+				
+				al[ind] = mGData[0];
+		        pl[ind] = mGData[1];
+		        rl[ind] = mGData[2];
+		        
+		        if ( ++ind == buffsize )
+		        	ind = 0;
+		        
+		        double a = 0, p = 0, r = 0;
+		        for ( int i =0; i < buffsize; i++ )
+		        {
+		        	a += al[i];
+		        	p += pl[i];
+		        	r += rl[i];
+		        }
+		        
+		        a /= buffsize;
+		        p /= buffsize;
+		        r /= buffsize;
+		        
+		        String res = "";
+				res += a+";" + p + ";" + r + ";";
+				sendData(InternalPtr, res);
+				break;
+			}
+			case Sensor.TYPE_MAGNETIC_FIELD:
+			{
+				for (int i=0 ; i<3 ; i++)
+	            	mGData[i] = event.values[i];
+				
+				lowPass(mGData, accel);
+				
+				al[ind] = mGData[0];
+		        pl[ind] = mGData[1];
+		        rl[ind] = mGData[2];
+		        
+		        if ( ++ind == buffsize )
+		        	ind = 0;
+		        
+		        double a = 0, p = 0, r = 0;
+		        for ( int i =0; i < buffsize; i++ )
+		        {
+		        	a += al[i];
+		        	p += pl[i];
+		        	r += rl[i];
+		        }
+		        
+		        a /= buffsize;
+		        p /= buffsize;
+		        r /= buffsize;
+		        
+		        String res = "";
+				res += a+";" + p + ";" + r + ";";
+				sendData(InternalPtr, res);
+				break;
+			}
+			//case Sensor.TYPE_ROTATION_VECTOR:
+			case 11:
+			{
+				double a = event.values[0], p = event.values[1], r = event.values[2];
+				
+				final float rad2deg = (float)(180.0f/Math.PI);
+		        a = a*rad2deg;
+				p = p*rad2deg;
+				r = r*rad2deg;
+				
+				String res = "";
+				res += a + ";" + p + ";" + r + ";";
+				sendData(InternalPtr, res);
+				
+				break;
+			}
+			case Sensor.TYPE_LIGHT:
+			{
+				String res = "";
+				res += event.values[0] + ";";
+				sendData(InternalPtr, res);
+				break;
+			}
+			case Sensor.TYPE_PRESSURE:
+			{
+				String res = "";
+				res += event.values[0]+";";
+				sendData(InternalPtr, res);
+				break;
+			}
+		}
+	}
+
+	static final float ALPHA = 0.01f;
+
+	protected float[] lowPass(float[] input, float[] output) {
+		if (output == null)
+			return input;
+
+		for (int i = 0; i < input.length; i++) {
+			output[i] = output[i] + ALPHA * (input[i] - output[i]);
+		}
+		return output;
+	}
+
+	Boolean accinited = false;
+	float[] accel = new float[3];
+
+	private void filterData(float[] data, float[] filter) {
+		float kFilteringFactor = 0.1f;
+
+		filter[0] = data[0] * kFilteringFactor + filter[0]
+				* (1.0f - kFilteringFactor);
+		filter[1] = data[1] * kFilteringFactor + filter[1]
+				* (1.0f - kFilteringFactor);
+		filter[2] = data[2] * kFilteringFactor + filter[2]
+				* (1.0f - kFilteringFactor);
+		data[0] = data[0] - filter[0];
+		data[1] = data[1] - filter[1];
+		data[2] = data[2] - filter[2];
+
+		filter[0] = data[0];
+		filter[1] = data[1];
+		filter[2] = data[2];
+	}
+
+	private void filterAccData() {
+		if (!accinited) {
+			accel[0] = mGData[0];
+			accel[1] = mGData[1];
+			accel[2] = mGData[2];
+			accinited = true;
+		}
+		filterData(mGData, accel);
+	}
+
+	Boolean maginited = false;
+	float[] mag = new float[3];
+
+	private void filterMagData() {
+		if (!maginited) {
+			mag[0] = mMData[0];
+			mag[1] = mMData[1];
+			mag[2] = mMData[2];
+			maginited = true;
+		}
+		filterData(mMData, mag);
+	}
+
+	Boolean orinited = false;
+	float[] ordata = new float[3];
+
+	private void filterOrientationData() {
+		if (!orinited) {
+			ordata[0] = mOrientation[0];
+			ordata[1] = mOrientation[1];
+			ordata[2] = mOrientation[2];
+			orinited = true;
+		}
+		filterData(mOrientation, ordata);
+	}
+
+	@Override
+	public void onLocationChanged(Location loc) {
+		String res = "";
+		res += loc.getLongitude() + ";" 
+				+ loc.getLatitude() + ";" 
+				+ loc.getAltitude() + ";"
+				+ loc.getAccuracy() + ";"
+				+ loc.getBearing() + ";";
+		sendData(InternalPtr, res);
+	}
+
+	@Override
+	public void onProviderDisabled(String arg0) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void onProviderEnabled(String arg0) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void onStatusChanged(String arg0, int arg1, Bundle arg2) {
+		// TODO Auto-generated method stub
+		
+	}
 
 }
+

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/Osmo4.java -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/Osmo4.java Changed

@@ -2,7 +2,7 @@
  *  Osmo on Android
  *  Aug/2010
  *  NGO Van Luyen
- * $Id: Osmo4.java 4276 2013-01-09 12:49:21Z cconcolato $
+ * $Id: Osmo4.java 4366 2013-03-14 16:54:01Z jeanlf $
  *
  */
 package com.gpac.Osmo4;
@@ -40,34 +40,53 @@
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.hardware.SensorManager;
+import android.location.LocationManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
+import android.os.Vibrator;
 import android.text.InputType;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
+import android.widget.LinearLayout;
 import android.widget.Toast;
+
+import com.gpac.Osmo4.Osmo4GLSurfaceView;
+import com.gpac.Osmo4.Preview;
+import com.gpac.Osmo4.R;
 import com.gpac.Osmo4.extra.FileChooserActivity;
 import com.gpac.Osmo4.logs.GpacLogger;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+import com.lge.real3d.Real3D;
+import com.lge.real3d.Real3DInfo;
 /**
  * The main Osmo4 activity, used to launch everything
  * 
- * @version $Revision: 4276 $
+ * @version $Revision: 4366 $
  * 
  */
 public class Osmo4 extends Activity implements GpacCallback {
 
     // private String[] m_modules_list;
+	
+	public boolean m3DLibraryLoaded = false;
+	private Real3D mReal3D;	
 
     private boolean shouldDeleteGpacConfig = false;
 
@@ -114,6 +133,8 @@
     private GpacLogger logger;
 
     private ProgressDialog startupProgress;
+    
+    private LinearLayout gl_view;
 
     // ---------------------------------------
     @Override
@@ -121,11 +142,24 @@
         super.onCreate(savedInstanceState);
         requestWindowFeature(Window.FEATURE_PROGRESS);
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, 
-                                WindowManager.LayoutParams.FLAG_FULLSCREEN);
+		
+		requestWindowFeature(Window.FEATURE_NO_TITLE);
+        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+        		WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        
+        try {
+			Class c = Class.forName("com.lge.real3d.Real3D");
+			final String LGE_3D_DISPLAY = "lge.hardware.real3d.barrier.landscape";
+			if(this.getPackageManager().hasSystemFeature(LGE_3D_DISPLAY))
+				m3DLibraryLoaded = true;
+        } 
+        catch (ClassNotFoundException e) {
+        	m3DLibraryLoaded = false;
+        }
 
+		MPEGVSensor.myAct = this;
         MPEGVSensor.initSensorManager((SensorManager) getSystemService(Context.SENSOR_SERVICE));
+		MPEGVSensor.initLocationManager((LocationManager)getSystemService(Context.LOCATION_SERVICE));
 
         final String toOpen;
         if (Intent.ACTION_VIEW.equals(getIntent().getAction())) {
@@ -157,14 +191,29 @@
         startupProgress.setMessage(getResources().getText(R.string.osmoLoading));
         startupProgress.setTitle(R.string.osmoLoading);
         startupProgress.show();
+        
         if (mGLView != null) {
-            setContentView(mGLView);
+            setContentView(R.layout.main);
             if (toOpen != null)
                 openURLasync(toOpen);
             // OK, it means activity has already been started
             return;
         }
-        mGLView = new Osmo4GLSurfaceView(Osmo4.this);
+		
+		Preview.context = this;
+       
+        setContentView(R.layout.main);
+		
+		mGLView = new Osmo4GLSurfaceView(this);
+		
+		gl_view = (LinearLayout)findViewById(R.id.surface_gl);
+        
+        if( m3DLibraryLoaded ) //should be checking wether the terminal is a LG one
+        {
+        	//TryLoad3DClass(true);
+        	mReal3D = new Real3D(mGLView.getHolder());
+        	mReal3D.setReal3DInfo(new Real3DInfo(true, Real3D.REAL3D_TYPE_SS, Real3D.REAL3D_ORDER_LR));
+        }
         service.submit(new Runnable() {
 
             @Override
@@ -186,7 +235,8 @@
 
                         Osmo4Renderer renderer = new Osmo4Renderer(Osmo4.this, gpacConfig, toOpen);
                         mGLView.setRenderer(renderer);
-                        setContentView(mGLView);
+                       
+                        gl_view.addView(mGLView);
                     }
                 });
 
@@ -545,7 +595,8 @@
             }
                 return true;
             case R.id.quit:
-                mGLView.disconnect();
+                if ( mGLView != null )
+            		mGLView.disconnect();
                 this.finish();
                 return true;
             default:
@@ -659,7 +710,8 @@
                                              public void onClick(DialogInterface dialog, int which) {
 
                                                  // Stop the activity
-                                                 mGLView.disconnect();
+                                                 if ( mGLView != null )
+                                                     mGLView.disconnect();
                                                  Osmo4.this.finish();
                                              }
 
@@ -680,7 +732,7 @@
     // long start = System.currentTimeMillis();
     // byte buffer[] = new byte[1024];
     // int[] ids = getAllRawResources();
-    //        String currentRevision = "$Revision: 4276 $"; //$NON-NLS-1$
+    //        String currentRevision = "$Revision: 4366 $"; //$NON-NLS-1$
     // File revisionFile = gpacConfig.getGpacLastRevFile();
     // boolean fastStartup = false;
     // // We check if we already copied all the modules once without error...
@@ -962,7 +1014,7 @@
                 sb.append("Description: "); //$NON-NLS-1$
                 sb.append(e.getLocalizedMessage());
                 sb.append('\n');
-                sb.append("Revision: $Revision: 4276 $"); //$NON-NLS-1$
+                sb.append("Revision: $Revision: 4366 $"); //$NON-NLS-1$
                 sb.append("\nConfiguration information :\n") //$NON-NLS-1$
                   .append(gpacConfig.getConfigAsText());
                 builder.setMessage(sb.toString());
@@ -1021,8 +1073,6 @@
      */
     @Override
     public void showKeyboard(boolean showKeyboard) {
-        if (keyboardIsVisible == showKeyboard)
-            return;
         this.keyboardIsVisible = showKeyboard;
 
         runOnUiThread(new Runnable() {
@@ -1030,7 +1080,11 @@
             @Override
             public void run() {
                 InputMethodManager mgr = ((InputMethodManager) getSystemService(INPUT_METHOD_SERVICE));
-                mgr.toggleSoftInputFromWindow(mGLView.getWindowToken(), 0, 0);
+                if ( Osmo4.this.keyboardIsVisible )
+                	mgr.showSoftInput(mGLView, 0);
+                else
+                	mgr.hideSoftInputFromWindow(mGLView.getWindowToken(), 0);
+                //mgr.toggleSoftInputFromWindow(mGLView.getWindowToken(), 0, 0);
                 mGLView.requestFocus();
             }
         });

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/Preview.java -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/Preview.java Changed

@@ -6,14 +6,21 @@
 import java.io.OutputStream;
 import java.lang.reflect.Method;
 import java.util.List;
+import android.app.Activity;
+import android.app.ProgressDialog;
 import android.graphics.Bitmap;
 import android.graphics.PixelFormat;
 import android.hardware.Camera;
+import android.hardware.Camera.Parameters;
 import android.hardware.Camera.Size;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.util.Log;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.View;
+import android.widget.LinearLayout;
 
 /**
  * Manage camera preview and frame grabbing.
@@ -47,6 +54,13 @@
     private int width = 0;
 
     private int height = 0;
+	
+	public static Activity context = null;
+	
+	private boolean previewRequested = false;
+	private boolean previewStarted = false;
+	
+	private CameraPreview camPreview = null;
 
     // Native functions
     private native void processFrameBuf(byte[] data);
@@ -61,7 +75,135 @@
         mCamera.release();
         mCamera = null;
     }
-
+	
+	private class CameraPreview implements SurfaceHolder.Callback {
+		
+		private SurfaceHolder holder = null;
+		private SurfaceView mCamSV;
+		private boolean hasCallback = false;
+		//private LinearLayout cam_view;
+		
+		private ProgressDialog cameraOpening;
+ 
+		
+		public CameraPreview(final Activity context) {
+			Log.v(TAG, "CameraPreview: Constructor...");
+			
+			cameraOpening = new ProgressDialog(context);
+			cameraOpening.setCancelable(false);
+			cameraOpening.setIndeterminate(true);
+			cameraOpening.setMessage("Opening camera");
+			cameraOpening.setTitle("Osmo4 camera");
+			
+			//cam_view = (LinearLayout)context.findViewById(R.id.surface_camera);
+		        
+		    //cam_view.addView(mCamSV);
+		    
+		    context.runOnUiThread(new Runnable() {
+				
+				@Override
+				public void run() {
+					cameraOpening.show();
+				}
+			});
+
+			mCamSV = (SurfaceView)context.findViewById(R.id.surface_camera);
+			
+		    holder = mCamSV.getHolder();
+			holder.addCallback(CameraPreview.this);
+			holder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
+			
+			hasCallback = true;
+
+			context.runOnUiThread(new Runnable() {
+				
+				@Override
+				public void run() {
+					Log.i(TAG, "CameraPreview: Set visible...");
+					mCamSV.setVisibility(View.VISIBLE);
+					Log.i(TAG, "CameraPreview: Set visible done");
+				}
+			});
+			Log.v(TAG, "CameraPreview: Constructor done");
+		}
+		
+		public void startPreview()
+		{
+			Log.v(TAG, "CameraPreview: Start preview...");
+			mCamera.startPreview();
+			context.runOnUiThread(new Runnable() {
+				@Override
+				public void run() {
+					//Log.i(TAG, "CameraPreview: Set gone...");
+					Log.i(TAG, "CameraPreview: Dismiss");
+					//mCamSV.setVisibility(View.GONE);
+					cameraOpening.dismiss();
+					//Log.i(TAG, "CameraPreview: Set gone done");
+				}
+			});
+			mPreviewHandler = new PreviewHandler("CameraPreviewHandler");
+			mPreviewing = true;
+			Log.v(TAG, "CameraPreview: Start preview done");
+		}
+		
+		public void stopPreview()
+		{
+			if ( hasCallback )
+			{
+				Log.v(TAG, "CameraPreview: Remove callback");
+				holder.removeCallback(CameraPreview.this);
+				//cam_view.removeView(mCamSV);
+				//mCamSV = null;
+				context.runOnUiThread(new Runnable() {
+					@Override
+					public void run() {
+						Log.i(TAG, "CameraPreview: Set gone...");
+						mCamSV.setVisibility(View.GONE);
+						Log.i(TAG, "CameraPreview: Set gone done");
+					}
+				});
+				hasCallback = false;
+			}
+		}
+
+		@Override
+		public void surfaceChanged(SurfaceHolder holder, int format, int width,
+				int height) {
+			Log.v(TAG, "CameraPreview: Surface changed "+width+"x"+height+" ...");
+		}
+
+		@Override
+		public void surfaceCreated(SurfaceHolder holder) {
+			try {
+				Log.v(TAG, "CameraPreview: Surface created...");
+				mCamera.setPreviewDisplay(holder);
+				if ( previewRequested )	{
+					startPreview();
+					previewRequested = false;
+				}
+				else
+					previewStarted = true;
+				Log.v(TAG, "CameraPreview: Surface created done");
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		@Override
+		public void surfaceDestroyed(SurfaceHolder holder) {
+			// TODO Auto-generated method stub
+			
+		}
+		
+		@Override
+		public void finalize()
+		{
+			stopPreview();
+			camPreview = null;
+		}
+	}
+		
     @Override
     protected void finalize() {
         stopCamera();
@@ -74,6 +216,7 @@
      * @return True if successful.
      */
     public boolean initializeCamera(boolean isPortrait) {
+	
         this.isPortrait = isPortrait;
 
         // Open camera
@@ -86,12 +229,12 @@
             }
         }
 
-        stopPreview();
+        pausePreview();
 
         // Get parameters
         mCamera.setParameters(setParameters(mCamera.getParameters()));
-        width = mCamera.getParameters().getPreviewSize().width;
-        height = mCamera.getParameters().getPreviewSize().height;
+        width = mPreviewSize.width;
+				height = mPreviewSize.height;
         if (mPreviewSize == null || mPreviewFormat == 0) {
             Log.e(TAG, "Preview size or format error"); //$NON-NLS-1$
             return false;
@@ -107,8 +250,14 @@
         // Initialize frame grabbing
         // mPreviewHandler = new PreviewHandler("CameraPreviewHandler");
 
-        mCamera.startPreview();
-        mPreviewing = true;
+        context.runOnUiThread(new Runnable() {
+			
+			@Override
+			public void run() {
+				camPreview = new CameraPreview(context);
+				//camPreview.setVisibility(View.INVISIBLE);
+			}
+		});
 
         Log.d(TAG, "Camera preview started"); //$NON-NLS-1$
         return true;
@@ -163,28 +312,16 @@
     public void stopCamera() {
         Log.v(TAG, "stopCamera()"); //$NON-NLS-1$
 
-        stopPreview();
+        if ( mPreviewing )
+			pausePreview();
         if (mCamera != null) {
+			camPreview.stopPreview();
+			camPreview = null;
             mCamera.release();
             mCamera = null;
-            Log.i(TAG, "Camera released"); //$NON-NLS-1$
-        }
-    }
-
-    /**
-     * Stop camera preview and frame grabbing.
-     */
-    synchronized protected void stopPreview() {
-        Log.v(TAG, "stopPreview()"); //$NON-NLS-1$
-        if (mPreviewHandler != null) {
-            Log.v(TAG, "mPreviewHandler != null"); //$NON-NLS-1$
-            mPreviewHandler.stopPreview();
-            mPreviewHandler = null;
-        }
-        if (mPreviewing) {
-            mCamera.stopPreview();
-            Log.d(TAG, "Camera preview stopped"); //$NON-NLS-1$
-            mPreviewing = false;
+            previewRequested = false;
+			previewStarted = false;
+			Log.v(TAG, "Camera released"); //$NON-NLS-1$
         }
     }
 
@@ -192,9 +329,14 @@
      * Stop the processing thread
      */
     public void pausePreview() {
-        if (mPreviewHandler != null) {
-            mPreviewHandler.stopPreview();
+		Log.v(TAG, "pausePreview()");
+		if ( mPreviewing ) {
+			if ( mPreviewHandler != null )
+				mPreviewHandler.stopPreview();
             mPreviewHandler = null;
+            mCamera.stopPreview();
+            mPreviewing = false;
+			Log.v(TAG, "Camera preview stopped"); //$NON-NLS-1$
         }
     }
 
@@ -202,9 +344,13 @@
      * Restart the processing thread
      */
     public void resumePreview() {
-        if (mPreviewHandler == null) {
-            mPreviewHandler = new PreviewHandler("CameraPreviewHandler"); //$NON-NLS-1$
-        }
+        Log.v(TAG, "resumePreview()");
+		if ( previewStarted ) {
+			camPreview.startPreview();
+			previewStarted = false;
+		}
+		else
+			previewRequested = true;
     }
 
     /**
@@ -221,6 +367,11 @@
             throw new IllegalArgumentException("parameters must not be null"); //$NON-NLS-1$
         // Get preview size
         mPreviewSize = parameters.getPreviewSize();
+		mPreviewSize = getOptimalPreviewSize(parameters.getSupportedPreviewSizes(), 800, 480);
+		
+		parameters.setPreviewSize(mPreviewSize.width, mPreviewSize.height);
+		
+		mPreviewSize = parameters.getPreviewSize();
         Log.d(TAG, "PreviewSize: " + mPreviewSize.width + 'x' + mPreviewSize.height); //$NON-NLS-1$
 
         // Get preview format
@@ -235,9 +386,44 @@
         }
 
         parameters.setPreviewFrameRate(15);
+        parameters.setFocusMode(Parameters.FOCUS_MODE_AUTO);
 
         return parameters;
     }
+	
+		
+	private Size getOptimalPreviewSize(List<Size> sizes, int w, int h) {
+        final double ASPECT_TOLERANCE = 0.1;
+        double targetRatio = (double) w / h;
+        if (sizes == null) return null;
+
+        Size optimalSize = null;
+        double minDiff = Double.MAX_VALUE;
+
+        int targetHeight = h;
+
+        // Try to find an size match aspect ratio and size
+        for (Size size : sizes) {
+            double ratio = (double) size.width / size.height;
+            if (Math.abs(ratio - targetRatio) > ASPECT_TOLERANCE) continue;
+            if (Math.abs(size.height - targetHeight) < minDiff) {
+                optimalSize = size;
+                minDiff = Math.abs(size.height - targetHeight);
+            }
+        }
+
+        // Cannot find the one match the aspect ratio, ignore the requirement
+        if (optimalSize == null) {
+            minDiff = Double.MAX_VALUE;
+            for (Size size : sizes) {
+                if (Math.abs(size.height - targetHeight) < minDiff) {
+                    optimalSize = size;
+                    minDiff = Math.abs(size.height - targetHeight);
+                }
+            }
+        }
+        return optimalSize;
+    }
 
     /**
      * Return preferred camera preview format. At the moment, PixelFormat.YCbCr_420_SP is required.
@@ -446,7 +632,8 @@
 
         @Override
         public void onPreviewFrame(final byte[] data, final Camera camera) {
-            if (mHandler != null && camera == mCamera) {
+        	synchronized (this) {
+				if (mHandler != null && camera == mCamera) {
                 mHandler.post(new Runnable() {
 
                     @Override
@@ -460,27 +647,33 @@
                     }
                 });
             }
+			}
+            
         }
 
         @Override
         synchronized protected void onLooperPrepared() {
-            Log.v(TAG, "onLooperPrepared()"); //$NON-NLS-1$
-            if (stopped == false) {
-                mHandler = new Handler();
-                Log.d(TAG, "frame processing start"); //$NON-NLS-1$
-                setPreviewCallbackWithBuffer(this);
-                // mCamera.setPreviewCallback(this);
-            }
+        	synchronized (this) {
+	            Log.v(TAG, "onLooperPrepared()"); //$NON-NLS-1$
+	            if (stopped == false) {
+	                mHandler = new Handler();
+	                Log.d(TAG, "frame processing start"); //$NON-NLS-1$
+	                setPreviewCallbackWithBuffer(this);
+	                // mCamera.setPreviewCallback(this);
+	            }
+        	}
         }
 
         synchronized private void stopPreview() {
-            stopped = true;
-            if (mHandler != null) {
-                Log.d(TAG, "frame processing stop"); //$NON-NLS-1$
-                setPreviewCallbackWithBuffer(null);
-                // mCamera.setPreviewCallback(null);
-                mHandler = null;
-            }
+        	synchronized (this) {
+		        stopped = true;
+		        if (mHandler != null) {
+		            Log.d(TAG, "frame processing stop"); //$NON-NLS-1$
+		            setPreviewCallbackWithBuffer(null);
+		            // mCamera.setPreviewCallback(null);
+		            mHandler = null;
+		        }
+        	}
         }
     }

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/extra/FileArrayAdapter.java -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/extra/FileArrayAdapter.java Changed

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/extra/FileChooserActivity.java -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/extra/FileChooserActivity.java Changed

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/extra/FileEntry.java -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/extra/FileEntry.java Changed

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/logs/GpacLogger.java -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_android/src/com/gpac/Osmo4/logs/GpacLogger.java Changed

gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_ios/Resources/Default-568h@2x.png Added

gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_ios/Resources/icon_ipad.png Added

gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_ios/Resources/icon_ipad_retina.png Added

gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_ios/Resources/icon_retina.png Added

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_ios/extract.c -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_ios/extract.c Changed

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_ios/main.c -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_ios/main.c Changed

@@ -23,97 +23,13 @@
  *
  */
 
+/*includes both terminal and od browser*/
+#include <gpac/terminal.h>
+#include <gpac/term_info.h>
+#include <gpac/constants.h>
+#include <gpac/options.h>
+#include <gpac/modules/service.h>
 
-#include "libgpac_symbols.h"
- 
-void (*gf_log_lt)(u32 ll, u32 lt);
-int (*AVI_close)(avi_t *AVI);
-GF_Err (*gf_term_del)(GF_Terminal *term);
-void (*gf_sleep)(u32 ms);
-GF_Err (*gf_sc_release_screen_buffer)(GF_Compositor *sr, GF_VideoSurface *framebuffer);
-char (*gf_prompt_get_char)();
-void (*gf_set_progress)(char *title, u32 done, u32 total);
-GF_Terminal *(*gf_term_new)(GF_User *user);
-GF_Err (*gf_term_process_step)(GF_Terminal *term);
-GF_Err (*gf_sc_get_screen_buffer)(GF_Compositor *sr, GF_VideoSurface *framebuffer, Bool depth_buffer);
-void (*gf_iphone_set_sdl_audio_module)(void* (*SDL_Module) (void));
-GF_Err (*gf_term_step_clocks)(GF_Terminal * term, u32 ms_diff);
-void (*gf_prompt_set_echo_off)(Bool echo_off);
-u32 (*gf_log_tool_level_on)();
-GF_Err (*gf_cfg_set_key)(GF_Config *cfgFile, const char *secName, const char *keyName, const char *keyValue);
-u32 (*gf_cfg_get_section_count)(GF_Config *cfgFile);
-GF_Err (*gf_term_get_service_info)(GF_Terminal *term, GF_ObjectManager *odm, NetInfoCommand *netcom);
-GF_Err (*gf_term_set_size)(GF_Terminal *term, u32 NewWidth, u32 NewHeight);
-Bool (*gf_sys_get_rti)(u32 refresh_time_ms, GF_SystemRTInfo *rti, u32 flags);
-u32 (*gf_term_play_from_time)(GF_Terminal *term, u64 from_time, u32 pause_at_first_frame);
-void *(*gf_malloc)(size_t size);
-void (*gf_log_set_tools_levels)(const char *);
-void (*gf_log_set_tool_level)(u32, u32);
-void (*gf_log_modify_tools_level)(const char *);
-void (*gf_iphone_set_sdl_video_module)(void* (*SDL_Module) (void));
-u32 (*gf_term_get_option)(GF_Terminal *term, u32 opt_type);
-Bool (*gf_term_user_event)(GF_Terminal *term, GF_Event *event);
-const char *(*gf_modules_get_file_name)(GF_ModuleManager *pm, u32 index);
-GF_Mutex *(*gf_mx_new)(const char *name);
-u32 (*gf_list_count)(GF_List *ptr);
-void (*gf_free)(void *ptr);
-const char *(*gf_term_get_world_info)(GF_Terminal *term, GF_ObjectManager *scene_od, GF_List *descriptions);
-const char *(*gf_cfg_get_section_name)(GF_Config *cfgFile, u32 secIndex);
-void (*gf_term_navigate_to)(GF_Terminal *term, const char *toURL);
-void (*gf_modules_del)(GF_ModuleManager *pm);
-GF_ModuleManager *(*gf_modules_new)(const char *directory, GF_Config *cfgFile);
-void (*gf_sys_init)(Bool enable_memory_tracker);
-void (*gf_log)(const char *fmt, ...);
-GF_Err (*gf_term_get_object_info)(GF_Terminal *term, GF_ObjectManager *odm, GF_MediaInfo *info);
-u32 (*gf_mx_p)(GF_Mutex *mx);
-u32 (*gf_mx_v)(GF_Mutex *mx);
-void (*gf_mx_del)(GF_Mutex *mx);
-GF_Err (*gf_term_process_flush)(GF_Terminal *term);
-const char *(*gf_cfg_get_key_name)(GF_Config *cfgFile, const char *secName, u32 keyIndex);
-int (*AVI_write_frame)(avi_t *AVI, char *data, long bytes, int keyframe);
-void (*gf_cfg_del)(GF_Config *iniFile);
-Bool (*gf_term_get_channel_net_info)(GF_Terminal *term, GF_ObjectManager *odm, u32 *d_enum, u32 *chid, NetStatCommand *netcom, GF_Err *ret_code);
-void (*gf_term_process_shortcut)(GF_Terminal *term, GF_Event *ev);
-GF_Config *(*gf_cfg_init)(const char *fileName, Bool *is_new);
-Bool (*gf_term_get_download_info)(GF_Terminal *term, GF_ObjectManager *odm, u32 *d_enum, const char **server, const char **path, u32 *bytes_done, u32 *total_bytes, u32 *bytes_per_sec);
-u32 (*gf_sys_clock)();
-GF_ObjectManager *(*gf_term_get_object)(GF_Terminal *term, GF_ObjectManager *scene_od, u32 index);
-GF_Err (*gf_term_set_option)(GF_Terminal *term, u32 opt_type, u32 opt_value);
-void (*gf_sys_close)();
-void (*gf_term_connect_from_time)(GF_Terminal *term, const char *URL, u64 time_in_ms, Bool pause_at_first_frame);
-avi_t* (*AVI_open_output_file)(char * filename);
-const char *(*gf_cfg_get_key)(GF_Config *cfgFile, const char *secName, const char *keyName);
-void (*AVI_set_video)(avi_t *AVI, int width, int height, double fps, char *compressor);
-void (*gf_term_set_speed)(GF_Terminal *term, Fixed speed);
-u32 (*gf_cfg_get_key_count)(GF_Config *cfgFile, const char *secName);
-u32 (*gf_term_object_subscene_type)(GF_Terminal *term, GF_ObjectManager *odm);
-Double (*gf_term_get_framerate)(GF_Terminal *term, Bool absoluteFPS);
-const char *(*gf_error_to_string)(GF_Err e);
-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);
-void (*gf_list_del)(GF_List *ptr);
-void *(*gf_list_get)(GF_List *ptr, u32 itemNumber);
-void (*gf_term_disconnect)(GF_Terminal *term);
-Bool (*gf_term_is_supported_url)(GF_Terminal *term, const char *fileName, Bool use_parent_url, Bool no_mime_check);
-GF_List *(*gf_list_new)(void);
-const char *(*gf_modules_get_option)(GF_BaseInterface *interface_obj, const char *secName, const char *keyName);
-GF_Err (*gf_term_dump_scene)(GF_Terminal *term, char *rad_name, char **filename, Bool xml_dump, Bool skip_proto, GF_ObjectManager *odm);
-Bool (*gf_prompt_has_input)();
-GF_Err (*gf_term_scene_update)(GF_Terminal *term, char *type, char *com);
-void (*gf_term_connect)(GF_Terminal *term, const char *URL);
-u32 (*gf_term_get_object_count)(GF_Terminal *term, GF_ObjectManager *scene_od);
-u32 (*gf_modules_get_count)(GF_ModuleManager *pm);
-GF_ObjectManager *(*gf_term_get_root_object)(GF_Terminal *term);
-u32 (*gf_term_get_time_in_ms)(GF_Terminal *term);
-void (*gf_term_connect_with_path)(GF_Terminal *term, const char *URL, const char *parent_URL);
-gf_log_cbk (*gf_log_set_callback)(void *usr_cbk, gf_log_cbk cbk);
-GF_Err (*gf_log_modify_tools_levels)(const char *val);
-void (*gf_term_switch_quality)(GF_Terminal *term, Bool up);
-GF_Err (*gf_term_release_screen_buffer)(GF_Terminal *term, GF_VideoSurface *framebuffer);
-GF_Err (*gf_term_get_screen_buffer)(GF_Terminal *term, GF_VideoSurface *framebuffer);
-FILE *(*gf_f64_open)(const char *file_name, const char *mode);
-size_t (*gf_fwrite)(const void *ptr, size_t size, size_t nmemb, FILE *stream);
-GF_Err (*gf_img_png_enc)(char *data, u32 width, u32 height, s32 stride, u32 pixel_format, char *dst, u32 *dst_size);
-u32 (*utf8_to_ucs4)(u32 *ucs4_buf, u32 utf8_len, unsigned char *utf8_buf);
 
 #ifndef WIN32
 #include <pwd.h>
@@ -141,14 +57,6 @@
 #endif	//WIN32
 
 
-/*local prototypes*/
-void PrintWorldInfo(GF_Terminal *term);
-void ViewOD(GF_Terminal *term, u32 OD_ID, u32 number);
-void PrintODList(GF_Terminal *term, GF_ObjectManager *root_odm, u32 num, u32 indent, char *root_name);
-
-void ViewODs(GF_Terminal *term, Bool show_timing);
-void PrintGPACConfig();
-
 static Bool restart = 0;
 #if defined(__DARWIN__) || defined(__APPLE__)
 static Bool not_threaded = 1;
@@ -173,7 +81,6 @@
 static Bool display_rti = 0;
 static Bool Run;
 static Bool CanSeek = 0;
-static u32 Volume=100;
 static char the_url[GF_MAX_PATH];
 static char pl_path[GF_MAX_PATH];
 static Bool no_mime_check = 1;
@@ -267,58 +174,6 @@
 		);
 }
 
-void PrintHelp()
-{
-	fprintf(stdout, "MP4Client command keys:\n"
-		"\to: connect to the specified URL\n"
-		"\tO: connect to the specified URL in playlist mode\n"
-		"\tN: switch to the next URL in the playlist (works with return key as well)\n"
-		"\tr: restart current presentation\n"
-		"\tp: play/pause the presentation\n"
-		"\ts: step one frame ahead\n"
-		"\tz: seek into presentation\n"
-		"\tt: print current timing\n"
-		"\n"
-		"\tw: view world info\n"
-		"\tv: view Object Descriptor list\n"
-		"\ti: view Object Descriptor info (by ID)\n"
-		"\tj: view Object Descriptor info (by number)\n"
-		"\tb: view media objects timing and buffering info\n"
-		"\tm: view media objects buffering and memory info\n"
-		"\td: dumps scene graph\n"
-		"\n"
-		"\tC: Enable Streaming Cache\n"
-		"\tS: Stops Streaming Cache and save to file\n"
-		"\tA: Aborts Streaming Cache\n"
-		"\n"
-		"\tk: turns stress mode on/off\n"
-		"\tn: changes navigation mode\n"
-		"\tx: reset to last active viewpoint\n"
-		"\n"
-		"\t2: restart using 2D compositor\n"
-		"\t3: restart using 3D compositor\n"
-		"\n"
-		"\t4: forces 4/3 Aspect Ratio\n"
-		"\t5: forces 16/9 Aspect Ratio\n"
-		"\t6: forces no Aspect Ratio (always fill screen)\n"
-		"\t7: forces original Aspect Ratio (default)\n"
-		"\n"
-		"\tL: changes to new log level. CF MP4Client usage for possible values\n"
-		"\tT: select new tools to log. CF MP4Client usage for possible values\n"
-		"\n"
-		"\tl: list available modules\n"
-		"\tc: prints some GPAC configuration info\n"
-		"\tR: toggles run-time info display on/off\n"
-		"\tq: exit the application\n"
-		"\th: print this message\n"
-		"\n"
-		"MP4Client - GPAC command line player - version %s\n"
-		"GPAC Written by Jean Le Feuvre (c) 2001-2005 - ENST (c) 2005-200X\n",
-
-		GPAC_FULL_VERSION
-		);
-}
-
 
 static void PrintTime(u64 time)
 {
@@ -565,14 +420,6 @@
 				fprintf(stderr, "\n");
 			}
 			break;
-		case GF_KEY_B:
-			if ((evt->key.flags & GF_KEY_MOD_CTRL) && is_connected)
-				ViewODs(term, 1);
-			break;
-		case GF_KEY_M:
-			if ((evt->key.flags & GF_KEY_MOD_CTRL) && is_connected)
-				ViewODs(term, 0);
-			break;
 		case GF_KEY_H:
 			if ((evt->key.flags & GF_KEY_MOD_CTRL) && is_connected)
 				gf_term_switch_quality(term, 1);
@@ -842,7 +689,7 @@
 	u32 i, times[100], nb_times, dump_mode;
 	u32 simulation_time = 0;
 	Bool auto_exit = 0;
-	Bool start_fs = 0;
+	Bool start_fs = 1;
 	Bool use_rtix = 0;
 	Bool rgbds_dump = 0;
 	Bool rgbd_dump = 0;
@@ -856,99 +703,8 @@
 	FILE *playlist = NULL;
 	FILE *logfile = NULL;
 	Float scale = 1;
-	int *libgpac_so = NULL;
-	
-	libgpac_so = dlopen("/Applications/osmo4ios.app/libgpac_dynamic.dylib", RTLD_LAZY);
-	fprintf(stderr, "dlopen libgpac_so: %p\n", libgpac_so);
-	fprintf(stderr, "dlsym: %p gf_log_lt\n", gf_log_lt = dlsym(libgpac_so, "gf_log_lt"));
-	fprintf(stderr, "dlsym: %p AVI_close\n", AVI_close = dlsym(libgpac_so, "AVI_close"));
-	fprintf(stderr, "dlsym: %p gf_sleep\n", gf_sleep = dlsym(libgpac_so, "gf_sleep"));
-	fprintf(stderr, "dlsym: %p gf_term_del\n", gf_term_del = dlsym(libgpac_so, "gf_term_del"));
-	fprintf(stderr, "dlsym: %p gf_sc_release_screen_buffer\n", gf_sc_release_screen_buffer = dlsym(libgpac_so, "gf_sc_release_screen_buffer"));
-	fprintf(stderr, "dlsym: %p gf_prompt_get_char\n", gf_prompt_get_char = dlsym(libgpac_so, "gf_prompt_get_char"));
-	fprintf(stderr, "dlsym: %p gf_set_progress\n", gf_set_progress = dlsym(libgpac_so, "gf_set_progress"));
-	fprintf(stderr, "dlsym: %p gf_term_new\n", gf_term_new = dlsym(libgpac_so, "gf_term_new"));
-	fprintf(stderr, "dlsym: %p gf_term_process_step\n", gf_term_process_step = dlsym(libgpac_so, "gf_term_process_step"));
-	fprintf(stderr, "dlsym: %p gf_sc_get_screen_buffer\n", gf_sc_get_screen_buffer = dlsym(libgpac_so, "gf_sc_get_screen_buffer"));
-	fprintf(stderr, "dlsym: %p gf_iphone_set_sdl_audio_module\n", gf_iphone_set_sdl_audio_module = dlsym(libgpac_so, "gf_iphone_set_sdl_audio_module"));
-	fprintf(stderr, "dlsym: %p gf_term_step_clocks\n", gf_term_step_clocks = dlsym(libgpac_so, "gf_term_step_clocks"));
-	fprintf(stderr, "dlsym: %p gf_prompt_set_echo_off\n", gf_prompt_set_echo_off = dlsym(libgpac_so, "gf_prompt_set_echo_off"));
-	fprintf(stderr, "dlsym: %p gf_log_tool_level_on\n", gf_log_tool_level_on = dlsym(libgpac_so, "gf_log_tool_level_on"));
-	fprintf(stderr, "dlsym: %p gf_cfg_set_key\n", gf_cfg_set_key = dlsym(libgpac_so, "gf_cfg_set_key"));
-	fprintf(stderr, "dlsym: %p gf_cfg_get_section_count\n", gf_cfg_get_section_count = dlsym(libgpac_so, "gf_cfg_get_section_count"));
-	fprintf(stderr, "dlsym: %p gf_term_get_service_info\n", gf_term_get_service_info = dlsym(libgpac_so, "gf_term_get_service_info"));
-	fprintf(stderr, "dlsym: %p gf_term_set_size\n", gf_term_set_size = dlsym(libgpac_so, "gf_term_set_size"));
-	fprintf(stderr, "dlsym: %p gf_sys_get_rti\n", gf_sys_get_rti = dlsym(libgpac_so, "gf_sys_get_rti"));
-	fprintf(stderr, "dlsym: %p gf_term_play_from_time\n", gf_term_play_from_time = dlsym(libgpac_so, "gf_term_play_from_time"));
-	fprintf(stderr, "dlsym: %p gf_malloc\n", gf_malloc = dlsym(libgpac_so, "gf_malloc"));
-	fprintf(stderr, "dlsym: %p gf_log_set_tool_level\n", gf_log_set_tool_level = dlsym(libgpac_so, "gf_log_set_tool_level"));
-	fprintf(stderr, "dlsym: %p gf_log_set_tools_levels\n", gf_log_set_tools_levels = dlsym(libgpac_so, "gf_log_set_tools_levels"));
-	fprintf(stderr, "dlsym: %p gf_log_modify_tools_levels\n", gf_log_modify_tools_levels = dlsym(libgpac_so, "gf_log_modify_tools_levels"));
-	fprintf(stderr, "dlsym: %p gf_iphone_set_sdl_video_module\n", gf_iphone_set_sdl_video_module = dlsym(libgpac_so, "gf_iphone_set_sdl_video_module"));
-	fprintf(stderr, "dlsym: %p gf_term_get_option\n", gf_term_get_option = dlsym(libgpac_so, "gf_term_get_option"));
-	fprintf(stderr, "dlsym: %p gf_term_user_event\n", gf_term_user_event = dlsym(libgpac_so, "gf_term_user_event"));
-	fprintf(stderr, "dlsym: %p gf_modules_get_file_name\n", gf_modules_get_file_name = dlsym(libgpac_so, "gf_modules_get_file_name"));
-	fprintf(stderr, "dlsym: %p gf_mx_new\n", gf_mx_new = dlsym(libgpac_so, "gf_mx_new"));
-	fprintf(stderr, "dlsym: %p gf_list_count\n", gf_list_count = dlsym(libgpac_so, "gf_list_count"));
-	fprintf(stderr, "dlsym: %p gf_free\n", gf_free = dlsym(libgpac_so, "gf_free"));
-	fprintf(stderr, "dlsym: %p gf_term_get_world_info\n", gf_term_get_world_info = dlsym(libgpac_so, "gf_term_get_world_info"));
-	fprintf(stderr, "dlsym: %p gf_cfg_get_section_name\n", gf_cfg_get_section_name = dlsym(libgpac_so, "gf_cfg_get_section_name"));
-	fprintf(stderr, "dlsym: %p gf_term_navigate_to\n", gf_term_navigate_to = dlsym(libgpac_so, "gf_term_navigate_to"));
-	fprintf(stderr, "dlsym: %p gf_modules_del\n", gf_modules_del = dlsym(libgpac_so, "gf_modules_del"));
-	fprintf(stderr, "dlsym: %p gf_modules_new\n", gf_modules_new = dlsym(libgpac_so, "gf_modules_new"));
-	fprintf(stderr, "dlsym: %p gf_sys_init\n", gf_sys_init = dlsym(libgpac_so, "gf_sys_init"));
-	fprintf(stderr, "dlsym: %p gf_log\n", gf_log = dlsym(libgpac_so, "gf_log"));
-	fprintf(stderr, "dlsym: %p gf_term_get_object_info\n", gf_term_get_object_info = dlsym(libgpac_so, "gf_term_get_object_info"));
-	fprintf(stderr, "dlsym: %p gf_mx_p\n", gf_mx_p = dlsym(libgpac_so, "gf_mx_p"));
-	fprintf(stderr, "dlsym: %p gf_mx_v\n", gf_mx_v = dlsym(libgpac_so, "gf_mx_v"));
-	fprintf(stderr, "dlsym: %p gf_mx_del\n", gf_mx_del = dlsym(libgpac_so, "gf_mx_del"));
-	fprintf(stderr, "dlsym: %p gf_term_process_flush\n", gf_term_process_flush = dlsym(libgpac_so, "gf_term_process_flush"));
-	fprintf(stderr, "dlsym: %p gf_cfg_get_key_name\n", gf_cfg_get_key_name = dlsym(libgpac_so, "gf_cfg_get_key_name"));
-	fprintf(stderr, "dlsym: %p AVI_write_frame\n", AVI_write_frame = dlsym(libgpac_so, "AVI_write_frame"));
-	fprintf(stderr, "dlsym: %p gf_cfg_del\n", gf_cfg_del = dlsym(libgpac_so, "gf_cfg_del"));
-	fprintf(stderr, "dlsym: %p gf_term_get_channel_net_info\n", gf_term_get_channel_net_info = dlsym(libgpac_so, "gf_term_get_channel_net_info"));
-	fprintf(stderr, "dlsym: %p gf_term_process_shortcut\n", gf_term_process_shortcut = dlsym(libgpac_so, "gf_term_process_shortcut"));
-	fprintf(stderr, "dlsym: %p gf_cfg_init\n", gf_cfg_init = dlsym(libgpac_so, "gf_cfg_init"));
-	fprintf(stderr, "dlsym: %p gf_term_get_download_info\n", gf_term_get_download_info = dlsym(libgpac_so, "gf_term_get_download_info"));
-	fprintf(stderr, "dlsym: %p gf_sys_clock\n", gf_sys_clock = dlsym(libgpac_so, "gf_sys_clock"));
-	fprintf(stderr, "dlsym: %p gf_term_get_object\n", gf_term_get_object = dlsym(libgpac_so, "gf_term_get_object"));
-	fprintf(stderr, "dlsym: %p gf_term_set_option\n", gf_term_set_option = dlsym(libgpac_so, "gf_term_set_option"));
-	fprintf(stderr, "dlsym: %p gf_sys_close\n", gf_sys_close = dlsym(libgpac_so, "gf_sys_close"));
-	fprintf(stderr, "dlsym: %p gf_term_connect_from_time\n", gf_term_connect_from_time = dlsym(libgpac_so, "gf_term_connect_from_time"));
-	fprintf(stderr, "dlsym: %p AVI_open_output_file\n", AVI_open_output_file = dlsym(libgpac_so, "AVI_open_output_file"));
-	fprintf(stderr, "dlsym: %p gf_cfg_get_key\n", gf_cfg_get_key = dlsym(libgpac_so, "gf_cfg_get_key"));
-	fprintf(stderr, "dlsym: %p AVI_set_video\n", AVI_set_video = dlsym(libgpac_so, "AVI_set_video"));
-	fprintf(stderr, "dlsym: %p gf_term_set_speed\n", gf_term_set_speed = dlsym(libgpac_so, "gf_term_set_speed"));
-	fprintf(stderr, "dlsym: %p gf_cfg_get_key_count\n", gf_cfg_get_key_count = dlsym(libgpac_so, "gf_cfg_get_key_count"));
-	fprintf(stderr, "dlsym: %p gf_term_object_subscene_type\n", gf_term_object_subscene_type = dlsym(libgpac_so, "gf_term_object_subscene_type"));
-	fprintf(stderr, "dlsym: %p gf_term_get_framerate\n", gf_term_get_framerate = dlsym(libgpac_so, "gf_term_get_framerate"));
-	fprintf(stderr, "dlsym: %p gf_error_to_string\n", gf_error_to_string = dlsym(libgpac_so, "gf_error_to_string"));
-	fprintf(stderr, "dlsym: %p gf_stretch_bits\n", gf_stretch_bits = dlsym(libgpac_so, "gf_stretch_bits"));
-	fprintf(stderr, "dlsym: %p gf_list_del\n", gf_list_del = dlsym(libgpac_so, "gf_list_del"));
-	fprintf(stderr, "dlsym: %p gf_list_get\n", gf_list_get = dlsym(libgpac_so, "gf_list_get"));
-	fprintf(stderr, "dlsym: %p gf_term_disconnect\n", gf_term_disconnect = dlsym(libgpac_so, "gf_term_disconnect"));
-	fprintf(stderr, "dlsym: %p gf_term_is_supported_url\n", gf_term_is_supported_url = dlsym(libgpac_so, "gf_term_is_supported_url"));
-	fprintf(stderr, "dlsym: %p gf_list_new\n", gf_list_new = dlsym(libgpac_so, "gf_list_new"));
-	fprintf(stderr, "dlsym: %p gf_modules_get_option\n", gf_modules_get_option = dlsym(libgpac_so, "gf_modules_get_option"));
-	fprintf(stderr, "dlsym: %p gf_term_dump_scene\n", gf_term_dump_scene = dlsym(libgpac_so, "gf_term_dump_scene"));
-	fprintf(stderr, "dlsym: %p gf_prompt_has_input\n", gf_prompt_has_input = dlsym(libgpac_so, "gf_prompt_has_input"));
-	fprintf(stderr, "dlsym: %p gf_term_scene_update\n", gf_term_scene_update = dlsym(libgpac_so, "gf_term_scene_update"));
-	fprintf(stderr, "dlsym: %p gf_term_connect\n", gf_term_connect = dlsym(libgpac_so, "gf_term_connect"));
-	fprintf(stderr, "dlsym: %p gf_term_get_object_count\n", gf_term_get_object_count = dlsym(libgpac_so, "gf_term_get_object_count"));
-	fprintf(stderr, "dlsym: %p gf_modules_get_count\n", gf_modules_get_count = dlsym(libgpac_so, "gf_modules_get_count"));
-	fprintf(stderr, "dlsym: %p gf_term_get_root_object\n", gf_term_get_root_object = dlsym(libgpac_so, "gf_term_get_root_object"));
-	fprintf(stderr, "dlsym: %p gf_term_get_time_in_ms\n", gf_term_get_time_in_ms = dlsym(libgpac_so, "gf_term_get_time_in_ms"));
-	fprintf(stderr, "dlsym: %p gf_term_connect_with_path\n", gf_term_connect_with_path = dlsym(libgpac_so, "gf_term_connect_with_path"));
-	fprintf(stderr, "dlsym: %p gf_log_set_callback\n", gf_log_set_callback = dlsym(libgpac_so, "gf_log_set_callback"));
-	fprintf(stderr, "dlsym: %p gf_term_switch_quality\n", gf_term_switch_quality = dlsym(libgpac_so, "gf_term_switch_quality"));
-	fprintf(stderr, "dlsym: %p gf_term_release_screen_buffer\n", gf_term_release_screen_buffer = dlsym(libgpac_so, "gf_term_release_screen_buffer"));
-	fprintf(stderr, "dlsym: %p gf_term_get_screen_buffer\n", gf_term_get_screen_buffer = dlsym(libgpac_so, "gf_term_get_screen_buffer"));
-	fprintf(stderr, "dlsym: %p gf_f64_open\n", gf_f64_open = dlsym(libgpac_so, "gf_f64_open"));
-	fprintf(stderr, "dlsym: %p gf_fwrite\n", gf_fwrite = dlsym(libgpac_so, "gf_fwrite"));
-	fprintf(stderr, "dlsym: %p gf_img_png_enc\n", gf_img_png_enc = dlsym(libgpac_so, "gf_img_png_enc"));
-	fprintf(stderr, "dlsym: %p utf8_to_ucs4\n", utf8_to_ucs4 = dlsym(libgpac_so, "utf8_to_ucs4"));
-
-	/*by default use current dir*/
+    
+    /*by default use current dir*/
 	strcpy(the_url, ".");
 
 	memset(&user, 0, sizeof(GF_User));
@@ -970,8 +726,6 @@
 	}
 
 	gf_sys_init(enable_mem_tracker);
-	gf_iphone_set_sdl_video_module(SDL_NewVideo);
-	gf_iphone_set_sdl_audio_module(SDL_NewAudio);
 	
 	cfg_file = gf_cfg_init(the_cfg, NULL);
 	if (!cfg_file) {
@@ -1128,7 +882,7 @@
 	fprintf(stderr, "Loading modules\n");
 	str = gf_cfg_get_key(cfg_file, "General", "ModulesDirectory");
 
-	user.modules = gf_modules_new((const unsigned char *) str, cfg_file);
+	user.modules = gf_modules_new((const char *) str, cfg_file);
 	if (user.modules) i = gf_modules_get_count(user.modules);
 	if (!i || !user.modules) {
 		fprintf(stdout, "Error: no modules found in %s - exiting\n", str);
@@ -1236,73 +990,20 @@
 		}
 	}
 	/*force fullscreen*/
-	if (start_fs) 
+	if (0 && start_fs) 
 		gf_term_set_option(term, GF_OPT_FULLSCREEN, 1);
 
 	while (Run) {
-		/*we don't want getchar to block*/
-		if (1 || !gf_prompt_has_input()) {
-			if (restart) {
-				restart = 0;
-				gf_term_play_from_time(term, 0, 0);
-			}
-			if (request_next_playlist_item) {
-				c = '\n';
-				request_next_playlist_item = 0;
-				goto force_input;
-			}
-			if (!use_rtix || display_rti) UpdateRTInfo(NULL);
-			if (not_threaded) {
-				//printf("gf_term_process_step from run loop\n");
-				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);
-			}
-			/*sim time*/
-			if (simulation_time && (gf_term_get_time_in_ms(term)>simulation_time)) {
-				Run = 0;
-			}
-			continue;
+		if (restart) {
+			restart = 0;
+			gf_term_play_from_time(term, 0, 0);
 		}
-		c = gf_prompt_get_char();
-
-force_input:
-		switch (c) {
-		case 'q':
-			Run = 0;
-			break;
-		case 'X':
-			exit(0);
-			break;
-		case 'Q':
-			break;
-		case 'o':
-			startup_file = 0;
-			gf_term_disconnect(term);
-			fprintf(stdout, "Enter the absolute URL\n");
-			scanf("%s", the_url);
-			if (rti_file) init_rti_logs(rti_file, the_url, use_rtix);
-			gf_term_connect(term, the_url);
-			break;
-		case 'O':
-			gf_term_disconnect(term);
-			fprintf(stdout, "Enter the absolute URL to the playlist\n");
-			scanf("%s", the_url);
-			playlist = gf_f64_open(the_url, "rt");
-			if (playlist) {
-				fscanf(playlist, "%s", the_url);
-				fprintf(stdout, "Opening URL %s\n", the_url);
-				gf_term_connect(term, the_url);
-			}
-			break;
-		case '\n':
-		case 'N':
+		if (request_next_playlist_item) {
+			c = '\n';
+			request_next_playlist_item = 0;
 			if (playlist) {
 				gf_term_disconnect(term);
-
+				
 				if (fscanf(playlist, "%s", the_url) == EOF) {
 					fprintf(stdout, "No more items - exiting\n");
 					Run = 0;
@@ -1311,298 +1012,25 @@
 					gf_term_connect_with_path(term, the_url, pl_path);
 				}
 			}
-			break;
-		case 'P':
-			if (playlist) {
-				u32 count;
-				gf_term_disconnect(term);
-				scanf("%d", &count);
-				while (count) {
-					fscanf(playlist, "%s", the_url);
-					count--;
-				}
-				fprintf(stdout, "Opening URL %s\n", the_url);
-				gf_term_connect(term, the_url);
-			}
-			break;
-		case 'r':
-			if (is_connected) {
-				gf_term_disconnect(term);
-				gf_term_connect(term, startup_file ? gf_cfg_get_key(cfg_file, "General", "StartupFile") : the_url);
-			}
-			break;
-		
-		case 'D':
-			if (is_connected) gf_term_disconnect(term);
-			break;
-
-		case 'p':
-			if (is_connected) {
-				Bool is_pause = gf_term_get_option(term, GF_OPT_PLAY_STATE);
-				fprintf(stdout, "[Status: %s]\n", is_pause ? "Playing" : "Paused");
-				gf_term_set_option(term, GF_OPT_PLAY_STATE, is_pause ? GF_STATE_PLAYING : GF_STATE_PAUSED);
-			}
-			break;
-		case 's':
-			if (is_connected) {
-				gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_STEP_PAUSE);
-				fprintf(stdout, "Step time: ");
-				PrintTime(gf_term_get_time_in_ms(term));
-				fprintf(stdout, "\n");
-			}
-			break;
-
-		case 'z':
-			if (!CanSeek || (Duration<=2000)) {
-				fprintf(stdout, "scene not seekable\n");
-			} else {
-				Double res;
-				s32 seekTo;
-				fprintf(stdout, "Duration: ");
-				PrintTime(Duration);
-				res = gf_term_get_time_in_ms(term);
-				res *= 100; res /= (s64)Duration;
-				fprintf(stdout, " (current %.2f %%)\nEnter Seek percentage:\n", res);
-				if (scanf("%d", &seekTo) == 1) { 
-					if (seekTo > 100) seekTo = 100;
-					res = (Double)(s64)Duration; res /= 100; res *= seekTo;
-					gf_term_play_from_time(term, (u64) (s64) res, 0);
-				}
-			}
-			break;
-
-		case 't':
-		{
-			if (is_connected) {
-				fprintf(stdout, "Current Time: ");
-				PrintTime(gf_term_get_time_in_ms(term));
-				fprintf(stdout, " - Duration: ");
-				PrintTime(Duration);
-				fprintf(stdout, "\n");
-			}
 		}
-			break;
-		case 'w':
-			if (is_connected) PrintWorldInfo(term);
-			break;
-		case 'v':
-			if (is_connected) PrintODList(term, NULL, 0, 0, "Root");
-			break;
-		case 'i':
-			if (is_connected) {
-				u32 ID;
-				fprintf(stdout, "Enter OD ID (0 for main OD): ");
-				fflush(stdout);
-				scanf("%d", &ID);
-				ViewOD(term, ID, (u32)-1);
-			}
-			break;
-		case 'j':
-			if (is_connected) {
-				u32 num;
-				fprintf(stdout, "Enter OD number (0 for main OD): ");
-				fflush(stdout);
-				scanf("%d", &num);
-				ViewOD(term, (u32)-1, num);
-			}
-			break;
-		case 'b':
-			if (is_connected) ViewODs(term, 1);
-			break;
-
-		case 'm':
-			if (is_connected) ViewODs(term, 0);
-			break;
-
-		case 'l':
-			list_modules(user.modules);
-			break;
-
-		case 'n':
-			if (is_connected) set_navigation();
-			break;
-		case 'x':
-			if (is_connected) gf_term_set_option(term, GF_OPT_NAVIGATION_TYPE, 0);
-			break;
-
-		case 'd':
-			if (is_connected) {
-				GF_ObjectManager *odm = NULL;
-				char radname[GF_MAX_PATH], *sExt;
-				GF_Err e;
-				u32 i, count, odid;
-				Bool xml_dump, std_out;
-				fprintf(stdout, "Enter Inline OD ID if any or 0");
-				fflush(stdout);
-				radname[0] = 0;
-				scanf("%d", &odid);
-				if (odid) {
-					GF_ObjectManager *root_odm = gf_term_get_root_object(term);
-					if (!root_odm) break;
-					count = gf_term_get_object_count(term, root_odm);
-					for (i=0; i<count; i++) {
-						GF_MediaInfo info;
-						odm = gf_term_get_object(term, root_odm, i);
-						if (gf_term_get_object_info(term, odm, &info) == GF_OK) {
-							if (info.od->objectDescriptorID==odid) break;
-						}
-						odm = NULL;
-					}
-				}
-				fprintf(stdout, "Enter file radical name (+\'.x\' for XML dumping) - \"std\" for stdout: ");
-				fflush(stdout);
-				scanf("%s", radname);
-				sExt = strrchr(radname, '.');
-				xml_dump = 0;
-				if (sExt) {
-					if (!stricmp(sExt, ".x")) xml_dump = 1;
-					sExt[0] = 0;
-				}
-				std_out = strnicmp(radname, "std", 3) ? 0 : 1;
-				e = gf_term_dump_scene(term, std_out ? NULL : radname, NULL, xml_dump, 0, odm);
-				fprintf(stdout, "Dump done (%s)\n", gf_error_to_string(e));
-			}
-			break;
-
-		case 'c':
-			PrintGPACConfig();
-			break;
-		case '3':
-		{
-			Bool use_3d = !gf_term_get_option(term, GF_OPT_USE_OPENGL);
-			if (gf_term_set_option(term, GF_OPT_USE_OPENGL, use_3d)==GF_OK) {
-				fprintf(stdout, "Using %s for 2D drawing\n", use_3d ? "OpenGL" : "2D rasterizer");
-			}
-		}
-			break;
-		case 'k':
-		{
-			Bool opt = gf_term_get_option(term, GF_OPT_STRESS_MODE);
-			opt = !opt;
-			fprintf(stdout, "Turning stress mode %s\n", opt ? "on" : "off");
-			gf_term_set_option(term, GF_OPT_STRESS_MODE, opt);
-		}
-			break;
-		case '4': gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_4_3); break;
-		case '5': gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_16_9); break;
-		case '6': gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_FILL_SCREEN); break;
-		case '7': gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_KEEP); break;
-
-		case 'C':
-			switch (gf_term_get_option(term, GF_OPT_MEDIA_CACHE)) {
-			case GF_MEDIA_CACHE_DISABLED: gf_term_set_option(term, GF_OPT_MEDIA_CACHE, GF_MEDIA_CACHE_ENABLED); break;
-			case GF_MEDIA_CACHE_ENABLED: gf_term_set_option(term, GF_OPT_MEDIA_CACHE, GF_MEDIA_CACHE_DISABLED); break;
-			case GF_MEDIA_CACHE_RUNNING: fprintf(stdout, "Streaming Cache is running - please stop it first\n"); continue;
-			}
-			switch (gf_term_get_option(term, GF_OPT_MEDIA_CACHE)) {
-			case GF_MEDIA_CACHE_ENABLED: fprintf(stdout, "Streaming Cache Enabled\n"); break;
-			case GF_MEDIA_CACHE_DISABLED: fprintf(stdout, "Streaming Cache Disabled\n"); break;
-			case GF_MEDIA_CACHE_RUNNING: fprintf(stdout, "Streaming Cache Running\n"); break;
-			}
-			break;
-		case 'S':
-		case 'A':
-			if (gf_term_get_option(term, GF_OPT_MEDIA_CACHE)==GF_MEDIA_CACHE_RUNNING) {
-				gf_term_set_option(term, GF_OPT_MEDIA_CACHE, (c=='S') ? GF_MEDIA_CACHE_DISABLED : GF_MEDIA_CACHE_DISCARD);
-				fprintf(stdout, "Streaming Cache stopped\n");
-			} else {
-				fprintf(stdout, "Streaming Cache not running\n");
-			}
-			break;
-		case 'R':
-			display_rti = !display_rti;
-			ResetCaption();
-			break;
-		case 'F':
-			if (display_rti) display_rti = 0;
-			else display_rti = 2;
-			ResetCaption();
-			break;
-
-		case 'u':
-		{
-			GF_Err e;
-			char szCom[8192];
-			fprintf(stdout, "Enter command to send:\n");
-			fflush(stdin);
-			szCom[0] = 0;
-			scanf("%[^\t\n]", szCom);
-			e = gf_term_scene_update(term, NULL, szCom);
-			if (e) fprintf(stdout, "Processing command failed: %s\n", gf_error_to_string(e));
-		}
-			break;
-
-		case 'L':
-		{
-			char szLog[1024];
-			fprintf(stdout, "Enter new log level:\n");
-			scanf("%s", szLog);
-			gf_log_modify_tools_levels( szLog );
-		}
-			break;
-		case 'g':
-		{
-			GF_SystemRTInfo rti;
-			gf_sys_get_rti(rti_update_time_ms, &rti, 0);
-			fprintf(stdout, "GPAC allocated memory "LLD"\n", rti.gpac_memory);
-		}
-			break;
-		case 'M':
-		{
-			u32 size;
-			fprintf(stdout, "Enter new video cache memory in kBytes (current %d):\n", gf_term_get_option(term, GF_OPT_VIDEO_CACHE_SIZE));
-			scanf("%d", &size);
-			gf_term_set_option(term, GF_OPT_VIDEO_CACHE_SIZE, size);
-		}
-			break;
-
-		case 'E':
-			gf_term_set_option(term, GF_OPT_RELOAD_CONFIG, 1); 
-			break;
-
-		case 'B':
-			switch_bench();
-			break;
-
-		/*extract to PNG*/
-		case 'Z':
-		{
-			GF_VideoSurface fb;
-			GF_Err e;
-			e = gf_term_get_screen_buffer(term, &fb);
-			if (e) {
-				fprintf(stdout, "Error dumping screen buffer %s\n", gf_error_to_string(e) );
-			} else {
-				u32 dst_size = fb.width*fb.height*3;
-				char *dst=malloc(sizeof(char)*dst_size);
-
-				e = gf_img_png_enc(fb.video_buffer, fb.width, fb.height, fb.pitch_y, fb.pixel_format, dst, &dst_size);
-				if (e) {
-					fprintf(stdout, "Error encoding PNG %s\n", gf_error_to_string(e) );
-				} else {
-					FILE *png = gf_f64_open("dump.png", "wb");
-					if (!png) {
-						fprintf(stdout, "Error writing file dump.png\n");
-					} else {
-						gf_fwrite(dst, dst_size, 1, png);
-						fclose(png);
-						fprintf(stdout, "Writing file dump.png\n");
-					}
-				}
-				if (dst) free(dst);
-				gf_term_release_screen_buffer(term, &fb);
-			}
+		if (!use_rtix || display_rti) UpdateRTInfo(NULL);
+		if (not_threaded) {
+			//printf("gf_term_process_step from run loop\n");
+			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);
 		}
-			break;
-
-		case 'h':
-			PrintHelp();
-			break;
-		default:
-			break;
+		/*sim time*/
+		if (simulation_time && (gf_term_get_time_in_ms(term)>simulation_time)) {
+			Run = 0;
 		}
+		continue;
 	}
 
+
 	gf_term_disconnect(term);
 	if (rti_file) UpdateRTInfo("Disconnected\n");
 
@@ -1631,497 +1059,3 @@
 	fprintf(stdout, "Bye\n");
 	return 0;
 }
-
-void PrintWorldInfo(GF_Terminal *term)
-{
-	u32 i;
-	const char *title;
-	GF_List *descs;
-	descs = gf_list_new();
-	title = gf_term_get_world_info(term, NULL, descs);
-	if (!title && !gf_list_count(descs)) {
-		fprintf(stdout, "No World Info available\n");
-	} else {
-		fprintf(stdout, "\t%s\n", title ? title : "No title available");
-		for (i=0; i<gf_list_count(descs); i++) {
-			char *str = gf_list_get(descs, i);
-			fprintf(stdout, "%s\n", str);
-		}
-	}
-	gf_list_del(descs);
-}
-
-void PrintODList(GF_Terminal *term, GF_ObjectManager *root_odm, u32 num, u32 indent, char *root_name)
-{
-	GF_MediaInfo odi;
-	u32 i, count;
-	char szIndent[50];
-	GF_ObjectManager *odm;
-
-	if (!root_odm) {
-		fprintf(stdout, "Currently loaded objects:\n");
-		root_odm = gf_term_get_root_object(term);
-	}
-	if (!root_odm) return;
-	if (gf_term_get_object_info(term, root_odm, &odi) != GF_OK) return;
-	if (!odi.od) {
-		fprintf(stdout, "Service not attached\n");
-		return;
-	}
-
-	for (i=0;i<indent;i++) szIndent[i]=' ';
-	szIndent[indent]=0;
-	
-	fprintf(stdout, "%s", szIndent);
-	fprintf(stdout, "#%d %s - ", num, root_name);
-	if (odi.media_url) {
-		fprintf(stdout, "%s\n", odi.media_url);
-	} else {
-		fprintf(stdout, "OD ID %d\n", odi.od->objectDescriptorID);
-	}
-
-	szIndent[indent]=' ';
-	szIndent[indent+1]=0;
-	indent++;
-
-	count = gf_term_get_object_count(term, root_odm);
-	for (i=0; i<count; i++) {
-		odm = gf_term_get_object(term, root_odm, i);
-		if (!odm) break;
-		num++;
-		if (gf_term_get_object_info(term, odm, &odi) == GF_OK) {
-			switch (gf_term_object_subscene_type(term, odm)) {
-			case 1:
-				PrintODList(term, odm, num, indent, "Root");
-				break;
-			case 2:
-				PrintODList(term, odm, num, indent, "Inline Scene");
-				break;
-			case 3:
-				PrintODList(term, odm, num, indent, "EXTERNPROTO Library");
-				break;
-			default:
-				fprintf(stdout, "%s", szIndent);
-				fprintf(stdout, "#%d - ", num);
-				if (odi.media_url) {
-					fprintf(stdout, "%s", odi.media_url);
-				} else {
-					fprintf(stdout, "ID %d", odi.od->objectDescriptorID);
-				}
-				fprintf(stdout, " - %s\n", (odi.od_type==GF_STREAM_VISUAL) ? "Video" : (odi.od_type==GF_STREAM_AUDIO) ? "Audio" : "Systems");
-				break;
-			}
-		}
-	}
-}
-
-void ViewOD(GF_Terminal *term, u32 OD_ID, u32 number)
-{
-	GF_MediaInfo odi;
-	u32 i, j, count, d_enum,id;
-	GF_Err e;
-	char code[5];
-	NetStatCommand com;
-	GF_ObjectManager *odm, *root_odm = gf_term_get_root_object(term);
-	if (!root_odm) return;
-
-	odm = NULL;
-	if ((!OD_ID && (number == (u32)(-1))) ||
-		((OD_ID == (u32)(-1)) && !number)) {
-		odm = root_odm;
-		if ((gf_term_get_object_info(term, odm, &odi) != GF_OK)) odm=NULL;
-	} else {
-		count = gf_term_get_object_count(term, root_odm);
-		for (i=0; i<count; i++) {
-			odm = gf_term_get_object(term, root_odm, i);
-			if (!odm) break;
-			if (gf_term_get_object_info(term, odm, &odi) == GF_OK) {
-				if ((number == (u32)(-1)) && (odi.od->objectDescriptorID == OD_ID)) break;
-				else if (i == (u32)(number-1)) break;
-			}
-			odm = NULL;
-		}
-	}
-	if (!odm) {
-		if (number == (u32)-1) fprintf(stdout, "cannot find OD with ID %d\n", OD_ID);
-		else fprintf(stdout, "cannot find OD with number %d\n", number);
-		return;
-	}
-	if (!odi.od) {
-		if (number == (u32)-1) fprintf(stdout, "Object %d not attached yet\n", OD_ID);
-		else fprintf(stdout, "Object #%d not attached yet\n", number);		
-		return;
-	}
-
-	if (!odi.od) {
-		fprintf(stdout, "Service not attached\n");
-		return;
-	}
-
-	if (odi.od->tag==GF_ODF_IOD_TAG) {
-		fprintf(stdout, "InitialObjectDescriptor %d\n", odi.od->objectDescriptorID);
-		fprintf(stdout, "Profiles and Levels: Scene %x - Graphics %x - Visual %x - Audio %x - OD %x\n", 
-			odi.scene_pl, odi.graphics_pl, odi.visual_pl, odi.audio_pl, odi.OD_pl);
-		fprintf(stdout, "Inline Profile Flag %d\n", odi.inline_pl);
-	} else {
-		fprintf(stdout, "ObjectDescriptor %d\n", odi.od->objectDescriptorID);
-	}
-
-	fprintf(stdout, "Object Duration: ");
-	if (odi.duration) {
-	  PrintTime((u32) (odi.duration*1000));
-	} else {
-	  fprintf(stdout, "unknown");
-	}
-	fprintf(stdout, "\n");
-
-	if (odi.owns_service) {
-		fprintf(stdout, "Service Handler: %s\n", odi.service_handler);
-		fprintf(stdout, "Service URL: %s\n", odi.service_url);
-	}		
-	if (odi.codec_name) {
-		Float avg_dec_time;
-		switch (odi.od_type) {
-		case GF_STREAM_VISUAL:
-			fprintf(stdout, "Video Object: Width %d - Height %d\r\n", odi.width, odi.height);
-			fprintf(stdout, "Media Codec: %s\n", odi.codec_name);
-			if (odi.par) fprintf(stdout, "Pixel Aspect Ratio: %d:%d\n", (odi.par>>16)&0xFF, (odi.par)&0xFF);
-			break;
-		case GF_STREAM_AUDIO:
-			fprintf(stdout, "Audio Object: Sample Rate %d - %d channels\r\n", odi.sample_rate, odi.num_channels);
-			fprintf(stdout, "Media Codec: %s\n", odi.codec_name);
-			break;
-		case GF_STREAM_SCENE:
-		case GF_STREAM_PRIVATE_SCENE:
-			if (odi.width && odi.height) {
-				fprintf(stdout, "Scene Description - Width %d - Height %d\n", odi.width, odi.height);
-			} else {
-				fprintf(stdout, "Scene Description - no size specified\n");
-			}
-			fprintf(stdout, "Scene Codec: %s\n", odi.codec_name);
-			break;
-		case GF_STREAM_TEXT:
-			if (odi.width && odi.height) {
-				fprintf(stdout, "Text Object: Width %d - Height %d\n", odi.width, odi.height);
-			} else {
-				fprintf(stdout, "Text Object: No size specified\n");
-			}
-			fprintf(stdout, "Text Codec %s\n", odi.codec_name);
-			break;
-		}
-	
-		avg_dec_time = 0;
-		if (odi.nb_dec_frames) { 
-			avg_dec_time = (Float) odi.total_dec_time; 
-			avg_dec_time /= odi.nb_dec_frames; 
-		}
-		fprintf(stdout, "\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", 
-			(u32) odi.avg_bitrate/1024, odi.max_bitrate/1024, avg_dec_time, odi.max_dec_time, odi.nb_dec_frames);
-	}
-	if (odi.protection) fprintf(stdout, "Encrypted Media%s\n", (odi.protection==2) ? " NOT UNLOCKED" : "");
-
-	count = gf_list_count(odi.od->ESDescriptors);
-	fprintf(stdout, "%d streams in OD\n", count);
-	for (i=0; i<count; i++) {
-		GF_ESD *esd = (GF_ESD *) gf_list_get(odi.od->ESDescriptors, i);
-
-		fprintf(stdout, "\nStream ID %d - Clock ID %d\n", esd->ESID, esd->OCRESID);
-		if (esd->dependsOnESID) fprintf(stdout, "\tDepends on Stream ID %d for decoding\n", esd->dependsOnESID);
-
-		switch (esd->decoderConfig->streamType) {
-		case GF_STREAM_OD: fprintf(stdout, "\tOD Stream - version %d\n", esd->decoderConfig->objectTypeIndication); break;
-		case GF_STREAM_OCR: fprintf(stdout, "\tOCR Stream\n"); break;
-		case GF_STREAM_SCENE: fprintf(stdout, "\tScene Description Stream - version %d\n", esd->decoderConfig->objectTypeIndication); break;
-		case GF_STREAM_VISUAL:
-			fprintf(stdout, "\tVisual Stream - media type: ");
-			switch (esd->decoderConfig->objectTypeIndication) {
-			case GPAC_OTI_VIDEO_MPEG4_PART2: fprintf(stdout, "MPEG-4\n"); break;
-			case GPAC_OTI_VIDEO_MPEG2_SIMPLE: fprintf(stdout, "MPEG-2 Simple Profile\n"); break;
-			case GPAC_OTI_VIDEO_MPEG2_MAIN: fprintf(stdout, "MPEG-2 Main Profile\n"); break;
-			case GPAC_OTI_VIDEO_MPEG2_SNR: fprintf(stdout, "MPEG-2 SNR Profile\n"); break;
-			case GPAC_OTI_VIDEO_MPEG2_SPATIAL: fprintf(stdout, "MPEG-2 Spatial Profile\n"); break;
-			case GPAC_OTI_VIDEO_MPEG2_HIGH: fprintf(stdout, "MPEG-2 High Profile\n"); break;
-			case GPAC_OTI_VIDEO_MPEG2_422: fprintf(stdout, "MPEG-2 422 Profile\n"); break;
-			case GPAC_OTI_VIDEO_MPEG1: fprintf(stdout, "MPEG-1\n"); break;
-			case GPAC_OTI_IMAGE_JPEG: fprintf(stdout, "JPEG\n"); break;
-			case GPAC_OTI_IMAGE_PNG: fprintf(stdout, "PNG\n"); break;
-			case GPAC_OTI_IMAGE_JPEG_2000: fprintf(stdout, "JPEG2000\n"); break;
-				
-			case GPAC_OTI_MEDIA_GENERIC:
-				memcpy(code, esd->decoderConfig->decoderSpecificInfo->data, 4);
-				code[4] = 0;
-				fprintf(stdout, "GPAC Intern (%s)\n", code);
-				break;
-			default:
-				fprintf(stdout, "Private Type (0x%x)\n", esd->decoderConfig->objectTypeIndication);
-				break;
-			}
-			break;
-
-		case GF_STREAM_AUDIO:
-			fprintf(stdout, "\tAudio Stream - media type: ");
-			switch (esd->decoderConfig->objectTypeIndication) {
-			case GPAC_OTI_AUDIO_AAC_MPEG4: fprintf(stdout, "MPEG-4\n"); break;
-			case GPAC_OTI_AUDIO_AAC_MPEG2_MP: fprintf(stdout, "MPEG-2 AAC Main Profile\n"); break;
-			case GPAC_OTI_AUDIO_AAC_MPEG2_LCP: fprintf(stdout, "MPEG-2 AAC LowComplexity Profile\n"); break;
-			case GPAC_OTI_AUDIO_AAC_MPEG2_SSRP: fprintf(stdout, "MPEG-2 AAC Scalable Sampling Rate Profile\n"); break;
-			case GPAC_OTI_AUDIO_MPEG2_PART3: fprintf(stdout, "MPEG-2 Audio\n"); break;
-			case GPAC_OTI_AUDIO_MPEG1: fprintf(stdout, "MPEG-1 Audio\n"); break;
-			case GPAC_OTI_AUDIO_EVRC_VOICE: fprintf(stdout, "EVRC Audio\n"); break;
-			case GPAC_OTI_AUDIO_SMV_VOICE: fprintf(stdout, "SMV Audio\n"); break;
-			case GPAC_OTI_AUDIO_13K_VOICE: fprintf(stdout, "QCELP Audio\n"); break;
-			case GPAC_OTI_MEDIA_GENERIC:
-				memcpy(code, esd->decoderConfig->decoderSpecificInfo->data, 4);
-				code[4] = 0;
-				fprintf(stdout, "GPAC Intern (%s)\n", code);
-				break;
-			default:
-				fprintf(stdout, "Private Type (0x%x)\n", esd->decoderConfig->objectTypeIndication);
-				break;
-			}
-			break;
-		case GF_STREAM_MPEG7: fprintf(stdout, "\tMPEG-7 Stream - version %d\n", esd->decoderConfig->objectTypeIndication); break;
-		case GF_STREAM_IPMP: fprintf(stdout, "\tIPMP Stream - version %d\n", esd->decoderConfig->objectTypeIndication); break;
-		case GF_STREAM_OCI: fprintf(stdout, "\tOCI Stream - version %d\n", esd->decoderConfig->objectTypeIndication); break;
-		case GF_STREAM_MPEGJ: fprintf(stdout, "\tMPEGJ Stream - version %d\n", esd->decoderConfig->objectTypeIndication); break;
-		case GF_STREAM_INTERACT: fprintf(stdout, "\tUser Interaction Stream - version %d\n", esd->decoderConfig->objectTypeIndication); break;
-		case GF_STREAM_TEXT: fprintf(stdout, "\tStreaming Text Stream - version %d\n", esd->decoderConfig->objectTypeIndication); break;
-		default: fprintf(stdout, "Unknown Stream\r\n"); break;
-		}
-
-		fprintf(stdout, "\tBuffer Size %d\n\tAverage Bitrate %d bps\n\tMaximum Bitrate %d bps\n", esd->decoderConfig->bufferSizeDB, esd->decoderConfig->avgBitrate, esd->decoderConfig->maxBitrate);
-		if (esd->slConfig->predefined==SLPredef_SkipSL) {
-			fprintf(stdout, "\tNot using MPEG-4 Synchronization Layer\n");
-		} else {
-			fprintf(stdout, "\tStream Clock Resolution %d\n", esd->slConfig->timestampResolution);
-		}
-		if (esd->URLString) fprintf(stdout, "\tStream Location: %s\n", esd->URLString);
-
-		/*check language*/
-		if (esd->langDesc) {
-			u32 i=0;
-			char lan[4], *szLang;
-			lan[0] = esd->langDesc->langCode>>16;
-			lan[1] = (esd->langDesc->langCode>>8)&0xFF;
-			lan[2] = (esd->langDesc->langCode)&0xFF;
-			lan[3] = 0;
-
-			if ((lan[0]=='u') && (lan[1]=='n') && (lan[2]=='d')) szLang = "Undetermined";
-			else {
-				szLang = lan;
-				while (GF_ISO639_Lang[i]) {
-					if (GF_ISO639_Lang[i+2][0] && strstr(GF_ISO639_Lang[i+1], lan)) {
-						szLang = (char*) GF_ISO639_Lang[i];
-						break;
-					}
-					i+=3;
-				}
-			}
-			fprintf(stdout, "\tStream Language: %s\n", szLang);
-		}
-	}
-	fprintf(stdout, "\n");
-	/*check OCI (not everything interests us) - FIXME: support for unicode*/
-	count = gf_list_count(odi.od->OCIDescriptors);
-	if (count) {
-		fprintf(stdout, "%d Object Content Information descriptors in OD\n", count);
-		for (i=0; i<count; i++) {
-			GF_Descriptor *desc = (GF_Descriptor *) gf_list_get(odi.od->OCIDescriptors, i);
-			switch (desc->tag) {
-			case GF_ODF_SEGMENT_TAG:
-			{
-				GF_Segment *sd = (GF_Segment *) desc;
-				fprintf(stdout, "Segment Descriptor: Name: %s - start time %g sec - duration %g sec\n", sd->SegmentName, sd->startTime, sd->Duration);
-			}
-				break;
-			case GF_ODF_CC_NAME_TAG:
-			{
-				GF_CC_Name *ccn = (GF_CC_Name *)desc;
-				fprintf(stdout, "Content Creators:\n");
-				for (j=0; j<gf_list_count(ccn->ContentCreators); j++) {
-					GF_ContentCreatorInfo *ci = (GF_ContentCreatorInfo *) gf_list_get(ccn->ContentCreators, j);
-					if (!ci->isUTF8) continue;
-					fprintf(stdout, "\t%s\n", ci->contentCreatorName);
-				}
-			}
-				break;
-
-			case GF_ODF_SHORT_TEXT_TAG:
-				{
-					GF_ShortTextual *std = (GF_ShortTextual *)desc;
-					fprintf(stdout, "Description:\n\tEvent: %s\n\t%s\n", std->eventName, std->eventText);
-				}
-				break;
-			default:
-				break;
-			}
-		}
-		fprintf(stdout, "\n");
-	}
-
-	switch (odi.status) {
-	case 0: fprintf(stdout, "Stopped - "); break;
-	case 1: fprintf(stdout, "Playing - "); break;
-	case 2: fprintf(stdout, "Paused - "); break;
-	case 3: fprintf(stdout, "Not setup yet\n"); return;
-	default: fprintf(stdout, "Setup Failed\n"); return;
-	}
-	if (odi.buffer>=0) fprintf(stdout, "Buffer: %d ms - ", odi.buffer);
-	else fprintf(stdout, "Not buffering - ");
-	fprintf(stdout, "Clock drift: %d ms\n", odi.clock_drift);
-	if (odi.db_unit_count) fprintf(stdout, "%d AU in DB\n", odi.db_unit_count);
-	if (odi.cb_max_count) fprintf(stdout, "Composition Buffer: %d CU (%d max)\n", odi.cb_unit_count, odi.cb_max_count);
-	fprintf(stdout, "\n");
-
-	if (odi.owns_service) {
-		const char *url;
-		u32 done, total, bps;
-		d_enum = 0;
-		while (gf_term_get_download_info(term, odm, &d_enum, &url, NULL, &done, &total, &bps)) {
-			if (d_enum==1) fprintf(stdout, "Current Downloads in service:\n");
-			if (done && total) {
-				fprintf(stdout, "%s: %d / %d bytes (%.2f %%) - %.2f kBps\n", url, done, total, (100.0f*done)/total, ((Float)bps)/1024.0f);
-			} else {
-				fprintf(stdout, "%s: %.2f kbps\n", url, ((Float)8*bps)/1024.0f);
-			}
-		}
-		if (!d_enum) fprintf(stdout, "No Downloads in service\n");
-		fprintf(stdout, "\n");
-	}
-	d_enum = 0;
-	while (gf_term_get_channel_net_info(term, odm, &d_enum, &id, &com, &e)) {
-		if (e) continue;
-		if (!com.bw_down && !com.bw_up) continue;
-
-		fprintf(stdout, "Stream ID %d statistics:\n", id);
-		if (com.multiplex_port) {
-			fprintf(stdout, "\tMultiplex Port %d - multiplex ID %d\n", com.multiplex_port, com.port);
-		} else {
-			fprintf(stdout, "\tPort %d\n", com.port);
-		}
-		fprintf(stdout, "\tPacket Loss Percentage: %.4f\n", com.pck_loss_percentage);
-		fprintf(stdout, "\tDown Bandwidth: %d bps\n", com.bw_down);
-		if (com.bw_up) fprintf(stdout, "\tUp Bandwidth: %d bps\n", com.bw_up);
-		if (com.ctrl_port) {
-			if (com.multiplex_port) {
-				fprintf(stdout, "\tControl Multiplex Port: %d - Control Multiplex ID %d\n", com.multiplex_port, com.ctrl_port);
-			} else {
-				fprintf(stdout, "\tControl Port: %d\n", com.ctrl_port);
-			}
-			fprintf(stdout, "\tDown Bandwidth: %d bps\n", com.ctrl_bw_down);
-			fprintf(stdout, "\tUp Bandwidth: %d bps\n", com.ctrl_bw_up);
-		}
-		fprintf(stdout, "\n");
-	}
-}
-
-void PrintODTiming(GF_Terminal *term, GF_ObjectManager *odm)
-{
-	GF_MediaInfo odi;
-	if (!odm) return;
-
-	if (gf_term_get_object_info(term, odm, &odi) != GF_OK) return;
-	if (!odi.od) {
-		fprintf(stdout, "Service not attached\n");
-		return;
-	}
-
-	fprintf(stdout, "OD %d: ", odi.od->objectDescriptorID);
-	switch (odi.status) {
-	case 1: fprintf(stdout, "Playing - "); break;
-	case 2: fprintf(stdout, "Paused - "); break;
-	default: fprintf(stdout, "Stopped - "); break;
-	}
-	if (odi.buffer>=0) fprintf(stdout, "Buffer: %d ms - ", odi.buffer);
-	else fprintf(stdout, "Not buffering - ");
-	fprintf(stdout, "Clock drift: %d ms", odi.clock_drift);
-	fprintf(stdout, " - time: ");
-	PrintTime((u32) (odi.current_time*1000));
-	fprintf(stdout, "\n");
-}
-
-void PrintODBuffer(GF_Terminal *term, GF_ObjectManager *odm)
-{
-	Float avg_dec_time;
-	GF_MediaInfo odi;
-	if (!odm) return;
-
-	if (gf_term_get_object_info(term, odm, &odi) != GF_OK) return;
-	if (!odi.od) {
-		fprintf(stdout, "Service not attached\n");
-		return;
-	}
-
-	fprintf(stdout, "OD %d: ", odi.od->objectDescriptorID);
-	switch (odi.status) {
-	case 1: fprintf(stdout, "Playing"); break;
-	case 2: fprintf(stdout, "Paused"); break;
-	default: fprintf(stdout, "Stopped"); break;
-	}
-	if (odi.buffer>=0) fprintf(stdout, " - Buffer: %d ms", odi.buffer);
-	if (odi.db_unit_count) fprintf(stdout, " - DB: %d AU", odi.db_unit_count);
-	if (odi.cb_max_count) fprintf(stdout, " - CB: %d/%d CUs", odi.cb_unit_count, odi.cb_max_count);
-	
-	fprintf(stdout, "\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(stdout, " * Avg Bitrate %d kbps (%d max) - Avg Decoding Time %.2f ms (%d max)\n",
-								(u32) odi.avg_bitrate/1024, odi.max_bitrate/1024, avg_dec_time, odi.max_dec_time);
-}
-
-void ViewODs(GF_Terminal *term, Bool show_timing)
-{
-	u32 i, count;
-	GF_ObjectManager *odm, *root_odm = gf_term_get_root_object(term);
-	if (!root_odm) return;
-
-	if (show_timing) {
-		PrintODTiming(term, root_odm);
-	} else {
-		PrintODBuffer(term, root_odm);
-	}
-	count = gf_term_get_object_count(term, root_odm);
-	for (i=0; i<count; i++) {
-		odm = gf_term_get_object(term, root_odm, i);
-		if (show_timing) {
-			PrintODTiming(term, odm);
-		} else {
-			PrintODBuffer(term, odm);
-		}
-	}
-	fprintf(stdout, "\n");
-}
-
-
-void PrintGPACConfig()
-{
-	u32 i, j, cfg_count, key_count;
-	char szName[200];
-	char *secName = NULL;
-
-	fprintf(stdout, "Enter section name (\"*\" for complete dump):\n");
-	scanf("%s", szName);
-	if (strcmp(szName, "*")) secName = szName;
-
-	fprintf(stdout, "\n\n*** GPAC Configuration ***\n\n");
-
-	cfg_count = gf_cfg_get_section_count(cfg_file);
-	for (i=0; i<cfg_count; i++) {
-		const char *sec = gf_cfg_get_section_name(cfg_file, i);
-		if (secName) {
-			if (stricmp(sec, secName)) continue;
-		} else {
-			if (!stricmp(sec, "General")) continue;
-			if (!stricmp(sec, "MimeTypes")) continue;
-			if (!stricmp(sec, "RecentFiles")) continue;
-		}
-		fprintf(stdout, "[%s]\n", sec);
-		key_count = gf_cfg_get_key_count(cfg_file, sec);
-		for (j=0; j<key_count; j++) {
-			const char *key = gf_cfg_get_key_name(cfg_file, sec, j);
-			const char *val = gf_cfg_get_key(cfg_file, sec, key);
-			fprintf(stdout, "%s=%s\n", key, val);
-		}
-		fprintf(stdout, "\n");
-	}
-}

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_ios/osmo4ios-Info.plist -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_ios/osmo4ios-Info.plist Changed

@@ -6,8 +6,28 @@
 	<string>English</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFiles</key>
+	<array>
+		<string>icon.png</string>
+		<string>icon_retina.png</string>
+		<string>icon_ipad.png</string>
+		<string>icon_ipad_retina.png</string>
+	</array>
+	<key>CFBundleIcons</key>
+	<dict>
+		<key>CFBundlePrimaryIcon</key>
+		<dict>
+			<key>CFBundleIconFiles</key>
+			<array>
+				<string>icon.png</string>
+				<string>icon_retina.png</string>
+				<string>icon_ipad.png</string>
+				<string>icon_ipad_retina.png</string>
+			</array>
+		</dict>
+	</dict>
 	<key>CFBundleIdentifier</key>
-	<string>com.gpac.${PRODUCT_NAME:identifier}</string>
+	<string>${PRODUCT_NAME:identifier}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -15,10 +35,10 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.9.9</string>
+	<string>0.5.0</string>
 	<key>CFBundleSignature</key>
 	<string>gpac</string>
 	<key>CFBundleVersion</key>
-	<string>9999</string> 
+	<string>0000</string>
 </dict>
 </plist>

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_w32/FileProps.cpp -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_w32/FileProps.cpp Changed

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_w32/FileProps.h -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_w32/FileProps.h Changed

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

@@ -160,19 +160,20 @@
 {
 	m_icoerror = AfxGetApp()->LoadIcon(IDI_ERR);
 	m_icomessage = AfxGetApp()->LoadIcon(IDI_MESSAGE);
-	m_bFullScreen = m_bRestoreFS = 0;	
+	m_bFullScreen = GF_FALSE;	
+	m_RestoreFS = 0;
 	m_aspect_ratio = GF_ASPECT_RATIO_KEEP;
 	m_pProps = NULL;
 	m_pOpt = NULL;
 	m_pPlayList = NULL;
 	m_pWndView = new CChildView();
-	m_bInitShow = TRUE;
-	m_bStartupFile = TRUE;
+	m_bInitShow = GF_TRUE;
+	m_bStartupFile = GF_TRUE;
 	m_num_chapters = 0;
 	m_chapters_start = NULL;
 	m_last_prog = -1;
 	m_timer_on = 0;
-	m_show_rti = 0;
+	m_show_rti = GF_FALSE;
 	nb_viewpoints = 0;
 }
 
@@ -185,13 +186,10 @@
 	delete m_pWndView;
 }
 
-
-
-
 #define RTI_TIMER	22
-#define RTI_REFRESH_MS		500
+#define RTI_REFRESH_MS		250
 
-void CALLBACK EXPORT RTInfoTimer(HWND , UINT , UINT nID , DWORD )
+void CALLBACK EXPORT RTInfoTimer(HWND , UINT , UINT_PTR nID , DWORD )
 {
 	char szMsg[100];
 	GF_SystemRTInfo rti;
@@ -207,18 +205,20 @@
 
 		if (pFrame->m_show_rti && !pFrame->m_timer_on) {
 			sprintf(szMsg, "FPS %02.2f - CPU %02d (%02d) - Mem %d kB", 
-						gf_term_get_framerate(app->m_term, 0), rti.total_cpu_usage, rti.process_cpu_usage, rti.gpac_memory/1024);
+						gf_term_get_framerate(app->m_term, GF_FALSE), rti.total_cpu_usage, rti.process_cpu_usage, rti.gpac_memory/1024);
 			pFrame->m_wndStatusBar.SetPaneText(1, szMsg);
 		}
 	}
 
-	u32 ms = gf_term_get_time_in_ms(app->m_term);
-	u32 h = ms / 1000 / 3600;
-	u32 m = ms / 1000 / 60 - h*60;
-	u32 s = ms / 1000 - h*3600 - m*60;
-	
-	sprintf(szMsg, "%02d:%02d.%02d", h, m, s);
-	pFrame->m_wndStatusBar.SetPaneText(0, szMsg);
+	if (! gf_term_get_option(app->m_term, GF_OPT_IS_FINISHED)) {
+		u32 ms = gf_term_get_time_in_ms(app->m_term);
+		u32 h = ms / 1000 / 3600;
+		u32 m = ms / 1000 / 60 - h*60;
+		u32 s = ms / 1000 - h*3600 - m*60;
+		
+		sprintf(szMsg, "%02d:%02d.%02d", h, m, s);
+		pFrame->m_wndStatusBar.SetPaneText(0, szMsg);
+	}
 }
 
 static UINT status_indics[] =
@@ -359,11 +359,11 @@
 void CMainFrame::OnSetFocus(CWnd* pOldWnd)
 {
 	m_pWndView->SetFocus();
-	if (m_bRestoreFS==1) {
-		m_bRestoreFS=2;
+	if (m_RestoreFS==1) {
+		m_RestoreFS=2;
 	}
-	else if (m_bRestoreFS==2) {
-		m_bRestoreFS = 0;
+	else if (m_RestoreFS==2) {
+		m_RestoreFS = 0;
 		SetFullscreen();
 	}
 }
@@ -415,11 +415,11 @@
 }
 
 
-LONG CMainFrame::OnSetSize(WPARAM wParam, LPARAM lParam)
+LRESULT CMainFrame::OnSetSize(WPARAM wParam, LPARAM lParam)
 {
 	UINT width, height;
-	width = wParam;
-	height = lParam;
+	width = (UINT) wParam;
+	height = (UINT) lParam;
 	if (m_bInitShow) {
 		m_wndToolBar.UpdateWindow();
 		m_wndToolBar.ShowWindow(SW_SHOW);
@@ -430,7 +430,7 @@
 		m_Sliders.m_PosSlider.EnableWindow(FALSE);
 		m_pWndView->ShowWindow(SW_SHOW);
 		ShowWindow(SW_SHOW);
-		m_bInitShow = FALSE;
+		m_bInitShow = GF_FALSE;
 	}
 
 	RECT winRect;
@@ -487,7 +487,7 @@
 #define PROGRESS_TIMER	20
 #define PROGRESS_REFRESH_MS		100
 
-void CALLBACK EXPORT ProgressTimer(HWND , UINT , UINT nID , DWORD )
+void CALLBACK EXPORT ProgressTimer(HWND , UINT , UINT_PTR nID , DWORD )
 {
 	u32 now;
 	if (nID != PROGRESS_TIMER) return;
@@ -521,21 +521,21 @@
 }
 
 
-LONG CMainFrame::Open(WPARAM wParam, LPARAM lParam)
+LRESULT CMainFrame::Open(WPARAM wParam, LPARAM lParam)
 {
 	Bool do_pause;
 	Osmo4 *app = GetApp();
 	CString txt, url;
-	m_bStartupFile = FALSE;
+	m_bStartupFile = GF_FALSE;
 	txt = "Osmo4 - ";
 	txt += m_pPlayList->GetDisplayName();
 
 	url = m_pPlayList->GetURL();
 	m_Address.m_Address.SetWindowText(url);
 	SetWindowText(txt);
-	if (app->start_mode==1) do_pause = 1;
-	else if (app->start_mode==2) do_pause = 0;
-	else do_pause = /*!app->m_AutoPlay*/0;
+	if (app->start_mode==1) do_pause = GF_TRUE;
+	else if (app->start_mode==2) do_pause = GF_FALSE;
+	else do_pause = /*!app->m_AutoPlay*/GF_FALSE;
 	gf_term_connect_from_time(app->m_term, (LPCSTR) url, app->m_reconnect_time, do_pause);
 	app->m_reconnect_time = 0;
 	app->start_mode = 0;
@@ -544,12 +544,12 @@
 	return 1;	
 }
 
-LONG CMainFrame::NewInstanceOpened(WPARAM wParam, LPARAM lParam)
+LRESULT CMainFrame::NewInstanceOpened(WPARAM wParam, LPARAM lParam)
 {
-	Bool queue_only = 0;
+	Bool queue_only = GF_FALSE;
 	char *url = (char *) static_gpac_get_url();
 	if (!strnicmp(url, "-queue ", 7)) {
-		queue_only = 1;
+		queue_only = GF_TRUE;
 		url += 7;
 	}
 	m_pPlayList->QueueURL(url);
@@ -587,7 +587,7 @@
 		::DragQueryFile(hDropInfo, 0, fileName, MAX_PATH);
 		char *ext = strrchr(fileName, '.');
 		if (ext && ( !stricmp(ext, ".srt") || !stricmp(ext, ".sub") || !stricmp(ext, ".ttxt") || !stricmp(ext, ".xml") ) ) {
-			AddSubtitle(fileName, 1);
+			AddSubtitle(fileName, GF_TRUE);
 			return;
 		}
 	}
@@ -605,7 +605,7 @@
 	m_pPlayList->PlayNext();
 }
 
-void CALLBACK EXPORT ConsoleTimer(HWND , UINT , UINT , DWORD )
+void CALLBACK EXPORT ConsoleTimer(HWND , UINT , UINT_PTR , DWORD )
 {
 	CMainFrame *pFrame = (CMainFrame *) GetApp()->m_pMainWnd;
 	
@@ -617,7 +617,7 @@
 
 #define CONSOLE_DISPLAY_TIME	1000
 
-LONG CMainFrame::OnConsoleMessage(WPARAM wParam, LPARAM lParam)
+LRESULT CMainFrame::OnConsoleMessage(WPARAM wParam, LPARAM lParam)
 {
 	if (m_timer_on) KillTimer(m_timer_on);
 	
@@ -630,7 +630,7 @@
 		sprintf(msg, "%s (%s)", console_message, console_service);
 		m_wndStatusBar.SetPaneText(1, msg);
 	}
-	m_timer_on = SetTimer(10, wParam ? wParam : CONSOLE_DISPLAY_TIME, ConsoleTimer);
+	m_timer_on = SetTimer(10, wParam ? (UINT) wParam : CONSOLE_DISPLAY_TIME, ConsoleTimer);
 	return 0;
 }
 
@@ -655,13 +655,13 @@
 {
 	Osmo4 *gpac = GetApp();
 	if (!m_bFullScreen) {
-//		GetWindowRect(&backup_wnd_rc);
+		GetWindowRect(&backup_wnd_rc);
 		if (gf_term_set_option(gpac->m_term, GF_OPT_FULLSCREEN, 1) == GF_OK) 
-			m_bFullScreen = 1;
+			m_bFullScreen = GF_TRUE;
 	} else {
 		if (gf_term_set_option(gpac->m_term, GF_OPT_FULLSCREEN, 0) == GF_OK) 
-			m_bFullScreen = 0;
-//		SetWindowPos(NULL, backup_wnd_rc.left, backup_wnd_rc.top, backup_wnd_rc.right-backup_wnd_rc.left, backup_wnd_rc.bottom-backup_wnd_rc.top, SWP_NOZORDER);
+			m_bFullScreen = GF_FALSE;
+		SetWindowPos(NULL, backup_wnd_rc.left, backup_wnd_rc.top, backup_wnd_rc.right-backup_wnd_rc.left, backup_wnd_rc.bottom-backup_wnd_rc.top, SWP_NOZORDER);
 	}
 }
 
@@ -767,7 +767,7 @@
 }
 
 
-LONG CMainFrame::OnNavigate(WPARAM /*wParam*/, LPARAM /*lParam*/)
+LRESULT CMainFrame::OnNavigate(WPARAM /*wParam*/, LPARAM /*lParam*/)
 {
 	Osmo4 *gpac = GetApp();
 
@@ -777,7 +777,7 @@
 		return 0;
 	}
 
-	if (gf_term_is_supported_url(gpac->m_term, gpac->m_navigate_url, 1, gpac->m_NoMimeFetch)) {
+	if (gf_term_is_supported_url(gpac->m_term, gpac->m_navigate_url, GF_TRUE, gpac->m_NoMimeFetch)) {
 		char *str = gf_url_concatenate(m_pPlayList->GetURL(), gpac->m_navigate_url);
 		if (str) {
 			m_pPlayList->Truncate();
@@ -791,7 +791,7 @@
 	
 	if (m_bFullScreen) {
 		SetFullscreen();
-		m_bRestoreFS = 1;
+		m_RestoreFS = 1;
 	}
 
 	console_message = gpac->m_navigate_url;
@@ -830,17 +830,17 @@
 	MessageBox(
 		"Open File: Ctrl + O\n"
 		"Open URL: Ctrl + U\n"
-		"Reload File: Ctrl + R\n"
+		"Reload File: F5\n"
 		"Pause/Resume File: Ctrl + P\n"
 		"Step by Step: Ctrl + S\n"
 		"Seek +5%: Alt + left arrow\n"
 		"Seek -5%: Alt + right arrow\n"
-		"Seek +1min: Alt + up arrow\n"
-		"Seek -1min: Alt + down arrow\n"
-		"Fullscreen On/Off: Alt+Return or Escape\n"
+		"Switch quality up: Ctrl + H\n"
+		"Switch quality down: Ctrl + L\n"
+		"Fullscreen On/Off: Double-click or Escape\n"
 		"\n"
 		"Show Properties: Ctrl + I\n"
-		"Show Playlist: Ctrl + V\n"
+		"Show Playlist: F3\n"
 		"Next Playlist Item: Ctrl + right arrow\n"
 		"Previous Playlist Item: Ctrl + left arrow\n"
 		"\n"
@@ -939,7 +939,7 @@
 	while (pMenu->GetMenuItemCount()) pMenu->DeleteMenu(0, MF_BYPOSITION);
 
 	if (reset_only) {
-		m_bFirstStreamQuery = 1;
+		m_bFirstStreamQuery = GF_TRUE;
 		return;
 	}
 	if (!app->m_isopen || !gf_term_get_option(app->m_term, GF_OPT_CAN_SELECT_STREAMS)) return;
@@ -998,7 +998,7 @@
 		}
 	}
 	if (m_bFirstStreamQuery) {
-		m_bFirstStreamQuery = 0;
+		m_bFirstStreamQuery = GF_FALSE;
 		if (!nb_subs && app->m_LookForSubtitles) LookForSubtitles();
 	}
 
@@ -1115,12 +1115,12 @@
 			u32 id = pPopupMenu->GetMenuItemID(i) - ID_SETCHAP_FIRST;
 			pPopupMenu->EnableMenuItem(i, MF_BYPOSITION);
 
-			Bool is_current = 0;
+			Bool is_current = GF_FALSE;
 			if (m_chapters_start[id]<=now) {
 				if (id+1<m_num_chapters) {
-					if (m_chapters_start[id+1]>now) is_current = 1;
+					if (m_chapters_start[id+1]>now) is_current = GF_TRUE;
 				} else {
-					is_current = 1;
+					is_current = GF_TRUE;
 				}
 			}
 			pPopupMenu->CheckMenuItem(i, MF_BYPOSITION | (is_current ? MF_CHECKED : MF_UNCHECKED));
@@ -1170,7 +1170,7 @@
 void CMainFrame::OnHeadlight() 
 {
 	Osmo4 *app = GetApp();
-	Bool val = !gf_term_get_option(app->m_term, GF_OPT_HEADLIGHT);
+	Bool val = gf_term_get_option(app->m_term, GF_OPT_HEADLIGHT) ? GF_FALSE : GF_TRUE;
 	gf_term_set_option(app->m_term, GF_OPT_HEADLIGHT, val);
 }
 
@@ -1189,7 +1189,7 @@
 void CMainFrame::OnGravity() 
 {
 	Osmo4 *app = GetApp();
-	Bool val = gf_term_get_option(app->m_term, GF_OPT_GRAVITY) ? 0 : 1;
+	Bool val = gf_term_get_option(app->m_term, GF_OPT_GRAVITY) ? GF_FALSE : GF_TRUE;
 	gf_term_set_option(app->m_term, GF_OPT_GRAVITY, val);
 }
 
@@ -1297,12 +1297,13 @@
 }
 void CMainFrame::OnPlaylistLoop() 
 {
-	GetApp()->m_Loop = !GetApp()->m_Loop;
+	GetApp()->m_Loop = GetApp()->m_Loop ? GF_FALSE : GF_TRUE;
+	gf_cfg_set_key(GetApp()->m_user.config, "General", "PlaylistLoop", GetApp()->m_Loop ? "yes" : "no");
 }
 
 void CMainFrame::OnUpdatePlaylistLoop(CCmdUI* pCmdUI) 
 {
-	pCmdUI->SetCheck(GetApp()->m_Loop ? 1 : 0);
+	pCmdUI->SetCheck(GetApp()->m_Loop ? GF_TRUE : GF_FALSE);
 }
 
 void CMainFrame::OnAddSubtitle() 
@@ -1310,7 +1311,7 @@
 	CFileDialog fd(TRUE,NULL,NULL, OFN_HIDEREADONLY | OFN_FILEMUSTEXIST, "All Subtitles|*.srt;*.sub;*.ttxt;*.xml|SRT Subtitles|*.srt|SUB Subtitles|*.sub|3GPP TimedText|*.ttxt|QuckTime TeXML|*.xml|");
 	if (fd.DoModal() != IDOK) return;
 
-	AddSubtitle(fd.GetPathName(), 1);
+	AddSubtitle(fd.GetPathName(), GF_TRUE);
 }
 
 void CMainFrame::AddSubtitle(const char *fileName, Bool auto_play)
@@ -1321,8 +1322,8 @@
 static Bool subs_enum_dir_item(void *cbck, char *item_name, char *item_path)
 {
 	CMainFrame *_this = (CMainFrame *)cbck;
-	_this->AddSubtitle(item_path, 0);
-	return 0;
+	_this->AddSubtitle(item_path, GF_FALSE);
+	return GF_FALSE;
 }
 
 void CMainFrame::LookForSubtitles()
@@ -1334,7 +1335,7 @@
 	if (!sep) ::GetCurrentDirectory(GF_MAX_PATH, dir);
 	else sep[0] = 0;
 
-	gf_enum_directory(dir, 0, subs_enum_dir_item, this, "ttxt;srt");
+	gf_enum_directory(dir, GF_FALSE, subs_enum_dir_item, this, "ttxt;srt");
 }
 
 void CMainFrame::OnCacheEnable()
@@ -1444,7 +1445,7 @@
 
 void CMainFrame::OnViewCPU()
 {
-	m_show_rti = !m_show_rti;
+	m_show_rti = m_show_rti ? GF_FALSE : GF_TRUE;
 }
 
 void CMainFrame::OnUpdateViewCPU(CCmdUI* pCmdUI) 
@@ -1456,8 +1457,8 @@
 
 void CMainFrame::OnFileCopy()
 {
-	u32 len;
-	const char *text = gf_term_get_text_selection(GetApp()->m_term, 0);
+	size_t len;
+	const char *text = gf_term_get_text_selection(GetApp()->m_term, GF_FALSE);
 	if (!text) return;
 
 	if (!IsClipboardFormatAvailable(CF_TEXT)) return;
@@ -1481,7 +1482,7 @@
 	Osmo4 *app = GetApp();
 	if (IsClipboardFormatAvailable(CF_TEXT)
 		&& app->m_term 
-		&& (gf_term_get_text_selection(app->m_term, 1)!=NULL)
+		&& (gf_term_get_text_selection(app->m_term, GF_TRUE)!=NULL)
 	) {
 		pCmdUI->Enable(TRUE);
 	} else {
@@ -1498,7 +1499,7 @@
 	HGLOBAL hglbCopy = GetClipboardData(CF_TEXT);
 	if (hglbCopy) {
 		LPTSTR lptstrCopy = (char *) GlobalLock(hglbCopy);
-		gf_term_paste_text(GetApp()->m_term, lptstrCopy, 0);
+		gf_term_paste_text(GetApp()->m_term, lptstrCopy, GF_FALSE);
 		GlobalUnlock(hglbCopy); 
 	}
 	CloseClipboard(); 
@@ -1509,7 +1510,7 @@
 	Osmo4 *app = GetApp();
 	if (IsClipboardFormatAvailable(CF_TEXT)
 		&& app->m_term 
-		&& (gf_term_paste_text(app->m_term, NULL, 1)==GF_OK)
+		&& (gf_term_paste_text(app->m_term, NULL, GF_TRUE)==GF_OK)
 	) {
 		pCmdUI->Enable(TRUE);
 	} else {

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_w32/MainFrm.h -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_w32/MainFrm.h Changed

@@ -94,8 +94,9 @@
 	COptions *m_pOpt;
 	Playlist *m_pPlayList;
 	CChildView *m_pWndView;
-	Bool m_bFullScreen, m_bRestoreFS;
-	u32 m_timer_on;
+	Bool m_bFullScreen;
+	u32 m_RestoreFS;
+	UINT_PTR m_timer_on;
 	CString console_message;
 	CString console_service;
 	GF_Err console_err;
@@ -137,10 +138,10 @@
 	afx_msg BOOL OnCommand(WPARAM wParam, LPARAM lParam);
 	afx_msg void OnSize(UINT nType, int cx, int cy);
 	afx_msg void OnMove(int x, int y);
-	afx_msg LONG OnSetSize(WPARAM wParam, LPARAM lParam);
-	afx_msg LONG OnNavigate(WPARAM wParam, LPARAM lParam);
-	afx_msg LONG Open(WPARAM wParam, LPARAM lParam);
-	afx_msg LONG NewInstanceOpened(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnSetSize(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnNavigate(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT Open(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT NewInstanceOpened(WPARAM wParam, LPARAM lParam);
 
 	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
 	afx_msg void OnLButtonDblClk(UINT nFlags, CPoint point);
@@ -151,7 +152,7 @@
 	afx_msg void OnKeyDown( UINT nChar, UINT nRepCnt, UINT nFlags );
 	afx_msg void OnKeyUp( UINT nChar, UINT nRepCnt, UINT nFlags );
 	afx_msg void OnDropFiles(HDROP hDropInfo);
-	afx_msg LONG OnConsoleMessage(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnConsoleMessage(WPARAM wParam, LPARAM lParam);
 	afx_msg void OnViewOriginal();
 	afx_msg void OnViewFullscreen();
 	afx_msg void OnArKeep();

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

@@ -234,15 +234,15 @@
 {
 	Osmo4 *gpac = GetApp();
 
-	gpac->m_Loop = m_Loop.GetCheck();
+	gpac->m_Loop = (Bool) m_Loop.GetCheck();
 	gf_cfg_set_key(gpac->m_user.config, "General", "Loop", gpac->m_Loop ? "yes" : "no");
-	gpac->m_LookForSubtitles = m_LookForSubs.GetCheck();
+	gpac->m_LookForSubtitles = (Bool) m_LookForSubs.GetCheck();
 	gf_cfg_set_key(gpac->m_user.config, "General", "LookForSubtitles",  gpac->m_LookForSubtitles ? "yes" : "no");
-	gpac->m_NoConsole = m_NoConsole.GetCheck();
+	gpac->m_NoConsole = (Bool) m_NoConsole.GetCheck();
 	gf_cfg_set_key(gpac->m_user.config, "General", "ConsoleOff", gpac->m_NoConsole ? "yes" : "no");
-	gpac->m_ViewXMTA = m_ViewXMT.GetCheck();
+	gpac->m_ViewXMTA = (Bool) m_ViewXMT.GetCheck();
 	gf_cfg_set_key(gpac->m_user.config, "General", "ViewXMT", gpac->m_ViewXMTA ? "yes" : "no");
-	gpac->m_SingleInstance = m_SingleInstance.GetCheck();
+	gpac->m_SingleInstance = (Bool) m_SingleInstance.GetCheck();
 	gf_cfg_set_key(gpac->m_user.config, "General", "SingleInstance", gpac->m_SingleInstance ? "yes" : "no");
 }
 
@@ -261,7 +261,7 @@
 	//{{AFX_DATA_MAP(COptSystems)
 	DDX_Control(pDX, IDC_FORCE_DURATION, m_ForceDuration);
 	DDX_Control(pDX, IDC_DEC_THREAD, m_Threading);
-	DDX_Control(pDX, IDC_BIFSDROP, m_BifsAlwaysDrawn);
+	DDX_Control(pDX, IDC_BIFSDROP, m_LateFramesAlwaysDrawn);
 	DDX_Control(pDX, IDC_LANG, m_Lang);
 	//}}AFX_DATA_MAP
 }
@@ -320,11 +320,11 @@
 	} else {
 		m_ForceDuration.SetCheck(0);
 	}
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "AlwaysDrawBIFS");
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "DrawLateFrames");
 	if (sOpt && !stricmp(sOpt, "yes")) {
-		m_BifsAlwaysDrawn.SetCheck(1);
+		m_LateFramesAlwaysDrawn.SetCheck(1);
 	} else {
-		m_BifsAlwaysDrawn.SetCheck(0);
+		m_LateFramesAlwaysDrawn.SetCheck(0);
 	}
 
 	
@@ -353,7 +353,7 @@
 	sel = m_Threading.GetCurSel();
 	gf_cfg_set_key(gpac->m_user.config, "Systems", "ThreadingPolicy", (sel==0) ? "Single" : ( (sel==1) ? "Multi" : "Free"));
 	gf_cfg_set_key(gpac->m_user.config, "Systems", "ForceSingleClock", m_ForceDuration.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "AlwaysDrawBIFS", m_BifsAlwaysDrawn.GetCheck() ? "yes" : "no");
+	gf_cfg_set_key(gpac->m_user.config, "Systems", "DrawLateFrames", m_LateFramesAlwaysDrawn.GetCheck() ? "yes" : "no");
 }
 
 
@@ -586,7 +586,7 @@
 	gf_cfg_set_key(gpac->m_user.config, "Compositor", "Raster2D", str);
 
 	gf_cfg_set_key(gpac->m_user.config, "Compositor", "ForceOpenGL", m_Use3DRender.GetCheck() ? "yes" : "no");
-	return 0;
+	return GF_FALSE;
 }
 
 
@@ -1340,16 +1340,16 @@
 
 	sOpt = gf_cfg_get_key(gpac->m_user.config, "Streaming", "DefaultPort");
 	u32 port = 554;
-	Bool force_rtsp = 0;;
+	Bool force_rtsp = GF_FALSE;
 	if (sOpt) port = atoi(sOpt);
 	switch (port) {
 	case 8080:
 		m_Port.SetCurSel(3);
-		force_rtsp = 1;
+		force_rtsp = GF_TRUE;
 		break;
 	case 80:
 		m_Port.SetCurSel(2);
-		force_rtsp = 1;
+		force_rtsp = GF_TRUE;
 		break;
 	case 7070:
 		m_Port.SetCurSel(1);
@@ -1359,9 +1359,9 @@
 		break;
 	}
 
-	Bool use_rtsp = 0;
+	Bool use_rtsp = GF_FALSE;
 	sOpt = gf_cfg_get_key(gpac->m_user.config, "Streaming", "RTPoverRTSP");
-	if (sOpt && !stricmp(sOpt, "yes")) use_rtsp = 1;
+	if (sOpt && !stricmp(sOpt, "yes")) use_rtsp = GF_TRUE;
 
 	if (force_rtsp) {
 		m_UseRTSP.SetCheck(1);
@@ -1482,16 +1482,16 @@
 void COptStream::SaveOptions()
 {
 	Osmo4 *gpac = GetApp();
-	Bool force_rtsp = 0;
+	Bool force_rtsp = GF_FALSE;
 	s32 sel = m_Port.GetCurSel();
 	switch (sel) {
 	case 3:
 		gf_cfg_set_key(gpac->m_user.config, "Streaming", "DefaultPort", "8080");
-		force_rtsp = 1;
+		force_rtsp = GF_TRUE;
 		break;
 	case 2:
 		gf_cfg_set_key(gpac->m_user.config, "Streaming", "DefaultPort", "80");
-		force_rtsp = 1;
+		force_rtsp = GF_TRUE;
 		break;
 	case 1:
 		gf_cfg_set_key(gpac->m_user.config, "Streaming", "DefaultPort", "7070");
@@ -1725,9 +1725,9 @@
 	sprintf(sText, "Module: %s", sKey+2);
 	m_PlugName.SetWindowText(sText);
 
-	Bool has_asso, need_asso, go = 1;
+	Bool has_asso, need_asso, go = GF_TRUE;
 	sKey = cur_ext;
-	need_asso = has_asso = 0;
+	need_asso = has_asso = GF_FALSE;
 
 	HKEY hKey;
 	DWORD dwSize;
@@ -1735,7 +1735,7 @@
 		Bool ok;
 		char szExt[50], szReg[60], c;
 		char *tmp = strchr(sKey, ' ');
-		if (!tmp) { go = 0;}
+		if (!tmp) { go = GF_FALSE;}
 		else { c = tmp[0]; tmp[0] = 0; }
 		sprintf(szExt, ".%s", sKey);
 		sprintf(szReg, "GPAC\\%s", sKey);
@@ -1743,12 +1743,12 @@
 
 		if (RegOpenKeyEx(HKEY_CLASSES_ROOT, szExt, 0, KEY_READ, &hKey ) == ERROR_SUCCESS) {
 			dwSize = 200;
-			ok = 1;
-			if (RegQueryValueEx(hKey, "", NULL, NULL,(unsigned char*) sDesc, &dwSize) != ERROR_SUCCESS) ok = 0;
+			ok = GF_TRUE;
+			if (RegQueryValueEx(hKey, "", NULL, NULL,(unsigned char*) sDesc, &dwSize) != ERROR_SUCCESS) ok = GF_FALSE;
 			RegCloseKey(hKey);
-			if (ok && !stricmp((char *)sDesc, szReg)) has_asso = 1;
-			else need_asso = 1;
-		} else need_asso = 1;
+			if (ok && !stricmp((char *)sDesc, szReg)) has_asso = GF_TRUE;
+			else need_asso = GF_TRUE;
+		} else need_asso = GF_TRUE;
 		sKey = tmp;
 
 	}
@@ -1770,7 +1770,7 @@
 	strcat((char *) szApp, "Osmo4.exe \"%L\"");
 
 	if (m_DoAssociate.GetCheck()) {
-		Bool go = 1;
+		Bool go = GF_TRUE;
 		sKey = cur_ext;
 
 		HKEY hKey;
@@ -1779,7 +1779,7 @@
 			Bool ok;
 			char szExt[50], szReg[60], szOld[80], szPath[1024], c;
 			char *tmp = strchr(sKey, ' ');
-			if (!tmp) { go = 0;}
+			if (!tmp) { go = GF_FALSE;}
 			else { c = tmp[0]; tmp[0] = 0; }
 			sprintf(szExt, ".%s", sKey);
 			sprintf(szReg, "GPAC\\%s", sKey);
@@ -1787,37 +1787,37 @@
 
 			RegOpenKeyEx(HKEY_CLASSES_ROOT, szExt, 0, 0, &hKey );
 			dwSize = 200;
-			ok = 1;
-			if (RegQueryValueEx(hKey, "", NULL, NULL,(unsigned char*) sDesc, &dwSize) != ERROR_SUCCESS) ok = 0;
+			ok = GF_TRUE;
+			if (RegQueryValueEx(hKey, "", NULL, NULL,(unsigned char*) sDesc, &dwSize) != ERROR_SUCCESS) ok = GF_FALSE;
 			RegCloseKey(hKey);
 			strcpy(szOld, "");
 			if (ok && stricmp((char *)sDesc, szReg)) strcpy(szOld, sDesc);
 
 			strcpy(szPath, szReg); strcat(szPath, "\\DefaultIcon");
 			RegCreateKeyEx(HKEY_CLASSES_ROOT, szPath, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, &dwSize);
-			RegSetValueEx(hKey, "", 0, REG_SZ, szIco, strlen((const char *) szIco)+1);
+			RegSetValueEx(hKey, "", 0, REG_SZ, szIco, (DWORD) strlen((const char *) szIco)+1);
 			RegCloseKey(hKey);
 
 			strcpy(szPath, szReg); strcat(szPath, "\\Shell\\open\\command");
 			RegCreateKeyEx(HKEY_CLASSES_ROOT, szPath, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, &dwSize);
-			RegSetValueEx(hKey, "", 0, REG_SZ, szApp, strlen((const char *) szApp)+1);
+			RegSetValueEx(hKey, "", 0, REG_SZ, szApp, (DWORD) strlen((const char *) szApp)+1);
 			RegCloseKey(hKey);
 
 			if (strlen(szOld)) {
 				strcpy(szPath, szReg); strcat(szPath, "\\Backup");
 				RegCreateKeyEx(HKEY_CLASSES_ROOT, szPath, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, &dwSize);
-				RegSetValueEx(hKey, "", 0, REG_SZ, (unsigned char *) szOld, strlen((const char *) szIco)+1);
+				RegSetValueEx(hKey, "", 0, REG_SZ, (unsigned char *) szOld, (DWORD) strlen((const char *) szIco)+1);
 				RegCloseKey(hKey);
 			}
 
 			RegCreateKeyEx(HKEY_CLASSES_ROOT, szExt, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, &dwSize);
-			RegSetValueEx(hKey, "", 0, REG_SZ, (const unsigned char *) szReg, strlen(szReg)+1);
+			RegSetValueEx(hKey, "", 0, REG_SZ, (const unsigned char *) szReg, (DWORD) strlen(szReg)+1);
 			RegCloseKey(hKey);
 
 			sKey = tmp;
 		}
 	} else {
-		Bool go = 1;
+		Bool go = GF_TRUE;
 		sKey = cur_ext;
 
 		HKEY hKey;
@@ -1826,7 +1826,7 @@
 			Bool ok;
 			char szExt[50], szReg[60], szPath[1024], c;
 			char *tmp = strchr(sKey, ' ');
-			if (!tmp) { go = 0;}
+			if (!tmp) { go = GF_FALSE;}
 			else { c = tmp[0]; tmp[0] = 0; }
 			sprintf(szExt, ".%s", sKey);
 			sprintf(szReg, "GPAC\\%s", sKey);
@@ -1835,12 +1835,12 @@
 			strcpy(szPath, szReg); strcat(szPath, "\\Backup");
 			RegOpenKeyEx(HKEY_CLASSES_ROOT, szPath, 0, 0, &hKey );
 			dwSize = 200;
-			ok = 1;
-			if (RegQueryValueEx(hKey, "", NULL, NULL,(unsigned char*) sDesc, &dwSize) != ERROR_SUCCESS) ok = 0;
+			ok = GF_TRUE;
+			if (RegQueryValueEx(hKey, "", NULL, NULL,(unsigned char*) sDesc, &dwSize) != ERROR_SUCCESS) ok = GF_FALSE;
 			RegCloseKey(hKey);
 			if (ok && strlen((char *)sDesc)) {
 				RegCreateKeyEx(HKEY_CLASSES_ROOT, szExt, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, &dwSize);
-				RegSetValueEx(hKey, "", 0, REG_SZ, (unsigned char*) sDesc, strlen((const char *) sDesc)+1);
+				RegSetValueEx(hKey, "", 0, REG_SZ, (unsigned char*) sDesc, (DWORD) strlen((const char *) sDesc)+1);
 				RegCloseKey(hKey);
 			}

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_w32/Options.h -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_w32/Options.h Changed

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

@@ -7,6 +7,7 @@
 #include <direct.h>
 #include "MainFrm.h"
 #include "OpenUrl.h"
+#include "resource.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -124,8 +125,8 @@
 {
 	m_site_url = site_url;
 	m_user = user;
-	if (DoModal() != IDOK) return 0;
-	return 1;
+	if (DoModal() != IDOK) return GF_FALSE;
+	return GF_TRUE;
 }
 
 
@@ -155,7 +156,7 @@
 	Osmo4 *gpac = (Osmo4 *) priv;
 	CMainFrame *pFrame = (CMainFrame *) gpac->m_pMainWnd;
 	/*shutdown*/
-	if (!pFrame) return 0;
+	if (!pFrame) return GF_FALSE;
 
 	switch (evt->type) {
 	case GF_EVENT_DURATION:
@@ -188,9 +189,9 @@
 				/*any error before connection confirm is a service connection error*/
 				if (!gpac->m_isopen) pFrame->m_pPlayList->SetDead();
 			}
-			return 0;
+			return GF_FALSE;
 		}
-		if (gpac->m_NoConsole) return 0;
+		if (gpac->m_NoConsole) return GF_FALSE;
 
 		/*process user message*/
 		pFrame->console_err = GF_OK;
@@ -230,18 +231,18 @@
 	case GF_EVENT_CONNECT:
 //		if (pFrame->m_bStartupFile) return 0;
 
-		pFrame->BuildStreamList(1);
+		pFrame->BuildStreamList(GF_TRUE);
 		if (evt->connect.is_connected) {
-			pFrame->BuildChapterList(0);
-			gpac->m_isopen = 1;
+			pFrame->BuildChapterList(GF_FALSE);
+			gpac->m_isopen = GF_TRUE;
 			//resetting sliders when opening a new file creates a deadlock on the window thread which is disconnecting
 			pFrame->m_wndToolBar.SetButtonInfo(5, ID_FILE_PLAY, TBBS_BUTTON, gpac->m_isopen ? 4 : 3);
 			pFrame->m_Sliders.m_PosSlider.SetPos(0);
-			pFrame->SetProgTimer(1);
+			pFrame->SetProgTimer(GF_TRUE);
 		} else {
 			gpac->max_duration = 0;
-			gpac->m_isopen = 0;
-			pFrame->BuildChapterList(1);
+			gpac->m_isopen = GF_FALSE;
+			pFrame->BuildChapterList(GF_TRUE);
 		}
 		if (!pFrame->m_bFullScreen) {
 			pFrame->SetFocus();
@@ -276,11 +277,36 @@
 			break;
 		case GF_KEY_H:
 			if ((evt->key.flags & GF_KEY_MOD_CTRL) && gpac->m_isopen)
-				gf_term_switch_quality(gpac->m_term, 1);
+				gf_term_switch_quality(gpac->m_term, GF_TRUE);
 			break;
 		case GF_KEY_L:
 			if ((evt->key.flags & GF_KEY_MOD_CTRL) && gpac->m_isopen)
-				gf_term_switch_quality(gpac->m_term, 0);
+				gf_term_switch_quality(gpac->m_term, GF_FALSE);
+			break;
+		case GF_KEY_LEFT:
+		case GF_KEY_RIGHT:
+			if (gpac->m_isopen && (gf_term_get_option(gpac->m_term, GF_OPT_NAVIGATION) == GF_NAVIGATE_NONE)) {
+				if (evt->key.flags & GF_KEY_MOD_CTRL) {
+					if (evt->key.key_code==GF_KEY_LEFT) pFrame->m_pPlayList->PlayPrev();
+					else if (evt->key.key_code==GF_KEY_RIGHT) pFrame->m_pPlayList->PlayNext();
+				}
+				else if (gpac->can_seek && (evt->key.flags & GF_KEY_MOD_ALT)) {
+					u32 duration = gpac->max_duration;
+					s32 current_time = gf_term_get_time_in_ms(gpac->m_term);
+
+					if (evt->key.key_code==GF_KEY_LEFT) {
+						current_time -= 5*duration/100;
+						if (current_time<0) current_time=0;
+						gf_term_play_from_time(gpac->m_term, (u64) current_time, 0);
+					}
+					else if (evt->key.key_code==GF_KEY_RIGHT) {
+						current_time += 5*duration/100;
+						if ((u32) current_time < duration) {
+							gf_term_play_from_time(gpac->m_term, (u64) current_time, 0);
+						}
+					}
+				}
+			}
 			break;
 		}
 		break;
@@ -289,26 +315,26 @@
 		/*store URL since it may be destroyed, and post message*/
 		gpac->m_navigate_url = evt->navigate.to_url;
 		pFrame->PostMessage(WM_NAVIGATE, NULL, NULL);
-		return 1;
+		return GF_TRUE;
 	case GF_EVENT_VIEWPOINTS:
 		pFrame->BuildViewList();
-		return 0;
+		return GF_FALSE;
 	case GF_EVENT_STREAMLIST:
-		pFrame->BuildStreamList(0);
-		return 0;
+		pFrame->BuildStreamList(GF_FALSE);
+		return GF_FALSE;
 	case GF_EVENT_SET_CAPTION:
 		pFrame->SetWindowText(evt->caption.caption);
 		break;
 	case GF_EVENT_DBLCLICK:
 		pFrame->PostMessage(WM_COMMAND, ID_VIEW_FULLSCREEN);
-		return 0;
+		return GF_FALSE;
 	case GF_EVENT_AUTHORIZATION:
 	{
 		UserPassDialog passdlg;
 		return passdlg.GetPassword(evt->auth.site_url, evt->auth.user, evt->auth.password);
 	}
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 
@@ -336,6 +362,8 @@
 {
 	CCommandLineInfo cmdInfo;
 
+	afxAmbientActCtx = FALSE; 
+
 	m_logs = NULL;
 
 	m_term = NULL;
@@ -347,12 +375,12 @@
 	while (szApplicationPath[strlen((char *) szApplicationPath)-1] != '\\') szApplicationPath[strlen((char *) szApplicationPath)-1] = 0;
 	if (szApplicationPath[strlen((char *) szApplicationPath)-1] != '\\') strcat(szApplicationPath, "\\");
 
-	gf_sys_init(0);
+	gf_sys_init(GF_FALSE);
 
 	/*setup user*/
 	memset(&m_user, 0, sizeof(GF_User));
 
-	Bool first_launch = 0;
+	Bool first_launch = GF_FALSE;
 	/*init config and modules*/
 	m_user.config = gf_cfg_init(NULL, &first_launch);
 	if (!m_user.config) {
@@ -368,7 +396,7 @@
 	gf_free(name);
 
 	const char *opt = gf_cfg_get_key(m_user.config, "General", "SingleInstance");
-	m_SingleInstance = (opt && !stricmp(opt, "yes")) ? 1 : 0;
+	m_SingleInstance = (opt && !stricmp(opt, "yes")) ? GF_TRUE : GF_FALSE;
 
 	m_hMutex = NULL;
 	if (m_SingleInstance) {
@@ -384,8 +412,8 @@
 				::SetForegroundWindow(static_gpac_hwnd);
 
 				if (m_lpCmdLine && strlen(m_lpCmdLine)) {
-					DWORD res;
-					u32 len;
+					DWORD_PTR res;
+					size_t len;
 					char *the_url, *cmd;
 					GetCurrentDirectory(1024, szDIR);
 					if (szDIR[strlen(szDIR)-1] != '\\') strcat(szDIR, "\\");
@@ -431,12 +459,13 @@
 	CMainFrame* pFrame = new CMainFrame;
 	m_pMainWnd = pFrame;
 	pFrame->LoadFrame(IDR_MAINFRAME, WS_OVERLAPPEDWINDOW | FWS_ADDTOTITLE, NULL, NULL);
+	pFrame->LoadAccelTable( MAKEINTRESOURCE(IDR_MAINACCEL));
+
 	m_pMainWnd->DragAcceptFiles();
 
 	if (m_SingleInstance) static_gpac_hwnd = m_pMainWnd->m_hWnd;
 
-	const char *str = gf_cfg_get_key(m_user.config, "General", "ModulesDirectory");
-	m_user.modules = gf_modules_new(str, m_user.config);
+	m_user.modules = gf_modules_new(NULL, m_user.config);
 	if (!m_user.modules || ! gf_modules_get_count(m_user.modules) ) {
 		MessageBox(NULL, "No modules available - system cannot work", "Fatal Error", MB_OK);
 		m_pMainWnd->PostMessage(WM_CLOSE);
@@ -461,7 +490,7 @@
 	}
 
 	/*check log file*/
-	str = gf_cfg_get_key(m_user.config, "General", "LogFile");
+	const char *str = gf_cfg_get_key(m_user.config, "General", "LogFile");
 	if (str) {
 		m_logs = gf_f64_open(str, "wt");
 		gf_log_set_callback(m_logs, osmo4_do_log);
@@ -476,7 +505,7 @@
 	m_user.os_window_handler = pFrame->m_pWndView->m_hWnd;
 	m_user.EventProc = Osmo4_EventProc;
 
-	m_reset = 0;
+	m_reset = GF_FALSE;
 	orig_width = 320;
 	orig_height = 240;
 
@@ -528,8 +557,11 @@
 		}
 #endif
 
-		sOpt = gf_cfg_get_key(GetApp()->m_user.config, "General", "StartupFile");
-		if (sOpt) gf_term_connect(m_term, sOpt);
+		sOpt = gf_cfg_get_key(m_user.config, "General", "StartupFile");
+		if (sOpt && !strstr(sOpt, "gui") ) gf_term_connect(m_term, sOpt);
+
+		sOpt = gf_cfg_get_key(m_user.config, "General", "PlaylistLoop");
+		m_Loop = (sOpt && !strcmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
 	}
 	pFrame->SetFocus();
 	pFrame->SetForegroundWindow();
@@ -633,15 +665,15 @@
 void Osmo4::SetOptions()
 {
 	const char *sOpt = gf_cfg_get_key(m_user.config, "General", "Loop");
-	m_Loop = (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0;
+	m_Loop = (sOpt && !stricmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
 	sOpt = gf_cfg_get_key(m_user.config, "General", "LookForSubtitles");
-	m_LookForSubtitles = (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0;
+	m_LookForSubtitles = (sOpt && !stricmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
 	sOpt = gf_cfg_get_key(m_user.config, "General", "ConsoleOff");
-	m_NoConsole = (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0;
+	m_NoConsole = (sOpt && !stricmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
 	sOpt = gf_cfg_get_key(m_user.config, "General", "ViewXMT");
-	m_ViewXMTA  = (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0;
+	m_ViewXMTA  = (sOpt && !stricmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
 	sOpt = gf_cfg_get_key(m_user.config, "General", "NoMIMETypeFetch");
-	m_NoMimeFetch = (!sOpt || !stricmp(sOpt, "yes")) ? 1 : 0;
+	m_NoMimeFetch = (!sOpt || !stricmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
 }
 
 
@@ -705,7 +737,7 @@
 		sFiles += sDesc;
 		sFiles += "|";
 
-		first = 1;
+		first = GF_TRUE;
 
 		sOpt = CString(szKeyList);
 		while (1) {
@@ -717,7 +749,7 @@
 				if (!first) {
 					sFiles += ";";
 				} else {
-					first = 0;
+					first = GF_FALSE;
 				}
 				sFiles += "*.";
 				sFiles += ext;
@@ -808,11 +840,11 @@
 void Osmo4::PlayFromTime(u32 time)
 {
 	Bool do_pause;
-	if (start_mode==1) do_pause = 1;
-	else if (start_mode==2) do_pause = 0;
-	else do_pause = /*!m_AutoPlay*/0;
+	if (start_mode==1) do_pause = GF_TRUE;
+	else if (start_mode==2) do_pause = GF_FALSE;
+	else do_pause = /*!m_AutoPlay*/GF_FALSE;
 	gf_term_play_from_time(m_term, time, do_pause);
-	m_reset = 0;
+	m_reset = GF_FALSE;
 }
 
 
@@ -844,9 +876,9 @@
 {
 	if (m_isopen) {
 		if (m_reset) {
-			m_reset = 0;
+			m_reset = GF_FALSE;
 			PlayFromTime(0);
-			((CMainFrame *)m_pMainWnd)->SetProgTimer(1);
+			((CMainFrame *)m_pMainWnd)->SetProgTimer(GF_TRUE);
 		} else {
 			Pause();
 		}
@@ -880,9 +912,9 @@
 	CMainFrame *pFrame = (CMainFrame *) m_pMainWnd;
 	if (m_reset) return;
 	if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PLAYING) Pause();
-	m_reset = 1;
+	m_reset = GF_TRUE;
 	pFrame->m_Sliders.m_PosSlider.SetPos(0);
-	pFrame->SetProgTimer(0);
+	pFrame->SetProgTimer(GF_FALSE);
 	pFrame->m_wndToolBar.SetButtonInfo(5, ID_FILE_PLAY, TBBS_BUTTON, 3);
 	start_mode = 2;
 }
@@ -895,7 +927,7 @@
 void Osmo4::OnSwitchRender() 
 {
 	const char *opt = gf_cfg_get_key(m_user.config, "Compositor", "ForceOpenGL");
-	Bool use_gl = (opt && !stricmp(opt, "yes")) ? 1 : 0;
+	Bool use_gl = (opt && !stricmp(opt, "yes")) ? GF_TRUE : GF_FALSE;
 	gf_cfg_set_key(m_user.config, "Compositor", "ForceOpenGL", use_gl ? "no" : "yes");
 
 	gf_term_set_option(m_term, GF_OPT_USE_OPENGL, !use_gl);

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_w32/Osmo4.h -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_w32/Osmo4.h Changed

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

@@ -9,8 +9,6 @@
 //
 #include "afxres.h"
 
-#include <gpac/version.h>
-
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 
@@ -32,7 +30,7 @@
 BEGIN
     POPUP "&File"
     BEGIN
-        MENUITEM "&Open File\tCtrl+O",          ID_FILEOPEN
+        MENUITEM "&Open File\tCtrl+O",          ID_OPENFILE
         MENUITEM "Open &URL\tCtrl+U",           ID_OPEN_URL
         MENUITEM SEPARATOR
         MENUITEM "File Propert&ies\tCtrl+I",    ID_FILE_PROP
@@ -117,14 +115,14 @@
             MENUITEM "",                            ID_SETCHAP_FIRST
         END
         MENUITEM SEPARATOR
-        MENUITEM "Playlist\tCtrl+L",            ID_VIEW_PL, CHECKED
+        MENUITEM "Playlist\tF3",                ID_VIEW_PL, CHECKED
         MENUITEM "&Loop Playlist",              ID_PLAYLIST_LOOP
         MENUITEM SEPARATOR
         MENUITEM "Play/Pause\tCtrl+P",          ID_FILE_PLAY
         MENUITEM "Step-by-Step\tCtrl+S",        ID_FILE_STEP
         MENUITEM "Stop",                        ID_FILE_STOP
         MENUITEM SEPARATOR
-        MENUITEM "Reload File\tCtrl+R",         ID_FILE_RELOAD
+        MENUITEM "Reload File\tF5",             ID_FILE_RELOAD
         MENUITEM SEPARATOR
         MENUITEM "Clear History",               ID_CLEAR_NAV
         MENUITEM "Reload Config",               ID_CONFIG_RELOAD
@@ -152,7 +150,7 @@
 BEGIN
     ICON            IDR_MAINFRAME,IDC_STATIC,8,4,20,20
     CTEXT           "Osmo4 Player - GPAC Multimedia Framework",IDC_STATIC,31,10,150,10,SS_NOPREFIX
-    CTEXT           "(c) Jean Le Feuvre 2000-2005 - (c) ENST 2005-200X\nAll Rights Reserved",IDC_STATIC,4,64,201,18
+    CTEXT           "(c) 2000-2013 Telecom ParisTech\nAll Rights Reserved",IDC_STATIC,4,64,201,18
     CTEXT           "This program is free software and may be distributed according to the terms of the GNU Lesser General Public License",IDC_STATIC,4,26,200,18
     PUSHBUTTON      "http://gpac.sourceforge.net",IDC_GOGPAC,43,47,121,13,BS_FLAT,WS_EX_STATICEDGE
     GROUPBOX        "With Many Thanks To:",IDC_STATIC,3,82,203,53
@@ -198,12 +196,12 @@
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "Osmo4-GPAC"
-            VALUE "FileVersion", GPAC_VERSION
+            VALUE "FileVersion", "0.5.1-DEV"
             VALUE "InternalName", "Osmo4"
             VALUE "LegalCopyright", "Copyright (C) Telecom ParisTech 2005-2012"
             VALUE "OriginalFilename", "Osmo4.EXE"
             VALUE "ProductName", "Osmo4-GPAC"
-            VALUE "ProductVersion", GPAC_VERSION
+            VALUE "ProductVersion", "0.5.1-DEV"
         END
     END
     BLOCK "VarFileInfo"
@@ -516,7 +514,7 @@
 CAPTION "Presentation Properties"
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
-    CONTROL         "Tree1",IDC_ODTREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_TRACKSELECT | WS_BORDER | WS_TABSTOP | 0x400,2,2,120,114
+    CONTROL         "Tree1",IDC_ODTREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_TRACKSELECT | TVS_SINGLEEXPAND | WS_BORDER | WS_TABSTOP,2,2,120,114
     EDITTEXT        IDC_ODINFO,123,17,213,130,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_NOHIDESEL | ES_OEMCONVERT | ES_READONLY | WS_VSCROLL | WS_HSCROLL,WS_EX_DLGMODALFRAME | WS_EX_STATICEDGE
     PUSHBUTTON      "Get World Info",IDC_WORLD,2,118,119,13
     PUSHBUTTON      "View Scene Graph",IDC_VIEWSG,2,134,119,13
@@ -563,11 +561,11 @@
     COMBOBOX        IDC_DRAW_MODE,111,25,53,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_SLIDERS DIALOG  0, 0, 218, 18
+IDD_SLIDERS DIALOGEX 0, 0, 218, 18
 STYLE DS_SETFONT | WS_CHILD
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
-    CONTROL         "Slider1",ID_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,0,3,185,12
+    CONTROL         "Slider1",ID_SLIDER,"msctls_trackbar32",TBS_TOP | TBS_NOTICKS,0,3,185,12
     CONTROL         "Slider1",ID_AUDIO_VOL,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_BORDER | WS_TABSTOP,187,3,30,13
 END
 
@@ -845,6 +843,23 @@
     0
 END
 
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Accelerator
+//
+
+IDR_MAINACCEL ACCELERATORS 
+BEGIN
+    "^P",           ID_FILE_PLAY,           ASCII,  NOINVERT
+    "\t",           ID_FILE_PROP,           ASCII,  NOINVERT
+    VK_F5,          ID_FILE_RELOAD,         VIRTKEY, NOINVERT
+    "^S",           ID_FILE_STEP,           ASCII,  NOINVERT
+    "^O",           ID_FILEOPEN,            ASCII,  NOINVERT
+    "^U",           ID_OPEN_URL,            ASCII,  NOINVERT
+    VK_F3,          ID_VIEW_PL,             VIRTKEY, NOINVERT
+END
+
 #endif    // Français (France) resources
 /////////////////////////////////////////////////////////////////////////////

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_w32/Playlist.cpp -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_w32/Playlist.cpp Changed

@@ -43,9 +43,9 @@
 		}
 	}
 	m_duration = 0;
-	m_bIsDead = 0;
-	m_bIsPlaying = 0;
-	m_bIsSelected = 0;
+	m_bIsDead = GF_FALSE;
+	m_bIsPlaying = GF_FALSE;
+	m_bIsSelected = GF_FALSE;
 }
 
 PLEntry::~PLEntry()
@@ -289,7 +289,7 @@
 
 void Playlist::ClearButPlaying()
 {
-	PLEntry *p;
+	PLEntry *p=NULL;
 	if (m_cur_entry>=0) p = (PLEntry *) gf_list_get(m_entries, m_cur_entry);
 	if (p) gf_list_rem(m_entries, m_cur_entry);
 
@@ -347,7 +347,7 @@
 
 		if (ple->m_bIsSelected) {
 			m_FileList.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
-			ple->m_bIsSelected = 0;
+			ple->m_bIsSelected = GF_FALSE;
 		}
 	}
 	
@@ -362,7 +362,7 @@
 
 	strcpy((char *) szPath, GetApp()->szUserPath);
 	strcat(szPath, "gpac_pl.m3u");
-	Save(szPath, 1);
+	Save(szPath, GF_TRUE);
 }
 
 void Playlist::OnPlAddFile() 
@@ -421,7 +421,7 @@
 		i = gf_list_del_item(m_entries, ple);
 		assert(i>=1);
 		gf_list_insert(m_entries, ple, i-1);
-		ple->m_bIsSelected = 1;
+		ple->m_bIsSelected = GF_TRUE;
 	}
 	RefreshList();
 }
@@ -441,7 +441,7 @@
 		PLEntry *ple = (PLEntry *) m_FileList.GetItemData(nItem);
 		i = gf_list_del_item(m_entries, ple);
 		gf_list_insert(m_entries, ple, i+1);
-		ple->m_bIsSelected = 1;
+		ple->m_bIsSelected = GF_TRUE;
 	}
 	RefreshList();
 }
@@ -481,17 +481,17 @@
 	Osmo4 *gpac = GetApp();
 	Playlist *_this = (Playlist *)cbck;
 
-	if (gf_term_is_supported_url(gpac->m_term, item_name, 0, 1)) {
+	if (gf_term_is_supported_url(gpac->m_term, item_name, GF_FALSE, GF_TRUE)) {
 		_this->QueueURL(item_path);
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 static Bool pl_enum_dir_dirs(void *cbck, char *item_name, char *item_path)
 {
-	gf_enum_directory(item_path, 0, pl_enum_dir_item, cbck, NULL);
-	gf_enum_directory(item_path, 1, pl_enum_dir_dirs, cbck, NULL);
-	return 0;
+	gf_enum_directory(item_path, GF_FALSE, pl_enum_dir_item, cbck, NULL);
+	gf_enum_directory(item_path, GF_TRUE, pl_enum_dir_dirs, cbck, NULL);
+	return GF_FALSE;
 }
 
 
@@ -502,7 +502,7 @@
 	LPITEMIDLIST ret;
 	char dir[MAX_PATH];
 
-	Bool res = 0;
+	Bool res = GF_FALSE;
 	if (NOERROR == ::SHGetMalloc(&pMalloc) ) {
 		memset(&brw, 0, sizeof(BROWSEINFO));
 		brw.hwndOwner = this->GetSafeHwnd();
@@ -513,7 +513,7 @@
 
 		ret = SHBrowseForFolder(&brw);
 		if (ret != NULL) {
-			if (::SHGetPathFromIDList(ret, dir)) res = 1;
+			if (::SHGetPathFromIDList(ret, dir)) res = GF_TRUE;
 			pMalloc->Free(ret);
 		}
 		pMalloc->Release();
@@ -521,18 +521,18 @@
 	if (!res) return;
 	strcpy(szCacheDir, dir);
 
-	gf_enum_directory(dir, 0, pl_enum_dir_item, this, NULL);
-	if (do_recurse) gf_enum_directory(dir, 1, pl_enum_dir_dirs, this, NULL);
+	gf_enum_directory(dir, GF_FALSE, pl_enum_dir_item, this, NULL);
+	if (do_recurse) gf_enum_directory(dir, GF_FALSE, pl_enum_dir_dirs, this, NULL);
 	m_all_dead_entries=-1;
 	RefreshList();
 }
 void Playlist::OnPlAddDir() 
 {
-	AddDir(0);
+	AddDir(GF_FALSE);
 }
 void Playlist::OnPlAddDirRec() 
 {
-	AddDir(1);
+	AddDir(GF_TRUE);
 }
 
 void Playlist::OnPlAddUrl() 
@@ -555,7 +555,7 @@
 
 	strcpy(szPath, fd.GetPathName());
 	strlwr(szPath);
-	save_m3u = (fd.m_ofn.nFilterIndex==1) ? 1 : 0;
+	save_m3u = (fd.m_ofn.nFilterIndex==1) ? GF_TRUE : GF_FALSE;
 	if (save_m3u) {
 		if (!strstr(szPath, ".m3u")) {
 			strcpy(szPath, fd.GetPathName());
@@ -624,10 +624,10 @@
 	pl = gf_f64_open(fileName, "rt");
 	if (!pl) return;
 	ple = NULL;
-	load_m3u = 1;
+	load_m3u = GF_TRUE;
 	while (!feof(pl)) {
 		fgets(szLine, GF_MAX_PATH, pl);
-		go = 1;
+		go = GF_TRUE;
 		while (go) {
 			switch (szLine[strlen(szLine)-1]) {
 			case '\n':
@@ -636,13 +636,13 @@
 				szLine[strlen(szLine)-1] = 0;
 				break;
 			default:
-				go = 0;
+				go = GF_FALSE;
 				break;
 			}
 		}
 		if (!strlen(szLine)) continue;
 		if (!stricmp(szLine, "[playlist]")) {
-			load_m3u = 0;
+			load_m3u = GF_FALSE;
 		} else if (load_m3u) {
 			ple = new PLEntry(szLine, szPath);
 			gf_list_add(m_entries, ple);
@@ -708,12 +708,12 @@
 	while (pos != NULL) {
 		int nItem = m_FileList.GetNextSelectedItem(pos);
 		PLEntry *ple = (PLEntry *) m_FileList.GetItemData(nItem);
-		ple->m_bIsSelected = 1;
+		ple->m_bIsSelected = GF_TRUE;
 	}
 
 	for (i=0; i<gf_list_count(m_entries); i++) {
 		PLEntry *ple = (PLEntry *) gf_list_get(m_entries, i);
-		ple->m_bIsSelected = !ple->m_bIsSelected;
+		ple->m_bIsSelected = (Bool) !ple->m_bIsSelected;
 	}
 	RefreshList();
 }
@@ -738,7 +738,7 @@
 {
 	GF_List *new_entries = gf_list_new();
 
-	gf_rand_init(0);
+	gf_rand_init(GF_FALSE);
 
 	while (gf_list_count(m_entries)>1) {
 		u32 pos = gf_rand() % (gf_list_count(m_entries)-1);
@@ -799,13 +799,13 @@
 	if (m_all_dead_entries==-1) {
 		for (u32 i=0; i<gf_list_count(m_entries); i++) {
 			PLEntry *ple = (PLEntry *) gf_list_get(m_entries, i);
-			ple->m_bIsPlaying = 0;
+			ple->m_bIsPlaying = GF_FALSE;
 			if (ple->m_bIsDead) nb_dead ++;
 		}
 		m_all_dead_entries = (nb_dead==gf_list_count(m_entries)) ? 1 : 0;
 	}
-	if (m_all_dead_entries==1) return 0;
-	return 1;
+	if (m_all_dead_entries==1) return GF_FALSE;
+	return GF_TRUE;
 }
 
 void Playlist::RefreshCurrent()
@@ -813,7 +813,7 @@
 	if (m_cur_entry==-1) return;
 	PLEntry *ple = (PLEntry *) gf_list_get(m_entries, m_cur_entry);
 	if (ple && ple->m_bIsPlaying) {
-		ple->m_bIsPlaying = 0;
+		ple->m_bIsPlaying = GF_FALSE;
 		UpdateEntry(m_cur_entry);
 	}
 }
@@ -839,7 +839,7 @@
 		Play();
 	} else {
 		char szPLE[20];
-		ple->m_bIsPlaying = 1;
+		ple->m_bIsPlaying = GF_TRUE;
 		UpdateEntry(m_cur_entry);
 		sprintf(szPLE, "%d", m_cur_entry);
 		gf_cfg_set_key(GetApp()->m_user.config, "General", "PLEntry", szPLE);
@@ -890,10 +890,15 @@
 
 void Playlist::PlayNext()
 {
+	s32 count = (s32)gf_list_count(m_entries);
+
 	RefreshCurrent();
-	if (1+m_cur_entry < (s32)gf_list_count(m_entries)) {
+	if (1+m_cur_entry < count) {
 		m_cur_entry++;
 		Play();
+	} else if ((1+m_cur_entry == count) && GetApp()->m_Loop) {
+		m_cur_entry=0;
+		Play();
 	}
 }
 
@@ -910,7 +915,7 @@
 {
 	PLEntry *ple = (PLEntry *) gf_list_get(m_entries, m_cur_entry);
 	if (ple) {
-		ple->m_bIsDead = 1;
+		ple->m_bIsDead = GF_TRUE;
 		UpdateEntry(m_cur_entry);
 		m_all_dead_entries=-1;
 		if (ple->m_bIsPlaying) PlayNext();

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_w32/Playlist.h -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_w32/Playlist.h Changed

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_w32/Sliders.cpp -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_w32/Sliders.cpp Changed

@@ -15,14 +15,13 @@
 /////////////////////////////////////////////////////////////////////////////
 // Sliders dialog
 
-
 Sliders::Sliders(CWnd* pParent /*=NULL*/)
 	: CDialog(Sliders::IDD, pParent)
 {
 	//{{AFX_DATA_INIT(Sliders)
 	//}}AFX_DATA_INIT
 
-	m_grabbed = 0;
+	m_grabbed = GF_FALSE;
 }
 
 
@@ -47,31 +46,35 @@
 /////////////////////////////////////////////////////////////////////////////
 // Sliders message handlers
 
-
 void Sliders::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) 
 {
 	
 	Osmo4 *app = GetApp();
 	if (pScrollBar->GetDlgCtrlID() == ID_SLIDER) {
 		switch (nSBCode) {
-		case TB_LINEUP:
-		case TB_LINEDOWN:
 		case TB_PAGEUP:
 		case TB_PAGEDOWN:
-		case TB_THUMBPOSITION:
-		case TB_THUMBTRACK:
+		case TB_LINEUP:
+		case TB_LINEDOWN:
 		case TB_TOP:
 		case TB_BOTTOM:
-			m_grabbed = 1;
+//			m_grabbed = GF_TRUE;
+			break;
+		case TB_THUMBPOSITION:
+		case TB_THUMBTRACK:
+			m_grabbed = GF_TRUE;
 			break;
 		case TB_ENDTRACK:
-			if (!app->can_seek || !app->m_isopen) {
-				m_PosSlider.SetPos(0);
-			} else {
-				u32 seek_to = m_PosSlider.GetPos();
-				app->PlayFromTime(seek_to);
+			if (m_grabbed) {
+				if (!app->can_seek || !app->m_isopen) {
+					m_PosSlider.SetPos(0);
+				} else {
+					u32 range = m_PosSlider.GetRangeMax() - m_PosSlider.GetRangeMin();
+					u32 seek_to = m_PosSlider.GetPos();
+					app->PlayFromTime(seek_to);
+				}
+				m_grabbed = GF_FALSE;
 			}
-			m_grabbed = 0;
 			break;
 		}
 	}
@@ -96,8 +99,14 @@
 
 	m_PosSlider.GetClientRect(&rc);
 	rc.right = rc.left + cx - tw;
+	rc.top += 10;
+	rc.bottom += 10;
 	m_PosSlider.SetWindowPos(this, rc.left, rc.top, rc.right, rc.bottom, SWP_NOZORDER | SWP_NOMOVE);
 
+	const UINT nPixelsLength = 24;
+	m_PosSlider.ModifyStyle(0,TBS_FIXEDLENGTH,FALSE);
+	m_PosSlider.SendMessage(TBM_SETTHUMBLENGTH,nPixelsLength,0); 
+
 	m_AudioVol.GetClientRect(&rc2);
 	rc2.top = rc2.bottom = cy/2;
 	rc2.top -= cy/3;

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_w32/Sliders.h -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_w32/Sliders.h Changed

gpac-0.5.0.svn4296.tar.bz2/applications/osmo4_w32/res/maintool.bmp -> gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_w32/res/maintool.bmp Changed

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

@@ -1,5 +1,5 @@
 //{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
+// Microsoft Visual C++ generated include file.
 // Used by Osmo4.rc
 //
 #define IDD_ABOUTBOX                    100
@@ -33,6 +33,7 @@
 #define IDD_OPT_FILETYPES               179
 #define IDR_MENUPL                      182
 #define IDD_PASSWD                      188
+#define IDR_MAINACCEL                   190
 #define IDC_FILES_MIMES                 1000
 #define IDC_FILES_PLUG                  1001
 #define ID_AUDIO_VOL                    1002
@@ -162,7 +163,7 @@
 #define ID_AR_FILL                      1142
 #define ID_AR_43                        1143
 #define ID_AR_169                       1144
-#define ID_FILE_MIGRATE					1145
+#define ID_FILE_MIGRATE                 1145
 #define ID_NAV_RESET                    1151
 #define ID_FILE_STOP                    1152
 #define ID_FILE_PREV                    1155
@@ -308,14 +309,15 @@
 #define ID_FILE_COPY                    32961
 #define ID_FILE_PASTE                   32962
 #define ID_CONFIG_RELOAD                32963
+#define ID_OPENFILE                     32967
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        189
-#define _APS_NEXT_COMMAND_VALUE         32964
+#define _APS_NEXT_RESOURCE_VALUE        192
+#define _APS_NEXT_COMMAND_VALUE         32981
 #define _APS_NEXT_CONTROL_VALUE         1131
 #define _APS_NEXT_SYMED_VALUE           101
 #endif

gpac-0.5.0.svn4296.tar.bz2/applications/osmophone/main.cpp -> gpac-0.5.0.svn4668.tar.bz2/applications/osmophone/main.cpp Changed

@@ -67,19 +67,19 @@
 static HWND g_hwnd_menu = NULL;
 static HWND g_hwnd_status = NULL;
 static HINSTANCE g_hinst = NULL;
-static Bool is_ppc = 0;
+static Bool is_ppc = GF_FALSE;
 
-static Bool is_connected = 0;
-static Bool navigation_on = 0;
-static Bool playlist_navigation_on = 1;
+static Bool is_connected = GF_FALSE;
+static Bool navigation_on = GF_FALSE;
+static Bool playlist_navigation_on = GF_TRUE;
 
 static u32 log_level = GF_LOG_ERROR;
 
 static u32 Duration;
-static Bool CanSeek = 0;
+static Bool CanSeek = GF_FALSE;
 static u32 Volume=100;
 static char the_url[GF_MAX_PATH] = "";
-static Bool NavigateTo = 0;
+static Bool NavigateTo = GF_FALSE;
 static char the_next_url[GF_MAX_PATH];
 static GF_Terminal *term;
 static GF_User user;
@@ -90,20 +90,20 @@
 static u32 menu_h = 0;
 static u32 caption_h = 0;
 static u32 ratio_h = 1;
-static Bool backlight_off = 0;
+static Bool backlight_off = GF_FALSE;
 static u32 prev_batt_bl, prev_ac_bl;
-static Bool show_status = 1;
-static Bool reset_status = 1;
+static Bool show_status = GF_TRUE;
+static Bool reset_status = GF_TRUE;
 static u32 last_state_time = 0;
-static Bool loop = 0;
-static Bool full_screen = 0;
-static Bool force_2d_gl = 0;
-static Bool ctrl_mod_down = 0;
-static Bool view_cpu = 1;
-static Bool use_low_fps = 0;
-static Bool use_svg_prog = 0;
-
-static Bool log_rti = 0;
+static Bool loop = GF_FALSE;
+static Bool full_screen = GF_FALSE;
+static Bool force_2d_gl = GF_FALSE;
+static Bool ctrl_mod_down = GF_FALSE;
+static Bool view_cpu = GF_TRUE;
+static Bool use_low_fps = GF_FALSE;
+static Bool use_svg_prog = GF_FALSE;
+
+static Bool log_rti = GF_FALSE;
 static FILE *log_file = NULL;
 static u32 rti_update_time_ms = 200;
 
@@ -150,18 +150,18 @@
 	if (last_state_time) {
 		if (GetTickCount() > last_state_time + 200) {
 			last_state_time = 0;
-			reset_status = 1;
+			reset_status = GF_TRUE;
 		}
 		else return;
 	}
 	if (!term) return;
 	if (!is_connected && reset_status) {
 		SendMessage(g_hwnd_status, WM_SETTEXT, 0, (LPARAM) TEXT("Ready") );
-		reset_status = 0;
+		reset_status = GF_FALSE;
 		return;
 	}
 
-	FPS = gf_term_get_framerate(term, 0);
+	FPS = gf_term_get_framerate(term, GF_FALSE);
 	time = gf_term_get_time_in_ms(term) / 1000;
 	m = time/60;
 	s = time - m*60;
@@ -193,16 +193,16 @@
 
 void set_full_screen()
 {
-	full_screen = !full_screen;
+	full_screen = (Bool)!full_screen;
 	if (full_screen) {
-		show_status = 0;
-		do_layout(0);
+		show_status = GF_FALSE;
+		do_layout(GF_FALSE);
 		gf_term_set_option(term, GF_OPT_FULLSCREEN, full_screen);
 	} else {
 		const char *str = gf_cfg_get_key(user.config, "General", "ShowStatusBar");
-		show_status = (str && !strcmp(str, "yes")) ? 1 : 0;
+		show_status = (str && !strcmp(str, "yes")) ? GF_TRUE : GF_FALSE;
 		gf_term_set_option(term, GF_OPT_FULLSCREEN, full_screen);
-		do_layout(1);
+		do_layout(GF_TRUE);
 	}
 }
 
@@ -221,7 +221,7 @@
 			gf_sys_clock(),
 			gf_term_get_time_in_ms(term),
 			rti.total_cpu_usage,
-			(u32) gf_term_get_framerate(term, 0),
+			(u32) gf_term_get_framerate(term, GF_FALSE),
 			(u32) ( rti.gpac_memory / 1024)
 		);
 	} else if (fmt && (ll>=GF_LOG_INFO)) {
@@ -328,7 +328,7 @@
 		break;
 	case GF_EVENT_MESSAGE:
 	{
-		if (!evt->message.message) return 0;
+		if (!evt->message.message) return GF_FALSE;
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONSOLE, ("%s: %s\n", evt->message.message, gf_error_to_string(evt->message.error)));
 		//set_status((char *) evt->message.message);
 	}
@@ -347,24 +347,24 @@
 		break;
 	case GF_EVENT_RESOLUTION:
 		recompute_res(evt->size.width, evt->size.height);
-		do_layout(1);
+		do_layout(GF_TRUE);
 		break;
 
 	case GF_EVENT_SCENE_SIZE:
-		do_layout(1);
+		do_layout(GF_TRUE);
 		break;
 	case GF_EVENT_DBLCLICK:
 		set_full_screen();
-		return 0;
+		return GF_FALSE;
 	case GF_EVENT_CONNECT:
 		if (evt->connect.is_connected) {
-			is_connected = 1;
-			if (!backlight_off) set_backlight_state(1);
+			is_connected = GF_TRUE;
+			if (!backlight_off) set_backlight_state(GF_TRUE);
 			refresh_recent_files();
-			navigation_on = (gf_term_get_option(term, GF_OPT_NAVIGATION)==GF_NAVIGATE_NONE) ? 0 : 1;
+			navigation_on = (gf_term_get_option(term, GF_OPT_NAVIGATION)==GF_NAVIGATE_NONE) ? GF_FALSE : GF_TRUE;
 		} else {
-			navigation_on = 0;
-			is_connected = 0;
+			navigation_on = GF_FALSE;
+			is_connected = GF_FALSE;
 			Duration = 0;
 		}
 		break;
@@ -381,7 +381,7 @@
 			if (full_screen) set_full_screen();
 			break;
 		case GF_KEY_1:
-			ctrl_mod_down = !ctrl_mod_down;
+			ctrl_mod_down = (Bool)!ctrl_mod_down;
 			evt->key.key_code = GF_KEY_CONTROL;
 			evt->type = ctrl_mod_down ? GF_EVENT_KEYDOWN : GF_EVENT_KEYUP;
 			gf_term_user_event(term, evt);
@@ -395,9 +395,9 @@
 		}
 		break;
 	case GF_EVENT_NAVIGATE:
-		if (gf_term_is_supported_url(term, evt->navigate.to_url, 1, 1)) {
+		if (gf_term_is_supported_url(term, evt->navigate.to_url, GF_TRUE, GF_TRUE)) {
 			gf_term_navigate_to(term, evt->navigate.to_url);
-			return 1;
+			return GF_TRUE;
 		} else {
 #ifdef _WIN32_WCE
 			u16 dst[1024];
@@ -422,9 +422,9 @@
 			info.nShow = SW_SHOWNORMAL;
 			ShellExecuteEx(&info);
 		}
-		return 1;
+		return GF_TRUE;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 //#define TERM_NOT_THREADED
@@ -451,7 +451,7 @@
 		gf_modules_del(user.modules);
 		gf_cfg_del(user.config);
 		memset(&user, 0, sizeof(GF_User));
-		return 0;
+		return GF_FALSE;
 	}
 
 #ifdef _WIN32_WCE
@@ -467,11 +467,11 @@
 
 	const char *str = gf_cfg_get_key(user.config, "General", "StartupFile");
 	if (str) {
-		do_layout(1);
+		do_layout(GF_TRUE);
 		strcpy(the_url, str);
 		gf_term_connect(term, str);
 	}
-	return 1;
+	return GF_TRUE;
 }
 
 void do_layout(Bool notif_size)
@@ -535,7 +535,7 @@
 		dwSize = 4;
 		dwValue = 0xefff ;
 		RegSetValueEx( hKey, _T("ACTimeout"), NULL, REG_DWORD, (unsigned char *)&dwValue, dwSize);
-		backlight_off = 1;
+		backlight_off = GF_TRUE;
 	} else {
 		if (prev_batt_bl) {
 			dwSize = 4;
@@ -545,7 +545,7 @@
 			dwSize = 4;
 			RegSetValueEx(hKey, _T("ACTimeout"), NULL, REG_DWORD,(unsigned char *)&prev_ac_bl, dwSize);
 		}
-		backlight_off = 0;
+		backlight_off = GF_FALSE;
 	}
 	RegCloseKey(hKey);
 	hBL = CreateEvent(NULL, FALSE, FALSE, _T("BackLightChangeEvent"));
@@ -556,29 +556,29 @@
 #endif
 }
 
-static Bool do_resume = 0;
+static Bool do_resume = GF_FALSE;
 static Bool prev_backlight_state;
 void gf_freeze_display(Bool do_gf_freeze)
 {
 	if (do_gf_freeze) {
 		prev_backlight_state = backlight_off;
-		do_resume = 0;
+		do_resume = GF_FALSE;
 		if (0 && is_connected && gf_term_get_option(term, GF_OPT_PLAY_STATE)==GF_STATE_PLAYING) {
-			do_resume= 1;
+			do_resume= GF_TRUE;
 			gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
 		}
 		/*gf_freeze display*/
 		gf_term_set_option(term, GF_OPT_FREEZE_DISPLAY, 1);
 		
-		set_backlight_state(0);
+		set_backlight_state(GF_FALSE);
 		gf_sleep(100);
 	} else {
-		if (prev_backlight_state) set_backlight_state(1);
+		if (prev_backlight_state) set_backlight_state(GF_TRUE);
 		gf_term_set_option(term, GF_OPT_FREEZE_DISPLAY, 0);
 
 		if (do_resume) {
 			gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
-			set_backlight_state(1);
+			set_backlight_state(GF_TRUE);
 		}	
 	}
 }
@@ -634,7 +634,7 @@
 	char ext_list[4096];
 	strcpy(ext_list, "");
 
-	gf_freeze_display(1);
+	gf_freeze_display(GF_TRUE);
 
 	u32 count = gf_cfg_get_key_count(user.config, "MimeTypes");
 	for (u32 i=0; i<count; i++) {
@@ -651,9 +651,9 @@
 #ifdef _WIN32_WCE
 	res = gf_file_dialog(g_hinst, hwnd, the_url, ext_list, user.config);
 #else
-	res = 0;
+	res = GF_FALSE;
 #endif
-	gf_freeze_display(0);
+	gf_freeze_display(GF_FALSE);
 
 	/*let's go*/
 	if (res) do_open_file();
@@ -720,11 +720,11 @@
 }
 void view_about(HWND hwnd)
 {
-	gf_freeze_display(1);
+	gf_freeze_display(GF_TRUE);
 //	::ShowWindow(g_hwnd_mb, SW_HIDE);
 	int iResult = DialogBox(g_hinst, MAKEINTRESOURCE(IDD_APPABOUT), hwnd,(DLGPROC)AboutDialogProc);
 //	::ShowWindow(g_hwnd_mb, SW_SHOW);
-	gf_freeze_display(0);
+	gf_freeze_display(GF_FALSE);
 }
 
 void pause_file()
@@ -754,7 +754,7 @@
 
 void set_svg_progressive()
 {
-	use_svg_prog = !use_svg_prog;
+	use_svg_prog = (Bool)!use_svg_prog;
 	if (use_svg_prog) {
 		gf_cfg_set_key(user.config, "SAXLoader", "Progressive", "yes");
 		gf_cfg_set_key(user.config, "SAXLoader", "MaxDuration", "30");
@@ -784,7 +784,7 @@
 //	term = gf_term_new(&user);
 //	gf_term_disconnect(term);
 //	gf_term_connect(term, the_url);
-	do_layout(1);
+	do_layout(GF_TRUE);
 }
 
 void do_copy_paste()
@@ -792,25 +792,25 @@
 	if (!OpenClipboard(g_hwnd)) return;
 
 	/*or we are editing text and clipboard is not empty*/
-	if (IsClipboardFormatAvailable(CF_TEXT) && (gf_term_paste_text(term, NULL, 1)==GF_OK)) {
+	if (IsClipboardFormatAvailable(CF_TEXT) && (gf_term_paste_text(term, NULL, GF_TRUE)==GF_OK)) {
 		HGLOBAL hglbCopy = GetClipboardData(CF_TEXT);
 		if (hglbCopy) {
 #ifdef _WIN32_WCE
 			char szString[1024];
 			LPCTSTR paste_string = (LPCTSTR) GlobalLock(hglbCopy);
 			CE_WideToChar((u16 *) paste_string, szString);
-			gf_term_paste_text(term, szString, 0);
+			gf_term_paste_text(term, szString, GF_FALSE);
 #else
 			char *szString = (char *)GlobalLock(hglbCopy);
-			gf_term_paste_text(term, szString, 0);
+			gf_term_paste_text(term, szString, GF_FALSE);
 #endif
 			GlobalUnlock(hglbCopy); 
 		}
 	}
 	/*we have something to copy*/
-	else if (gf_term_get_text_selection(term, 1)!=NULL) {
+	else if (gf_term_get_text_selection(term, GF_TRUE)!=NULL) {
 		u32 len;
-		const char *text = gf_term_get_text_selection(term, 0);
+		const char *text = gf_term_get_text_selection(term, GF_FALSE);
 		if (text && strlen(text)) {
 			EmptyClipboard();
 			len = strlen(text);
@@ -858,7 +858,7 @@
 		open_file(hwnd);
 		break;
 	case IDM_FILE_LOG_RTI:
-		log_rti = !log_rti;
+		log_rti = (Bool)!log_rti;
 		setup_logs();
 		break;
 	case IDM_FILE_PAUSE:
@@ -871,15 +871,15 @@
 		set_full_screen();
 		break;
 	case IDM_VIEW_STATUS:
-		show_status = !show_status;
+		show_status = (Bool)!show_status;
 		gf_cfg_set_key(user.config, "General", "ShowStatusBar", show_status ? "yes" : "no");
-		do_layout(1);
+		do_layout(GF_TRUE);
 		break;
 	case IDM_VIEW_CPU:
-		view_cpu = !view_cpu;
+		view_cpu = (Bool)!view_cpu;
 		break;
 	case IDM_VIEW_FORCEGL:
-		force_2d_gl = !force_2d_gl;
+		force_2d_gl = (Bool)!force_2d_gl;
 		gf_cfg_set_key(user.config, "Compositor", "ForceOpenGL", force_2d_gl ? "yes" : "no");
 		gf_term_set_option(term, GF_OPT_USE_OPENGL, force_2d_gl);
 		break;
@@ -931,7 +931,7 @@
 		break;
 
 	case IDM_VIEW_LOW_RATE:
-		use_low_fps = !use_low_fps;
+		use_low_fps = (Bool)!use_low_fps;
 		gf_term_set_simulation_frame_rate(term, use_low_fps ? 15.0 : 30.0);
 		break;
 	case ID_VIDEO_DIRECTDRAW:
@@ -960,7 +960,7 @@
 		break;
 
 	case IDS_CAP_DISABLE_PLAYLIST:
-		playlist_navigation_on = !playlist_navigation_on;
+		playlist_navigation_on = (Bool)!playlist_navigation_on;
 		break;
 	case IDM_VIEW_SVG_LOAD:
 		set_svg_progressive();
@@ -1065,9 +1065,9 @@
 	EnableMenuItem((HMENU)wParam, IDM_FILE_PAUSE, MF_BYCOMMAND| (is_connected ? MF_ENABLED : MF_GRAYED) );
 
 	if (/*we have something to copy*/
-		(gf_term_get_text_selection(term, 1)!=NULL) 
+		(gf_term_get_text_selection(term, GF_TRUE)!=NULL) 
 		/*or we are editing text and clipboard is not empty*/
-		|| (IsClipboardFormatAvailable(CF_TEXT) && (gf_term_paste_text(term, NULL, 1)==GF_OK))
+		|| (IsClipboardFormatAvailable(CF_TEXT) && (gf_term_paste_text(term, NULL, GF_TRUE)==GF_OK))
 	) {
 		EnableMenuItem((HMENU)wParam, ID_FILE_CUT_PASTE, MF_BYCOMMAND| MF_ENABLED);
 	} else {
@@ -1078,7 +1078,7 @@
 	
 	if (!is_connected) type = 0;
 	else type = gf_term_get_option(term, GF_OPT_NAVIGATION_TYPE);
-	navigation_on = type ? 1 : 0;
+	navigation_on = type ? GF_TRUE : GF_FALSE;
 
 	EnableMenuItem((HMENU)wParam, IDM_NAV_NONE, MF_BYCOMMAND | (!type ? MF_GRAYED : MF_ENABLED) );
 	EnableMenuItem((HMENU)wParam, IDM_NAV_SLIDE, MF_BYCOMMAND | (!type ? MF_GRAYED : MF_ENABLED) );
@@ -1094,7 +1094,7 @@
 
 	if (type) {
 		u32 mode = gf_term_get_option(term, GF_OPT_NAVIGATION);
-		navigation_on = (mode==GF_NAVIGATE_NONE) ? 0 : 1;
+		navigation_on = (mode==GF_NAVIGATE_NONE) ? GF_FALSE : GF_TRUE;
 		CheckMenuItem((HMENU)wParam, IDM_NAV_NONE, MF_BYCOMMAND | ( (mode==GF_NAVIGATE_NONE) ? MF_CHECKED : MF_UNCHECKED) );
 		CheckMenuItem((HMENU)wParam, IDM_NAV_SLIDE, MF_BYCOMMAND | ( (mode==GF_NAVIGATE_SLIDE) ? MF_CHECKED : MF_UNCHECKED) );
 		CheckMenuItem((HMENU)wParam, IDM_NAV_WALK, MF_BYCOMMAND | ( (mode==GF_NAVIGATE_WALK) ? MF_CHECKED : MF_UNCHECKED) );
@@ -1164,7 +1164,7 @@
 
 		g_hwnd_status = CreateWindow(TEXT("STATIC"), TEXT("Status"), WS_CHILD|WS_VISIBLE|SS_LEFT, 0, 0, disp_w, caption_h, hwnd, NULL, g_hinst, NULL);
 
-		do_layout(1);
+		do_layout(GF_TRUE);
 	}
 		break;
 		
@@ -1182,8 +1182,8 @@
 		break;
 	case WM_KEYDOWN:
 		if (playlist_navigation_on && !navigation_on) {
-			if (wParam==VK_LEFT) { switch_playlist(1); break; }
-			else if (wParam==VK_RIGHT) { switch_playlist(0); break; }
+			if (wParam==VK_LEFT) { switch_playlist(GF_TRUE); break; }
+			else if (wParam==VK_RIGHT) { switch_playlist(GF_FALSE); break; }
 		}
 		/*fall through*/
 	case WM_SYSKEYDOWN:
@@ -1203,22 +1203,22 @@
 		DestroyWindow(hwnd);
 		break;
     case WM_SETFOCUS:
-		gf_freeze_display(0);
+		gf_freeze_display(GF_FALSE);
 		break;
     case WM_KILLFOCUS:
         if ((HWND) wParam==g_hwnd) {
-			gf_freeze_display(1);
+			gf_freeze_display(GF_TRUE);
 		}
 		break;
     case WM_ACTIVATE:
         if (WA_INACTIVE != LOWORD(wParam)) {
 			if ((HWND) lParam == g_hwnd) {
-				gf_freeze_display(0);
+				gf_freeze_display(GF_FALSE);
 				SetFocus(hwnd);
 			}
 		} else {
 			if ((HWND) lParam == g_hwnd_disp) {
-				gf_freeze_display(1);
+				gf_freeze_display(GF_TRUE);
 			}
 		}
         break;
@@ -1272,7 +1272,7 @@
 	refresh_recent_files();
 
 	::SetTimer(g_hwnd, STATE_TIMER_ID, STATE_TIMER_DUR, NULL);
-	do_layout(1);
+	do_layout(GF_TRUE);
 
 	set_status("Loading Terminal");
 	PostMessage(g_hwnd, WM_LOADTERM, 0, 0);
@@ -1308,13 +1308,10 @@
 				   int nShowCmd 
 ) {
 	MSG 	msg;
-#ifdef _WIN32_WCE
-	TCHAR wzExePath[GF_MAX_PATH];
-#endif
 
 	HWND 	hwndOld = NULL;	
 	const char *str;
-	Bool initial_launch = 0;
+	Bool initial_launch = GF_FALSE;
 
 	if (hwndOld = FindWindow(_T("Osmophone"), NULL))
 	{
@@ -1346,8 +1343,8 @@
 #ifdef _WIN32_WCE
 	TCHAR      szBuf[MAX_PATH];
 	SystemParametersInfo(SPI_GETPLATFORMTYPE, MAX_PATH, szBuf, 0);
-	if (! lstrcmp(szBuf, __TEXT("PocketPC"))) is_ppc = 1;
-	else if (! lstrcmp(szBuf, __TEXT("Palm PC2"))) is_ppc = 1;
+	if (! lstrcmp(szBuf, __TEXT("PocketPC"))) is_ppc = GF_TRUE;
+	else if (! lstrcmp(szBuf, __TEXT("Palm PC2"))) is_ppc = GF_TRUE;
 #endif
 
 
@@ -1368,15 +1365,8 @@
 	disp_h = screen_h;
 #endif
 
-	str = gf_cfg_get_key(user.config, "General", "ModulesDirectory");
-	if (!str) {
-		gf_cfg_del(user.config);
-		MessageBox(NULL, _T("Couldn't locate GPAC plugins"), _T("Fatal Error"), MB_OK);
-		return 0;
-	}
-
-	gf_sys_init(0);
-	user.modules = gf_modules_new(str, user.config);
+	gf_sys_init(GF_FALSE);
+	user.modules = gf_modules_new(NULL, user.config);
 	if (!gf_modules_get_count(user.modules)) {
 		MessageBox(GetForegroundWindow(), _T("No modules found"), _T("GPAC Init Error"), MB_OK);
 		gf_modules_del(user.modules);
@@ -1415,10 +1405,10 @@
 	}
 
 	str = gf_cfg_get_key(user.config, "General", "Loop");
-	loop = (!str || !stricmp(str, "yes")) ? 1 : 0;
+	loop = (!str || !stricmp(str, "yes")) ? GF_TRUE : GF_FALSE;
 
 	str = gf_cfg_get_key(user.config, "SAXLoader", "Progressive");
-	use_svg_prog = (str && !strcmp(str, "yes")) ? 1 : 0;
+	use_svg_prog = (str && !strcmp(str, "yes")) ? GF_TRUE : GF_FALSE;
 
 	str = gf_cfg_get_key(user.config, "General", "RTIRefreshPeriod");
 	if (str) {
@@ -1428,7 +1418,7 @@
 	}
 
 	str = gf_cfg_get_key(user.config, "General", "ShowStatusBar");
-	show_status = (str && !strcmp(str, "yes")) ? 1 : 0;
+	show_status = (str && !strcmp(str, "yes")) ? GF_TRUE : GF_FALSE;
 
 
 #ifdef _WIN32_WCE
@@ -1437,20 +1427,20 @@
 
 	if (InitInstance(nShowCmd)) {
 		SetForegroundWindow(g_hwnd);
-		show_taskbar(0);
+		show_taskbar(GF_FALSE);
 
-		force_2d_gl = gf_term_get_option(term, GF_OPT_USE_OPENGL);
+		force_2d_gl = (Bool)gf_term_get_option(term, GF_OPT_USE_OPENGL);
 
 		while (GetMessage(&msg, NULL, 0,0) == TRUE) {
 			TranslateMessage (&msg);
 			DispatchMessage (&msg);
 
 			if (playlist_act) {
-				switch_playlist(playlist_act-1);
+				switch_playlist((Bool)(playlist_act-1));
 				playlist_act = 0;
 			}
 		}
-		show_taskbar(1);
+		show_taskbar(GF_TRUE);
 	}
 #ifdef _WIN32_WCE
 	if (is_ppc) GXCloseInput();
@@ -1461,7 +1451,7 @@
 	if (user.modules) gf_modules_del(user.modules);
 	if (user.config) gf_cfg_del(user.config);
 
-	if (backlight_off) set_backlight_state(0);
+	if (backlight_off) set_backlight_state(GF_FALSE);
 
 	gf_sys_close();
 	if (log_file) fclose(log_file);

gpac-0.5.0.svn4296.tar.bz2/applications/osmophone/openfile.cpp -> gpac-0.5.0.svn4668.tar.bz2/applications/osmophone/openfile.cpp Changed

@@ -17,8 +17,8 @@
 static u8 current_dir[GF_MAX_PATH] = "\\";
 static const char *extension_list = NULL;
 static char *out_url = NULL;
-Bool bViewUnknownTypes = 0;
-Bool playlist_mode = 0;
+Bool bViewUnknownTypes = GF_FALSE;
+Bool playlist_mode = GF_FALSE;
 GF_Config *cfg;
 
 
@@ -66,7 +66,7 @@
 	wcscat(w_str_name, w_name);
     int iRes = SendMessage(hList, LB_ADDSTRING, 0, (LPARAM)(LPCTSTR) w_str_name);
 	SendMessage(hList, LB_SETITEMDATA, iRes, (LPARAM) 1);
-	return 0;
+	return GF_FALSE;
 }
 
 Bool enum_files(void *cbk, char *name, char *path)
@@ -75,11 +75,11 @@
 
 	if (!bViewUnknownTypes && extension_list) {
 		char *ext = strrchr(name, '.');
-		if (!ext || !strstr(extension_list, ext+1)) return 0;
+		if (!ext || !strstr(extension_list, ext+1)) return GF_FALSE;
 	}
 	CE_CharToWide(name, (u16 *) w_name);
     SendMessage(hList, LB_ADDSTRING, 0, (LPARAM)(LPCTSTR) w_name);
-	return 0;
+	return GF_FALSE;
 }
 
 
@@ -97,9 +97,9 @@
 	}
 
 	/*enum directories*/
-	gf_enum_directory((const char *) current_dir, 1, enum_dirs, NULL, NULL);
+	gf_enum_directory((const char *) current_dir, GF_TRUE, enum_dirs, NULL, NULL);
 	/*enum files*/
-	gf_enum_directory((char *) current_dir, 0, enum_files, NULL, NULL);
+	gf_enum_directory((char *) current_dir, GF_FALSE, enum_files, NULL, NULL);
     SendMessage(hList, LB_SETCURSEL, 0, 0);
 	SetFocus(hList);
 }
@@ -184,10 +184,10 @@
 {
 	if (!bViewUnknownTypes && extension_list) {
 		char *ext = strrchr(name, '.');
-		if (!ext || !strstr(extension_list, ext+1)) return 0;
+		if (!ext || !strstr(extension_list, ext+1)) return GF_FALSE;
 	}
 	gf_cfg_set_key(cfg, "Playlist", path, "");
-	return 0;
+	return GF_FALSE;
 }
 
 void process_list_change(HWND hWnd, Bool add_to_pl)
@@ -216,7 +216,7 @@
 				wcscat(wdir, sTxt+2);
 				wcscat(wdir, _T("\\"));
 				CE_WideToChar((u16 *) wdir, (char *) dir);
-				gf_enum_directory(dir, 0, add_files, NULL, NULL);
+				gf_enum_directory(dir, GF_FALSE, add_files, NULL, NULL);
 			} else {
 				wcscat(w_current_dir, sTxt+2);
 				wcscat(w_current_dir, _T("\\"));
@@ -321,25 +321,25 @@
     case WM_COMMAND:
 		if (LOWORD(wParam) == IDC_FILELIST) {
 			if (HIWORD(wParam) == LBN_DBLCLK) {
-		        process_list_change(hWnd, 0);
+		        process_list_change(hWnd, GF_FALSE);
 			} else {
 	            bProcessedMsg = FALSE;
 			}
 		} else {
 			switch (LOWORD(wParam)) {
 			case IDOK:
-				process_list_change(hWnd, 0);
+				process_list_change(hWnd, GF_FALSE);
 				break;
 			case IDCANCEL:
 				EndDialog(hWnd, 0);
 				break;
 			case IDM_OF_VIEW_ALL:
-				bViewUnknownTypes = !bViewUnknownTypes;
+				bViewUnknownTypes = (Bool) !bViewUnknownTypes;
 				refresh_menu_states();
 				set_directory(w_current_dir);
 				break;
 			case IDM_OF_PLAYLIST:
-				playlist_mode = !playlist_mode;
+				playlist_mode = (Bool) !playlist_mode;
 				if (playlist_mode) refresh_playlist();
 				else set_directory(w_current_dir);
 				switch_menu_pl();
@@ -348,7 +348,7 @@
 				if (playlist_mode) {
 					playlist_act(0);
 				} else {
-					process_list_change(hWnd, 1);
+					process_list_change(hWnd, GF_TRUE);
 				}
 				break;
 			case IDM_OF_PL_UP:
@@ -396,8 +396,8 @@
 	g_hInst = inst;
 	cfg = gpac_cfg;
 	int iResult = DialogBox(inst, MAKEINTRESOURCE(IDD_FILEDIALOG), parent,(DLGPROC)FileDialogProc);
-	if (iResult>0) return 1;
-	return 0;
+	if (iResult>0) return GF_TRUE;
+	return GF_FALSE;
 }

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

@@ -67,11 +67,11 @@
 {
 	char msg[1024];
 	Osmozilla *osmo = (Osmozilla *)opaque;
-	if (!osmo->term) return 0;
+	if (!osmo->term) return GF_FALSE;
 
 	switch (evt->type) {
 	case GF_EVENT_MESSAGE:
-		if (!evt->message.message) return 0;
+		if (!evt->message.message) return GF_FALSE;
 		if (evt->message.error)
 			sprintf((char *)msg, "GPAC: %s (%s)", evt->message.message, gf_error_to_string(evt->message.error));
 		else
@@ -124,9 +124,9 @@
 		Osmozilla_SetStatus(osmo->np_instance, msg);
 		break;
 	case GF_EVENT_NAVIGATE:
-		if (gf_term_is_supported_url(osmo->term, evt->navigate.to_url, 1, osmo->disable_mime)) {
+		if (gf_term_is_supported_url(osmo->term, evt->navigate.to_url, GF_TRUE, osmo->disable_mime ? GF_TRUE : GF_FALSE)) {
 			gf_term_navigate_to(osmo->term, evt->navigate.to_url);
-			return 1;
+			return GF_TRUE;
 		} else {
 			u32 i;
 			char *target = (char *)"_self";
@@ -139,11 +139,11 @@
 				else if (!strnicmp(evt->navigate.parameters[i], "_target=", 8)) target = (char *) evt->navigate.parameters[i]+8;
 			}
 			Osmozilla_GetURL(osmo->np_instance, evt->navigate.to_url, target);
-			return 1;
+			return GF_TRUE;
 		}
 		break;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 int Osmozilla_Initialize(Osmozilla *osmo, signed short argc, char* argn[], char* argv[])
@@ -183,16 +183,16 @@
 	/*URL is not absolute, request new stream to mozilla - we don't pass absolute URLs since some may not be 
 	handled by gecko */
 	if (osmo->url) {
-		Bool absolute_url = 0;
-		if (strstr(osmo->url, "://")) absolute_url = 1;
+		Bool absolute_url = GF_FALSE;
+		if (strstr(osmo->url, "://")) absolute_url = GF_TRUE;
 		else if (osmo->url[0] == '/') {
 			FILE *test = gf_f64_open(osmo->url, "rb");
 			if (test) {	
-				absolute_url = 1;
+				absolute_url = GF_TRUE;
 				fclose(test);
 			}
 		}
-		else if ((osmo->url[1] == ':') && ((osmo->url[2] == '\\') || (osmo->url[2] == '/'))) absolute_url = 1;
+		else if ((osmo->url[1] == ':') && ((osmo->url[2] == '\\') || (osmo->url[2] == '/'))) absolute_url = GF_TRUE;
 
 		if (!absolute_url) {
 			char *url = osmo->url;
@@ -216,8 +216,7 @@
 		return 0;
 	}
 
-	str = gf_cfg_get_key(osmo->user->config, "General", "ModulesDirectory");
-	osmo->user->modules = gf_modules_new(str, osmo->user->config);
+	osmo->user->modules = gf_modules_new(NULL, osmo->user->config);
 	if (!gf_modules_get_count(osmo->user->modules)) {
 		if (osmo->user->modules) gf_modules_del(osmo->user->modules);
 		gf_free(osmo->user);
@@ -313,7 +312,11 @@
 {
 	if (!osmo->user) return;
 
+	if ( osmo->url && !strcmp(url, osmo->url))
+		return;
+
 	fprintf(stdout, "Osmozilla connecting to %s\n", url);
+
 	if (osmo->url) gf_free(osmo->url);	
 	osmo->url = gf_strdup(url);
 
@@ -509,7 +512,7 @@
 void Osmozilla_QualitySwitch(Osmozilla *osmo, int switch_up)
 {
 	if (osmo->term)
-		gf_term_switch_quality(osmo->term, switch_up ? 1 : 0);
+		gf_term_switch_quality(osmo->term, switch_up ? GF_TRUE : GF_FALSE);
 }
 
 void Osmozilla_SetURL(Osmozilla *osmo, const char *url)

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

gpac-0.5.0.svn4668.tar.bz2/bin/x64 Added

gpac-0.5.0.svn4668.tar.bz2/bin/x64/Release Added

gpac-0.5.0.svn4296.tar.bz2/build/android/jni/Application.mk -> gpac-0.5.0.svn4668.tar.bz2/build/android/jni/Application.mk Changed

gpac-0.5.0.svn4296.tar.bz2/build/android/jni/gpac_build_android -> gpac-0.5.0.svn4668.tar.bz2/build/android/jni/gpac_build_android Changed

@@ -105,46 +105,59 @@
 #echo
 #echo "[OK] success." 
 
-LIBS_DIR="$BASEPATH/applications/osmo4_android/libs/"
+LIBS_DIR="$BASEPATH/applications/osmo4_android/libs"
+mkdir -p $LIBS_DIR
 echo "Copying libs to libs dir $LIBS_DIR ..."
 for i in $(find . -name '*.so')
 do
 	echo -n " Copy $i"
+	TMP_DIR=$(dirname $i)
+	echo $TMP_DIR
+	mkdir -p "$LIBS_DIR/$TMP_DIR"
 	cp "$i" "$LIBS_DIR/$i"
 done
 echo
 echo "[OK] success module for Osmo4."
 
 
-LIBS_DIR="$BASEPATH/applications/mp4box_android/libs/"
+LIBS_DIR="$BASEPATH/applications/mp4box_android/libs"
+mkdir -p $LIBS_DIR
 echo "Copying libs to libs dir $LIBS_DIR ..."
 for i in $(find . $ -name '*.so' $ -a $ -name "*ft2*" -o -name "*edit*" -o -name "*libgpac.so*" -o -name "*jpeg*" -o -name "*js_osmo*" -o -name "*mp4box*" -o -name "*openjpeg*" -o -name "*png*" -o -name "*libz.*" $ )
 do
-echo " Copy $i"
-cp "$i" "$LIBS_DIR/$i"
+	echo " Copy $i"
+	TMP_DIR=$(dirname $i)
+	mkdir -p "$LIBS_DIR/$TMP_DIR"
+	cp "$i" "$LIBS_DIR/$i"
 done
 echo
 echo "[OK] success module for MP4box."
 
 
-LIBS_DIR="$BASEPATH/applications/osmo4_android/libs/"
+LIBS_DIR="$BASEPATH/applications/osmo4_android/libs"
+mkdir -p $LIBS_DIR
 cd "$BASEPATH/extra_lib/lib/android"
 echo "Copying all extra libs to $LIBS_DIR ..."
 for i in $(find . -name '*.so')
 do
-echo " Copy $i"
-cp "$i" "$LIBS_DIR/$i"
+	echo " Copy $i"
+	TMP_DIR=$(dirname $i)
+	mkdir -p "$LIBS_DIR/$TMP_DIR"
+	cp "$i" "$LIBS_DIR/$i"
 done
 echo "[OK] success extra lib for Osmo4."
 
-LIBS_DIR="$BASEPATH/applications/mp4box_android/libs/"
+LIBS_DIR="$BASEPATH/applications/mp4box_android/libs"
+mkdir -p $LIBS_DIR
 cd "$BASEPATH/extra_lib/lib/android"
 echo "Copying all extra libs to $LIBS_DIR ..."
 
 for i in $(find . $ -name '*.so' $ -a $ -name "*ft2*" -o -name "*edit*" -o -name "*libgpac.so*" -o -name "*jpeg*" -o -name "*js_osmo*" -o -name "*mp4box*" -o -name "*openjpeg*" -o -name "*png*" -o -name "*libz.*" $ )
 do
-echo " Copy $i"
-cp "$i" "$LIBS_DIR/$i"
+	echo " Copy $i"
+	TMP_DIR=$(dirname $i)
+	mkdir -p "$LIBS_DIR/$TMP_DIR"
+	cp "$i" "$LIBS_DIR/$i"
 done
 echo "[OK] success extra lib MP4box."
 
@@ -163,7 +176,7 @@
 rm $BASEPATH/Osmo4-$(grep "\#define GPAC_VERSION " $BASEPATH/include/gpac/version.h | cut -d "\"" -f 2 )-r$version.apk
 fi  
 
-zipalign -v 4 bin/Osmo4-unaligned.apk $BASEPATH/Osmo4-$(grep "\#define GPAC_VERSION " $BASEPATH/include/gpac/version.h | cut -d "\"" -f 2 )-r$version.apk
+zipalign -v 4 bin/Osmo4-release-unaligned.apk $BASEPATH/Osmo4-$(grep "\#define GPAC_VERSION " $BASEPATH/include/gpac/version.h | cut -d "\"" -f 2 )-r$version.apk
 rm bin/Osmo4-*
 echo -e "\n[OK] success."
 fi

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

@@ -99,6 +99,7 @@
 	../../../../src/media_tools/vobsub.c \
 	../../../../src/media_tools/media_import.c \
 	../../../../src/media_tools/text_import.c \
+	../../../../src/media_tools/webvtt.c \
 	../../../../src/media_tools/ismacryp.c \
 	../../../../src/media_tools/img.c \
 	../../../../src/media_tools/mpegts.c \
@@ -115,6 +116,8 @@
 	../../../../src/media_tools/m3u8.c \
 	../../../../src/media_tools/ait.c \
 	../../../../src/media_tools/dsmcc.c \
+	../../../../src/media_tools/html5_media.c \
+	../../../../src/media_tools/html5_mse.c \
 	../../../../src/laser/lsr_tables.c \
 	../../../../src/laser/lsr_dec.c \
 	../../../../src/laser/lsr_enc.c \
@@ -264,6 +267,8 @@
 	../../../../src/scenegraph/smil_timing.c \
 	../../../../src/scenegraph/vrml_script.c \
 	../../../../src/scenegraph/vrml_proto.c \
+	../../../../src/scenegraph/html5_media_smjs.c \
+	../../../../src/scenegraph/html5_mse_smjs.c \
 	../../../../src/odf/ipmpx_dump.c \
 	../../../../src/odf/odf_code.c \
 	../../../../src/odf/desc_private.c \

gpac-0.5.0.svn4296.tar.bz2/build/android/jni/modules/Android.mk -> gpac-0.5.0.svn4668.tar.bz2/build/android/jni/modules/Android.mk Changed

gpac-0.5.0.svn4296.tar.bz2/build/android/jni/modules/Application.mk -> gpac-0.5.0.svn4668.tar.bz2/build/android/jni/modules/Application.mk Changed

gpac-0.5.0.svn4296.tar.bz2/build/android/jni/modules/base.mk -> gpac-0.5.0.svn4668.tar.bz2/build/android/jni/modules/base.mk Changed

gpac-0.5.0.svn4296.tar.bz2/build/android/jni/modules/gm_aac_in.mk -> gpac-0.5.0.svn4668.tar.bz2/build/android/jni/modules/gm_aac_in.mk Changed

gpac-0.5.0.svn4296.tar.bz2/build/android/jni/modules/gm_img_in.mk -> gpac-0.5.0.svn4668.tar.bz2/build/android/jni/modules/gm_img_in.mk Changed

gpac-0.5.0.svn4296.tar.bz2/build/android/jni/modules/gm_ismacryp.mk -> gpac-0.5.0.svn4668.tar.bz2/build/android/jni/modules/gm_ismacryp.mk Changed

gpac-0.5.0.svn4296.tar.bz2/build/android/jni/modules/gm_isom_in.mk -> gpac-0.5.0.svn4668.tar.bz2/build/android/jni/modules/gm_isom_in.mk Changed

gpac-0.5.0.svn4296.tar.bz2/build/android/jni/modules/gm_mp3_in.mk -> gpac-0.5.0.svn4668.tar.bz2/build/android/jni/modules/gm_mp3_in.mk Changed

gpac-0.5.0.svn4668.tar.bz2/build/android/jni/modules/gm_osd.mk Added

gpac-0.5.0.svn4296.tar.bz2/build/codeblocks/ismacryp.cbp -> gpac-0.5.0.svn4668.tar.bz2/build/codeblocks/ismacryp.cbp Changed

gpac-0.5.0.svn4296.tar.bz2/build/codeblocks/isom_in.cbp -> gpac-0.5.0.svn4668.tar.bz2/build/codeblocks/isom_in.cbp Changed

gpac-0.5.0.svn4296.tar.bz2/build/codeblocks/libgpac.cbp -> gpac-0.5.0.svn4668.tar.bz2/build/codeblocks/libgpac.cbp Changed

gpac-0.5.0.svn4296.tar.bz2/build/msevc4/ismacryp.vcp -> gpac-0.5.0.svn4668.tar.bz2/build/msevc4/ismacryp.vcp Changed

gpac-0.5.0.svn4296.tar.bz2/build/msevc4/isom_in.vcp -> gpac-0.5.0.svn4668.tar.bz2/build/msevc4/isom_in.vcp Changed

gpac-0.5.0.svn4296.tar.bz2/build/msevc4/libgpac.vcp -> gpac-0.5.0.svn4668.tar.bz2/build/msevc4/libgpac.vcp Changed

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

@@ -5,10 +5,18 @@
       <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>
@@ -21,40 +29,67 @@
     <UseOfAtl>Dynamic</UseOfAtl>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <UseOfAtl>Dynamic</UseOfAtl>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <UseOfAtl>Dynamic</UseOfAtl>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <UseOfAtl>Dynamic</UseOfAtl>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>Performing registration</Message>
-      <Command>regsvr32 /s /c "$(TargetPath)"
-echo regsvr32 exec. time &gt; "$(OutDir)regsvr32.trg"
-</Command>
-      <Outputs>$(OutDir)regsvr32.trg;%(Outputs)</Outputs>
+      <Message>
+      </Message>
+      <Command>
+      </Command>
+      <Outputs>
+      </Outputs>
     </CustomBuildStep>
     <Midl>
       <TypeLibraryName>.\obj/w32_deb/GPAX.tlb</TypeLibraryName>
@@ -83,7 +118,7 @@
       <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)/$(Configuration)/$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>..\..\applications\GPAX\GPAX.def</ModuleDefinitionFile>
@@ -98,13 +133,65 @@
       <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>Performing registration</Message>
-      <Command>regsvr32 /s /c "$(TargetPath)"
-echo regsvr32 exec. time &gt; "$(OutDir)regsvr32.trg"
-</Command>
-      <Outputs>$(OutDir)regsvr32.trg;%(Outputs)</Outputs>
+      <Message>
+      </Message>
+      <Command>
+      </Command>
+      <Outputs>
+      </Outputs>
     </CustomBuildStep>
     <Midl>
       <TypeLibraryName>.\obj/w32_rel/GPAX.tlb</TypeLibraryName>
@@ -130,10 +217,11 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x040c</Culture>
+      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>js32.lib;zlib.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)/$(Configuration)/GPAX.dll</OutputFile>
+      <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>
@@ -153,6 +241,61 @@
       </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" />
@@ -161,21 +304,33 @@
   <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>
@@ -187,15 +342,21 @@
   <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -21,31 +29,55 @@
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Dynamic</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Dynamic</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -77,7 +109,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)/$(Configuration)/Osmo4.exe</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
@@ -89,6 +121,46 @@
       <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>
@@ -121,7 +193,7 @@
       <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/Osmo4.exe</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
@@ -132,68 +204,148 @@
       <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,32 +28,61 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -59,7 +96,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/faad;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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>
@@ -78,7 +115,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>libfaad.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -92,6 +129,48 @@
       <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>
@@ -105,7 +184,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/faad;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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>
@@ -123,7 +202,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>libfaad.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -137,18 +216,69 @@
       <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,11 +28,21 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -32,22 +50,43 @@
     <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'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -80,7 +119,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>liba52.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -97,6 +136,51 @@
       <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>
@@ -128,7 +212,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>liba52.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -142,18 +226,69 @@
       <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <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'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -76,7 +112,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -91,6 +127,49 @@
       <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>
@@ -121,7 +200,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -135,18 +214,67 @@
       <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -76,7 +112,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -90,6 +126,47 @@
       <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>
@@ -120,7 +197,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -134,18 +211,68 @@
       <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <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'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -76,7 +112,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -89,6 +125,47 @@
       <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>
@@ -119,7 +196,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -132,13 +209,48 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Bscmake>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\audio_filter\audio_filter.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+  <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -77,7 +113,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -91,6 +127,48 @@
       <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>
@@ -121,7 +199,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -135,6 +213,48 @@
       <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" />

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <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'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -76,7 +112,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -89,6 +125,47 @@
       <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>
@@ -119,7 +196,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -132,12 +209,56 @@
       <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <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'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -76,7 +112,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -89,6 +125,47 @@
       <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>
@@ -119,7 +196,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -132,12 +209,56 @@
       <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>

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/dashcast.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>{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}</ProjectGuid>
+    <RootNamespace>dashcast</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">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'">
+    <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>avcodec-54.lib;avformat-54.lib;avutil-51.lib;swscale-2.lib;Ws2_32.lib</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+    </ProjectReference>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <RegisterOutput>false</RegisterOutput>
+      <AdditionalDependencies>avcodec-54.lib;avformat-54.lib;avutil-51.lib;swscale-2.lib;Ws2_32.lib</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+    </Link>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+    </ProjectReference>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MinSpace</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>avcodec-54.lib;avformat-54.lib;avutil-51.lib;swscale-2.lib;Ws2_32.lib</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <Optimization>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>avcodec-54.lib;avformat-54.lib;avutil-51.lib;swscale-2.lib;Ws2_32.lib</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\applications\dashcast\audio_data.c" />
+    <ClCompile Include="..\..\applications\dashcast\audio_decoder.c" />
+    <ClCompile Include="..\..\applications\dashcast\audio_encoder.c" />
+    <ClCompile Include="..\..\applications\dashcast\audio_muxer.c" />
+    <ClCompile Include="..\..\applications\dashcast\circular_buffer.c" />
+    <ClCompile Include="..\..\applications\dashcast\cmd_data.c" />
+    <ClCompile Include="..\..\applications\dashcast\controler.c" />
+    <ClCompile Include="..\..\applications\dashcast\dashcast.c" />
+    <ClCompile Include="..\..\applications\dashcast\message_queue.c" />
+    <ClCompile Include="..\..\applications\dashcast\register.c" />
+    <ClCompile Include="..\..\applications\dashcast\task.c" />
+    <ClCompile Include="..\..\applications\dashcast\video_data.c" />
+    <ClCompile Include="..\..\applications\dashcast\video_decoder.c" />
+    <ClCompile Include="..\..\applications\dashcast\video_encoder.c" />
+    <ClCompile Include="..\..\applications\dashcast\video_muxer.c" />
+    <ClCompile Include="..\..\applications\dashcast\video_scaler.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\applications\dashcast\audio_data.h" />
+    <ClInclude Include="..\..\applications\dashcast\audio_decoder.h" />
+    <ClInclude Include="..\..\applications\dashcast\audio_encoder.h" />
+    <ClInclude Include="..\..\applications\dashcast\audio_muxer.h" />
+    <ClInclude Include="..\..\applications\dashcast\circular_buffer.h" />
+    <ClInclude Include="..\..\applications\dashcast\cmd_data.h" />
+    <ClInclude Include="..\..\applications\dashcast\controler.h" />
+    <ClInclude Include="..\..\applications\dashcast\libav_compat.h" />
+    <ClInclude Include="..\..\applications\dashcast\message_queue.h" />
+    <ClInclude Include="..\..\applications\dashcast\register.h" />
+    <ClInclude Include="..\..\applications\dashcast\task.h" />
+    <ClInclude Include="..\..\applications\dashcast\video_data.h" />
+    <ClInclude Include="..\..\applications\dashcast\video_decoder.h" />
+    <ClInclude Include="..\..\applications\dashcast\video_encoder.h" />
+    <ClInclude Include="..\..\applications\dashcast\video_muxer.h" />
+    <ClInclude Include="..\..\applications\dashcast\video_scaler.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -76,7 +112,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -89,6 +125,46 @@
       <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>
@@ -119,7 +195,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -132,12 +208,57 @@
       <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <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'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -77,7 +113,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;..\..\extra_lib\lib\$(Platform)\$(Configuration);$(DXSDK_DIR)Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -91,6 +127,49 @@
       <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>
@@ -122,7 +201,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;..\..\extra_lib\lib\$(Platform)\$(Configuration);$(DXSDK_DIR)Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -136,6 +215,48 @@
       <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" />
@@ -143,33 +264,53 @@
   <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>
@@ -180,9 +321,13 @@
   <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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'">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>
@@ -76,7 +112,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -90,6 +126,47 @@
       <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>
@@ -120,7 +197,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -134,24 +211,80 @@
       <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -77,7 +113,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -94,6 +130,51 @@
       <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>
@@ -125,7 +206,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -139,6 +220,49 @@
       <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" />

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <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'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -77,7 +113,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -90,6 +126,48 @@
       <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>
@@ -122,7 +200,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -135,30 +213,88 @@
       <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>

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

@@ -1,8 +1,14 @@
 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
@@ -15,6 +21,9 @@
 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
@@ -33,8 +42,14 @@
 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
@@ -43,6 +58,9 @@
 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
@@ -66,8 +84,6 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ac3_in", "ac3_in.vcxproj", "{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osmophone", "osmophone.vcxproj", "{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}"
-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}"
@@ -90,211 +106,466 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GPAX", "GPAX.vcxproj", "{72486240-A124-496E-A67A-E76FEC7E99BE}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hyb_in", "hyb_in.vcxproj", "{41B1DAF0-D7ED-4934-B915-05DBB0EE6B0E}"
-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
 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
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Win32.ActiveCfg = Release|Win32
-		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.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
-		{41B1DAF0-D7ED-4934-B915-05DBB0EE6B0E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{41B1DAF0-D7ED-4934-B915-05DBB0EE6B0E}.Debug|Win32.Build.0 = Debug|Win32
-		{41B1DAF0-D7ED-4934-B915-05DBB0EE6B0E}.Release|Win32.ActiveCfg = Release|Win32
-		{41B1DAF0-D7ED-4934-B915-05DBB0EE6B0E}.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
 	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}
+		{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.svn4296.tar.bz2/build/msvc10/gpac_js.vcxproj -> gpac-0.5.0.svn4668.tar.bz2/build/msvc10/gpac_js.vcxproj Changed

@@ -5,10 +5,18 @@
       <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>
@@ -20,11 +28,21 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -32,19 +50,37 @@
     <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'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -77,7 +113,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)/$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -92,6 +128,49 @@
       <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>
@@ -123,7 +202,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)/$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -137,12 +216,59 @@
       <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>

gpac-0.5.0.svn4296.tar.bz2/build/msvc10/hyb_in.vcxproj -> gpac-0.5.0.svn4668.tar.bz2/build/msvc10/hyb_in.vcxproj Changed

@@ -5,10 +5,18 @@
       <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>
@@ -21,28 +29,49 @@
     <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>
@@ -64,6 +93,24 @@
       <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>
@@ -83,6 +130,24 @@
       <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" />

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -58,7 +94,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/jpeg;../../extra_lib/include/zlib;../../extra_lib/include/openjpeg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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>
@@ -77,7 +113,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>libjpeg.lib;libpng.lib;zlib.lib;LibOpenJPEGd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -91,6 +127,48 @@
       <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>
@@ -104,7 +182,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/zlib;../../extra_lib/include/jpeg;../../extra_lib/include/openjpeg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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>
@@ -122,7 +200,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>libpng.lib;zlib.lib;libjpeg.lib;LibOpenJPEG.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -136,38 +214,101 @@
       <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <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'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -76,7 +112,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -89,6 +125,47 @@
       <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>
@@ -119,7 +196,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -132,12 +209,56 @@
       <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\ismacryp.c">
+    <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -77,7 +113,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -90,6 +126,47 @@
       <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>
@@ -120,7 +197,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -133,31 +210,88 @@
       <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\cache.c">
+    <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -76,7 +112,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -89,6 +125,46 @@
       <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>
@@ -119,7 +195,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -132,12 +208,57 @@
       <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>

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

@@ -1,14 +1,395 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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\generic_subtitle.c" />
+    <ClCompile Include="..\..\src\isomedia\hinting.c" />
+    <ClCompile Include="..\..\src\isomedia\hint_track.c" />
+    <ClCompile Include="..\..\src\isomedia\isom_intern.c" />
+    <ClCompile Include="..\..\src\isomedia\isom_read.c" />
+    <ClCompile Include="..\..\src\isomedia\isom_store.c" />
+    <ClCompile Include="..\..\src\isomedia\isom_write.c" />
+    <ClCompile Include="..\..\src\isomedia\media.c" />
+    <ClCompile Include="..\..\src\isomedia\media_odf.c" />
+    <ClCompile Include="..\..\src\isomedia\meta.c" />
+    <ClCompile Include="..\..\src\isomedia\movie_fragments.c" />
+    <ClCompile Include="..\..\src\isomedia\sample_descs.c" />
+    <ClCompile Include="..\..\src\isomedia\stbl_read.c" />
+    <ClCompile Include="..\..\src\isomedia\stbl_write.c" />
+    <ClCompile Include="..\..\src\isomedia\track.c" />
+    <ClCompile Include="..\..\src\isomedia\tx3g.c" />
+    <ClCompile Include="..\..\src\laser\lsr_dec.c" />
+    <ClCompile Include="..\..\src\laser\lsr_enc.c" />
+    <ClCompile Include="..\..\src\laser\lsr_tables.c" />
+    <ClCompile Include="..\..\src\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\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>
@@ -20,27 +401,51 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <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'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -81,6 +486,46 @@
       <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>
@@ -115,1036 +560,41 @@
       <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\isomedia\generic_subtitle.c" />
-    <ClCompile Include="..\..\src\scene_manager\swf_svg.c" />
-    <ClCompile Include="..\..\src\utils\alloc.c" />
-    <ClCompile Include="..\..\src\utils\sha1.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\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\token.c" />
-    <ClCompile Include="..\..\src\utils\uni_bidi.c" />
-    <ClCompile Include="..\..\src\utils\unicode.c" />
-    <ClCompile Include="..\..\src\utils\url.c" />
-    <ClCompile Include="..\..\src\utils\utf.c" />
-    <ClCompile Include="..\..\src\utils\xml_parser.c" />
-    <ClCompile Include="..\..\src\odf\desc_private.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\odf\descriptors.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\odf\ipmpx_code.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\odf\ipmpx_dump.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\odf\ipmpx_parse.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\odf\oci_codec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\odf\odf_code.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\odf\odf_codec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\odf\odf_command.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\odf\odf_dump.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\odf\odf_parse.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\odf\qos.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\odf\slc.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bifs\arith_decoder.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bifs\bifs_codec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bifs\bifs_node_tables.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bifs\com_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bifs\com_enc.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bifs\conditional.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bifs\field_decode.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bifs\field_encode.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bifs\memory_decoder.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bifs\predictive_mffield.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bifs\quantize.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bifs\script_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bifs\script_enc.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bifs\unquantize.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\avc_ext.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\box_code_3gpp.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\box_code_adobe.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\box_code_apple.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\box_code_base.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\box_code_drm.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\box_code_meta.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\box_dump.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\box_funcs.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\data_map.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\hint_track.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\hinting.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\drm_sample.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\isom_intern.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\isom_read.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\isom_store.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\isom_write.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\media.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\media_odf.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\meta.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\movie_fragments.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\sample_descs.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\stbl_read.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\stbl_write.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\track.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\tx3g.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ietf\rtcp.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ietf\rtp.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ietf\rtp_depacketizer.c" />
-    <ClCompile Include="..\..\src\ietf\rtp_packetizer.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ietf\rtp_pck_3gpp.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ietf\rtp_pck_mpeg12.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ietf\rtp_pck_mpeg4.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ietf\rtp_streamer.c" />
-    <ClCompile Include="..\..\src\ietf\rtsp_command.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ietf\rtsp_common.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ietf\rtsp_response.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ietf\rtsp_session.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ietf\sdp.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\base_scenegraph.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\commands.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\dom_events.c" />
-    <ClCompile Include="..\..\src\scenegraph\dom_smjs.c" />
-    <ClCompile Include="..\..\src\scenegraph\mpeg4_animators.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\mpeg4_nodes.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\mpeg4_valuator.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\smil_anim.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\smil_timing.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <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">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\vrml_proto.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\vrml_route.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\vrml_script.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\vrml_smjs.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\vrml_tools.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\x3d_nodes.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\xbl_process.c" />
-    <ClCompile Include="..\..\src\scenegraph\xml_ns.c" />
-    <ClCompile Include="..\..\src\media_tools\ait.c" />
-    <ClCompile Include="..\..\src\media_tools\av_parsers.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\avilib.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <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">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\img.c" />
-    <ClCompile Include="..\..\src\media_tools\ismacryp.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\isom_hinter.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\isom_tools.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\m2ts_mux.c" />
-    <ClCompile Include="..\..\src\media_tools\m3u8.c">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\media_export.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\media_import.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\mpd.c">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\dash_client.c">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\mpeg2_ps.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\mpegts.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\reedsolomon.c" />
-    <ClCompile Include="..\..\src\media_tools\saf.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\text_import.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\vobsub.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scene_manager\encode_isom.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scene_manager\loader_bt.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scene_manager\loader_isom.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scene_manager\loader_qt.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scene_manager\loader_svg.c" />
-    <ClCompile Include="..\..\src\scene_manager\loader_xmt.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scene_manager\scene_dump.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scene_manager\scene_engine.c" />
-    <ClCompile Include="..\..\src\scene_manager\scene_manager.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scene_manager\scene_stats.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scene_manager\swf_bifs.c" />
-    <ClCompile Include="..\..\src\scene_manager\swf_parse.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scene_manager\text_to_bifs.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\mcrypt\cbc.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\mcrypt\cfb.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\mcrypt\ctr.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\mcrypt\des.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\mcrypt\ecb.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\mcrypt\g_crypt.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\mcrypt\ncfb.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\mcrypt\nofb.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\mcrypt\ofb.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\mcrypt\rijndael-128.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\mcrypt\rijndael-192.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\mcrypt\rijndael-256.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\mcrypt\stream.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\mcrypt\tripledes.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\channel.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\clock.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\decoder.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\input_sensor.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\media_control.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\media_manager.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\media_memory.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\media_object.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\media_sensor.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\mpeg4_inline.c" />
-    <ClCompile Include="..\..\src\terminal\network_service.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\object_browser.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\object_manager.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\scene.c" />
-    <ClCompile Include="..\..\src\terminal\svg_external.c" />
-    <ClCompile Include="..\..\src\terminal\term_node_init.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\terminal.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <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\laser\lsr_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\laser\lsr_enc.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\src\laser\lsr_tables.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+  <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>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\utils\module_wrap.h" />
-    <ClInclude Include="..\..\include\gpac\internal\odf_dev.h" />
-    <ClInclude Include="..\..\include\gpac\internal\bifs_dev.h" />
-    <ClInclude Include="..\..\include\gpac\internal\bifs_tables.h" />
-    <ClInclude Include="..\..\src\bifs\quant.h" />
-    <ClInclude Include="..\..\src\bifs\script.h" />
-    <ClInclude Include="..\..\include\gpac\internal\isomedia_dev.h" />
-    <ClInclude Include="..\..\include\gpac\internal\ietf_dev.h" />
-    <ClInclude Include="..\..\include\gpac\internal\scenegraph_dev.h" />
-    <ClInclude Include="..\..\include\gpac\internal\smjs_api.h" />
-    <ClInclude Include="..\..\include\gpac\internal\avilib.h" />
-    <ClInclude Include="..\..\include\gpac\internal\dvb_mpe_dev.h" />
-    <ClInclude Include="..\..\include\gpac\internal\media_dev.h" />
-    <ClInclude Include="..\..\src\media_tools\mpeg2_ps.h" />
-    <ClInclude Include="..\..\include\gpac\internal\ogg.h" />
-    <ClInclude Include="..\..\include\gpac\internal\reedsolomon.h" />
-    <ClInclude Include="..\..\include\gpac\internal\vobsub.h" />
-    <ClInclude Include="..\..\include\gpac\internal\swf_dev.h" />
-    <ClInclude Include="..\..\include\gpac\internal\crypt_dev.h" />
-    <ClInclude Include="..\..\src\terminal\input_sensor.h" />
-    <ClInclude Include="..\..\src\terminal\media_control.h" />
-    <ClInclude Include="..\..\src\terminal\media_memory.h" />
-    <ClInclude Include="..\..\include\gpac\internal\terminal_dev.h" />
-    <ClInclude Include="..\..\include\gpac\internal\camera.h" />
-    <ClInclude Include="..\..\include\gpac\internal\compositor_dev.h" />
-    <ClInclude Include="..\..\src\compositor\drawable.h" />
-    <ClInclude Include="..\..\src\compositor\gl_inc.h" />
-    <ClInclude Include="..\..\include\gpac\internal\mesh.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="..\..\include\gpac\internal\laser_dev.h" />
-    <ClInclude Include="..\..\include\gpac\ait.h" />
-    <ClInclude Include="..\..\include\gpac\modules\audio_out.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\modules\codec.h" />
-    <ClInclude Include="..\..\include\gpac\color.h" />
-    <ClInclude Include="..\..\include\gpac\compositor.h" />
-    <ClInclude Include="..\..\include\gpac\config_file.h" />
-    <ClInclude Include="..\..\include\gpac\configuration.h" />
-    <ClInclude Include="..\..\include\gpac\constants.h" />
-    <ClInclude Include="..\..\include\gpac\crypt.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\modules\font.h" />
-    <ClInclude Include="..\..\include\gpac\ietf.h" />
-    <ClInclude Include="..\..\include\gpac\modules\ipmp.h" />
-    <ClInclude Include="..\..\include\gpac\ismacryp.h" />
-    <ClInclude Include="..\..\include\gpac\iso639.h" />
-    <ClInclude Include="..\..\include\gpac\isomedia.h" />
-    <ClInclude Include="..\..\include\gpac\modules\js_usr.h" />
-    <ClInclude Include="..\..\include\gpac\laser.h" />
-    <ClInclude Include="..\..\include\gpac\list.h" />
-    <ClInclude Include="..\..\include\gpac\internal\m3u8.h" />
-    <ClInclude Include="..\..\include\gpac\math.h" />
-    <ClInclude Include="..\..\include\gpac\media_tools.h" />
-    <ClInclude Include="..\..\include\gpac\mediaobject.h" />
-    <ClInclude Include="..\..\include\gpac\module.h" />
-    <ClInclude Include="..\..\include\gpac\internal\mpd.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\modules\raster2d.h" />
-    <ClInclude Include="..\..\include\gpac\rtp_streamer.h" />
-    <ClInclude Include="..\..\include\gpac\scene_engine.h" />
-    <ClInclude Include="..\..\include\gpac\scene_manager.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\modules\service.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\modules\term_ext.h" />
-    <ClInclude Include="..\..\include\gpac\term_info.h" />
-    <ClInclude Include="..\..\include\gpac\terminal.h" />
-    <ClInclude Include="..\..\include\gpac\thread.h" />
-    <ClInclude Include="..\..\include\gpac\token.h" />
-    <ClInclude Include="..\..\include\gpac\tools.h" />
-    <ClInclude Include="..\..\include\gpac\user.h" />
-    <ClInclude Include="..\..\include\gpac\utf.h" />
-    <ClInclude Include="..\..\include\gpac\version.h" />
-    <ClInclude Include="..\..\include\gpac\revision.h" />
-    <ClInclude Include="..\..\include\gpac\modules\video_out.h" />
-    <ClInclude Include="..\..\include\gpac\xml.h" />
-  </ItemGroup>
+    <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>

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/libgpac.vcxproj.filters Added

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

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -80,8 +116,8 @@
       <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
     </ProjectReference>
     <Link>
-      <AdditionalDependencies>js32.lib;zlib.lib;winmm.lib;ws2_32.lib;ssleay32.lib;libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)/$(Configuration)/libgpac.dll</OutputFile>
+      <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>
@@ -89,7 +125,7 @@
       </ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>.\obj/$(Platform)/$(Configuration)/libgpac_dll/libgpac.pdb</ProgramDatabaseFile>
-      <ImportLibrary>.\obj/$(Platform)/$(Configuration)/libgpac_dll/libgpac.lib</ImportLibrary>
+      <ImportLibrary>../../bin/$(Platform)/$(Configuration)/libgpac.lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
     <Bscmake>
@@ -97,6 +133,54 @@
       <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>
@@ -130,8 +214,8 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>js32.lib;zlib.lib;winmm.lib;ws2_32.lib;opengl32.lib;glu32.lib;ssleay32.lib;libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)/$(Configuration)/libgpac.dll</OutputFile>
+      <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>
@@ -145,6 +229,52 @@
       <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -58,7 +94,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/mad;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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>
@@ -77,7 +113,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>libmad.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -91,6 +127,48 @@
       <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>
@@ -104,7 +182,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/mad;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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>
@@ -122,7 +200,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>libmad.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -136,19 +214,70 @@
       <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -19,11 +27,21 @@
     <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>
@@ -31,19 +49,33 @@
     <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'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -73,7 +105,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)/$(Configuration)/MP42TS.exe</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -85,6 +117,44 @@
       <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>.\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>%(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>
@@ -100,9 +170,9 @@
       <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>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </ClCompile>
@@ -112,7 +182,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)/$(Configuration)/MP42TS.exe</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
@@ -123,12 +193,53 @@
       <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,32 +28,57 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -76,7 +109,7 @@
     <Link>
       <RegisterOutput>false</RegisterOutput>
       <AdditionalDependencies>zlib.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/MP4Box.exe</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -92,6 +125,49 @@
       <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>
@@ -119,7 +195,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>zlib.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)/$(Configuration)/MP4Box.exe</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
@@ -135,25 +211,79 @@
       </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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,57 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -76,7 +110,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>User32.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)/$(Configuration)/MP4Client.exe</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
@@ -87,6 +121,45 @@
       <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>
@@ -114,7 +187,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>User32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)/$(Configuration)/MP4Client.exe</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
@@ -125,18 +198,63 @@
       <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -21,28 +29,53 @@
     <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>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <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>
@@ -59,12 +92,31 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <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>
@@ -76,7 +128,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -84,6 +136,24 @@
       <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" />

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -76,7 +112,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -89,6 +125,46 @@
       <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>
@@ -119,7 +195,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -132,13 +208,58 @@
       <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>

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/mse_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>{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}</ProjectGuid>
+    <RootNamespace>dash</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </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.svn4296.tar.bz2/build/msvc10/odf_dec.vcxproj -> gpac-0.5.0.svn4668.tar.bz2/build/msvc10/odf_dec.vcxproj Changed

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <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'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -76,7 +112,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -89,6 +125,47 @@
       <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>
@@ -120,7 +197,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -133,13 +210,58 @@
       <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <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'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -76,8 +112,8 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>ogg_static.lib;vorbis_static.lib;theora_static.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -91,6 +127,49 @@
       <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>
@@ -121,8 +200,8 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>vorbis_static.lib;theora_static.lib;ogg_static.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -136,31 +215,89 @@
       <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>

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/openhevc.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">
+    <ProjectName>openhevc_dec</ProjectName>
+    <ProjectGuid>{073E2381-4FDE-4C4D-B217-C489EF17C48B}</ProjectGuid>
+    <RootNamespace>openhevc_dec</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/dymmy_in_deb/openhevc_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/dymmy_in_deb/openhevc_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_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.svn4296.tar.bz2/build/msvc10/opensvc.vcxproj -> gpac-0.5.0.svn4668.tar.bz2/build/msvc10/opensvc.vcxproj Changed

@@ -5,10 +5,18 @@
       <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>
@@ -21,31 +29,59 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -77,7 +113,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -91,6 +127,47 @@
       <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>
@@ -121,7 +198,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -135,13 +212,60 @@
       <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>

gpac-0.5.0.svn4296.tar.bz2/build/msvc10/osmophone.vcxproj -> gpac-0.5.0.svn4668.tar.bz2/build/msvc10/osmophone.vcxproj Changed

@@ -5,10 +5,18 @@
       <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>
@@ -20,11 +28,21 @@
     <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>
@@ -32,19 +50,33 @@
     <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>
@@ -97,6 +129,55 @@
       <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>
@@ -144,36 +225,103 @@
       <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -79,7 +115,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>advapi32.lib;user32.lib;gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)/$(Configuration)/nposmozilla.dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>..\..\applications\osmozilla\osmozilla.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -95,6 +131,52 @@
       <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>
@@ -126,7 +208,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>advapi32.lib;user32.lib;gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)/$(Configuration)/nposmozilla.dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>..\..\applications\osmozilla\osmozilla.def</ModuleDefinitionFile>
       <ProgramDatabaseFile>.\obj/osmozilla_rel/nposmozilla.pdb</ProgramDatabaseFile>
@@ -141,6 +223,50 @@
       <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" />
@@ -148,9 +274,13 @@
   <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,11 +28,21 @@
     <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>
@@ -32,20 +50,39 @@
     <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'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -80,7 +117,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>platinum.lib;neptune.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -95,6 +132,52 @@
       <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>
@@ -126,7 +209,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>platinum.lib;neptune.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -141,6 +224,49 @@
       <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" />

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <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'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -76,7 +112,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -89,6 +125,47 @@
       <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>
@@ -119,7 +196,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -132,13 +209,57 @@
       <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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'">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>
@@ -76,7 +112,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -90,6 +126,47 @@
       <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>
@@ -120,7 +197,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -134,13 +211,59 @@
       <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <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'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -76,7 +112,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -89,6 +125,47 @@
       <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>
@@ -119,7 +196,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -132,43 +209,107 @@
       <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <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'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -76,7 +112,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -89,6 +125,47 @@
       <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>
@@ -119,7 +196,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -132,13 +209,57 @@
       <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,60 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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\SDL\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>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>
@@ -76,8 +113,8 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>SDL.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -91,6 +128,48 @@
       <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>
@@ -121,8 +200,8 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>SDL.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -136,31 +215,90 @@
       <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <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'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -76,7 +112,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -89,6 +125,47 @@
       <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>
@@ -119,7 +196,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -132,49 +209,117 @@
       <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <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'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -77,7 +113,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -91,6 +127,49 @@
       <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>
@@ -122,7 +201,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -136,13 +215,59 @@
       <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <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'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -76,7 +112,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -89,6 +125,47 @@
       <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>
@@ -119,7 +196,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -132,19 +209,67 @@
       <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -76,7 +112,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -89,6 +125,46 @@
       <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>
@@ -119,7 +195,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -132,13 +208,58 @@
       <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -76,7 +112,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -89,6 +125,46 @@
       <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>
@@ -119,7 +195,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -132,13 +208,58 @@
       <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,31 +28,59 @@
     <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'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -77,7 +113,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -90,6 +126,48 @@
       <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>
@@ -121,7 +199,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
@@ -134,13 +212,58 @@
       <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>

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,11 +28,21 @@
     <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>
@@ -32,19 +50,37 @@
     <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'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -77,7 +113,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -91,6 +127,49 @@
       <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>
@@ -122,7 +201,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -137,6 +216,49 @@
       <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" />

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

@@ -5,10 +5,18 @@
       <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>
@@ -20,11 +28,21 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
@@ -32,20 +50,38 @@
   <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'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <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>
@@ -60,7 +96,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/xvid;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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>
@@ -78,7 +114,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>libxvidcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -86,6 +122,52 @@
       <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>
@@ -104,7 +186,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/xvid;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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>
@@ -123,7 +205,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>libxvidcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/gm_$(ProjectName).dll</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>
@@ -132,6 +214,50 @@
       <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>
@@ -140,165 +266,243 @@
   <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>

gpac-0.5.0.svn4296.tar.bz2/build/msvc8/ismacryp.vcproj -> gpac-0.5.0.svn4668.tar.bz2/build/msvc8/ismacryp.vcproj Changed

gpac-0.5.0.svn4296.tar.bz2/build/msvc8/isom_in.vcproj -> gpac-0.5.0.svn4668.tar.bz2/build/msvc8/isom_in.vcproj Changed

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

gpac-0.5.0.svn4296.tar.bz2/build/msvc9/aac_in.vcproj -> gpac-0.5.0.svn4668.tar.bz2/build/msvc9/aac_in.vcproj Changed

@@ -51,7 +51,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/faad"
+				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_FAAD"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -149,7 +149,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/faad"
+				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;GPAC_HAS_FAAD"
 				MinimalRebuild="true"
 				RuntimeLibrary="3"
@@ -251,7 +251,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/faad"
+				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_FAAD"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -347,7 +347,7 @@
 				ExecutionBucket="7"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/faad"
+				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;NDEBUG;GPAC_HAS_FAAD"
 				StringPooling="true"
 				RuntimeLibrary="2"

gpac-0.5.0.svn4296.tar.bz2/build/msvc9/gpac.sln -> gpac-0.5.0.svn4668.tar.bz2/build/msvc9/gpac.sln Changed

@@ -223,6 +223,16 @@
 		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openhevc_dec", "openhevc.vcproj", "{073E2381-4FDE-4C4D-B217-C489EF17C48B}"
+	ProjectSection(ProjectDependencies) = postProject
+		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mse_in", "mse_in.vcproj", "{BD61B537-632E-42D2-944E-628800413629}"
+	ProjectSection(ProjectDependencies) = postProject
+		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Mixed Platforms = Debug|Mixed Platforms
@@ -926,6 +936,36 @@
 		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
 		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release|Win32.ActiveCfg = Release|Win32
 		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release|Win32.Build.0 = Release|Win32
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|Smartphone 2003 (ARMV4).Deploy.0 = Debug|Smartphone 2003 (ARMV4)
+		{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}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|Smartphone 2003 (ARMV4).Deploy.0 = Release|Smartphone 2003 (ARMV4)
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|Win32.ActiveCfg = Release|Win32
+		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|Win32.Build.0 = Release|Win32
+		{BD61B537-632E-42D2-944E-628800413629}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{BD61B537-632E-42D2-944E-628800413629}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{BD61B537-632E-42D2-944E-628800413629}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32
+		{BD61B537-632E-42D2-944E-628800413629}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Win32
+		{BD61B537-632E-42D2-944E-628800413629}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BD61B537-632E-42D2-944E-628800413629}.Debug|Win32.Build.0 = Debug|Win32
+		{BD61B537-632E-42D2-944E-628800413629}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{BD61B537-632E-42D2-944E-628800413629}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{BD61B537-632E-42D2-944E-628800413629}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32
+		{BD61B537-632E-42D2-944E-628800413629}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Win32
+		{BD61B537-632E-42D2-944E-628800413629}.Release|Win32.ActiveCfg = Release|Win32
+		{BD61B537-632E-42D2-944E-628800413629}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

gpac-0.5.0.svn4668.tar.bz2/build/msvc9/gpac_static.sln Added

@@ -0,0 +1,177 @@
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GPAX", "GPAX.vcproj", "{72486240-A124-496E-A67A-E76FEC7E99BE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Osmo4", "Osmo4.vcproj", "{C79C2D73-06E9-4622-92CE-F166B1B51792}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp42ts", "mp42ts.vcproj", "{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}"
+	ProjectSection(ProjectDependencies) = postProject
+		{233014D5-F6E5-419D-8757-FA9CE7337088} = {233014D5-F6E5-419D-8757-FA9CE7337088}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp4box", "mp4box.vcproj", "{48E2C7C6-52EB-46FB-8722-00A62F46F497}"
+	ProjectSection(ProjectDependencies) = postProject
+		{233014D5-F6E5-419D-8757-FA9CE7337088} = {233014D5-F6E5-419D-8757-FA9CE7337088}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp4client", "mp4client.vcproj", "{A35D99BF-D72D-4F56-99A1-97249B22BCE2}"
+	ProjectSection(ProjectDependencies) = postProject
+		{233014D5-F6E5-419D-8757-FA9CE7337088} = {233014D5-F6E5-419D-8757-FA9CE7337088}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osmozilla", "osmozilla.vcproj", "{A0288B75-0D95-4106-A3A7-779A891E8FEF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osmophone", "osmophone.vcproj", "{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}"
+	ProjectSection(ProjectDependencies) = postProject
+		{233014D5-F6E5-419D-8757-FA9CE7337088} = {233014D5-F6E5-419D-8757-FA9CE7337088}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dashmuxts", "..\..\applications\dashmuxts\dashmuxts.vcproj", "{F728CC84-A7D1-43D2-8A28-05CE9F2EF0D0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgpac_static", "libgpac_static.vcproj", "{233014D5-F6E5-419D-8757-FA9CE7337088}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|Pocket PC 2003 (ARMV4) = Debug|Pocket PC 2003 (ARMV4)
+		Debug|Smartphone 2003 (ARMV4) = Debug|Smartphone 2003 (ARMV4)
+		Debug|Win32 = Debug|Win32
+		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|Pocket PC 2003 (ARMV4) = Release|Pocket PC 2003 (ARMV4)
+		Release|Smartphone 2003 (ARMV4) = Release|Smartphone 2003 (ARMV4)
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
+		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
+		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
+		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
+		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
+		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
+		{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}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
+		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
+		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
+		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
+		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
+		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
+		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Win32.ActiveCfg = Release|Win32
+		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Win32.Build.0 = Release|Win32
+		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
+		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
+		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
+		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
+		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
+		{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}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
+		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
+		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
+		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
+		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
+		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Win32.ActiveCfg = Release|Win32
+		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Win32.Build.0 = Release|Win32
+		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32
+		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Win32
+		{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}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32
+		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Win32
+		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Win32.ActiveCfg = Release|Win32
+		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Win32.Build.0 = Release|Win32
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
+		{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}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Win32.ActiveCfg = Release|Win32
+		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Win32.Build.0 = Release|Win32
+		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
+		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
+		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
+		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
+		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
+		{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}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
+		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
+		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
+		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
+		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
+		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Win32.ActiveCfg = Release|Win32
+		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Win32.Build.0 = Release|Win32
+		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
+		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
+		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
+		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
+		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
+		{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}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
+		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
+		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
+		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
+		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
+		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Win32.ActiveCfg = Release|Win32
+		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Win32.Build.0 = Release|Win32
+		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Mixed Platforms.ActiveCfg = Debug|Pocket PC 2003 (ARMV4)
+		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Mixed Platforms.Build.0 = Debug|Pocket PC 2003 (ARMV4)
+		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Pocket PC 2003 (ARMV4)
+		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Pocket PC 2003 (ARMV4).Build.0 = Debug|Pocket PC 2003 (ARMV4)
+		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
+		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
+		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Smartphone 2003 (ARMV4).Deploy.0 = Debug|Smartphone 2003 (ARMV4)
+		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Debug|Win32.ActiveCfg = Debug|Pocket PC 2003 (ARMV4)
+		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Mixed Platforms.ActiveCfg = Release|Pocket PC 2003 (ARMV4)
+		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Mixed Platforms.Build.0 = Release|Pocket PC 2003 (ARMV4)
+		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Pocket PC 2003 (ARMV4)
+		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Pocket PC 2003 (ARMV4).Build.0 = Release|Pocket PC 2003 (ARMV4)
+		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
+		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
+		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Smartphone 2003 (ARMV4).Deploy.0 = Release|Smartphone 2003 (ARMV4)
+		{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}.Release|Win32.ActiveCfg = Release|Pocket PC 2003 (ARMV4)
+		{F728CC84-A7D1-43D2-8A28-05CE9F2EF0D0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{F728CC84-A7D1-43D2-8A28-05CE9F2EF0D0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{F728CC84-A7D1-43D2-8A28-05CE9F2EF0D0}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32
+		{F728CC84-A7D1-43D2-8A28-05CE9F2EF0D0}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Win32
+		{F728CC84-A7D1-43D2-8A28-05CE9F2EF0D0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F728CC84-A7D1-43D2-8A28-05CE9F2EF0D0}.Debug|Win32.Build.0 = Debug|Win32
+		{F728CC84-A7D1-43D2-8A28-05CE9F2EF0D0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{F728CC84-A7D1-43D2-8A28-05CE9F2EF0D0}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{F728CC84-A7D1-43D2-8A28-05CE9F2EF0D0}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32
+		{F728CC84-A7D1-43D2-8A28-05CE9F2EF0D0}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Win32
+		{F728CC84-A7D1-43D2-8A28-05CE9F2EF0D0}.Release|Win32.ActiveCfg = Release|Win32
+		{F728CC84-A7D1-43D2-8A28-05CE9F2EF0D0}.Release|Win32.Build.0 = Release|Win32
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Mixed Platforms.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Mixed Platforms.Build.0 = Debug|Smartphone 2003 (ARMV4)
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Mixed Platforms.Deploy.0 = Debug|Smartphone 2003 (ARMV4)
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Smartphone 2003 (ARMV4).Deploy.0 = Debug|Smartphone 2003 (ARMV4)
+		{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}.Release|Mixed Platforms.ActiveCfg = Release|Smartphone 2003 (ARMV4)
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Mixed Platforms.Build.0 = Release|Smartphone 2003 (ARMV4)
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Mixed Platforms.Deploy.0 = Release|Smartphone 2003 (ARMV4)
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Smartphone 2003 (ARMV4).Deploy.0 = Release|Smartphone 2003 (ARMV4)
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Win32.ActiveCfg = Release|Win32
+		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

gpac-0.5.0.svn4296.tar.bz2/build/msvc9/img_in.vcproj -> gpac-0.5.0.svn4668.tar.bz2/build/msvc9/img_in.vcproj Changed

@@ -51,7 +51,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/png,../../extra_lib/include/jpeg,../../extra_lib/include/zlib,../../extra_lib/include/openjpeg"
+				AdditionalIncludeDirectories="../../include,../../extra_lib/include/png,../../extra_lib/include/jpeg,../../extra_lib/include/zlib,../../extra_lib/include"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -149,7 +149,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/png,../../extra_lib/include/jpeg,../../extra_lib/include/zlib,../../extra_lib/include/openjpeg"
+				AdditionalIncludeDirectories="../../include,../../extra_lib/include/png,../../extra_lib/include/jpeg,../../extra_lib/include/zlib,../../extra_lib/include"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;$(NOINHERIT)"
 				MinimalRebuild="true"
 				RuntimeLibrary="3"
@@ -250,7 +250,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/png,../../extra_lib/include/zlib,../../extra_lib/include/jpeg,../../extra_lib/include/openjpeg"
+				AdditionalIncludeDirectories="../../include,../../extra_lib/include/png,../../extra_lib/include/zlib,../../extra_lib/include/jpeg,../../extra_lib/include"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -346,7 +346,7 @@
 				ExecutionBucket="7"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/png,../../extra_lib/include/zlib,../../extra_lib/include/jpeg,../../extra_lib/include/openjpeg"
+				AdditionalIncludeDirectories="../../include,../../extra_lib/include/png,../../extra_lib/include/zlib,../../extra_lib/include/jpeg,../../extra_lib/include"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
 				StringPooling="true"
 				RuntimeLibrary="2"

gpac-0.5.0.svn4296.tar.bz2/build/msvc9/ismacryp.vcproj -> gpac-0.5.0.svn4668.tar.bz2/build/msvc9/ismacryp.vcproj Changed

@@ -412,44 +412,8 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\modules\ismacryp\ismacryp.c"
+			RelativePath="..\..\modules\ismacryp\isma_ea.c"
 			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
 		</File>
 		<File
 			RelativePath="..\..\modules\modules_export.cpp"

gpac-0.5.0.svn4296.tar.bz2/build/msvc9/isom_in.vcproj -> gpac-0.5.0.svn4668.tar.bz2/build/msvc9/isom_in.vcproj Changed

@@ -414,44 +414,8 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\modules\isom_in\cache.c"
+			RelativePath="..\..\modules\isom_in\isom_cache.c"
 			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Smartphone 2003 (ARMV4)"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
 		</File>
 		<File
 			RelativePath="..\..\modules\isom_in\isom_in.h"

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

@@ -654,6 +654,10 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\..\src\utils\map.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\src\utils\math.c"
 				>
 				<FileConfiguration
@@ -3902,6 +3906,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\src\scenegraph\html5_media_smjs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\scenegraph\html5_mse_smjs.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\src\scenegraph\mpeg4_animators.c"
 				>
 				<FileConfiguration
@@ -4566,6 +4578,14 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\..\src\media_tools\html5_media.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\media_tools\html5_mse.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\src\media_tools\img.c"
 				>
 			</File>
@@ -7110,6 +7130,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\include\gpac\html5_media.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\html5_mse.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\include\gpac\ietf.h"
 				>
 			</File>

gpac-0.5.0.svn4296.tar.bz2/build/msvc9/libgpac_dll.vcproj -> gpac-0.5.0.svn4668.tar.bz2/build/msvc9/libgpac_dll.vcproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc9/libgpac_static.vcproj Added

@@ -0,0 +1,6752 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="libgpac_static"
+	ProjectGUID="{233014D5-F6E5-419D-8757-FA9CE7337088}"
+	RootNamespace="libgpac"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="Smartphone 2003 (ARMV4)"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../../include;../../extra_lib/include/;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include/freetype"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB;_WINDOWS;GPAC_STATIC_MODULES;GPAC_HAS_FAAD;GPAC_HAS_LIBA52;GPAC_HAS_JP2;OPJ_STATIC;GPAC_HAS_MAD;GPAC_HAS_VORBIS;GPAC_HAS_THEORA"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
+				BrowseInformation="1"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalOptions="/ignore:4221"
+				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/libgpac_static.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\obj\$(PlatformName)\$(ConfigurationName)\libgpac/libgpac.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Smartphone 2003 (ARMV4)"
+			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\libgpac"
+			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\libgpac"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../include;../../extra_lib/include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_LIB;_DEBUG"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
+				AssemblerListingLocation="$(IntDir)/"
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/"
+				BrowseInformation="1"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)\libgpac_static.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="&quot;$(InputDir)..\..\version.bat&quot;"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="1"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../../include;../../extra_lib/include/;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include/freetype"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_LIB;GPAC_STATIC_MODULES;GPAC_HAS_FAAD;GPAC_HAS_LIBA52"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="false"
+				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalOptions="/ignore:4221"
+				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/libgpac_static.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile="$(IntDir)\$(ProjectName).bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Smartphone 2003 (ARMV4)"
+			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="&quot;$(InputDir)..\..\version.bat&quot;"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="1"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../../include;../../extra_lib/include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_LIB;NDEBUG"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)\libgpac_static.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile="$(IntDir)\$(ProjectName).bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="utils"
+			>
+			<File
+				RelativePath="..\..\src\utils\alloc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\base_encoding.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\bitstream.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\cache.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\color.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\configfile.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\dlmalloc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\downloader.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\error.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						CompileAs="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						CompileAs="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						CompileAs="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						CompileAs="1"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\list.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\map.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\math.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\module.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\module_wrap.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\os_config_init.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\os_divers.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\os_module.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\os_net.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\os_thread.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\path2d.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\path2d_stroker.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\ringbuffer.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\sha1.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\token.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\uni_bidi.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\unicode.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\url.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\utf.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\xml_parser.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="odf"
+			>
+			<File
+				RelativePath="..\..\src\odf\desc_private.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\odf\descriptors.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\odf\ipmpx_code.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\odf\ipmpx_dump.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\odf\ipmpx_parse.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\odf\oci_codec.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\odf\odf_code.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\odf\odf_codec.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\odf\odf_command.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\internal\odf_dev.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\odf\odf_dump.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\odf\odf_parse.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\odf\qos.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\odf\slc.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="bifs"
+			>
+			<File
+				RelativePath="..\..\src\bifs\arith_decoder.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\bifs\bifs_codec.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\internal\bifs_dev.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bifs\bifs_node_tables.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\internal\bifs_tables.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bifs\com_dec.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\bifs\com_enc.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\bifs\conditional.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\bifs\field_decode.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\bifs\field_encode.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\bifs\memory_decoder.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\bifs\predictive_mffield.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\bifs\quant.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bifs\quantize.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\bifs\script.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bifs\script_dec.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\bifs\script_enc.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\bifs\unquantize.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="isomedia"
+			>
+			<File
+				RelativePath="..\..\src\isomedia\avc_ext.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\isomedia\box_code_3gpp.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\isomedia\box_code_adobe.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\isomedia\box_code_apple.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\isomedia\box_code_base.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\isomedia\box_code_drm.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\isomedia\box_code_meta.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\isomedia\box_dump.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\isomedia\box_funcs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\isomedia\data_map.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\isomedia\drm_sample.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\isomedia\generic_subtitle.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\isomedia\hint_track.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\isomedia\hinting.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\isomedia\isom_intern.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\isomedia\isom_read.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\isomedia\isom_store.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\isomedia\isom_write.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\internal\isomedia_dev.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\isomedia\media.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\isomedia\media_odf.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\isomedia\meta.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\isomedia\movie_fragments.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\isomedia\sample_descs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\isomedia\stbl_read.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\isomedia\stbl_write.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\isomedia\track.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\isomedia\tx3g.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="ietf"
+			>
+			<File
+				RelativePath="..\..\include\gpac\internal\ietf_dev.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\ietf\rtcp.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\ietf\rtp.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\ietf\rtp_depacketizer.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\ietf\rtp_packetizer.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\ietf\rtp_pck_3gpp.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\ietf\rtp_pck_mpeg12.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\ietf\rtp_pck_mpeg4.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\ietf\rtp_streamer.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\ietf\rtsp_command.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\ietf\rtsp_common.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\ietf\rtsp_response.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\ietf\rtsp_session.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\ietf\sdp.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="scenegraph"
+			>
+			<File
+				RelativePath="..\..\src\scenegraph\base_scenegraph.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\scenegraph\commands.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\scenegraph\dom_events.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\scenegraph\dom_smjs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\scenegraph\mpeg4_animators.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\scenegraph\mpeg4_nodes.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\scenegraph\mpeg4_valuator.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\internal\scenegraph_dev.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\scenegraph\smil_anim.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\scenegraph\smil_timing.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\scenegraph\svg_attributes.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\scenegraph\svg_properties.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\scenegraph\svg_smjs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\scenegraph\svg_types.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\scenegraph\vrml_interpolators.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\scenegraph\vrml_proto.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\scenegraph\vrml_route.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\scenegraph\vrml_script.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\scenegraph\vrml_smjs.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\scenegraph\vrml_tools.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\scenegraph\x3d_nodes.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\scenegraph\xbl_process.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\scenegraph\xml_ns.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="media_tools"
+			>
+			<File
+				RelativePath="..\..\src\media_tools\ait.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\media_tools\av_parsers.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\media_tools\avilib.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\internal\avilib.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\media_tools\dash_client.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\media_tools\dash_segmenter.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\media_tools\dsmcc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\media_tools\dvb_mpe.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\internal\dvb_mpe_dev.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\media_tools\filestreamer.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\media_tools\gpac_ogg.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\media_tools\img.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\media_tools\ismacryp.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\media_tools\isom_hinter.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\media_tools\isom_tools.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\media_tools\m2ts_mux.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\media_tools\m3u8.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\internal\media_dev.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\media_tools\media_export.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\media_tools\media_import.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\media_tools\mpd.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\media_tools\mpeg2_ps.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\media_tools\mpeg2_ps.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\media_tools\mpegts.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\internal\ogg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\media_tools\reedsolomon.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\internal\reedsolomon.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\media_tools\saf.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\media_tools\text_import.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\media_tools\vobsub.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\internal\vobsub.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="scene_manager"
+			>
+			<File
+				RelativePath="..\..\src\scene_manager\encode_isom.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\scene_manager\loader_bt.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\scene_manager\loader_isom.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\scene_manager\loader_qt.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\scene_manager\loader_svg.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\scene_manager\loader_xmt.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\scene_manager\scene_dump.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\scene_manager\scene_engine.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\scene_manager\scene_manager.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\scene_manager\scene_stats.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\scene_manager\swf_bifs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\internal\swf_dev.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\scene_manager\swf_parse.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\scene_manager\swf_svg.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\scene_manager\text_to_bifs.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="terminal"
+			>
+			<File
+				RelativePath="..\..\src\terminal\channel.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\terminal\clock.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\terminal\decoder.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\terminal\input_sensor.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\terminal\input_sensor.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\terminal\media_control.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\terminal\media_control.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\terminal\media_manager.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\terminal\media_memory.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\terminal\media_memory.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\terminal\media_object.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\terminal\media_sensor.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\terminal\mpeg4_inline.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\terminal\network_service.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\terminal\object_browser.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\terminal\object_manager.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\terminal\scene.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\terminal\svg_external.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\terminal\term_node_init.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\terminal\terminal.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\internal\terminal_dev.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="compositor"
+			>
+			<File
+				RelativePath="..\..\src\compositor\audio_input.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\audio_mixer.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\audio_render.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\bindable.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\camera.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\internal\camera.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\compositor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\compositor_2d.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\compositor_3d.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\internal\compositor_dev.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\compositor_node_init.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\drawable.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\drawable.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\events.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\font_engine.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\gl_inc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\hardcoded_protos.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\hc_flash_shape.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mesh.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\internal\mesh.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mesh_collide.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mesh_tesselate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mpeg4_animstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mpeg4_audio.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mpeg4_background.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mpeg4_background2d.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mpeg4_bitmap.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mpeg4_composite.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mpeg4_form.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mpeg4_geometry_2d.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mpeg4_geometry_3d.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mpeg4_geometry_ifs2d.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mpeg4_geometry_ils2d.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mpeg4_gradients.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mpeg4_grouping.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mpeg4_grouping.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mpeg4_grouping_2d.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mpeg4_grouping_3d.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mpeg4_layer_2d.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mpeg4_layer_3d.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mpeg4_layout.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mpeg4_lighting.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mpeg4_path_layout.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mpeg4_sensors.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mpeg4_sound.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mpeg4_text.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mpeg4_textures.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mpeg4_timesensor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\mpeg4_viewport.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\navigate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\nodes_stacks.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\offscreen_cache.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\offscreen_cache.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\svg_base.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\svg_filters.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\svg_font.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\svg_geometry.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\svg_grouping.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\svg_media.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\svg_paint_servers.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\svg_text.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\texturing.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\texturing.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\texturing_gl.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\visual_manager.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\visual_manager.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\visual_manager_2d.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\visual_manager_2d.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\visual_manager_2d_draw.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\visual_manager_3d.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\visual_manager_3d.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\visual_manager_3d_gl.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\compositor\x3d_geometry.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="laser"
+			>
+			<File
+				RelativePath="..\..\include\gpac\internal\laser_dev.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\laser\lsr_dec.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\laser\lsr_enc.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\laser\lsr_tables.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="include"
+			>
+			<File
+				RelativePath="..\..\include\gpac\ait.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\modules\audio_out.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\avparse.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\base_coding.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\bifs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\bitstream.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\modules\codec.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\color.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\compositor.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\config_file.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\configuration.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\constants.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\crypt.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\dash.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\download.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\dsmcc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\dvb_mpe.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\esi.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\events.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\events_constants.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\filestreamer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\modules\font.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\modules\hardcoded_proto.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\ietf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\modules\ipmp.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\ismacryp.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\iso639.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\isomedia.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\modules\js_usr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\laser.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\list.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\internal\m3u8.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\math.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\media_tools.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\mediaobject.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\module.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\internal\mpd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\mpeg4_odf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\mpegts.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\network.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\nodes_mpeg4.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\nodes_svg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\nodes_x3d.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\nodes_xbl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\options.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\path2d.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\modules\raster2d.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\rtp_streamer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\scene_engine.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\scene_manager.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\scenegraph.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\scenegraph_svg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\scenegraph_vrml.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\modules\service.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\setup.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\svg_types.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\sync_layer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\modules\term_ext.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\term_info.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\terminal.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\thread.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\token.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\tools.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\user.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\utf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\version.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\modules\video_out.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\xml.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="mcrypt"
+			>
+			<File
+				RelativePath="..\..\src\mcrypt\cbc.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\mcrypt\cfb.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\include\gpac\internal\crypt_dev.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\mcrypt\ctr.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\mcrypt\des.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\mcrypt\ecb.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\mcrypt\g_crypt.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\mcrypt\ncfb.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\mcrypt\nofb.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\mcrypt\ofb.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\mcrypt\rijndael-128.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\mcrypt\rijndael-192.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\mcrypt\rijndael-256.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\mcrypt\stream.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\mcrypt\tripledes.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Smartphone 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="modules"
+			>
+			<File
+				RelativePath="..\..\modules\aac_in\aac_in.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\modules\ac3_in\ac3_in.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\modules\audio_filter\audio_filter.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\modules\bifs_dec\bifs_dec.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\modules\ctx_load\ctx_load.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\modules\dummy_in\dummy_in.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\modules\aac_in\faad_dec.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\modules\ft_font\ft_font.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\modules\ft_font\ft_font.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\modules\gpac_js\gpac_js.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\modules\ismacryp\isma_ea.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\modules\laser_dec\laser_dec.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\modules\ac3_in\liba52_dec.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\modules\mp3_in\mad_dec.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\modules\mp3_in\mp3_in.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\modules\mpd_in\mpd_in.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\modules\mpegts_in\mpegts_in.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\modules\odf_dec\odf_dec.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\modules\openhevc_dec\openhevc_dec.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\modules\opensvc_dec\opensvc_dec.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\modules\raw_out\raw_video.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\modules\redirect_av\redirect_av.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\modules\saf_in\saf_in.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\modules\svg_in\svg_in.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\modules\timedtext\timedtext_dec.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\modules\timedtext\timedtext_in.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\modules\validator\validator.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\modules\wav_out\wav_out.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\modules\xvid_dec\xvid_dec.c"
+				>
+			</File>
+			<Filter
+				Name="dx"
+				>
+				<File
+					RelativePath="..\..\modules\dx_hw\collide.cur"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\dx_hw\copy_pixels.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\dx_hw\dx_2d.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\dx_hw\dx_audio.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\dx_hw\dx_hw.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\dx_hw\dx_hw.rc"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\dx_hw\dx_video.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\dx_hw\dx_window.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\dx_hw\hand.cur"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\modules_export.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\dx_hw\resource.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="SDL"
+				>
+				<File
+					RelativePath="..\..\modules\sdl_out\audio.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\sdl_out\cursors.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\sdl_out\sdl_out.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\sdl_out\sdl_out.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\sdl_out\video.c"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="img"
+				>
+				<File
+					RelativePath="..\..\modules\img_in\bmp_dec.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\img_in\img_dec.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\img_in\img_in.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\img_in\img_in.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\img_in\jp2_dec.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\img_in\jpeg_dec.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\img_in\png_dec.c"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="isom"
+				>
+				<File
+					RelativePath="..\..\modules\isom_in\isom_cache.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\isom_in\isom_in.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\isom_in\load.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\isom_in\read.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\isom_in\read_ch.c"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="ffmpeg"
+				>
+				<File
+					RelativePath="..\..\modules\ffmpeg_in\ffmpeg_decode.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\ffmpeg_in\ffmpeg_demux.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\ffmpeg_in\ffmpeg_in.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\ffmpeg_in\ffmpeg_load.c"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="soft_raster"
+				>
+				<File
+					RelativePath="..\..\modules\soft_raster\ftgrays.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\soft_raster\rast_soft.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\soft_raster\raster_565.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\soft_raster\raster_argb.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\soft_raster\raster_load.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\soft_raster\raster_rgb.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\soft_raster\stencil.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\soft_raster\surface.c"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="ogg"
+				>
+				<File
+					RelativePath="..\..\modules\ogg\ogg_in.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\ogg\ogg_in.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\ogg\ogg_load.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\ogg\theora_dec.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\ogg\vorbis_dec.c"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="rtp"
+				>
+				<File
+					RelativePath="..\..\modules\rtp_in\rtp_in.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\rtp_in\rtp_in.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\rtp_in\rtp_session.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\rtp_in\rtp_signaling.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\rtp_in\rtp_stream.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\rtp_in\sdp_fetch.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\rtp_in\sdp_load.c"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="widgetman"
+				>
+				<File
+					RelativePath="..\..\modules\widgetman\unzip.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\widgetman\unzip.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\widgetman\wgt_load.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\widgetman\widget.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\widgetman\widgetman.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\modules\widgetman\widgetman.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

gpac-0.5.0.svn4296.tar.bz2/build/msvc9/mp3_in.vcproj -> gpac-0.5.0.svn4668.tar.bz2/build/msvc9/mp3_in.vcproj Changed

@@ -51,7 +51,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/mad"
+				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_MAD"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -149,7 +149,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/mad"
+				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;GPAC_HAS_MAD"
 				MinimalRebuild="true"
 				RuntimeLibrary="3"
@@ -250,7 +250,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/mad"
+				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_MAD"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -346,7 +346,7 @@
 				ExecutionBucket="7"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/mad"
+				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL;GPAC_HAS_MAD"
 				StringPooling="true"
 				RuntimeLibrary="2"

gpac-0.5.0.svn4296.tar.bz2/build/msvc9/mp42ts.vcproj -> gpac-0.5.0.svn4668.tar.bz2/build/msvc9/mp42ts.vcproj Changed

gpac-0.5.0.svn4296.tar.bz2/build/msvc9/mp4client.vcproj -> gpac-0.5.0.svn4668.tar.bz2/build/msvc9/mp4client.vcproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc9/mse_in.vcproj Added

@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="mse_in"
+	ProjectGUID="{BD61B537-632E-42D2-944E-628800413629}"
+	RootNamespace="dash"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../include;../../extra_lib/include/js"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="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>
+		<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="../../include;../../extra_lib/include/js"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
+				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>
+		<File
+			RelativePath="..\..\modules\modules_export.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\modules\mse_in\mse_in.c"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

gpac-0.5.0.svn4668.tar.bz2/build/msvc9/openhevc.vcproj Added

@@ -0,0 +1,466 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="openhevc_dec"
+	ProjectGUID="{073E2381-4FDE-4C4D-B217-C489EF17C48B}"
+	RootNamespace="openhevc_dec"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="Smartphone 2003 (ARMV4)"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\obj/dymmy_in_deb/openhevc_dec.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../include;../../extra_lib/include"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies=""
+				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
+				GenerateManifest="true"
+				ModuleDefinitionFile=""
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+				EmbedManifest="true"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Smartphone 2003 (ARMV4)"
+			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\obj/dymmy_in_deb/openhevc_dec.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../include;../../extra_lib/include"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
+				AssemblerListingLocation="$(IntDir)/"
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
+				ModuleDefinitionFile=""
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)/gm_openhevc_dec.pdb"
+				SubSystem="9"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
+				TargetMachine="3"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile="$(OutDir)/$(ProjectName).bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\obj/dymmy_in_rel/openhevc_dec.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../../include;../../extra_lib/include"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies=""
+				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
+				ModuleDefinitionFile=""
+				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile="$(IntDir)\$(ProjectName).bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Smartphone 2003 (ARMV4)"
+			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\obj/dymmy_in_rel/openhevc_dec.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../../include;../../extra_lib/include"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
+				ModuleDefinitionFile=""
+				ProgramDatabaseFile=".\obj/dymmy_in_rel/gm_openhevc_dec.pdb"
+				SubSystem="9"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
+				TargetMachine="3"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile="$(IntDir)\$(ProjectName).bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\modules\modules_export.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\modules\openhevc_dec\openhevc_dec.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug|Smartphone 2003 (ARMV4)"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Smartphone 2003 (ARMV4)"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

gpac-0.5.0.svn4296.tar.bz2/build/msvc9/sdl_out.vcproj -> gpac-0.5.0.svn4668.tar.bz2/build/msvc9/sdl_out.vcproj Changed

@@ -77,7 +77,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="SDL.lib"
 				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -116,7 +115,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
+			Name="Debug|Smartphone 2003 (ARMV4)"
 			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
 			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="2"
@@ -138,35 +137,35 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\obj/sdl_out_rel/sdl_out.tlb"
+				TypeLibraryName=".\obj/sdl_out_deb/sdl_out.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/SDL"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../include"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
 				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
+				AssemblerListingLocation="$(IntDir)/"
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1036"
 			/>
 			<Tool
@@ -175,43 +174,48 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="SDL.lib"
-				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="1"
+				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
+				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
 				ModuleDefinitionFile=""
-				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
+				SubSystem="9"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="1"
+				TargetMachine="3"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile="$(IntDir)\$(ProjectName).bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
 			/>
 			<Tool
-				Name="VCAppVerifierTool"
+				Name="VCCodeSignTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
+			Name="Release|Win32"
 			OutputDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
 			IntermediateDirectory=".\obj\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="2"
@@ -233,35 +237,35 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\obj/sdl_out_deb/sdl_out.tlb"
+				TypeLibraryName=".\obj/sdl_out_rel/sdl_out.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../../include,../../extra_lib/include/SDL"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1036"
 			/>
 			<Tool
@@ -270,45 +274,40 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="SDL.lib"
-				OutputFile="../../bin/$(PlatformName)/$(ConfigurationName)/gm_$(ProjectName).dll"
-				LinkIncremental="2"
+				OutputFile="../../bin/$(PlatformName)\$(ConfigurationName)/gm_$(ProjectName).dll"
+				LinkIncremental="1"
 				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="../../extra_lib/lib/$(PlatformName)/$(ConfigurationName)"
 				ModuleDefinitionFile=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/gm_$(ProjectName).pdb"
-				SubSystem="9"
+				ProgramDatabaseFile="$(IntDir)\gm_$(ProjectName).pdb"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				ImportLibrary="$(IntDir)/gm_$(ProjectName).lib"
-				TargetMachine="3"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
+				OutputFile="$(IntDir)\$(ProjectName).bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
 			/>
 			<Tool
-				Name="VCCodeSignTool"
+				Name="VCAppVerifierTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\gpac"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Smartphone 2003 (ARMV4)"
@@ -428,7 +427,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release|Win32"
+				Name="Debug|Smartphone 2003 (ARMV4)"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -437,7 +436,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
+				Name="Release|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -468,7 +467,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release|Win32"
+				Name="Debug|Smartphone 2003 (ARMV4)"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -477,7 +476,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
+				Name="Release|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -512,7 +511,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release|Win32"
+				Name="Debug|Smartphone 2003 (ARMV4)"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -521,7 +520,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
+				Name="Release|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -556,7 +555,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release|Win32"
+				Name="Debug|Smartphone 2003 (ARMV4)"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -565,7 +564,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Debug|Smartphone 2003 (ARMV4)"
+				Name="Release|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"

gpac-0.5.0.svn4296.tar.bz2/build/msvc9/xvid_dec.vcproj -> gpac-0.5.0.svn4668.tar.bz2/build/msvc9/xvid_dec.vcproj Changed

@@ -58,7 +58,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/xvid"
+				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -157,7 +157,7 @@
 				ExecutionBucket="7"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/xvid"
+				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;NDEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -260,7 +260,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/xvid"
+				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -361,7 +361,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../extra_lib/include/xvid"
+				AdditionalIncludeDirectories="../../include,../../extra_lib/include"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_DEBUG;_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;ARMV4;UNDER_CE=$(CEVER);UNICODE;_USR_DLL"
 				MinimalRebuild="true"
 				RuntimeLibrary="3"

gpac-0.5.0.svn4296.tar.bz2/build/symbian/ismacryp.mmp -> gpac-0.5.0.svn4668.tar.bz2/build/symbian/ismacryp.mmp Changed

gpac-0.5.0.svn4296.tar.bz2/build/symbian/isom_in.mmp -> gpac-0.5.0.svn4668.tar.bz2/build/symbian/isom_in.mmp Changed

gpac-0.5.0.svn4296.tar.bz2/build/symbian/libgpac.mmp -> gpac-0.5.0.svn4668.tar.bz2/build/symbian/libgpac.mmp Changed

gpac-0.5.0.svn4296.tar.bz2/build/xcode/generate_ios.sh -> gpac-0.5.0.svn4668.tar.bz2/build/xcode/generate_ios.sh Changed

@@ -14,35 +14,26 @@
 fi
 
 echo "*** Clean previous build files ***"
-xcodebuild -alltargets -sdk iphoneos -configuration Debug -project gpac4ios.xcodeproj clean
+#xcodebuild -alltargets -sdk iphoneos -configuration Debug -project gpac4ios.xcodeproj clean
 xcodebuild -alltargets -sdk iphoneos -configuration Release -project gpac4ios.xcodeproj clean
 
-echo "*** Compile libgpac for iOS (arm) ***"
-xcodebuild -target libgpac_dynamic -sdk iphoneos -configuration Release -project gpac4ios.xcodeproj
-./script_libgpac.sh Release
-#xcodebuild -target libgpac_dynamic -sdk iphoneos -configuration Release -project gpac4ios.xcodeproj
-
-echo "*** Compile modules for iOS (arm) ***"
-xcodebuild -alltargets -parallelizeTargets -sdk iphoneos -configuration Release -project gpac4ios.xcodeproj
-./script_modules.sh Release
-
 echo "*** Compile osmo4ios for iOS (arm) ***"
 #link must occur at debug to avoid optimizing that leads to freezes
-xcodebuild -target osmo4ios -sdk iphoneos -configuration Debug -project gpac4ios.xcodeproj
+#xcodebuild -target osmo4ios -sdk iphoneos -configuration Debug -project gpac4ios.xcodeproj
+xcodebuild -target osmo4ios -sdk iphoneos -configuration Release -project gpac4ios.xcodeproj
 
 echo "*** Copy the generated libs (arm only) ***"
-cp build/Release-iphoneos/*.dylib ../../bin/iOS/osmo4ios.app/
-cp build/Debug-iphoneos/osmo4ios.app/osmo4ios ../../bin/iOS/osmo4ios.app/
-cp build/Debug-iphoneos/osmo4ios.app/PkgInfo ../../bin/iOS/osmo4ios.app/
-cp build/Debug-iphoneos/osmo4ios.app/Info.plist ../../bin/iOS/osmo4ios.app/
+cp build/Release-iphoneos/osmo4ios.app/osmo4ios ../../bin/iOS/osmo4ios.app/
+cp build/Release-iphoneos/osmo4ios.app/PkgInfo ../../bin/iOS/osmo4ios.app/
+cp build/Release-iphoneos/osmo4ios.app/Info.plist ../../bin/iOS/osmo4ios.app/
 cp build/Release-iphoneos/osmo4ios.app/ResourceRules.plist ../../bin/iOS/osmo4ios.app/
 
 echo "*** Test the presence of target files ***"
-if [ `ls ../../bin/iOS/osmo4ios.app/ | wc -l` -ne 24 ]
-then
-	echo "Error: target files number not correct (expected 24, got `ls ../../bin/iOS/osmo4ios.app/ | wc -l`)"
-	exit 1
-fi
+#if [ `ls ../../bin/iOS/osmo4ios.app/ | wc -l` -ne 5 ]
+#then
+#	echo "Error: target files number not correct (expected 24, got `ls ../../bin/iOS/osmo4ios.app/ | wc -l`)"
+#	exit 1
+#fi
 
 #echo "*** Build archive name ***"
 cd ../..
@@ -59,7 +50,7 @@
 mkdir osmo4ios.app/gui
 mkdir osmo4ios.app/gui/icons
 mkdir osmo4ios.app/gui/extensions
-cp ../../applications/osmo4_ios/Resources/icon.png osmo4ios.app/
+cp ../../applications/osmo4_ios/Resources/icon*.png osmo4ios.app/
 cp ../../gui/gui*.bt osmo4ios.app/gui/
 cp ../../gui/gui*.js osmo4ios.app/gui/
 cp ../../gui/gwlib.js osmo4ios.app/gui/

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

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

@@ -3,97 +3,25 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 45;
+	objectVersion = 46;
 	objects = {
 
 /* Begin PBXBuildFile section */
-		71179CA31292E7BA00A83216 /* libfaad.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 71F2A45012830B1400C384DE /* libfaad.a */; };
-		71179CAE1292E7F700A83216 /* libmad.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 71F2A45512830B1400C384DE /* libmad.a */; };
-		71179CC91292EC5200A83216 /* mpd_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 71179CBF1292EC1800A83216 /* mpd_in.c */; };
-		71179CF31292EDED00A83216 /* libc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71847811127860F000917298 /* libc.dylib */; };
-		712986C312928421003B02A1 /* extract.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A19B411279713300ACFF58 /* extract.c */; };
-		712986C41292843B003B02A1 /* audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199991278778800ACFF58 /* audio.c */; };
-		712986C51292843B003B02A1 /* video.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1999E1278778800ACFF58 /* video.c */; };
-		712986D8129284BD003B02A1 /* sdl_out.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1999C1278778800ACFF58 /* sdl_out.c */; };
+		0496F07716DD1A18009D9D8D /* libfaad.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 71F2A45012830B1400C384DE /* libfaad.a */; };
+		0496F07816DD1A18009D9D8D /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 71F2A45112830B1400C384DE /* libfreetype.a */; };
+		0496F07916DD1A18009D9D8D /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 71F2A45312830B1400C384DE /* libjpeg.a */; };
+		0496F07A16DD1A18009D9D8D /* libjs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 71F2A45412830B1400C384DE /* libjs.a */; };
+		0496F07B16DD1A18009D9D8D /* libmad.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 71F2A45512830B1400C384DE /* libmad.a */; };
+		0496F07C16DD1A18009D9D8D /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 71F2A45612830B1400C384DE /* libpng.a */; };
+		0496F09B16DE35C9009D9D8D /* libgpac_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 71CCF1311277037A00339E12 /* libgpac_static.a */; };
+		0496F09C16DE36BC009D9D8D /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71847813127860F000917298 /* libz.dylib */; };
+		04EFB63516E51E4200D1D44A /* libglues.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 04EFB63416E51E4200D1D44A /* libglues.a */; };
 		7141FF301292CB9200FCB27D /* alloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 7141FF2F1292CB9200FCB27D /* alloc.c */; };
 		7147426012B918C900DB5A59 /* cache.c in Sources */ = {isa = PBXBuildFile; fileRef = 7147425F12B918C900DB5A59 /* cache.c */; };
-		718477E4127817B700917298 /* libgpac_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 71CCF1311277037A00339E12 /* libgpac_static.a */; };
-		718477FA12781DEB00917298 /* empty.c in Sources */ = {isa = PBXBuildFile; fileRef = 718477F912781DEB00917298 /* empty.c */; };
-		71847812127860F000917298 /* libc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71847811127860F000917298 /* libc.dylib */; };
-		71847814127860F000917298 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71847813127860F000917298 /* libz.dylib */; };
-		71A1990A1278765600ACFF58 /* aac_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199071278765600ACFF58 /* aac_in.c */; };
-		71A1990B1278765600ACFF58 /* faad_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199081278765600ACFF58 /* faad_dec.c */; };
-		71A199101278767B00ACFF58 /* bifs_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1990E1278767B00ACFF58 /* bifs_dec.c */; };
-		71A1991E1278769100ACFF58 /* ftgrays.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199151278769100ACFF58 /* ftgrays.c */; };
-		71A199201278769100ACFF58 /* rast_soft.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A199171278769100ACFF58 /* rast_soft.h */; };
-		71A199211278769100ACFF58 /* raster_565.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199181278769100ACFF58 /* raster_565.c */; };
-		71A199221278769100ACFF58 /* raster_argb.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199191278769100ACFF58 /* raster_argb.c */; };
-		71A199231278769100ACFF58 /* raster_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1991A1278769100ACFF58 /* raster_load.c */; };
-		71A199241278769100ACFF58 /* raster_rgb.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1991B1278769100ACFF58 /* raster_rgb.c */; };
-		71A199251278769100ACFF58 /* stencil.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1991C1278769100ACFF58 /* stencil.c */; };
-		71A199261278769100ACFF58 /* surface.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1991D1278769100ACFF58 /* surface.c */; };
-		71A1992A127876A200ACFF58 /* dummy_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A19928127876A200ACFF58 /* dummy_in.c */; };
-		71A1992F127876B000ACFF58 /* ctx_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1992D127876B000ACFF58 /* ctx_load.c */; };
-		71A19935127876C300ACFF58 /* svg_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A19933127876C300ACFF58 /* svg_in.c */; };
-		71A1993A127876D300ACFF58 /* mad_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A19937127876D300ACFF58 /* mad_dec.c */; };
-		71A1993C127876D300ACFF58 /* mp3_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A19939127876D300ACFF58 /* mp3_in.c */; };
-		71A19946127876E300ACFF58 /* bmp_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1993E127876E300ACFF58 /* bmp_dec.c */; };
-		71A19947127876E300ACFF58 /* img_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1993F127876E300ACFF58 /* img_dec.c */; };
-		71A19948127876E300ACFF58 /* img_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A19940127876E300ACFF58 /* img_in.c */; };
-		71A19949127876E300ACFF58 /* img_in.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A19941127876E300ACFF58 /* img_in.h */; };
-		71A1994A127876E300ACFF58 /* jp2_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A19942127876E300ACFF58 /* jp2_dec.c */; };
-		71A1994B127876E300ACFF58 /* jpeg_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A19943127876E300ACFF58 /* jpeg_dec.c */; };
-		71A1994D127876E300ACFF58 /* png_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A19945127876E300ACFF58 /* png_dec.c */; };
-		71A19951127876FA00ACFF58 /* gpac_js.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1994F127876FA00ACFF58 /* gpac_js.c */; };
-		71A1995A1278770900ACFF58 /* cache.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199541278770900ACFF58 /* cache.c */; };
-		71A1995B1278770900ACFF58 /* isom_in.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A199551278770900ACFF58 /* isom_in.h */; };
-		71A1995C1278770900ACFF58 /* load.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199561278770900ACFF58 /* load.c */; };
-		71A1995E1278770900ACFF58 /* read.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199581278770900ACFF58 /* read.c */; };
-		71A1995F1278770900ACFF58 /* read_ch.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199591278770900ACFF58 /* read_ch.c */; };
-		71A199631278772500ACFF58 /* laser_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199611278772500ACFF58 /* laser_dec.c */; };
-		71A199691278773900ACFF58 /* odf_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199671278773900ACFF58 /* odf_dec.c */; };
-		71A199741278774A00ACFF58 /* rtp_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1996C1278774A00ACFF58 /* rtp_in.c */; };
-		71A199751278774A00ACFF58 /* rtp_in.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A1996D1278774A00ACFF58 /* rtp_in.h */; };
-		71A199761278774A00ACFF58 /* rtp_session.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1996E1278774A00ACFF58 /* rtp_session.c */; };
-		71A199771278774A00ACFF58 /* rtp_signaling.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1996F1278774A00ACFF58 /* rtp_signaling.c */; };
-		71A199781278774A00ACFF58 /* rtp_stream.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199701278774A00ACFF58 /* rtp_stream.c */; };
-		71A199791278774A00ACFF58 /* sdp_fetch.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199711278774A00ACFF58 /* sdp_fetch.c */; };
-		71A1997A1278774A00ACFF58 /* sdp_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199721278774A00ACFF58 /* sdp_load.c */; };
-		71A1997F1278775900ACFF58 /* mpegts_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1997D1278775900ACFF58 /* mpegts_in.c */; };
-		71A199841278776700ACFF58 /* ft_font.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199811278776700ACFF58 /* ft_font.c */; };
-		71A199851278776700ACFF58 /* ft_font.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A199821278776700ACFF58 /* ft_font.h */; };
-		71A199911278777A00ACFF58 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199891278777A00ACFF58 /* unzip.c */; };
-		71A199921278777A00ACFF58 /* unzip.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A1998A1278777A00ACFF58 /* unzip.h */; };
-		71A199931278777A00ACFF58 /* wgt_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1998B1278777A00ACFF58 /* wgt_load.c */; };
-		71A199951278777A00ACFF58 /* widget.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1998D1278777A00ACFF58 /* widget.c */; };
-		71A199961278777A00ACFF58 /* widgetman.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1998E1278777A00ACFF58 /* widgetman.c */; };
-		71A199971278777A00ACFF58 /* widgetman.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A1998F1278777A00ACFF58 /* widgetman.h */; };
-		71A19A1A12787BFB00ACFF58 /* libc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71847811127860F000917298 /* libc.dylib */; };
-		71A19A2112787C3200ACFF58 /* libc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71847811127860F000917298 /* libc.dylib */; };
-		71A19A2C12787C6800ACFF58 /* libc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71847811127860F000917298 /* libc.dylib */; };
-		71A19A3F12787CB800ACFF58 /* libc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71847811127860F000917298 /* libc.dylib */; };
-		71A19A4512787CDB00ACFF58 /* libc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71847811127860F000917298 /* libc.dylib */; };
-		71A19A4912787CF000ACFF58 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71847813127860F000917298 /* libz.dylib */; };
-		71A19A5212787D0E00ACFF58 /* libc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71847811127860F000917298 /* libc.dylib */; };
-		71A19A5B12787D2A00ACFF58 /* libc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71847811127860F000917298 /* libc.dylib */; };
-		71A19A6112787D4000ACFF58 /* libc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71847811127860F000917298 /* libc.dylib */; };
-		71A19A6712787D8300ACFF58 /* libc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71847811127860F000917298 /* libc.dylib */; };
-		71A19A6D12787D9800ACFF58 /* libc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71847811127860F000917298 /* libc.dylib */; };
-		71A19A7712787DC100ACFF58 /* libc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71847811127860F000917298 /* libc.dylib */; };
-		71A19A7D12787DD700ACFF58 /* libc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71847811127860F000917298 /* libc.dylib */; };
-		71A19A8312787DED00ACFF58 /* libc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71847811127860F000917298 /* libc.dylib */; };
-		71A19A8912787E0400ACFF58 /* libc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71847811127860F000917298 /* libc.dylib */; };
-		71A19AA612795BE100ACFF58 /* libc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71847811127860F000917298 /* libc.dylib */; };
-		71A19AAF12795C3100ACFF58 /* libc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71847811127860F000917298 /* libc.dylib */; };
-		71A19AB312795C4900ACFF58 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71847813127860F000917298 /* libz.dylib */; };
-		71A19ABE12795C7E00ACFF58 /* libc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71847811127860F000917298 /* libc.dylib */; };
 		71A19B2112796B6F00ACFF58 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A19B2012796B6F00ACFF58 /* main.c */; };
-		71A19B4012796FCC00ACFF58 /* module_av_generic.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A19B3F12796FCC00ACFF58 /* module_av_generic.c */; };
 		71A19BB212797D1B00ACFF58 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71A19BB112797D1B00ACFF58 /* OpenGLES.framework */; };
-		71A19BB912797D4800ACFF58 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71A19BB812797D4800ACFF58 /* AudioToolbox.framework */; };
 		71A19BC412797D9200ACFF58 /* libobjc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71A19BC312797D9200ACFF58 /* libobjc.dylib */; };
-		71A19BCD12797DBA00ACFF58 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71A19BCC12797DBA00ACFF58 /* UIKit.framework */; };
-		71A19C3B12797E4000ACFF58 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71A19C3A12797E4000ACFF58 /* CoreGraphics.framework */; };
+		71A19BCD12797DBA00ACFF58 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71A19BCC12797DBA00ACFF58 /* UIKit.framework */; settings = {ATTRIBUTES = (Required, ); }; };
 		71A19C3D12797E4000ACFF58 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71A19C3C12797E4000ACFF58 /* Foundation.framework */; };
 		71A19C3F12797E4000ACFF58 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71A19C3E12797E4000ACFF58 /* QuartzCore.framework */; };
 		71A19C4112797E4000ACFF58 /* libdl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71A19C4012797E4000ACFF58 /* libdl.dylib */; };
@@ -428,21 +356,76 @@
 		71CCF3FD12770A8C00339E12 /* user.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF3AE12770A8C00339E12 /* user.h */; };
 		71CCF3FE12770A8C00339E12 /* utf.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF3AF12770A8C00339E12 /* utf.h */; };
 		71CCF3FF12770A8C00339E12 /* xml.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF3B012770A8C00339E12 /* xml.h */; };
-		71EB6E5514C5B92200B7EDA7 /* fm_fake_pull.c in Sources */ = {isa = PBXBuildFile; fileRef = 71EB6E4F14C5B92200B7EDA7 /* fm_fake_pull.c */; };
-		71EB6E5614C5B92200B7EDA7 /* fm_fake_push.c in Sources */ = {isa = PBXBuildFile; fileRef = 71EB6E5014C5B92200B7EDA7 /* fm_fake_push.c */; };
-		71EB6E5814C5B92200B7EDA7 /* hyb_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 71EB6E5214C5B92200B7EDA7 /* hyb_in.c */; };
-		71EB6E5914C5B92200B7EDA7 /* hyb_in.h in Headers */ = {isa = PBXBuildFile; fileRef = 71EB6E5314C5B92200B7EDA7 /* hyb_in.h */; };
-		71EB6EAF14C5C2F700B7EDA7 /* libgcc_s.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A270D1343540C0007362C /* libgcc_s.1.dylib */; };
-		71EB6EB014C5C30000B7EDA7 /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A28521344632F0007362C /* libgpac_dynamic.dylib */; };
-		71EB6EB114C5C30500B7EDA7 /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A283F134462AE0007362C /* libgpac_dynamic.dylib */; };
-		71EB6EB214C5C32B00B7EDA7 /* libc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71847811127860F000917298 /* libc.dylib */; };
 		71EC88E11396273B004DCB6A /* osmo.icns in Resources */ = {isa = PBXBuildFile; fileRef = 71EC88E01396273B004DCB6A /* osmo.icns */; };
-		71F2A45E12830B5300C384DE /* libjs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 71F2A45412830B1400C384DE /* libjs.a */; };
-		71F2A46E12830BE200C384DE /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 71F2A45312830B1400C384DE /* libjpeg.a */; };
-		71F2A46F12830BE800C384DE /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 71F2A45612830B1400C384DE /* libpng.a */; };
-		71F2A4BA12830E3000C384DE /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 71F2A45112830B1400C384DE /* libfreetype.a */; };
-		71F2A4C512830E5A00C384DE /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71847813127860F000917298 /* libz.dylib */; };
-		71F2A4D012830E7400C384DE /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 71F2A45712830B1400C384DE /* libSDL.a */; };
+		926B9D7116EFA5AC00773B53 /* osmo4ios.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = 926B9D7016EFA5AC00773B53 /* osmo4ios.entitlements */; };
+		929A929C16EF8BC200B7C64F /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 929A929616EF8BC200B7C64F /* Default-568h@2x.png */; };
+		929A929D16EF8BC200B7C64F /* icon_ipad_retina.png in Resources */ = {isa = PBXBuildFile; fileRef = 929A929716EF8BC200B7C64F /* icon_ipad_retina.png */; };
+		929A929E16EF8BC200B7C64F /* icon_ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 929A929816EF8BC200B7C64F /* icon_ipad.png */; };
+		929A929F16EF8BC200B7C64F /* icon_retina.png in Resources */ = {isa = PBXBuildFile; fileRef = 929A929916EF8BC200B7C64F /* icon_retina.png */; };
+		929A92A016EF8BC200B7C64F /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 929A929A16EF8BC200B7C64F /* icon.png */; };
+		92A3A03E16F0C10C004EE581 /* extract.c in Sources */ = {isa = PBXBuildFile; fileRef = 92A3A03D16F0C10C004EE581 /* extract.c */; };
+		92B039F716F2050100B2568F /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 92B039F616F2050100B2568F /* libSDL2.a */; };
+		92BC210216EF8E7A000E0620 /* aac_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199071278765600ACFF58 /* aac_in.c */; };
+		92BC210316EF8E7A000E0620 /* audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199991278778800ACFF58 /* audio.c */; };
+		92BC210416EF8E7A000E0620 /* bifs_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1990E1278767B00ACFF58 /* bifs_dec.c */; };
+		92BC210516EF8E7A000E0620 /* bmp_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1993E127876E300ACFF58 /* bmp_dec.c */; };
+		92BC210616EF8E7A000E0620 /* ctx_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1992D127876B000ACFF58 /* ctx_load.c */; };
+		92BC210716EF8E7A000E0620 /* cursors.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1999A1278778800ACFF58 /* cursors.c */; };
+		92BC210816EF8E7A000E0620 /* dummy_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A19928127876A200ACFF58 /* dummy_in.c */; };
+		92BC210916EF8E7A000E0620 /* faad_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199081278765600ACFF58 /* faad_dec.c */; };
+		92BC210C16EF8E7A000E0620 /* ft_font.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199811278776700ACFF58 /* ft_font.c */; };
+		92BC210D16EF8E7A000E0620 /* ft_font.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A199821278776700ACFF58 /* ft_font.h */; };
+		92BC210E16EF8E7A000E0620 /* ftgrays.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199151278769100ACFF58 /* ftgrays.c */; };
+		92BC210F16EF8E7A000E0620 /* gpac_js.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1994F127876FA00ACFF58 /* gpac_js.c */; };
+		92BC211216EF8E7A000E0620 /* img_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1993F127876E300ACFF58 /* img_dec.c */; };
+		92BC211316EF8E7A000E0620 /* img_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A19940127876E300ACFF58 /* img_in.c */; };
+		92BC211416EF8E7A000E0620 /* img_in.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A19941127876E300ACFF58 /* img_in.h */; };
+		92BC211516EF8E7A000E0620 /* isom_cache.c in Sources */ = {isa = PBXBuildFile; fileRef = 970D981B16D6D0AE00FB0325 /* isom_cache.c */; };
+		92BC211616EF8E7A000E0620 /* isom_in.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A199551278770900ACFF58 /* isom_in.h */; };
+		92BC211716EF8E7A000E0620 /* jp2_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A19942127876E300ACFF58 /* jp2_dec.c */; };
+		92BC211816EF8E7A000E0620 /* jpeg_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A19943127876E300ACFF58 /* jpeg_dec.c */; };
+		92BC211916EF8E7A000E0620 /* laser_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199611278772500ACFF58 /* laser_dec.c */; };
+		92BC211A16EF8E7A000E0620 /* load.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199561278770900ACFF58 /* load.c */; };
+		92BC211B16EF8E7A000E0620 /* mad_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A19937127876D300ACFF58 /* mad_dec.c */; };
+		92BC211D16EF8E7A000E0620 /* mp3_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A19939127876D300ACFF58 /* mp3_in.c */; };
+		92BC211E16EF8E7A000E0620 /* mpd_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 71179CBF1292EC1800A83216 /* mpd_in.c */; };
+		92BC211F16EF8E7A000E0620 /* mpegts_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1997D1278775900ACFF58 /* mpegts_in.c */; };
+		92BC212016EF8E7A000E0620 /* odf_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199671278773900ACFF58 /* odf_dec.c */; };
+		92BC212116EF8E7A000E0620 /* png_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A19945127876E300ACFF58 /* png_dec.c */; };
+		92BC212216EF8E7A000E0620 /* rast_soft.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A199171278769100ACFF58 /* rast_soft.h */; };
+		92BC212316EF8E7A000E0620 /* raster_565.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199181278769100ACFF58 /* raster_565.c */; };
+		92BC212416EF8E7A000E0620 /* raster_argb.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199191278769100ACFF58 /* raster_argb.c */; };
+		92BC212516EF8E7A000E0620 /* raster_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1991A1278769100ACFF58 /* raster_load.c */; };
+		92BC212616EF8E7A000E0620 /* raster_rgb.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1991B1278769100ACFF58 /* raster_rgb.c */; };
+		92BC212716EF8E7A000E0620 /* read.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199581278770900ACFF58 /* read.c */; };
+		92BC212816EF8E7A000E0620 /* read_ch.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199591278770900ACFF58 /* read_ch.c */; };
+		92BC212916EF8E7A000E0620 /* rtp_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1996C1278774A00ACFF58 /* rtp_in.c */; };
+		92BC212A16EF8E7A000E0620 /* rtp_in.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A1996D1278774A00ACFF58 /* rtp_in.h */; };
+		92BC212B16EF8E7A000E0620 /* rtp_session.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1996E1278774A00ACFF58 /* rtp_session.c */; };
+		92BC212C16EF8E7A000E0620 /* rtp_signaling.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1996F1278774A00ACFF58 /* rtp_signaling.c */; };
+		92BC212D16EF8E7A000E0620 /* rtp_stream.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199701278774A00ACFF58 /* rtp_stream.c */; };
+		92BC212E16EF8E7A000E0620 /* sdl_out.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1999C1278778800ACFF58 /* sdl_out.c */; };
+		92BC212F16EF8E7A000E0620 /* sdl_out.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A1999D1278778800ACFF58 /* sdl_out.h */; };
+		92BC213016EF8E7A000E0620 /* sdp_fetch.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199711278774A00ACFF58 /* sdp_fetch.c */; };
+		92BC213116EF8E7A000E0620 /* sdp_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199721278774A00ACFF58 /* sdp_load.c */; };
+		92BC213216EF8E7A000E0620 /* stencil.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1991C1278769100ACFF58 /* stencil.c */; };
+		92BC213316EF8E7A000E0620 /* surface.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1991D1278769100ACFF58 /* surface.c */; };
+		92BC213416EF8E7A000E0620 /* svg_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A19933127876C300ACFF58 /* svg_in.c */; };
+		92BC213516EF8E7A000E0620 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199891278777A00ACFF58 /* unzip.c */; };
+		92BC213616EF8E7A000E0620 /* unzip.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A1998A1278777A00ACFF58 /* unzip.h */; };
+		92BC213716EF8E7A000E0620 /* video.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1999E1278778800ACFF58 /* video.c */; };
+		92BC213816EF8E7A000E0620 /* video2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1999F1278778800ACFF58 /* video2d.c */; };
+		92BC213916EF8E7A000E0620 /* wgt_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1998B1278777A00ACFF58 /* wgt_load.c */; };
+		92BC213A16EF8E7A000E0620 /* widget.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1998D1278777A00ACFF58 /* widget.c */; };
+		92BC213B16EF8E7A000E0620 /* widgetman.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1998E1278777A00ACFF58 /* widgetman.c */; };
+		92BC213C16EF8E7A000E0620 /* widgetman.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A1998F1278777A00ACFF58 /* widgetman.h */; };
+		92FA814116F235520002629E /* ios_cam.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA813E16F235520002629E /* ios_cam.c */; };
+		92FA825A16F2549D0002629E /* validator.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA825916F2549D0002629E /* validator.c */; };
+		92FA825C16F254AF0002629E /* audio_filter.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA825B16F254AF0002629E /* audio_filter.c */; };
+		92FA825E16F254C60002629E /* saf_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA825D16F254C60002629E /* saf_in.c */; };
+		92FA826016F254DA0002629E /* isma_ea.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA825F16F254DA0002629E /* isma_ea.c */; };
+		92FA826316F254F50002629E /* timedtext_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA826116F254F50002629E /* timedtext_dec.c */; };
+		92FA826416F254F50002629E /* timedtext_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA826216F254F50002629E /* timedtext_in.c */; };
 		970A26C913434D2C0007362C /* m3u8.c in Sources */ = {isa = PBXBuildFile; fileRef = 970A26C713434D2C0007362C /* m3u8.c */; };
 		970A26CA13434D2C0007362C /* mpd.c in Sources */ = {isa = PBXBuildFile; fileRef = 970A26C813434D2C0007362C /* mpd.c */; };
 		970A26CD13434D780007362C /* m3u8.h in Headers */ = {isa = PBXBuildFile; fileRef = 970A26CB13434D780007362C /* m3u8.h */; };
@@ -452,60 +435,22 @@
 		970A26D413434D960007362C /* unicode.h in Headers */ = {isa = PBXBuildFile; fileRef = 970A26D113434D960007362C /* unicode.h */; };
 		970A26D713434DAC0007362C /* ringbuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 970A26D513434DAC0007362C /* ringbuffer.c */; };
 		970A26D813434DAC0007362C /* unicode.c in Sources */ = {isa = PBXBuildFile; fileRef = 970A26D613434DAC0007362C /* unicode.c */; };
-		970A270E1343540C0007362C /* libgcc_s.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A270D1343540C0007362C /* libgcc_s.1.dylib */; };
-		970A27E2134377400007362C /* libgcc_s.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A270D1343540C0007362C /* libgcc_s.1.dylib */; };
-		970A27E3134377430007362C /* libgcc_s.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A270D1343540C0007362C /* libgcc_s.1.dylib */; };
-		970A27E4134377440007362C /* libgcc_s.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A270D1343540C0007362C /* libgcc_s.1.dylib */; };
-		970A27E5134377480007362C /* libgcc_s.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A270D1343540C0007362C /* libgcc_s.1.dylib */; };
-		970A27E6134377490007362C /* libgcc_s.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A270D1343540C0007362C /* libgcc_s.1.dylib */; };
-		970A27E71343774A0007362C /* libgcc_s.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A270D1343540C0007362C /* libgcc_s.1.dylib */; };
-		970A27E81343774B0007362C /* libgcc_s.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A270D1343540C0007362C /* libgcc_s.1.dylib */; };
-		970A27E91343774C0007362C /* libgcc_s.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A270D1343540C0007362C /* libgcc_s.1.dylib */; };
-		970A2840134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A283F134462AE0007362C /* libgpac_dynamic.dylib */; };
-		970A2841134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A283F134462AE0007362C /* libgpac_dynamic.dylib */; };
-		970A2842134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A283F134462AE0007362C /* libgpac_dynamic.dylib */; };
-		970A2843134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A283F134462AE0007362C /* libgpac_dynamic.dylib */; };
-		970A2844134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A283F134462AE0007362C /* libgpac_dynamic.dylib */; };
-		970A2845134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A283F134462AE0007362C /* libgpac_dynamic.dylib */; };
-		970A2846134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A283F134462AE0007362C /* libgpac_dynamic.dylib */; };
-		970A2847134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A283F134462AE0007362C /* libgpac_dynamic.dylib */; };
-		970A2848134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A283F134462AE0007362C /* libgpac_dynamic.dylib */; };
-		970A2849134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A283F134462AE0007362C /* libgpac_dynamic.dylib */; };
-		970A284A134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A283F134462AE0007362C /* libgpac_dynamic.dylib */; };
-		970A284B134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A283F134462AE0007362C /* libgpac_dynamic.dylib */; };
-		970A284C134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A283F134462AE0007362C /* libgpac_dynamic.dylib */; };
-		970A284D134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A283F134462AE0007362C /* libgpac_dynamic.dylib */; };
-		970A284E134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A283F134462AE0007362C /* libgpac_dynamic.dylib */; };
-		970A284F134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A283F134462AE0007362C /* libgpac_dynamic.dylib */; };
-		970A2850134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A283F134462AE0007362C /* libgpac_dynamic.dylib */; };
-		970A2851134462AF0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A283F134462AE0007362C /* libgpac_dynamic.dylib */; };
-		970A28531344632F0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A28521344632F0007362C /* libgpac_dynamic.dylib */; };
-		970A28541344632F0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A28521344632F0007362C /* libgpac_dynamic.dylib */; };
-		970A28551344632F0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A28521344632F0007362C /* libgpac_dynamic.dylib */; };
-		970A28561344632F0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A28521344632F0007362C /* libgpac_dynamic.dylib */; };
-		970A28571344632F0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A28521344632F0007362C /* libgpac_dynamic.dylib */; };
-		970A28581344632F0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A28521344632F0007362C /* libgpac_dynamic.dylib */; };
-		970A28591344632F0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A28521344632F0007362C /* libgpac_dynamic.dylib */; };
-		970A285A1344632F0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A28521344632F0007362C /* libgpac_dynamic.dylib */; };
-		970A285B1344632F0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A28521344632F0007362C /* libgpac_dynamic.dylib */; };
-		970A285C1344632F0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A28521344632F0007362C /* libgpac_dynamic.dylib */; };
-		970A285D1344632F0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A28521344632F0007362C /* libgpac_dynamic.dylib */; };
-		970A285E1344632F0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A28521344632F0007362C /* libgpac_dynamic.dylib */; };
-		970A285F1344632F0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A28521344632F0007362C /* libgpac_dynamic.dylib */; };
-		970A28601344632F0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A28521344632F0007362C /* libgpac_dynamic.dylib */; };
-		970A28611344632F0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A28521344632F0007362C /* libgpac_dynamic.dylib */; };
-		970A28621344632F0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A28521344632F0007362C /* libgpac_dynamic.dylib */; };
-		970A28631344632F0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A28521344632F0007362C /* libgpac_dynamic.dylib */; };
-		970A28641344632F0007362C /* libgpac_dynamic.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A28521344632F0007362C /* libgpac_dynamic.dylib */; };
+		970FBA7D16F9F0720052216D /* html5_media.c in Sources */ = {isa = PBXBuildFile; fileRef = 970FBA7B16F9F0720052216D /* html5_media.c */; };
+		970FBA7E16F9F0720052216D /* html5_mse.c in Sources */ = {isa = PBXBuildFile; fileRef = 970FBA7C16F9F0720052216D /* html5_mse.c */; };
+		970FBA8116F9F0920052216D /* html5_media_smjs.c in Sources */ = {isa = PBXBuildFile; fileRef = 970FBA7F16F9F0910052216D /* html5_media_smjs.c */; };
+		970FBA8216F9F0920052216D /* html5_mse_smjs.c in Sources */ = {isa = PBXBuildFile; fileRef = 970FBA8016F9F0920052216D /* html5_mse_smjs.c */; };
 		97116F211646E38D00BD1AD0 /* box_code_adobe.c in Sources */ = {isa = PBXBuildFile; fileRef = 97116F201646E38D00BD1AD0 /* box_code_adobe.c */; };
+		9719CE751704C35000381CE6 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9793AE341704C0BD00E0C938 /* CoreGraphics.framework */; };
 		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 */; };
 		9747B6F414864C7800280D95 /* ait.c in Sources */ = {isa = PBXBuildFile; fileRef = 9747B6F214864C7800280D95 /* ait.c */; };
 		9747B6F514864C7800280D95 /* dsmcc.c in Sources */ = {isa = PBXBuildFile; fileRef = 9747B6F314864C7800280D95 /* dsmcc.c */; };
+		976AF99A1704C5C9004E9C00 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 976AF9991704C5C9004E9C00 /* AudioToolbox.framework */; };
 		97793E5115E6370D005123E1 /* dash_client.c in Sources */ = {isa = PBXBuildFile; fileRef = 97793E5015E6370D005123E1 /* dash_client.c */; };
-		979D587014C53556000F5831 /* libgcc_s.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 970A270D1343540C0007362C /* libgcc_s.1.dylib */; };
+		9793AE351704C0BD00E0C938 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9793AE341704C0BD00E0C938 /* CoreGraphics.framework */; };
+		97A5D5891704C61A00144E5D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 976AF9991704C5C9004E9C00 /* AudioToolbox.framework */; };
 		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 */; };
@@ -513,14 +458,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		713FD6E31393868200E8102E /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 718478371278647200917298;
-			remoteInfo = dummy_in;
-		};
-		718477D4127814D600917298 /* PBXContainerItemProxy */ = {
+		047ACFD316DF56BF00F2BF65 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
 			proxyType = 1;
@@ -530,34 +468,90 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		71179CBF1292EC1800A83216 /* mpd_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpd_in.c; sourceTree = "<group>"; };
-		71179CC41292EC3400A83216 /* gm_mpd_in.dylib */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = gm_mpd_in.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		04E81AC016E0FF0A004796EF /* applications-system.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "applications-system.svg"; sourceTree = "<group>"; };
+		04E81AC116E0FF0A004796EF /* init.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = init.js; sourceTree = "<group>"; };
+		04E81AC216E0FF0A004796EF /* gui.bt */ = {isa = PBXFileReference; lastKnownFileType = text; path = gui.bt; sourceTree = "<group>"; };
+		04E81AC316E0FF0A004796EF /* gui.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = gui.js; sourceTree = "<group>"; };
+		04E81AC416E0FF0A004796EF /* gui_old.bt */ = {isa = PBXFileReference; lastKnownFileType = text; path = gui_old.bt; sourceTree = "<group>"; };
+		04E81AC516E0FF0A004796EF /* gui_old.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = gui_old.js; sourceTree = "<group>"; };
+		04E81AC616E0FF0A004796EF /* gwlib.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = gwlib.js; sourceTree = "<group>"; };
+		04E81AC816E0FF0A004796EF /* applications-internet.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "applications-internet.svg"; sourceTree = "<group>"; };
+		04E81AC916E0FF0A004796EF /* applications-multimedia.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "applications-multimedia.svg"; sourceTree = "<group>"; };
+		04E81ACA16E0FF0A004796EF /* applications-system.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "applications-system.svg"; sourceTree = "<group>"; };
+		04E81ACB16E0FF0A004796EF /* audio-volume-high.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "audio-volume-high.svg"; sourceTree = "<group>"; };
+		04E81ACC16E0FF0A004796EF /* audio-volume-low.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "audio-volume-low.svg"; sourceTree = "<group>"; };
+		04E81ACD16E0FF0A004796EF /* audio-volume-medium.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "audio-volume-medium.svg"; sourceTree = "<group>"; };
+		04E81ACE16E0FF0A004796EF /* audio-volume-muted.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "audio-volume-muted.svg"; sourceTree = "<group>"; };
+		04E81ACF16E0FF0A004796EF /* audio-x-generic.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "audio-x-generic.svg"; sourceTree = "<group>"; };
+		04E81AD016E0FF0A004796EF /* battery-caution.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "battery-caution.svg"; sourceTree = "<group>"; };
+		04E81AD116E0FF0A004796EF /* camera-photo.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "camera-photo.svg"; sourceTree = "<group>"; };
+		04E81AD216E0FF0A004796EF /* camera-video.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "camera-video.svg"; sourceTree = "<group>"; };
+		04E81AD316E0FF0A004796EF /* dialog-error.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "dialog-error.svg"; sourceTree = "<group>"; };
+		04E81AD416E0FF0A004796EF /* dialog-information.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "dialog-information.svg"; sourceTree = "<group>"; };
+		04E81AD516E0FF0A004796EF /* dialog-warning.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "dialog-warning.svg"; sourceTree = "<group>"; };
+		04E81AD616E0FF0A004796EF /* document-new.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "document-new.svg"; sourceTree = "<group>"; };
+		04E81AD716E0FF0A004796EF /* document-print-preview.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "document-print-preview.svg"; sourceTree = "<group>"; };
+		04E81AD816E0FF0A004796EF /* document-print.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "document-print.svg"; sourceTree = "<group>"; };
+		04E81AD916E0FF0A004796EF /* document-save-as.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "document-save-as.svg"; sourceTree = "<group>"; };
+		04E81ADA16E0FF0A004796EF /* document-save.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "document-save.svg"; sourceTree = "<group>"; };
+		04E81ADB16E0FF0A004796EF /* edit-find.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "edit-find.svg"; sourceTree = "<group>"; };
+		04E81ADC16E0FF0A004796EF /* emblem-symbolic-link.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "emblem-symbolic-link.svg"; sourceTree = "<group>"; };
+		04E81ADD16E0FF0A004796EF /* emblem-unreadable.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "emblem-unreadable.svg"; sourceTree = "<group>"; };
+		04E81ADE16E0FF0A004796EF /* face-surprise.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "face-surprise.svg"; sourceTree = "<group>"; };
+		04E81ADF16E0FF0A004796EF /* folder-open.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "folder-open.svg"; sourceTree = "<group>"; };
+		04E81AE016E0FF0A004796EF /* folder.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = folder.svg; sourceTree = "<group>"; };
+		04E81AE116E0FF0A004796EF /* go-bottom.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "go-bottom.svg"; sourceTree = "<group>"; };
+		04E81AE216E0FF0A004796EF /* go-down.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "go-down.svg"; sourceTree = "<group>"; };
+		04E81AE316E0FF0A004796EF /* go-first.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "go-first.svg"; sourceTree = "<group>"; };
+		04E81AE416E0FF0A004796EF /* go-home.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "go-home.svg"; sourceTree = "<group>"; };
+		04E81AE516E0FF0A004796EF /* go-jump.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "go-jump.svg"; sourceTree = "<group>"; };
+		04E81AE616E0FF0A004796EF /* go-last.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "go-last.svg"; sourceTree = "<group>"; };
+		04E81AE716E0FF0A004796EF /* go-next.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "go-next.svg"; sourceTree = "<group>"; };
+		04E81AE816E0FF0A004796EF /* go-previous.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "go-previous.svg"; sourceTree = "<group>"; };
+		04E81AE916E0FF0A004796EF /* go-top.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "go-top.svg"; sourceTree = "<group>"; };
+		04E81AEA16E0FF0B004796EF /* go-up.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "go-up.svg"; sourceTree = "<group>"; };
+		04E81AEB16E0FF0B004796EF /* image-missing.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "image-missing.svg"; sourceTree = "<group>"; };
+		04E81AEC16E0FF0B004796EF /* left_arrow.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = left_arrow.svg; sourceTree = "<group>"; };
+		04E81AED16E0FF0B004796EF /* list-add.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "list-add.svg"; sourceTree = "<group>"; };
+		04E81AEE16E0FF0B004796EF /* list-remove.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "list-remove.svg"; sourceTree = "<group>"; };
+		04E81AEF16E0FF0B004796EF /* media-eject.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "media-eject.svg"; sourceTree = "<group>"; };
+		04E81AF016E0FF0B004796EF /* media-playback-pause.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "media-playback-pause.svg"; sourceTree = "<group>"; };
+		04E81AF116E0FF0B004796EF /* media-playback-start.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "media-playback-start.svg"; sourceTree = "<group>"; };
+		04E81AF216E0FF0B004796EF /* media-playback-stop.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "media-playback-stop.svg"; sourceTree = "<group>"; };
+		04E81AF316E0FF0B004796EF /* media-record.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "media-record.svg"; sourceTree = "<group>"; };
+		04E81AF416E0FF0B004796EF /* media-seek-backward.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "media-seek-backward.svg"; sourceTree = "<group>"; };
+		04E81AF516E0FF0B004796EF /* media-seek-forward.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "media-seek-forward.svg"; sourceTree = "<group>"; };
+		04E81AF616E0FF0B004796EF /* media-skip-backward.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "media-skip-backward.svg"; sourceTree = "<group>"; };
+		04E81AF716E0FF0B004796EF /* media-skip-forward.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "media-skip-forward.svg"; sourceTree = "<group>"; };
+		04E81AF816E0FF0B004796EF /* preferences-desktop-remote-desktop.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "preferences-desktop-remote-desktop.svg"; sourceTree = "<group>"; };
+		04E81AF916E0FF0B004796EF /* preferences-system-windows.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "preferences-system-windows.svg"; sourceTree = "<group>"; };
+		04E81AFA16E0FF0B004796EF /* process-stop.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "process-stop.svg"; sourceTree = "<group>"; };
+		04E81AFB16E0FF0B004796EF /* right_arrow.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = right_arrow.svg; sourceTree = "<group>"; };
+		04E81AFC16E0FF0B004796EF /* tennis_ball.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = tennis_ball.svg; sourceTree = "<group>"; };
+		04E81AFD16E0FF0B004796EF /* tennis_black.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = tennis_black.svg; sourceTree = "<group>"; };
+		04E81AFE16E0FF0B004796EF /* tennis_racket.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = tennis_racket.svg; sourceTree = "<group>"; };
+		04E81AFF16E0FF0B004796EF /* tennis_racket_color.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = tennis_racket_color.svg; sourceTree = "<group>"; };
+		04E81B0016E0FF0B004796EF /* user-trash.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "user-trash.svg"; sourceTree = "<group>"; };
+		04E81B0116E0FF0B004796EF /* video-display.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "video-display.svg"; sourceTree = "<group>"; };
+		04E81B0216E0FF0B004796EF /* video-x-generic.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "video-x-generic.svg"; sourceTree = "<group>"; };
+		04E81B0316E0FF0B004796EF /* view-fullscreen.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "view-fullscreen.svg"; sourceTree = "<group>"; };
+		04E81B0416E0FF0B004796EF /* iphone_wm_gui.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = iphone_wm_gui.js; sourceTree = "<group>"; };
+		04E81B0516E0FF0B004796EF /* iphone_wm_gui.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = iphone_wm_gui.svg; sourceTree = "<group>"; };
+		04E81B0616E0FF0B004796EF /* mpegu-core.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = "mpegu-core.js"; sourceTree = "<group>"; };
+		04E81B0716E0FF0B004796EF /* mpegu-wm.bt */ = {isa = PBXFileReference; lastKnownFileType = text; path = "mpegu-wm.bt"; sourceTree = "<group>"; };
+		04E81B0816E0FF0B004796EF /* mpegu-wm.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = "mpegu-wm.js"; sourceTree = "<group>"; };
+		04E81B0916E0FF0B004796EF /* mpegu-wm.xmt */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "mpegu-wm.xmt"; sourceTree = "<group>"; };
+		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>"; };
+		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>"; };
-		718477D0127814B200917298 /* libgpac_dynamic.dylib */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libgpac_dynamic.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		718477F912781DEB00917298 /* empty.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = empty.c; sourceTree = "<group>"; };
 		71847811127860F000917298 /* libc.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libc.dylib; path = usr/lib/libc.dylib; sourceTree = SDKROOT; };
 		71847813127860F000917298 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
-		718478311278645B00917298 /* gm_soft_raster.dylib */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = gm_soft_raster.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		718478381278647200917298 /* gm_dummy_in.dylib */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = gm_dummy_in.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		71847841127864AC00917298 /* gm_ctx_load.dylib */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = gm_ctx_load.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		718478491278654000917298 /* gm_aac_in.dylib */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = gm_aac_in.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		718478501278655800917298 /* gm_svg_in.dylib */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = gm_svg_in.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		718478571278656E00917298 /* gm_mp3_in.dylib */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = gm_mp3_in.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		7184785E1278657F00917298 /* gm_img_in.dylib */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = gm_img_in.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		718478651278658A00917298 /* gm_bifs_dec.dylib */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = gm_bifs_dec.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		7184786C127865A200917298 /* gm_gpac_js.dylib */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = gm_gpac_js.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		71847873127865B700917298 /* gm_isom_in.dylib */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = gm_isom_in.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		7184787A127865CB00917298 /* gm_laser_dec.dylib */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = gm_laser_dec.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		71847881127865D600917298 /* gm_odf_dec.dylib */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = gm_odf_dec.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		71847891127865F700917298 /* gm_rtp_in.dylib */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = gm_rtp_in.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		718478981278660400917298 /* gm_mpegts_in.dylib */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = gm_mpegts_in.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		7184789F1278661700917298 /* gm_ft_font.dylib */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = gm_ft_font.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		718478A61278662F00917298 /* gm_widgetman.dylib */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = gm_widgetman.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		718478B11278666100917298 /* gm_sdl_out.dylib */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = gm_sdl_out.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		71A199071278765600ACFF58 /* aac_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = aac_in.c; sourceTree = "<group>"; };
-		71A199081278765600ACFF58 /* faad_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = faad_dec.c; sourceTree = "<group>"; };
-		71A1990E1278767B00ACFF58 /* bifs_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bifs_dec.c; sourceTree = "<group>"; };
+		71A199071278765600ACFF58 /* aac_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = aac_in.c; path = ../../modules/aac_in/aac_in.c; sourceTree = "<group>"; };
+		71A199081278765600ACFF58 /* faad_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = faad_dec.c; path = ../../modules/aac_in/faad_dec.c; sourceTree = "<group>"; };
+		71A1990E1278767B00ACFF58 /* bifs_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bifs_dec.c; path = ../../modules/bifs_dec/bifs_dec.c; sourceTree = "<group>"; };
 		71A199151278769100ACFF58 /* ftgrays.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ftgrays.c; sourceTree = "<group>"; };
 		71A199171278769100ACFF58 /* rast_soft.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rast_soft.h; sourceTree = "<group>"; };
 		71A199181278769100ACFF58 /* raster_565.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = raster_565.c; sourceTree = "<group>"; };
@@ -566,11 +560,11 @@
 		71A1991B1278769100ACFF58 /* raster_rgb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = raster_rgb.c; sourceTree = "<group>"; };
 		71A1991C1278769100ACFF58 /* stencil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stencil.c; sourceTree = "<group>"; };
 		71A1991D1278769100ACFF58 /* surface.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = surface.c; sourceTree = "<group>"; };
-		71A19928127876A200ACFF58 /* dummy_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dummy_in.c; sourceTree = "<group>"; };
-		71A1992D127876B000ACFF58 /* ctx_load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ctx_load.c; sourceTree = "<group>"; };
-		71A19933127876C300ACFF58 /* svg_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_in.c; sourceTree = "<group>"; };
-		71A19937127876D300ACFF58 /* mad_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mad_dec.c; sourceTree = "<group>"; };
-		71A19939127876D300ACFF58 /* mp3_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mp3_in.c; sourceTree = "<group>"; };
+		71A19928127876A200ACFF58 /* dummy_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dummy_in.c; path = ../../modules/dummy_in/dummy_in.c; sourceTree = "<group>"; };
+		71A1992D127876B000ACFF58 /* ctx_load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ctx_load.c; path = ../../modules/ctx_load/ctx_load.c; sourceTree = "<group>"; };
+		71A19933127876C300ACFF58 /* svg_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = svg_in.c; path = ../../modules/svg_in/svg_in.c; sourceTree = "<group>"; };
+		71A19937127876D300ACFF58 /* mad_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mad_dec.c; path = ../../modules/mp3_in/mad_dec.c; sourceTree = "<group>"; };
+		71A19939127876D300ACFF58 /* mp3_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mp3_in.c; path = ../../modules/mp3_in/mp3_in.c; sourceTree = "<group>"; };
 		71A1993E127876E300ACFF58 /* bmp_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bmp_dec.c; sourceTree = "<group>"; };
 		71A1993F127876E300ACFF58 /* img_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = img_dec.c; sourceTree = "<group>"; };
 		71A19940127876E300ACFF58 /* img_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = img_in.c; sourceTree = "<group>"; };
@@ -578,14 +572,13 @@
 		71A19942127876E300ACFF58 /* jp2_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jp2_dec.c; sourceTree = "<group>"; };
 		71A19943127876E300ACFF58 /* jpeg_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jpeg_dec.c; sourceTree = "<group>"; };
 		71A19945127876E300ACFF58 /* png_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = png_dec.c; sourceTree = "<group>"; };
-		71A1994F127876FA00ACFF58 /* gpac_js.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gpac_js.c; sourceTree = "<group>"; };
-		71A199541278770900ACFF58 /* cache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cache.c; sourceTree = "<group>"; };
+		71A1994F127876FA00ACFF58 /* gpac_js.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gpac_js.c; path = ../../modules/gpac_js/gpac_js.c; sourceTree = "<group>"; };
 		71A199551278770900ACFF58 /* isom_in.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = isom_in.h; sourceTree = "<group>"; };
 		71A199561278770900ACFF58 /* load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = load.c; sourceTree = "<group>"; };
 		71A199581278770900ACFF58 /* read.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = read.c; sourceTree = "<group>"; };
 		71A199591278770900ACFF58 /* read_ch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = read_ch.c; sourceTree = "<group>"; };
-		71A199611278772500ACFF58 /* laser_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = laser_dec.c; sourceTree = "<group>"; };
-		71A199671278773900ACFF58 /* odf_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = odf_dec.c; sourceTree = "<group>"; };
+		71A199611278772500ACFF58 /* laser_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = laser_dec.c; path = ../../modules/laser_dec/laser_dec.c; sourceTree = "<group>"; };
+		71A199671278773900ACFF58 /* odf_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = odf_dec.c; path = ../../modules/odf_dec/odf_dec.c; sourceTree = "<group>"; };
 		71A1996C1278774A00ACFF58 /* rtp_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rtp_in.c; sourceTree = "<group>"; };
 		71A1996D1278774A00ACFF58 /* rtp_in.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rtp_in.h; sourceTree = "<group>"; };
 		71A1996E1278774A00ACFF58 /* rtp_session.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rtp_session.c; sourceTree = "<group>"; };
@@ -593,9 +586,9 @@
 		71A199701278774A00ACFF58 /* rtp_stream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rtp_stream.c; sourceTree = "<group>"; };
 		71A199711278774A00ACFF58 /* sdp_fetch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sdp_fetch.c; sourceTree = "<group>"; };
 		71A199721278774A00ACFF58 /* sdp_load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sdp_load.c; sourceTree = "<group>"; };
-		71A1997D1278775900ACFF58 /* mpegts_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpegts_in.c; sourceTree = "<group>"; };
-		71A199811278776700ACFF58 /* ft_font.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ft_font.c; sourceTree = "<group>"; };
-		71A199821278776700ACFF58 /* ft_font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ft_font.h; sourceTree = "<group>"; };
+		71A1997D1278775900ACFF58 /* mpegts_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mpegts_in.c; path = ../../modules/mpegts_in/mpegts_in.c; sourceTree = "<group>"; };
+		71A199811278776700ACFF58 /* ft_font.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ft_font.c; path = ../../modules/ft_font/ft_font.c; sourceTree = "<group>"; };
+		71A199821278776700ACFF58 /* ft_font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ft_font.h; path = ../../modules/ft_font/ft_font.h; sourceTree = "<group>"; };
 		71A199891278777A00ACFF58 /* unzip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = unzip.c; sourceTree = "<group>"; };
 		71A1998A1278777A00ACFF58 /* unzip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unzip.h; sourceTree = "<group>"; };
 		71A1998B1278777A00ACFF58 /* wgt_load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = wgt_load.c; sourceTree = "<group>"; };
@@ -612,14 +605,9 @@
 		71A19B1A12796B5600ACFF58 /* osmo4ios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = osmo4ios.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		71A19B1C12796B5700ACFF58 /* osmo4ios-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "osmo4ios-Info.plist"; path = "../../applications/osmo4_ios/osmo4ios-Info.plist"; sourceTree = "<group>"; };
 		71A19B2012796B6F00ACFF58 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = main.c; path = ../../applications/osmo4_ios/main.c; sourceTree = SOURCE_ROOT; };
-		71A19B3F12796FCC00ACFF58 /* module_av_generic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = module_av_generic.c; sourceTree = SOURCE_ROOT; };
-		71A19B411279713300ACFF58 /* extract.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = extract.c; path = ../../applications/osmo4_ios/extract.c; sourceTree = SOURCE_ROOT; };
-		71A19B43127971C700ACFF58 /* libgpac_symbols.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libgpac_symbols.h; sourceTree = "<group>"; };
 		71A19BB112797D1B00ACFF58 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
-		71A19BB812797D4800ACFF58 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		71A19BC312797D9200ACFF58 /* libobjc.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libobjc.dylib; path = usr/lib/libobjc.dylib; sourceTree = SDKROOT; };
 		71A19BCC12797DBA00ACFF58 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
-		71A19C3A12797E4000ACFF58 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 		71A19C3C12797E4000ACFF58 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		71A19C3E12797E4000ACFF58 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		71A19C4012797E4000ACFF58 /* libdl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libdl.dylib; path = usr/lib/libdl.dylib; sourceTree = SDKROOT; };
@@ -955,11 +943,6 @@
 		71CCF3AE12770A8C00339E12 /* user.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = user.h; sourceTree = "<group>"; };
 		71CCF3AF12770A8C00339E12 /* utf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf.h; sourceTree = "<group>"; };
 		71CCF3B012770A8C00339E12 /* xml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xml.h; sourceTree = "<group>"; };
-		71EB6E4814C5B6F500B7EDA7 /* gm_hyb_in.dylib */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = gm_hyb_in.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		71EB6E4F14C5B92200B7EDA7 /* fm_fake_pull.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fm_fake_pull.c; sourceTree = "<group>"; };
-		71EB6E5014C5B92200B7EDA7 /* fm_fake_push.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fm_fake_push.c; sourceTree = "<group>"; };
-		71EB6E5214C5B92200B7EDA7 /* hyb_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hyb_in.c; sourceTree = "<group>"; };
-		71EB6E5314C5B92200B7EDA7 /* hyb_in.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hyb_in.h; sourceTree = "<group>"; };
 		71EC88E01396273B004DCB6A /* osmo.icns */ = {isa = PBXFileReference; explicitFileType = image.icns; name = osmo.icns; path = ../../applications/osmo4_ios/Resources/osmo.icns; sourceTree = SOURCE_ROOT; };
 		71F2A45012830B1400C384DE /* libfaad.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfaad.a; path = ../../extra_lib/lib/iOS/libfaad.a; sourceTree = SOURCE_ROOT; };
 		71F2A45112830B1400C384DE /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfreetype.a; path = ../../extra_lib/lib/iOS/libfreetype.a; sourceTree = SOURCE_ROOT; };
@@ -967,7 +950,23 @@
 		71F2A45412830B1400C384DE /* libjs.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjs.a; path = ../../extra_lib/lib/iOS/libjs.a; sourceTree = SOURCE_ROOT; };
 		71F2A45512830B1400C384DE /* libmad.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmad.a; path = ../../extra_lib/lib/iOS/libmad.a; sourceTree = SOURCE_ROOT; };
 		71F2A45612830B1400C384DE /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../extra_lib/lib/iOS/libpng.a; sourceTree = SOURCE_ROOT; };
-		71F2A45712830B1400C384DE /* libSDL.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL.a; path = ../../extra_lib/lib/iOS/libSDL.a; sourceTree = SOURCE_ROOT; };
+		926B9D7016EFA5AC00773B53 /* osmo4ios.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = osmo4ios.entitlements; sourceTree = "<group>"; };
+		929A929616EF8BC200B7C64F /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "../../applications/osmo4_ios/Resources/Default-568h@2x.png"; sourceTree = SOURCE_ROOT; };
+		929A929716EF8BC200B7C64F /* icon_ipad_retina.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = icon_ipad_retina.png; path = ../../applications/osmo4_ios/Resources/icon_ipad_retina.png; sourceTree = SOURCE_ROOT; };
+		929A929816EF8BC200B7C64F /* icon_ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = icon_ipad.png; path = ../../applications/osmo4_ios/Resources/icon_ipad.png; sourceTree = SOURCE_ROOT; };
+		929A929916EF8BC200B7C64F /* icon_retina.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = icon_retina.png; path = ../../applications/osmo4_ios/Resources/icon_retina.png; sourceTree = SOURCE_ROOT; };
+		929A929A16EF8BC200B7C64F /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = icon.png; path = ../../applications/osmo4_ios/Resources/icon.png; sourceTree = SOURCE_ROOT; };
+		92A3A03D16F0C10C004EE581 /* extract.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = extract.c; path = ../../applications/osmo4_ios/extract.c; sourceTree = SOURCE_ROOT; };
+		92B039F616F2050100B2568F /* libSDL2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2.a; path = ../../extra_lib/lib/iOS/libSDL2.a; sourceTree = SOURCE_ROOT; };
+		92FA813A16F235520002629E /* cam_wrap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cam_wrap.h; path = ../../modules/ios_cam/cam_wrap.h; sourceTree = SOURCE_ROOT; };
+		92FA813C16F235520002629E /* CameraObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CameraObject.h; path = ../../modules/ios_cam/CameraObject.h; sourceTree = SOURCE_ROOT; };
+		92FA813E16F235520002629E /* ios_cam.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ios_cam.c; path = ../../modules/ios_cam/ios_cam.c; sourceTree = SOURCE_ROOT; };
+		92FA825916F2549D0002629E /* validator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = validator.c; path = ../../modules/validator/validator.c; sourceTree = SOURCE_ROOT; };
+		92FA825B16F254AF0002629E /* audio_filter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = audio_filter.c; path = ../../modules/audio_filter/audio_filter.c; sourceTree = SOURCE_ROOT; };
+		92FA825D16F254C60002629E /* saf_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = saf_in.c; path = ../../modules/saf_in/saf_in.c; sourceTree = SOURCE_ROOT; };
+		92FA825F16F254DA0002629E /* isma_ea.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = isma_ea.c; path = ../../modules/ismacryp/isma_ea.c; sourceTree = SOURCE_ROOT; };
+		92FA826116F254F50002629E /* timedtext_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = timedtext_dec.c; path = ../../modules/timedtext/timedtext_dec.c; sourceTree = SOURCE_ROOT; };
+		92FA826216F254F50002629E /* timedtext_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = timedtext_in.c; path = ../../modules/timedtext/timedtext_in.c; sourceTree = SOURCE_ROOT; };
 		970A26C713434D2C0007362C /* m3u8.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = m3u8.c; sourceTree = "<group>"; };
 		970A26C813434D2C0007362C /* mpd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpd.c; sourceTree = "<group>"; };
 		970A26CB13434D780007362C /* m3u8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = m3u8.h; sourceTree = "<group>"; };
@@ -978,8 +977,11 @@
 		970A26D513434DAC0007362C /* ringbuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ringbuffer.c; sourceTree = "<group>"; };
 		970A26D613434DAC0007362C /* unicode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = unicode.c; sourceTree = "<group>"; };
 		970A270D1343540C0007362C /* libgcc_s.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libgcc_s.1.dylib; path = usr/lib/libgcc_s.1.dylib; sourceTree = SDKROOT; };
-		970A283F134462AE0007362C /* libgpac_dynamic.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libgpac_dynamic.dylib; path = "build/Release-iphonesimulator/libgpac_dynamic.dylib"; sourceTree = SOURCE_ROOT; };
-		970A28521344632F0007362C /* libgpac_dynamic.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libgpac_dynamic.dylib; path = ../../bin/iOS/osmo4ios.app/libgpac_dynamic.dylib; sourceTree = SOURCE_ROOT; };
+		970D981B16D6D0AE00FB0325 /* isom_cache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = isom_cache.c; sourceTree = "<group>"; };
+		970FBA7B16F9F0720052216D /* html5_media.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html5_media.c; sourceTree = "<group>"; };
+		970FBA7C16F9F0720052216D /* html5_mse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html5_mse.c; sourceTree = "<group>"; };
+		970FBA7F16F9F0910052216D /* html5_media_smjs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html5_media_smjs.c; sourceTree = "<group>"; };
+		970FBA8016F9F0920052216D /* html5_mse_smjs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html5_mse_smjs.c; sourceTree = "<group>"; };
 		97116F201646E38D00BD1AD0 /* box_code_adobe.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = box_code_adobe.c; sourceTree = "<group>"; };
 		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>"; };
@@ -987,7 +989,9 @@
 		9747B6EE14864C6400280D95 /* events_constants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = events_constants.h; sourceTree = "<group>"; };
 		9747B6F214864C7800280D95 /* ait.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ait.c; sourceTree = "<group>"; };
 		9747B6F314864C7800280D95 /* dsmcc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dsmcc.c; sourceTree = "<group>"; };
+		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; };
 		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>"; };
@@ -995,228 +999,28 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-		71179CC21292EC3400A83216 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71179CF31292EDED00A83216 /* libc.dylib in Frameworks */,
-				970A2850134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */,
-				970A28631344632F0007362C /* libgpac_dynamic.dylib in Frameworks */,
-				979D587014C53556000F5831 /* libgcc_s.1.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		718477CE127814B200917298 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				718477E4127817B700917298 /* libgpac_static.a in Frameworks */,
-				71847812127860F000917298 /* libc.dylib in Frameworks */,
-				71847814127860F000917298 /* libz.dylib in Frameworks */,
-				71F2A45E12830B5300C384DE /* libjs.a in Frameworks */,
-				71F2A46E12830BE200C384DE /* libjpeg.a in Frameworks */,
-				71F2A46F12830BE800C384DE /* libpng.a in Frameworks */,
-				970A270E1343540C0007362C /* libgcc_s.1.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		7184782F1278645B00917298 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A19A1A12787BFB00ACFF58 /* libc.dylib in Frameworks */,
-				970A27E2134377400007362C /* libgcc_s.1.dylib in Frameworks */,
-				970A2840134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */,
-				970A28531344632F0007362C /* libgpac_dynamic.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		718478361278647200917298 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A19A2112787C3200ACFF58 /* libc.dylib in Frameworks */,
-				970A2841134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */,
-				970A28541344632F0007362C /* libgpac_dynamic.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		7184783F127864AC00917298 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A19A2C12787C6800ACFF58 /* libc.dylib in Frameworks */,
-				970A27E3134377430007362C /* libgcc_s.1.dylib in Frameworks */,
-				970A2843134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */,
-				970A28561344632F0007362C /* libgpac_dynamic.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		718478471278654000917298 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A19A3F12787CB800ACFF58 /* libc.dylib in Frameworks */,
-				71179CA31292E7BA00A83216 /* libfaad.a in Frameworks */,
-				970A27E4134377440007362C /* libgcc_s.1.dylib in Frameworks */,
-				970A2842134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */,
-				970A28551344632F0007362C /* libgpac_dynamic.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		7184784E1278655800917298 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A19A4512787CDB00ACFF58 /* libc.dylib in Frameworks */,
-				71A19A4912787CF000ACFF58 /* libz.dylib in Frameworks */,
-				970A2844134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */,
-				970A28571344632F0007362C /* libgpac_dynamic.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		718478551278656E00917298 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A19A5212787D0E00ACFF58 /* libc.dylib in Frameworks */,
-				71179CAE1292E7F700A83216 /* libmad.a in Frameworks */,
-				970A27E5134377480007362C /* libgcc_s.1.dylib in Frameworks */,
-				970A2845134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */,
-				970A28581344632F0007362C /* libgpac_dynamic.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		7184785C1278657F00917298 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A19A5B12787D2A00ACFF58 /* libc.dylib in Frameworks */,
-				970A2846134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */,
-				970A28591344632F0007362C /* libgpac_dynamic.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		718478631278658A00917298 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A19A6112787D4000ACFF58 /* libc.dylib in Frameworks */,
-				970A2847134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */,
-				970A285A1344632F0007362C /* libgpac_dynamic.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		7184786A127865A200917298 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A19A6712787D8300ACFF58 /* libc.dylib in Frameworks */,
-				970A2848134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */,
-				970A285B1344632F0007362C /* libgpac_dynamic.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		71847871127865B700917298 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A19A6D12787D9800ACFF58 /* libc.dylib in Frameworks */,
-				970A27E6134377490007362C /* libgcc_s.1.dylib in Frameworks */,
-				970A2849134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */,
-				970A285C1344632F0007362C /* libgpac_dynamic.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		71847878127865CB00917298 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A19A7712787DC100ACFF58 /* libc.dylib in Frameworks */,
-				970A284A134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */,
-				970A285D1344632F0007362C /* libgpac_dynamic.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		7184787F127865D600917298 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A19A7D12787DD700ACFF58 /* libc.dylib in Frameworks */,
-				970A284B134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */,
-				970A285E1344632F0007362C /* libgpac_dynamic.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		7184788F127865F700917298 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A19A8312787DED00ACFF58 /* libc.dylib in Frameworks */,
-				970A27E71343774A0007362C /* libgcc_s.1.dylib in Frameworks */,
-				970A284D134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */,
-				970A28601344632F0007362C /* libgpac_dynamic.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		718478961278660400917298 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A19A8912787E0400ACFF58 /* libc.dylib in Frameworks */,
-				970A27E81343774B0007362C /* libgcc_s.1.dylib in Frameworks */,
-				970A284C134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */,
-				970A285F1344632F0007362C /* libgpac_dynamic.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		7184789D1278661700917298 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A19AA612795BE100ACFF58 /* libc.dylib in Frameworks */,
-				71F2A4BA12830E3000C384DE /* libfreetype.a in Frameworks */,
-				71F2A4C512830E5A00C384DE /* libz.dylib in Frameworks */,
-				970A27E91343774C0007362C /* libgcc_s.1.dylib in Frameworks */,
-				970A284E134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */,
-				970A28611344632F0007362C /* libgpac_dynamic.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		718478A41278662F00917298 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A19AAF12795C3100ACFF58 /* libc.dylib in Frameworks */,
-				71A19AB312795C4900ACFF58 /* libz.dylib in Frameworks */,
-				970A284F134462AE0007362C /* libgpac_dynamic.dylib in Frameworks */,
-				970A28621344632F0007362C /* libgpac_dynamic.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		718478AF1278666100917298 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A19ABE12795C7E00ACFF58 /* libc.dylib in Frameworks */,
-				970A2851134462AF0007362C /* libgpac_dynamic.dylib in Frameworks */,
-				970A28641344632F0007362C /* libgpac_dynamic.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		71A19B1812796B5600ACFF58 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				04EFB63516E51E4200D1D44A /* libglues.a in Frameworks */,
+				0496F09C16DE36BC009D9D8D /* libz.dylib in Frameworks */,
+				0496F09B16DE35C9009D9D8D /* libgpac_static.a in Frameworks */,
+				0496F07716DD1A18009D9D8D /* libfaad.a in Frameworks */,
+				0496F07816DD1A18009D9D8D /* libfreetype.a in Frameworks */,
+				0496F07916DD1A18009D9D8D /* libjpeg.a in Frameworks */,
+				0496F07A16DD1A18009D9D8D /* libjs.a in Frameworks */,
+				0496F07B16DD1A18009D9D8D /* libmad.a in Frameworks */,
+				0496F07C16DD1A18009D9D8D /* libpng.a in Frameworks */,
 				71A19BB212797D1B00ACFF58 /* OpenGLES.framework in Frameworks */,
-				71A19BB912797D4800ACFF58 /* AudioToolbox.framework in Frameworks */,
 				71A19BC412797D9200ACFF58 /* libobjc.dylib in Frameworks */,
 				71A19BCD12797DBA00ACFF58 /* UIKit.framework in Frameworks */,
-				71A19C3B12797E4000ACFF58 /* CoreGraphics.framework in Frameworks */,
 				71A19C3D12797E4000ACFF58 /* Foundation.framework in Frameworks */,
 				71A19C3F12797E4000ACFF58 /* QuartzCore.framework in Frameworks */,
 				71A19C4112797E4000ACFF58 /* libdl.dylib in Frameworks */,
-				71F2A4D012830E7400C384DE /* libSDL.a in Frameworks */,
+				92B039F716F2050100B2568F /* libSDL2.a in Frameworks */,
+				9719CE751704C35000381CE6 /* CoreGraphics.framework in Frameworks */,
+				97A5D5891704C61A00144E5D /* AudioToolbox.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1224,108 +1028,159 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		71EB6E4614C5B6F500B7EDA7 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71EB6EAF14C5C2F700B7EDA7 /* libgcc_s.1.dylib in Frameworks */,
-				71EB6EB014C5C30000B7EDA7 /* libgpac_dynamic.dylib in Frameworks */,
-				71EB6EB114C5C30500B7EDA7 /* libgpac_dynamic.dylib in Frameworks */,
-				71EB6EB214C5C32B00B7EDA7 /* libc.dylib in Frameworks */,
+				9793AE351704C0BD00E0C938 /* CoreGraphics.framework in Frameworks */,
+				976AF99A1704C5C9004E9C00 /* AudioToolbox.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		04E81ABD16E0FF0A004796EF /* gui */ = {
+			isa = PBXGroup;
+			children = (
+				04E81ABE16E0FF0A004796EF /* extensions */,
+				04E81AC216E0FF0A004796EF /* gui.bt */,
+				04E81AC316E0FF0A004796EF /* gui.js */,
+				04E81AC416E0FF0A004796EF /* gui_old.bt */,
+				04E81AC516E0FF0A004796EF /* gui_old.js */,
+				04E81AC616E0FF0A004796EF /* gwlib.js */,
+				04E81AC716E0FF0A004796EF /* icons */,
+				04E81B0416E0FF0B004796EF /* iphone_wm_gui.js */,
+				04E81B0516E0FF0B004796EF /* iphone_wm_gui.svg */,
+				04E81B0616E0FF0B004796EF /* mpegu-core.js */,
+				04E81B0716E0FF0B004796EF /* mpegu-wm.bt */,
+				04E81B0816E0FF0B004796EF /* mpegu-wm.js */,
+				04E81B0916E0FF0B004796EF /* mpegu-wm.xmt */,
+				04E81B0A16E0FF0B004796EF /* tv_wm_gui.js */,
+				04E81B0B16E0FF0B004796EF /* tv_wm_gui.svg */,
+			);
+			name = gui;
+			path = ../../gui;
+			sourceTree = "<group>";
+		};
+		04E81ABE16E0FF0A004796EF /* extensions */ = {
+			isa = PBXGroup;
+			children = (
+				04E81ABF16E0FF0A004796EF /* widget_manager */,
+			);
+			path = extensions;
+			sourceTree = "<group>";
+		};
+		04E81ABF16E0FF0A004796EF /* widget_manager */ = {
+			isa = PBXGroup;
+			children = (
+				04E81AC016E0FF0A004796EF /* applications-system.svg */,
+				04E81AC116E0FF0A004796EF /* init.js */,
+			);
+			path = widget_manager;
+			sourceTree = "<group>";
+		};
+		04E81AC716E0FF0A004796EF /* icons */ = {
+			isa = PBXGroup;
+			children = (
+				04E81AC816E0FF0A004796EF /* applications-internet.svg */,
+				04E81AC916E0FF0A004796EF /* applications-multimedia.svg */,
+				04E81ACA16E0FF0A004796EF /* applications-system.svg */,
+				04E81ACB16E0FF0A004796EF /* audio-volume-high.svg */,
+				04E81ACC16E0FF0A004796EF /* audio-volume-low.svg */,
+				04E81ACD16E0FF0A004796EF /* audio-volume-medium.svg */,
+				04E81ACE16E0FF0A004796EF /* audio-volume-muted.svg */,
+				04E81ACF16E0FF0A004796EF /* audio-x-generic.svg */,
+				04E81AD016E0FF0A004796EF /* battery-caution.svg */,
+				04E81AD116E0FF0A004796EF /* camera-photo.svg */,
+				04E81AD216E0FF0A004796EF /* camera-video.svg */,
+				04E81AD316E0FF0A004796EF /* dialog-error.svg */,
+				04E81AD416E0FF0A004796EF /* dialog-information.svg */,
+				04E81AD516E0FF0A004796EF /* dialog-warning.svg */,
+				04E81AD616E0FF0A004796EF /* document-new.svg */,
+				04E81AD716E0FF0A004796EF /* document-print-preview.svg */,
+				04E81AD816E0FF0A004796EF /* document-print.svg */,
+				04E81AD916E0FF0A004796EF /* document-save-as.svg */,
+				04E81ADA16E0FF0A004796EF /* document-save.svg */,
+				04E81ADB16E0FF0A004796EF /* edit-find.svg */,
+				04E81ADC16E0FF0A004796EF /* emblem-symbolic-link.svg */,
+				04E81ADD16E0FF0A004796EF /* emblem-unreadable.svg */,
+				04E81ADE16E0FF0A004796EF /* face-surprise.svg */,
+				04E81ADF16E0FF0A004796EF /* folder-open.svg */,
+				04E81AE016E0FF0A004796EF /* folder.svg */,
+				04E81AE116E0FF0A004796EF /* go-bottom.svg */,
+				04E81AE216E0FF0A004796EF /* go-down.svg */,
+				04E81AE316E0FF0A004796EF /* go-first.svg */,
+				04E81AE416E0FF0A004796EF /* go-home.svg */,
+				04E81AE516E0FF0A004796EF /* go-jump.svg */,
+				04E81AE616E0FF0A004796EF /* go-last.svg */,
+				04E81AE716E0FF0A004796EF /* go-next.svg */,
+				04E81AE816E0FF0A004796EF /* go-previous.svg */,
+				04E81AE916E0FF0A004796EF /* go-top.svg */,
+				04E81AEA16E0FF0B004796EF /* go-up.svg */,
+				04E81AEB16E0FF0B004796EF /* image-missing.svg */,
+				04E81AEC16E0FF0B004796EF /* left_arrow.svg */,
+				04E81AED16E0FF0B004796EF /* list-add.svg */,
+				04E81AEE16E0FF0B004796EF /* list-remove.svg */,
+				04E81AEF16E0FF0B004796EF /* media-eject.svg */,
+				04E81AF016E0FF0B004796EF /* media-playback-pause.svg */,
+				04E81AF116E0FF0B004796EF /* media-playback-start.svg */,
+				04E81AF216E0FF0B004796EF /* media-playback-stop.svg */,
+				04E81AF316E0FF0B004796EF /* media-record.svg */,
+				04E81AF416E0FF0B004796EF /* media-seek-backward.svg */,
+				04E81AF516E0FF0B004796EF /* media-seek-forward.svg */,
+				04E81AF616E0FF0B004796EF /* media-skip-backward.svg */,
+				04E81AF716E0FF0B004796EF /* media-skip-forward.svg */,
+				04E81AF816E0FF0B004796EF /* preferences-desktop-remote-desktop.svg */,
+				04E81AF916E0FF0B004796EF /* preferences-system-windows.svg */,
+				04E81AFA16E0FF0B004796EF /* process-stop.svg */,
+				04E81AFB16E0FF0B004796EF /* right_arrow.svg */,
+				04E81AFC16E0FF0B004796EF /* tennis_ball.svg */,
+				04E81AFD16E0FF0B004796EF /* tennis_black.svg */,
+				04E81AFE16E0FF0B004796EF /* tennis_racket.svg */,
+				04E81AFF16E0FF0B004796EF /* tennis_racket_color.svg */,
+				04E81B0016E0FF0B004796EF /* user-trash.svg */,
+				04E81B0116E0FF0B004796EF /* video-display.svg */,
+				04E81B0216E0FF0B004796EF /* video-x-generic.svg */,
+				04E81B0316E0FF0B004796EF /* view-fullscreen.svg */,
+			);
+			path = icons;
+			sourceTree = "<group>";
+		};
 		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
 			isa = PBXGroup;
 			children = (
-				71EB6E4E14C5B92200B7EDA7 /* hyb_in */,
-				71179CB91292EC1800A83216 /* mpd_in */,
-				71A199061278765600ACFF58 /* aac_in */,
-				71A1990D1278767B00ACFF58 /* bifs_dec */,
-				71A1992C127876B000ACFF58 /* ctx_load */,
-				71A19927127876A200ACFF58 /* dummy_in */,
-				71A199801278776700ACFF58 /* ft_font */,
-				71A1994E127876FA00ACFF58 /* gpac_js */,
-				71A1993D127876E300ACFF58 /* img_in */,
-				71A199531278770900ACFF58 /* isom_in */,
-				71A199601278772500ACFF58 /* laser_dec */,
 				71CCF1381277041D00339E12 /* libgpac */,
-				71A19936127876D300ACFF58 /* mp3_in */,
-				71A1997B1278775900ACFF58 /* mpegts_in */,
-				71A199651278773900ACFF58 /* odf_dec */,
+				929A929516EF8A7500B7C64F /* modules */,
 				71A19B1412796AC700ACFF58 /* osmo4iOS */,
-				71A1996A1278774A00ACFF58 /* rtp_in */,
-				71A199981278778800ACFF58 /* sdl_out */,
-				71A199141278769100ACFF58 /* soft_raster */,
-				71A19931127876C300ACFF58 /* svg_in */,
-				71A199871278777A00ACFF58 /* widgetman */,
 				7184780712785F7B00917298 /* Frameworks */,
 				71CCF1321277037A00339E12 /* Products */,
 			);
 			name = CustomTemplate;
 			sourceTree = "<group>";
 		};
-		71179CB91292EC1800A83216 /* mpd_in */ = {
-			isa = PBXGroup;
-			children = (
-				71179CBF1292EC1800A83216 /* mpd_in.c */,
-			);
-			name = mpd_in;
-			path = ../../modules/mpd_in;
-			sourceTree = SOURCE_ROOT;
-		};
 		7184780712785F7B00917298 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				970A28521344632F0007362C /* libgpac_dynamic.dylib */,
-				970A283F134462AE0007362C /* libgpac_dynamic.dylib */,
+				92B039F616F2050100B2568F /* libSDL2.a */,
 				970A270D1343540C0007362C /* libgcc_s.1.dylib */,
+				04EFB63416E51E4200D1D44A /* libglues.a */,
 				71F2A45012830B1400C384DE /* libfaad.a */,
 				71F2A45112830B1400C384DE /* libfreetype.a */,
 				71F2A45312830B1400C384DE /* libjpeg.a */,
 				71F2A45412830B1400C384DE /* libjs.a */,
 				71F2A45512830B1400C384DE /* libmad.a */,
 				71F2A45612830B1400C384DE /* libpng.a */,
-				71F2A45712830B1400C384DE /* libSDL.a */,
-				71A19C3A12797E4000ACFF58 /* CoreGraphics.framework */,
+				9793AE341704C0BD00E0C938 /* CoreGraphics.framework */,
 				71A19C3C12797E4000ACFF58 /* Foundation.framework */,
 				71A19C3E12797E4000ACFF58 /* QuartzCore.framework */,
 				71A19C4012797E4000ACFF58 /* libdl.dylib */,
 				71A19BB112797D1B00ACFF58 /* OpenGLES.framework */,
-				71A19BB812797D4800ACFF58 /* AudioToolbox.framework */,
 				71A19BC312797D9200ACFF58 /* libobjc.dylib */,
 				71A19BCC12797DBA00ACFF58 /* UIKit.framework */,
 				71847811127860F000917298 /* libc.dylib */,
 				71847813127860F000917298 /* libz.dylib */,
+				976AF9991704C5C9004E9C00 /* AudioToolbox.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		71A199061278765600ACFF58 /* aac_in */ = {
-			isa = PBXGroup;
-			children = (
-				71A199071278765600ACFF58 /* aac_in.c */,
-				71A199081278765600ACFF58 /* faad_dec.c */,
-			);
-			name = aac_in;
-			path = ../../modules/aac_in;
-			sourceTree = SOURCE_ROOT;
-		};
-		71A1990D1278767B00ACFF58 /* bifs_dec */ = {
-			isa = PBXGroup;
-			children = (
-				71A1990E1278767B00ACFF58 /* bifs_dec.c */,
-			);
-			name = bifs_dec;
-			path = ../../modules/bifs_dec;
-			sourceTree = SOURCE_ROOT;
-		};
 		71A199141278769100ACFF58 /* soft_raster */ = {
 			isa = PBXGroup;
 			children = (
@@ -1342,43 +1197,6 @@
 			path = ../../modules/soft_raster;
 			sourceTree = SOURCE_ROOT;
 		};
-		71A19927127876A200ACFF58 /* dummy_in */ = {
-			isa = PBXGroup;
-			children = (
-				71A19928127876A200ACFF58 /* dummy_in.c */,
-			);
-			name = dummy_in;
-			path = ../../modules/dummy_in;
-			sourceTree = SOURCE_ROOT;
-		};
-		71A1992C127876B000ACFF58 /* ctx_load */ = {
-			isa = PBXGroup;
-			children = (
-				71A1992D127876B000ACFF58 /* ctx_load.c */,
-			);
-			name = ctx_load;
-			path = ../../modules/ctx_load;
-			sourceTree = SOURCE_ROOT;
-		};
-		71A19931127876C300ACFF58 /* svg_in */ = {
-			isa = PBXGroup;
-			children = (
-				71A19933127876C300ACFF58 /* svg_in.c */,
-			);
-			name = svg_in;
-			path = ../../modules/svg_in;
-			sourceTree = SOURCE_ROOT;
-		};
-		71A19936127876D300ACFF58 /* mp3_in */ = {
-			isa = PBXGroup;
-			children = (
-				71A19937127876D300ACFF58 /* mad_dec.c */,
-				71A19939127876D300ACFF58 /* mp3_in.c */,
-			);
-			name = mp3_in;
-			path = ../../modules/mp3_in;
-			sourceTree = SOURCE_ROOT;
-		};
 		71A1993D127876E300ACFF58 /* img_in */ = {
 			isa = PBXGroup;
 			children = (
@@ -1394,19 +1212,10 @@
 			path = ../../modules/img_in;
 			sourceTree = SOURCE_ROOT;
 		};
-		71A1994E127876FA00ACFF58 /* gpac_js */ = {
-			isa = PBXGroup;
-			children = (
-				71A1994F127876FA00ACFF58 /* gpac_js.c */,
-			);
-			name = gpac_js;
-			path = ../../modules/gpac_js;
-			sourceTree = SOURCE_ROOT;
-		};
 		71A199531278770900ACFF58 /* isom_in */ = {
 			isa = PBXGroup;
 			children = (
-				71A199541278770900ACFF58 /* cache.c */,
+				970D981B16D6D0AE00FB0325 /* isom_cache.c */,
 				71A199551278770900ACFF58 /* isom_in.h */,
 				71A199561278770900ACFF58 /* load.c */,
 				71A199581278770900ACFF58 /* read.c */,
@@ -1416,24 +1225,6 @@
 			path = ../../modules/isom_in;
 			sourceTree = SOURCE_ROOT;
 		};
-		71A199601278772500ACFF58 /* laser_dec */ = {
-			isa = PBXGroup;
-			children = (
-				71A199611278772500ACFF58 /* laser_dec.c */,
-			);
-			name = laser_dec;
-			path = ../../modules/laser_dec;
-			sourceTree = SOURCE_ROOT;
-		};
-		71A199651278773900ACFF58 /* odf_dec */ = {
-			isa = PBXGroup;
-			children = (
-				71A199671278773900ACFF58 /* odf_dec.c */,
-			);
-			name = odf_dec;
-			path = ../../modules/odf_dec;
-			sourceTree = SOURCE_ROOT;
-		};
 		71A1996A1278774A00ACFF58 /* rtp_in */ = {
 			isa = PBXGroup;
 			children = (
@@ -1449,25 +1240,6 @@
 			path = ../../modules/rtp_in;
 			sourceTree = SOURCE_ROOT;
 		};
-		71A1997B1278775900ACFF58 /* mpegts_in */ = {
-			isa = PBXGroup;
-			children = (
-				71A1997D1278775900ACFF58 /* mpegts_in.c */,
-			);
-			name = mpegts_in;
-			path = ../../modules/mpegts_in;
-			sourceTree = SOURCE_ROOT;
-		};
-		71A199801278776700ACFF58 /* ft_font */ = {
-			isa = PBXGroup;
-			children = (
-				71A199811278776700ACFF58 /* ft_font.c */,
-				71A199821278776700ACFF58 /* ft_font.h */,
-			);
-			name = ft_font;
-			path = ../../modules/ft_font;
-			sourceTree = SOURCE_ROOT;
-		};
 		71A199871278777A00ACFF58 /* widgetman */ = {
 			isa = PBXGroup;
 			children = (
@@ -1486,7 +1258,6 @@
 		71A199981278778800ACFF58 /* sdl_out */ = {
 			isa = PBXGroup;
 			children = (
-				71A19B3F12796FCC00ACFF58 /* module_av_generic.c */,
 				71A199991278778800ACFF58 /* audio.c */,
 				71A1999A1278778800ACFF58 /* cursors.c */,
 				71A1999C1278778800ACFF58 /* sdl_out.c */,
@@ -1501,9 +1272,15 @@
 		71A19B1412796AC700ACFF58 /* osmo4iOS */ = {
 			isa = PBXGroup;
 			children = (
+				926B9D7016EFA5AC00773B53 /* osmo4ios.entitlements */,
+				04E81ABD16E0FF0A004796EF /* gui */,
+				929A929616EF8BC200B7C64F /* Default-568h@2x.png */,
+				929A929716EF8BC200B7C64F /* icon_ipad_retina.png */,
+				929A929816EF8BC200B7C64F /* icon_ipad.png */,
+				929A929916EF8BC200B7C64F /* icon_retina.png */,
+				929A929A16EF8BC200B7C64F /* icon.png */,
 				71EC88E01396273B004DCB6A /* osmo.icns */,
-				71A19B43127971C700ACFF58 /* libgpac_symbols.h */,
-				71A19B411279713300ACFF58 /* extract.c */,
+				92A3A03D16F0C10C004EE581 /* extract.c */,
 				71A19B2012796B6F00ACFF58 /* main.c */,
 				71A19B1C12796B5700ACFF58 /* osmo4ios-Info.plist */,
 			);
@@ -1514,27 +1291,7 @@
 			isa = PBXGroup;
 			children = (
 				71CCF1311277037A00339E12 /* libgpac_static.a */,
-				718477D0127814B200917298 /* libgpac_dynamic.dylib */,
-				718478311278645B00917298 /* gm_soft_raster.dylib */,
-				718478381278647200917298 /* gm_dummy_in.dylib */,
-				71847841127864AC00917298 /* gm_ctx_load.dylib */,
-				718478491278654000917298 /* gm_aac_in.dylib */,
-				718478501278655800917298 /* gm_svg_in.dylib */,
-				718478571278656E00917298 /* gm_mp3_in.dylib */,
-				7184785E1278657F00917298 /* gm_img_in.dylib */,
-				718478651278658A00917298 /* gm_bifs_dec.dylib */,
-				7184786C127865A200917298 /* gm_gpac_js.dylib */,
-				71847873127865B700917298 /* gm_isom_in.dylib */,
-				7184787A127865CB00917298 /* gm_laser_dec.dylib */,
-				71847881127865D600917298 /* gm_odf_dec.dylib */,
-				71847891127865F700917298 /* gm_rtp_in.dylib */,
-				718478981278660400917298 /* gm_mpegts_in.dylib */,
-				7184789F1278661700917298 /* gm_ft_font.dylib */,
-				718478A61278662F00917298 /* gm_widgetman.dylib */,
-				718478B11278666100917298 /* gm_sdl_out.dylib */,
 				71A19B1A12796B5600ACFF58 /* osmo4ios.app */,
-				71179CC41292EC3400A83216 /* gm_mpd_in.dylib */,
-				71EB6E4814C5B6F500B7EDA7 /* gm_hyb_in.dylib */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -1542,7 +1299,6 @@
 		71CCF1381277041D00339E12 /* libgpac */ = {
 			isa = PBXGroup;
 			children = (
-				718477F912781DEB00917298 /* empty.c */,
 				71CCF35E12770A8C00339E12 /* include */,
 				71CCF1391277045100339E12 /* bifs */,
 				71CCF14A1277045100339E12 /* compositor */,
@@ -1754,6 +1510,8 @@
 		71CCF1CD1277045100339E12 /* media_tools */ = {
 			isa = PBXGroup;
 			children = (
+				970FBA7B16F9F0720052216D /* html5_media.c */,
+				970FBA7C16F9F0720052216D /* html5_mse.c */,
 				97DB67C41627B22F00A7E054 /* dash_segmenter.c */,
 				97793E5015E6370D005123E1 /* dash_client.c */,
 				9747B6F214864C7800280D95 /* ait.c */,
@@ -1830,6 +1588,8 @@
 		71CCF1FD1277045100339E12 /* scenegraph */ = {
 			isa = PBXGroup;
 			children = (
+				970FBA7F16F9F0910052216D /* html5_media_smjs.c */,
+				970FBA8016F9F0920052216D /* html5_mse_smjs.c */,
 				71CCF1FE1277045100339E12 /* base_scenegraph.c */,
 				71CCF1FF1277045100339E12 /* commands.c */,
 				71CCF2001277045100339E12 /* dom_events.c */,
@@ -2042,165 +1802,66 @@
 			path = modules;
 			sourceTree = "<group>";
 		};
-		71EB6E4E14C5B92200B7EDA7 /* hyb_in */ = {
+		929A929516EF8A7500B7C64F /* modules */ = {
 			isa = PBXGroup;
 			children = (
-				71EB6E4F14C5B92200B7EDA7 /* fm_fake_pull.c */,
-				71EB6E5014C5B92200B7EDA7 /* fm_fake_push.c */,
-				71EB6E5214C5B92200B7EDA7 /* hyb_in.c */,
-				71EB6E5314C5B92200B7EDA7 /* hyb_in.h */,
+				92FA826116F254F50002629E /* timedtext_dec.c */,
+				92FA826216F254F50002629E /* timedtext_in.c */,
+				92FA825F16F254DA0002629E /* isma_ea.c */,
+				92FA825D16F254C60002629E /* saf_in.c */,
+				92FA825B16F254AF0002629E /* audio_filter.c */,
+				92FA825916F2549D0002629E /* validator.c */,
+				92FA813816F235470002629E /* camera */,
+				71A1993D127876E300ACFF58 /* img_in */,
+				71A199531278770900ACFF58 /* isom_in */,
+				71A1996A1278774A00ACFF58 /* rtp_in */,
+				71A199981278778800ACFF58 /* sdl_out */,
+				71A199141278769100ACFF58 /* soft_raster */,
+				71A199871278777A00ACFF58 /* widgetman */,
+				71A199071278765600ACFF58 /* aac_in.c */,
+				71A1990E1278767B00ACFF58 /* bifs_dec.c */,
+				71A1992D127876B000ACFF58 /* ctx_load.c */,
+				71A19928127876A200ACFF58 /* dummy_in.c */,
+				71A199081278765600ACFF58 /* faad_dec.c */,
+				71A199811278776700ACFF58 /* ft_font.c */,
+				71A199821278776700ACFF58 /* ft_font.h */,
+				71A1994F127876FA00ACFF58 /* gpac_js.c */,
+				71A199611278772500ACFF58 /* laser_dec.c */,
+				71A19937127876D300ACFF58 /* mad_dec.c */,
+				71A19939127876D300ACFF58 /* mp3_in.c */,
+				71A1997D1278775900ACFF58 /* mpegts_in.c */,
+				71179CBF1292EC1800A83216 /* mpd_in.c */,
+				71A199671278773900ACFF58 /* odf_dec.c */,
+				71A19933127876C300ACFF58 /* svg_in.c */,
 			);
-			name = hyb_in;
-			path = ../../modules/hyb_in;
-			sourceTree = SOURCE_ROOT;
+			name = modules;
+			sourceTree = "<group>";
+		};
+		92FA813816F235470002629E /* camera */ = {
+			isa = PBXGroup;
+			children = (
+				92FA813A16F235520002629E /* cam_wrap.h */,
+				92FA813C16F235520002629E /* CameraObject.h */,
+				92FA813E16F235520002629E /* ios_cam.c */,
+			);
+			name = camera;
+			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
-		71179CC01292EC3400A83216 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		718477CC127814B200917298 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		7184782D1278645B00917298 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A199201278769100ACFF58 /* rast_soft.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		718478341278647200917298 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		7184783D127864AC00917298 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		718478451278654000917298 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		7184784C1278655800917298 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		718478531278656E00917298 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		7184785A1278657F00917298 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A19949127876E300ACFF58 /* img_in.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		718478611278658A00917298 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		71847868127865A200917298 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		7184786F127865B700917298 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A1995B1278770900ACFF58 /* isom_in.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		71847876127865CB00917298 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		7184787D127865D600917298 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		7184788D127865F700917298 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A199751278774A00ACFF58 /* rtp_in.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		718478941278660400917298 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		7184789B1278661700917298 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A199851278776700ACFF58 /* ft_font.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		718478A21278662F00917298 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A199921278777A00ACFF58 /* unzip.h in Headers */,
-				71A199971278777A00ACFF58 /* widgetman.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		718478AD1278666100917298 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		71CCF12D1277037A00339E12 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				92BC211416EF8E7A000E0620 /* img_in.h in Headers */,
+				92BC210D16EF8E7A000E0620 /* ft_font.h in Headers */,
+				92BC211616EF8E7A000E0620 /* isom_in.h in Headers */,
+				92BC213C16EF8E7A000E0620 /* widgetman.h in Headers */,
+				92BC212F16EF8E7A000E0620 /* sdl_out.h in Headers */,
+				92BC213616EF8E7A000E0620 /* unzip.h in Headers */,
+				92BC212A16EF8E7A000E0620 /* rtp_in.h in Headers */,
+				92BC212216EF8E7A000E0620 /* rast_soft.h in Headers */,
 				71CCF2501277045100339E12 /* quant.h in Headers */,
 				71CCF2521277045100339E12 /* script.h in Headers */,
 				71CCF2601277045100339E12 /* drawable.h in Headers */,
@@ -2308,342 +1969,9 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		71EB6E4414C5B6F500B7EDA7 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71EB6E5914C5B92200B7EDA7 /* hyb_in.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
-		71179CC31292EC3400A83216 /* mpd_in */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 71179CD11292ECAC00A83216 /* Build configuration list for PBXNativeTarget "mpd_in" */;
-			buildPhases = (
-				71179CC01292EC3400A83216 /* Headers */,
-				71179CC11292EC3400A83216 /* Sources */,
-				71179CC21292EC3400A83216 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = mpd_in;
-			productName = mpd_in;
-			productReference = 71179CC41292EC3400A83216 /* gm_mpd_in.dylib */;
-			productType = "com.apple.product-type.library.static";
-		};
-		718477CF127814B200917298 /* libgpac_dynamic */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 718477D3127814D100917298 /* Build configuration list for PBXNativeTarget "libgpac_dynamic" */;
-			buildPhases = (
-				718477CC127814B200917298 /* Headers */,
-				718477CD127814B200917298 /* Sources */,
-				718477CE127814B200917298 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				718477D5127814D600917298 /* PBXTargetDependency */,
-			);
-			name = libgpac_dynamic;
-			productName = libgpac_dynamic;
-			productReference = 718477D0127814B200917298 /* libgpac_dynamic.dylib */;
-			productType = "com.apple.product-type.library.static";
-		};
-		718478301278645B00917298 /* soft_raster */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 7184783B1278649100917298 /* Build configuration list for PBXNativeTarget "soft_raster" */;
-			buildPhases = (
-				7184782D1278645B00917298 /* Headers */,
-				7184782E1278645B00917298 /* Sources */,
-				7184782F1278645B00917298 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				713FD6E41393868200E8102E /* PBXTargetDependency */,
-			);
-			name = soft_raster;
-			productName = soft_raster;
-			productReference = 718478311278645B00917298 /* gm_soft_raster.dylib */;
-			productType = "com.apple.product-type.library.static";
-		};
-		718478371278647200917298 /* dummy_in */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 7184783C1278649100917298 /* Build configuration list for PBXNativeTarget "dummy_in" */;
-			buildPhases = (
-				718478341278647200917298 /* Headers */,
-				718478351278647200917298 /* Sources */,
-				718478361278647200917298 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = dummy_in;
-			productName = dummy_in;
-			productReference = 718478381278647200917298 /* gm_dummy_in.dylib */;
-			productType = "com.apple.product-type.library.static";
-		};
-		71847840127864AC00917298 /* ctx_load */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 71847844127864CB00917298 /* Build configuration list for PBXNativeTarget "ctx_load" */;
-			buildPhases = (
-				7184783D127864AC00917298 /* Headers */,
-				7184783E127864AC00917298 /* Sources */,
-				7184783F127864AC00917298 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = ctx_load;
-			productName = ctx_load;
-			productReference = 71847841127864AC00917298 /* gm_ctx_load.dylib */;
-			productType = "com.apple.product-type.library.static";
-		};
-		718478481278654000917298 /* aac_in */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 71847884127865F500917298 /* Build configuration list for PBXNativeTarget "aac_in" */;
-			buildPhases = (
-				718478451278654000917298 /* Headers */,
-				718478461278654000917298 /* Sources */,
-				718478471278654000917298 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = aac_in;
-			productName = aac_in;
-			productReference = 718478491278654000917298 /* gm_aac_in.dylib */;
-			productType = "com.apple.product-type.library.static";
-		};
-		7184784F1278655800917298 /* svg_in */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 71847885127865F500917298 /* Build configuration list for PBXNativeTarget "svg_in" */;
-			buildPhases = (
-				7184784C1278655800917298 /* Headers */,
-				7184784D1278655800917298 /* Sources */,
-				7184784E1278655800917298 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = svg_in;
-			productName = svg_in;
-			productReference = 718478501278655800917298 /* gm_svg_in.dylib */;
-			productType = "com.apple.product-type.library.static";
-		};
-		718478561278656E00917298 /* mp3_in */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 71847886127865F500917298 /* Build configuration list for PBXNativeTarget "mp3_in" */;
-			buildPhases = (
-				718478531278656E00917298 /* Headers */,
-				718478541278656E00917298 /* Sources */,
-				718478551278656E00917298 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = mp3_in;
-			productName = mp3_in;
-			productReference = 718478571278656E00917298 /* gm_mp3_in.dylib */;
-			productType = "com.apple.product-type.library.static";
-		};
-		7184785D1278657F00917298 /* img_in */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 71847887127865F500917298 /* Build configuration list for PBXNativeTarget "img_in" */;
-			buildPhases = (
-				7184785A1278657F00917298 /* Headers */,
-				7184785B1278657F00917298 /* Sources */,
-				7184785C1278657F00917298 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = img_in;
-			productName = img_in;
-			productReference = 7184785E1278657F00917298 /* gm_img_in.dylib */;
-			productType = "com.apple.product-type.library.static";
-		};
-		718478641278658A00917298 /* bifs_dec */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 71847888127865F500917298 /* Build configuration list for PBXNativeTarget "bifs_dec" */;
-			buildPhases = (
-				718478611278658A00917298 /* Headers */,
-				718478621278658A00917298 /* Sources */,
-				718478631278658A00917298 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = bifs_dec;
-			productName = bifs_dec;
-			productReference = 718478651278658A00917298 /* gm_bifs_dec.dylib */;
-			productType = "com.apple.product-type.library.static";
-		};
-		7184786B127865A200917298 /* gpac_js */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 71847889127865F500917298 /* Build configuration list for PBXNativeTarget "gpac_js" */;
-			buildPhases = (
-				71847868127865A200917298 /* Headers */,
-				71847869127865A200917298 /* Sources */,
-				7184786A127865A200917298 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = gpac_js;
-			productName = gpac_js;
-			productReference = 7184786C127865A200917298 /* gm_gpac_js.dylib */;
-			productType = "com.apple.product-type.library.static";
-		};
-		71847872127865B700917298 /* isom_in */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 7184788A127865F500917298 /* Build configuration list for PBXNativeTarget "isom_in" */;
-			buildPhases = (
-				7184786F127865B700917298 /* Headers */,
-				71847870127865B700917298 /* Sources */,
-				71847871127865B700917298 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = isom_in;
-			productName = isom_in;
-			productReference = 71847873127865B700917298 /* gm_isom_in.dylib */;
-			productType = "com.apple.product-type.library.static";
-		};
-		71847879127865CB00917298 /* laser_dec */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 7184788B127865F500917298 /* Build configuration list for PBXNativeTarget "laser_dec" */;
-			buildPhases = (
-				71847876127865CB00917298 /* Headers */,
-				71847877127865CB00917298 /* Sources */,
-				71847878127865CB00917298 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = laser_dec;
-			productName = laser_dec;
-			productReference = 7184787A127865CB00917298 /* gm_laser_dec.dylib */;
-			productType = "com.apple.product-type.library.static";
-		};
-		71847880127865D600917298 /* odf_dec */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 7184788C127865F500917298 /* Build configuration list for PBXNativeTarget "odf_dec" */;
-			buildPhases = (
-				7184787D127865D600917298 /* Headers */,
-				7184787E127865D600917298 /* Sources */,
-				7184787F127865D600917298 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = odf_dec;
-			productName = odf_dec;
-			productReference = 71847881127865D600917298 /* gm_odf_dec.dylib */;
-			productType = "com.apple.product-type.library.static";
-		};
-		71847890127865F700917298 /* rtp_in */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 718478A91278664D00917298 /* Build configuration list for PBXNativeTarget "rtp_in" */;
-			buildPhases = (
-				7184788D127865F700917298 /* Headers */,
-				7184788E127865F700917298 /* Sources */,
-				7184788F127865F700917298 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = rtp_in;
-			productName = rtp_in;
-			productReference = 71847891127865F700917298 /* gm_rtp_in.dylib */;
-			productType = "com.apple.product-type.library.static";
-		};
-		718478971278660400917298 /* mpegts_in */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 718478AA1278664D00917298 /* Build configuration list for PBXNativeTarget "mpegts_in" */;
-			buildPhases = (
-				718478941278660400917298 /* Headers */,
-				718478951278660400917298 /* Sources */,
-				718478961278660400917298 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = mpegts_in;
-			productName = mpegts_in;
-			productReference = 718478981278660400917298 /* gm_mpegts_in.dylib */;
-			productType = "com.apple.product-type.library.static";
-		};
-		7184789E1278661700917298 /* ft_font */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 718478AB1278664D00917298 /* Build configuration list for PBXNativeTarget "ft_font" */;
-			buildPhases = (
-				7184789B1278661700917298 /* Headers */,
-				7184789C1278661700917298 /* Sources */,
-				7184789D1278661700917298 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = ft_font;
-			productName = ft_font;
-			productReference = 7184789F1278661700917298 /* gm_ft_font.dylib */;
-			productType = "com.apple.product-type.library.static";
-		};
-		718478A51278662F00917298 /* widgetman */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 718478AC1278664D00917298 /* Build configuration list for PBXNativeTarget "widgetman" */;
-			buildPhases = (
-				718478A21278662F00917298 /* Headers */,
-				718478A31278662F00917298 /* Sources */,
-				718478A41278662F00917298 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = widgetman;
-			productName = widgetman;
-			productReference = 718478A61278662F00917298 /* gm_widgetman.dylib */;
-			productType = "com.apple.product-type.library.static";
-		};
-		718478B01278666100917298 /* sdl_out */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 718478B41278667F00917298 /* Build configuration list for PBXNativeTarget "sdl_out" */;
-			buildPhases = (
-				718478AD1278666100917298 /* Headers */,
-				718478AE1278666100917298 /* Sources */,
-				718478AF1278666100917298 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = sdl_out;
-			productName = sdl_out;
-			productReference = 718478B11278666100917298 /* gm_sdl_out.dylib */;
-			productType = "com.apple.product-type.library.static";
-		};
 		71A19B1912796B5600ACFF58 /* osmo4ios */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 71A19B1F12796B5800ACFF58 /* Build configuration list for PBXNativeTarget "osmo4ios" */;
@@ -2655,6 +1983,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				047ACFD416DF56BF00F2BF65 /* PBXTargetDependency */,
 			);
 			name = osmo4ios;
 			productName = osmo4ios;
@@ -2665,7 +1994,6 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 71CCF1351277037B00339E12 /* Build configuration list for PBXNativeTarget "libgpac_static" */;
 			buildPhases = (
-				970AE51B1340DD1100501CF4 /* ShellScript */,
 				71CCF12D1277037A00339E12 /* Headers */,
 				71CCF12E1277037A00339E12 /* Sources */,
 				71CCF12F1277037A00339E12 /* Frameworks */,
@@ -2679,30 +2007,16 @@
 			productReference = 71CCF1311277037A00339E12 /* libgpac_static.a */;
 			productType = "com.apple.product-type.library.static";
 		};
-		71EB6E4714C5B6F500B7EDA7 /* hyb_in */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 71EB6E4B14C5B71300B7EDA7 /* Build configuration list for PBXNativeTarget "hyb_in" */;
-			buildPhases = (
-				71EB6E4414C5B6F500B7EDA7 /* Headers */,
-				71EB6E4514C5B6F500B7EDA7 /* Sources */,
-				71EB6E4614C5B6F500B7EDA7 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = hyb_in;
-			productName = hyb_in;
-			productReference = 71EB6E4814C5B6F500B7EDA7 /* gm_hyb_in.dylib */;
-			productType = "com.apple.product-type.library.static";
-		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0460;
+			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "gpac4ios" */;
-			compatibilityVersion = "Xcode 3.1";
+			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
@@ -2717,27 +2031,7 @@
 			projectRoot = "";
 			targets = (
 				71CCF1301277037A00339E12 /* libgpac_static */,
-				718477CF127814B200917298 /* libgpac_dynamic */,
-				718478301278645B00917298 /* soft_raster */,
-				718478371278647200917298 /* dummy_in */,
-				71847840127864AC00917298 /* ctx_load */,
-				718478481278654000917298 /* aac_in */,
-				7184784F1278655800917298 /* svg_in */,
-				718478561278656E00917298 /* mp3_in */,
-				7184785D1278657F00917298 /* img_in */,
-				718478641278658A00917298 /* bifs_dec */,
-				7184786B127865A200917298 /* gpac_js */,
-				71847872127865B700917298 /* isom_in */,
-				71847879127865CB00917298 /* laser_dec */,
-				71847880127865D600917298 /* odf_dec */,
-				71847890127865F700917298 /* rtp_in */,
-				718478971278660400917298 /* mpegts_in */,
-				7184789E1278661700917298 /* ft_font */,
-				718478A51278662F00917298 /* widgetman */,
-				718478B01278666100917298 /* sdl_out */,
 				71A19B1912796B5600ACFF58 /* osmo4ios */,
-				71179CC31292EC3400A83216 /* mpd_in */,
-				71EB6E4714C5B6F500B7EDA7 /* hyb_in */,
 			);
 		};
 /* End PBXProject section */
@@ -2748,213 +2042,31 @@
 			buildActionMask = 2147483647;
 			files = (
 				71EC88E11396273B004DCB6A /* osmo.icns in Resources */,
+				929A929C16EF8BC200B7C64F /* Default-568h@2x.png in Resources */,
+				929A929D16EF8BC200B7C64F /* icon_ipad_retina.png in Resources */,
+				929A929E16EF8BC200B7C64F /* icon_ipad.png in Resources */,
+				929A929F16EF8BC200B7C64F /* icon_retina.png in Resources */,
+				929A92A016EF8BC200B7C64F /* icon.png in Resources */,
+				926B9D7116EFA5AC00773B53 /* osmo4ios.entitlements in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXResourcesBuildPhase section */
 
-/* Begin PBXShellScriptBuildPhase section */
-		970AE51B1340DD1100501CF4 /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "if which svnversion 2>/dev/null; then echo \"#define GPAC_SVN_REVISION \\\"`svnversion`\\\"\" > ../../include/gpac/revision.h ; else  echo \"No SVN Version found\"; fi\n";
-		};
-/* End PBXShellScriptBuildPhase section */
-
 /* Begin PBXSourcesBuildPhase section */
-		71179CC11292EC3400A83216 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71179CC91292EC5200A83216 /* mpd_in.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		718477CD127814B200917298 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				718477FA12781DEB00917298 /* empty.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		7184782E1278645B00917298 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A1991E1278769100ACFF58 /* ftgrays.c in Sources */,
-				71A199211278769100ACFF58 /* raster_565.c in Sources */,
-				71A199221278769100ACFF58 /* raster_argb.c in Sources */,
-				71A199231278769100ACFF58 /* raster_load.c in Sources */,
-				71A199241278769100ACFF58 /* raster_rgb.c in Sources */,
-				71A199251278769100ACFF58 /* stencil.c in Sources */,
-				71A199261278769100ACFF58 /* surface.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		718478351278647200917298 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A1992A127876A200ACFF58 /* dummy_in.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		7184783E127864AC00917298 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A1992F127876B000ACFF58 /* ctx_load.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		718478461278654000917298 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A1990A1278765600ACFF58 /* aac_in.c in Sources */,
-				71A1990B1278765600ACFF58 /* faad_dec.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		7184784D1278655800917298 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A19935127876C300ACFF58 /* svg_in.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		718478541278656E00917298 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A1993A127876D300ACFF58 /* mad_dec.c in Sources */,
-				71A1993C127876D300ACFF58 /* mp3_in.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		7184785B1278657F00917298 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A19946127876E300ACFF58 /* bmp_dec.c in Sources */,
-				71A19947127876E300ACFF58 /* img_dec.c in Sources */,
-				71A19948127876E300ACFF58 /* img_in.c in Sources */,
-				71A1994A127876E300ACFF58 /* jp2_dec.c in Sources */,
-				71A1994B127876E300ACFF58 /* jpeg_dec.c in Sources */,
-				71A1994D127876E300ACFF58 /* png_dec.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		718478621278658A00917298 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A199101278767B00ACFF58 /* bifs_dec.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		71847869127865A200917298 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A19951127876FA00ACFF58 /* gpac_js.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		71847870127865B700917298 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A1995A1278770900ACFF58 /* cache.c in Sources */,
-				71A1995C1278770900ACFF58 /* load.c in Sources */,
-				71A1995E1278770900ACFF58 /* read.c in Sources */,
-				71A1995F1278770900ACFF58 /* read_ch.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		71847877127865CB00917298 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A199631278772500ACFF58 /* laser_dec.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		7184787E127865D600917298 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A199691278773900ACFF58 /* odf_dec.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		7184788E127865F700917298 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A199741278774A00ACFF58 /* rtp_in.c in Sources */,
-				71A199761278774A00ACFF58 /* rtp_session.c in Sources */,
-				71A199771278774A00ACFF58 /* rtp_signaling.c in Sources */,
-				71A199781278774A00ACFF58 /* rtp_stream.c in Sources */,
-				71A199791278774A00ACFF58 /* sdp_fetch.c in Sources */,
-				71A1997A1278774A00ACFF58 /* sdp_load.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		718478951278660400917298 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A1997F1278775900ACFF58 /* mpegts_in.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		7184789C1278661700917298 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A199841278776700ACFF58 /* ft_font.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		718478A31278662F00917298 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A199911278777A00ACFF58 /* unzip.c in Sources */,
-				71A199931278777A00ACFF58 /* wgt_load.c in Sources */,
-				71A199951278777A00ACFF58 /* widget.c in Sources */,
-				71A199961278777A00ACFF58 /* widgetman.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		718478AE1278666100917298 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71A19B4012796FCC00ACFF58 /* module_av_generic.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		71A19B1712796B5600ACFF58 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				71A19B2112796B6F00ACFF58 /* main.c in Sources */,
-				712986C312928421003B02A1 /* extract.c in Sources */,
-				712986C41292843B003B02A1 /* audio.c in Sources */,
-				712986C51292843B003B02A1 /* video.c in Sources */,
-				712986D8129284BD003B02A1 /* sdl_out.c in Sources */,
+				92A3A03E16F0C10C004EE581 /* extract.c in Sources */,
+				92FA814116F235520002629E /* ios_cam.c in Sources */,
+				92FA825A16F2549D0002629E /* validator.c in Sources */,
+				92FA825C16F254AF0002629E /* audio_filter.c in Sources */,
+				92FA825E16F254C60002629E /* saf_in.c in Sources */,
+				92FA826016F254DA0002629E /* isma_ea.c in Sources */,
+				92FA826316F254F50002629E /* timedtext_dec.c in Sources */,
+				92FA826416F254F50002629E /* timedtext_in.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2962,6 +2074,52 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				92BC210E16EF8E7A000E0620 /* ftgrays.c in Sources */,
+				92BC212316EF8E7A000E0620 /* raster_565.c in Sources */,
+				92BC212416EF8E7A000E0620 /* raster_argb.c in Sources */,
+				92BC212516EF8E7A000E0620 /* raster_load.c in Sources */,
+				92BC212616EF8E7A000E0620 /* raster_rgb.c in Sources */,
+				92BC213216EF8E7A000E0620 /* stencil.c in Sources */,
+				92BC213316EF8E7A000E0620 /* surface.c in Sources */,
+				92BC210316EF8E7A000E0620 /* audio.c in Sources */,
+				92BC210716EF8E7A000E0620 /* cursors.c in Sources */,
+				92BC212E16EF8E7A000E0620 /* sdl_out.c in Sources */,
+				92BC213516EF8E7A000E0620 /* unzip.c in Sources */,
+				92BC213916EF8E7A000E0620 /* wgt_load.c in Sources */,
+				92BC213A16EF8E7A000E0620 /* widget.c in Sources */,
+				92BC213B16EF8E7A000E0620 /* widgetman.c in Sources */,
+				92BC213716EF8E7A000E0620 /* video.c in Sources */,
+				92BC213816EF8E7A000E0620 /* video2d.c in Sources */,
+				92BC212916EF8E7A000E0620 /* rtp_in.c in Sources */,
+				92BC212B16EF8E7A000E0620 /* rtp_session.c in Sources */,
+				92BC212C16EF8E7A000E0620 /* rtp_signaling.c in Sources */,
+				92BC212D16EF8E7A000E0620 /* rtp_stream.c in Sources */,
+				92BC213016EF8E7A000E0620 /* sdp_fetch.c in Sources */,
+				92BC213116EF8E7A000E0620 /* sdp_load.c in Sources */,
+				92BC211516EF8E7A000E0620 /* isom_cache.c in Sources */,
+				92BC211A16EF8E7A000E0620 /* load.c in Sources */,
+				92BC212716EF8E7A000E0620 /* read.c in Sources */,
+				92BC212816EF8E7A000E0620 /* read_ch.c in Sources */,
+				92BC210516EF8E7A000E0620 /* bmp_dec.c in Sources */,
+				92BC211216EF8E7A000E0620 /* img_dec.c in Sources */,
+				92BC211316EF8E7A000E0620 /* img_in.c in Sources */,
+				92BC211716EF8E7A000E0620 /* jp2_dec.c in Sources */,
+				92BC211816EF8E7A000E0620 /* jpeg_dec.c in Sources */,
+				92BC212116EF8E7A000E0620 /* png_dec.c in Sources */,
+				92BC210216EF8E7A000E0620 /* aac_in.c in Sources */,
+				92BC210416EF8E7A000E0620 /* bifs_dec.c in Sources */,
+				92BC210616EF8E7A000E0620 /* ctx_load.c in Sources */,
+				92BC210816EF8E7A000E0620 /* dummy_in.c in Sources */,
+				92BC210916EF8E7A000E0620 /* faad_dec.c in Sources */,
+				92BC210C16EF8E7A000E0620 /* ft_font.c in Sources */,
+				92BC210F16EF8E7A000E0620 /* gpac_js.c in Sources */,
+				92BC211916EF8E7A000E0620 /* laser_dec.c in Sources */,
+				92BC211B16EF8E7A000E0620 /* mad_dec.c in Sources */,
+				92BC211D16EF8E7A000E0620 /* mp3_in.c in Sources */,
+				92BC211E16EF8E7A000E0620 /* mpd_in.c in Sources */,
+				92BC211F16EF8E7A000E0620 /* mpegts_in.c in Sources */,
+				92BC212016EF8E7A000E0620 /* odf_dec.c in Sources */,
+				92BC213416EF8E7A000E0620 /* svg_in.c in Sources */,
 				71CCF2461277045100339E12 /* arith_decoder.c in Sources */,
 				71CCF2471277045100339E12 /* bifs_codec.c in Sources */,
 				71CCF2481277045100339E12 /* bifs_node_tables.c in Sources */,
@@ -3212,1171 +2370,29 @@
 				97E08C69160F684B00BBDC34 /* swf_svg.c in Sources */,
 				97DB67C51627B22F00A7E054 /* dash_segmenter.c in Sources */,
 				97116F211646E38D00BD1AD0 /* box_code_adobe.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		71EB6E4514C5B6F500B7EDA7 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				71EB6E5514C5B92200B7EDA7 /* fm_fake_pull.c in Sources */,
-				71EB6E5614C5B92200B7EDA7 /* fm_fake_push.c in Sources */,
-				71EB6E5814C5B92200B7EDA7 /* hyb_in.c in Sources */,
+				970FBA7D16F9F0720052216D /* html5_media.c in Sources */,
+				970FBA7E16F9F0720052216D /* html5_mse.c in Sources */,
+				970FBA8116F9F0920052216D /* html5_media_smjs.c in Sources */,
+				970FBA8216F9F0920052216D /* html5_mse_smjs.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		713FD6E41393868200E8102E /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 718478371278647200917298 /* dummy_in */;
-			targetProxy = 713FD6E31393868200E8102E /* PBXContainerItemProxy */;
-		};
-		718477D5127814D600917298 /* PBXTargetDependency */ = {
+		047ACFD416DF56BF00F2BF65 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 71CCF1301277037A00339E12 /* libgpac_static */;
-			targetProxy = 718477D4127814D600917298 /* PBXContainerItemProxy */;
+			targetProxy = 047ACFD316DF56BF00F2BF65 /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
-		71179CC51292EC3500A83216 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = ../../include;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_mpd_in.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = mpd_in;
-			};
-			name = Debug;
-		};
-		71179CC61292EC3500A83216 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = ../../include;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_mpd_in.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = mpd_in;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
-		718477D1127814B300917298 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = "";
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				ONLY_ACTIVE_ARCH = NO;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/libgpac_dynamic.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = libgpac_dynamic;
-			};
-			name = Debug;
-		};
-		718477D2127814B300917298 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = "";
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				ONLY_ACTIVE_ARCH = NO;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/libgpac_dynamic.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = libgpac_dynamic;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
-		718478321278645C00917298 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = ../../include;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_CFLAGS = "-fgnu89-inline";
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_soft_raster.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = soft_raster;
-			};
-			name = Debug;
-		};
-		718478331278645C00917298 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = ../../include;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_soft_raster.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = soft_raster;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
-		718478391278647300917298 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = ../../include;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_dummy_in.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = dummy_in;
-			};
-			name = Debug;
-		};
-		7184783A1278647300917298 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = ../../include;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_dummy_in.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = dummy_in;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
-		71847842127864AD00917298 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = ../../include;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_ctx_load.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = ctx_load;
-			};
-			name = Debug;
-		};
-		71847843127864AD00917298 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = ../../include;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_ctx_load.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = ctx_load;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
-		7184784A1278654100917298 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					GPAC_CONFIG_DARWIN,
-					GPAC_IPHONE,
-					XP_UNIX,
-					GPAC_HAS_FAAD,
-				);
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = (
-					../../include,
-					../../extra_lib/include/faad,
-				);
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_aac_in.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = aac_in;
-			};
-			name = Debug;
-		};
-		7184784B1278654100917298 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					GPAC_CONFIG_DARWIN,
-					GPAC_IPHONE,
-					XP_UNIX,
-					GPAC_HAS_FAAD,
-				);
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = (
-					../../include,
-					../../extra_lib/include/faad,
-				);
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_aac_in.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = aac_in;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
-		718478511278655900917298 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = ../../include;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_svg_in.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = svg_in;
-			};
-			name = Debug;
-		};
-		718478521278655900917298 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = ../../include;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_svg_in.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = svg_in;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
-		718478581278656F00917298 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					GPAC_CONFIG_DARWIN,
-					GPAC_IPHONE,
-					XP_UNIX,
-					GPAC_HAS_MAD,
-				);
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = (
-					../../include,
-					../../extra_lib/include/mad,
-				);
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_mp3_in.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = mp3_in;
-			};
-			name = Debug;
-		};
-		718478591278656F00917298 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					GPAC_CONFIG_DARWIN,
-					GPAC_IPHONE,
-					XP_UNIX,
-					GPAC_HAS_MAD,
-				);
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = (
-					../../include,
-					../../extra_lib/include/mad,
-				);
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_mp3_in.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = mp3_in;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
-		7184785F1278657F00917298 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = ../../include;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_img_in.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = img_in;
-			};
-			name = Debug;
-		};
-		718478601278657F00917298 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = ../../include;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_img_in.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = img_in;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
-		718478661278658B00917298 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = ../../include;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_bifs_dec.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = bifs_dec;
-			};
-			name = Debug;
-		};
-		718478671278658B00917298 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = ../../include;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_bifs_dec.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = bifs_dec;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
-		7184786D127865A300917298 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					GPAC_CONFIG_DARWIN,
-					GPAC_IPHONE,
-					XP_UNIX,
-					GPAC_HAS_SPIDERMONKEY,
-					MOZILLA_1_8_BRANCH,
-				);
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = (
-					../../include,
-					../../extra_lib/include/js,
-				);
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_gpac_js.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = gpac_js;
-			};
-			name = Debug;
-		};
-		7184786E127865A300917298 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					GPAC_CONFIG_DARWIN,
-					GPAC_IPHONE,
-					XP_UNIX,
-					GPAC_HAS_SPIDERMONKEY,
-					MOZILLA_1_8_BRANCH,
-				);
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = (
-					../../include,
-					../../extra_lib/include/js,
-				);
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_gpac_js.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = gpac_js;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
-		71847874127865B700917298 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = ../../include;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_isom_in.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = isom_in;
-			};
-			name = Debug;
-		};
-		71847875127865B700917298 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = ../../include;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_isom_in.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = isom_in;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
-		7184787B127865CC00917298 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = ../../include;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_laser_dec.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = laser_dec;
-			};
-			name = Debug;
-		};
-		7184787C127865CC00917298 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = ../../include;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_laser_dec.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = laser_dec;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
-		71847882127865D700917298 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = ../../include;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_odf_dec.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = odf_dec;
-			};
-			name = Debug;
-		};
-		71847883127865D700917298 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = ../../include;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_odf_dec.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = odf_dec;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
-		71847892127865F800917298 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = ../../include;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_rtp_in.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = rtp_in;
-			};
-			name = Debug;
-		};
-		71847893127865F800917298 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = ../../include;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_rtp_in.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = rtp_in;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
-		718478991278660400917298 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = ../../include;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_mpegts_in.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = mpegts_in;
-			};
-			name = Debug;
-		};
-		7184789A1278660400917298 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = ../../include;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_mpegts_in.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = mpegts_in;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
-		718478A01278661800917298 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = (
-					../../extra_lib/include/freetype,
-					../../include,
-				);
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_ft_font.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = ft_font;
-			};
-			name = Debug;
-		};
-		718478A11278661800917298 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = (
-					../../extra_lib/include/freetype,
-					../../include,
-				);
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_ft_font.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = ft_font;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
-		718478A71278662F00917298 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = (
-					../../include,
-					../../extra_lib/include/js,
-				);
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_widgetman.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = widgetman;
-			};
-			name = Debug;
-		};
-		718478A81278662F00917298 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = (
-					../../include,
-					../../extra_lib/include/js,
-				);
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_widgetman.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = widgetman;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
-		718478B21278666100917298 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = (
-					../../include,
-					../../extra_lib/include/SDL,
-				);
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_sdl_out.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = sdl_out;
-			};
-			name = Debug;
-		};
-		718478B31278666100917298 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = (
-					../../include,
-					../../extra_lib/include/SDL,
-				);
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_sdl_out.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = sdl_out;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
 		71A19B1D12796B5700ACFF58 /* Debug */ = {
 			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;
@@ -4387,19 +2403,18 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
 				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = (
-					../../include,
-					../../extra_lib/include/SDL,
-				);
+				HEADER_SEARCH_PATHS = ../../include;
 				INFOPLIST_FILE = "../../applications/osmo4_ios/osmo4ios-Info.plist";
-				INSTALL_PATH = "$(HOME)/Applications";
+				INSTALL_PATH = /Applications;
+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				OTHER_CFLAGS = "";
+				OTHER_CPLUSPLUSFLAGS = "";
 				OTHER_LDFLAGS = "";
-				PREBINDING = NO;
 				PRODUCT_NAME = osmo4ios;
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
@@ -4411,26 +2426,25 @@
 			isa = XCBuildConfiguration;
 			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_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
 				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = (
-					../../include,
-					../../extra_lib/include/SDL,
-				);
+				HEADER_SEARCH_PATHS = ../../include;
 				INFOPLIST_FILE = "../../applications/osmo4_ios/osmo4ios-Info.plist";
-				INSTALL_PATH = "$(HOME)/Applications";
+				INSTALL_PATH = /Applications;
+				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				OTHER_LDFLAGS = "";
-				PREBINDING = NO;
 				PRODUCT_NAME = osmo4ios;
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
@@ -4455,17 +2469,17 @@
 					../../extra_lib/include/jpeg,
 					../../extra_lib/include/js,
 					../../extra_lib/include/zlib,
-					../../modules/sdl_out,
-					../../extra_lib/include/SDL,
+					../../extra_lib/include/SDL2,
+					../../extra_lib/include/freetype,
+					../../extra_lib/include,
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS/Debug-iphonesimulator\"",
-				);
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				ONLY_ACTIVE_ARCH = NO;
-				OTHER_CFLAGS = "-fms-extensions";
-				PREBINDING = NO;
+				OTHER_CFLAGS = (
+					"-fms-extensions",
+					"-D__IPHONEOS__",
+				);
 				PRODUCT_NAME = libgpac_static;
 			};
 			name = Debug;
@@ -4476,7 +2490,6 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				COPY_PHASE_STRIP = YES;
 				EXECUTABLE_PREFIX = "";
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_THUMB_SUPPORT = NO;
 				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
 				HEADER_SEARCH_PATHS = (
@@ -4486,96 +2499,29 @@
 					../../extra_lib/include/jpeg,
 					../../extra_lib/include/js,
 					../../extra_lib/include/zlib,
-					../../modules/sdl_out,
-					../../extra_lib/include/SDL,
+					../../extra_lib/include/SDL2,
+					../../extra_lib/include/freetype,
+					../../extra_lib/include,
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS/Debug-iphonesimulator\"",
-				);
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"-fms-extensions",
 					"-DNS_BLOCK_ASSERTIONS=1",
+					"-D__IPHONEOS__",
 				);
-				PREBINDING = NO;
 				PRODUCT_NAME = libgpac_static;
 				ZERO_LINK = NO;
 			};
 			name = Release;
 		};
-		71EB6E4914C5B6F500B7EDA7 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_BUILTIN_FUNCTIONS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = ../../include;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphoneos\"",
-					"\"$(SRCROOT)/../../bin/iOS/osmo4ios.app\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_hyb_in.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = hyb_in;
-				SDKROOT = iphoneos;
-			};
-			name = Debug;
-		};
-		71EB6E4A14C5B6F500B7EDA7 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				EXECUTABLE_EXTENSION = dylib;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_ENABLE_BUILTIN_FUNCTIONS = YES;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = ../../include;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphonesimulator\"",
-					"\"$(SRCROOT)/../../bin/iOS\"",
-					"\"$(SRCROOT)/build/Release-iphoneos\"",
-					"\"$(SRCROOT)/../../bin/iOS/osmo4ios.app\"",
-				);
-				MACH_O_TYPE = mh_dylib;
-				OTHER_LDFLAGS = (
-					"-dynamic",
-					"-install_name",
-					"@loader_path/gm_hyb_in.dylib",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = hyb_in;
-				SDKROOT = iphoneos;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
 		C01FCF4F08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_FAST_OBJC_DISPATCH = NO;
 				GCC_OBJC_CALL_CXX_CDTORS = NO;
@@ -4587,9 +2533,9 @@
 				GCC_THUMB_SUPPORT = NO;
 				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;
-				PREBINDING = NO;
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
 				SDKROOT = iphoneos;
@@ -4601,8 +2547,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_FAST_OBJC_DISPATCH = NO;
 				GCC_OBJC_CALL_CXX_CDTORS = NO;
@@ -4617,7 +2563,6 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
-				PREBINDING = NO;
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
 				SDKROOT = iphoneos;
@@ -4628,177 +2573,6 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		71179CD11292ECAC00A83216 /* Build configuration list for PBXNativeTarget "mpd_in" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				71179CC51292EC3500A83216 /* Debug */,
-				71179CC61292EC3500A83216 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		718477D3127814D100917298 /* Build configuration list for PBXNativeTarget "libgpac_dynamic" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				718477D1127814B300917298 /* Debug */,
-				718477D2127814B300917298 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		7184783B1278649100917298 /* Build configuration list for PBXNativeTarget "soft_raster" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				718478321278645C00917298 /* Debug */,
-				718478331278645C00917298 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		7184783C1278649100917298 /* Build configuration list for PBXNativeTarget "dummy_in" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				718478391278647300917298 /* Debug */,
-				7184783A1278647300917298 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		71847844127864CB00917298 /* Build configuration list for PBXNativeTarget "ctx_load" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				71847842127864AD00917298 /* Debug */,
-				71847843127864AD00917298 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		71847884127865F500917298 /* Build configuration list for PBXNativeTarget "aac_in" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				7184784A1278654100917298 /* Debug */,
-				7184784B1278654100917298 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		71847885127865F500917298 /* Build configuration list for PBXNativeTarget "svg_in" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				718478511278655900917298 /* Debug */,
-				718478521278655900917298 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		71847886127865F500917298 /* Build configuration list for PBXNativeTarget "mp3_in" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				718478581278656F00917298 /* Debug */,
-				718478591278656F00917298 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		71847887127865F500917298 /* Build configuration list for PBXNativeTarget "img_in" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				7184785F1278657F00917298 /* Debug */,
-				718478601278657F00917298 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		71847888127865F500917298 /* Build configuration list for PBXNativeTarget "bifs_dec" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				718478661278658B00917298 /* Debug */,
-				718478671278658B00917298 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		71847889127865F500917298 /* Build configuration list for PBXNativeTarget "gpac_js" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				7184786D127865A300917298 /* Debug */,
-				7184786E127865A300917298 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		7184788A127865F500917298 /* Build configuration list for PBXNativeTarget "isom_in" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				71847874127865B700917298 /* Debug */,
-				71847875127865B700917298 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		7184788B127865F500917298 /* Build configuration list for PBXNativeTarget "laser_dec" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				7184787B127865CC00917298 /* Debug */,
-				7184787C127865CC00917298 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		7184788C127865F500917298 /* Build configuration list for PBXNativeTarget "odf_dec" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				71847882127865D700917298 /* Debug */,
-				71847883127865D700917298 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		718478A91278664D00917298 /* Build configuration list for PBXNativeTarget "rtp_in" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				71847892127865F800917298 /* Debug */,
-				71847893127865F800917298 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		718478AA1278664D00917298 /* Build configuration list for PBXNativeTarget "mpegts_in" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				718478991278660400917298 /* Debug */,
-				7184789A1278660400917298 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		718478AB1278664D00917298 /* Build configuration list for PBXNativeTarget "ft_font" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				718478A01278661800917298 /* Debug */,
-				718478A11278661800917298 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		718478AC1278664D00917298 /* Build configuration list for PBXNativeTarget "widgetman" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				718478A71278662F00917298 /* Debug */,
-				718478A81278662F00917298 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		718478B41278667F00917298 /* Build configuration list for PBXNativeTarget "sdl_out" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				718478B21278666100917298 /* Debug */,
-				718478B31278666100917298 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		71A19B1F12796B5800ACFF58 /* Build configuration list for PBXNativeTarget "osmo4ios" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -4816,15 +2590,6 @@
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
-		};
-		71EB6E4B14C5B71300B7EDA7 /* Build configuration list for PBXNativeTarget "hyb_in" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				71EB6E4914C5B6F500B7EDA7 /* Debug */,
-				71EB6E4A14C5B6F500B7EDA7 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
 		};
 		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "gpac4ios" */ = {
 			isa = XCConfigurationList;

gpac-0.5.0.svn4668.tar.bz2/build/xcode/osmo4ios.entitlements Added

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

@@ -33,6 +33,7 @@
 prefix="/usr/local"
 mandir=""
 cross_prefix=""
+targetos=""
 dxsdk_path=""
 moz_path="local"
 cc_orig="gcc"
@@ -44,6 +45,7 @@
 make="make"
 strip="strip"
 pkg_config="pkg-config"
+windres="windres"
 readelf="readelf"
 install="${INSTALL:=install}"
 instflags="${INSTFLAGS:=-p}"
@@ -58,6 +60,7 @@
 libdir="lib"
 
 #GPAC module config
+static_modules="no"
 js_flags="XP_UNIX"
 js_lib="-ljs"
 lm_lib=""
@@ -151,12 +154,14 @@
 disable_dvbx="yes"
 disable_vobsub="no"
 disable_ttxt="no"
+disable_hevc="no"
 enable_depth_compositor="no"
 enable_renoir="no"
 has_avcap="no"
 avcap_cflags=""
 avcap_ldflags="-lavcap"
 has_opensvc="no"
+has_openhevc="no"
 
 win32="no"
 mingw32="no"
@@ -198,6 +203,7 @@
   --verbose                enable verbose building [$verbose]
   --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]
   --make=MAKE              use specified make [$make]
@@ -217,6 +223,7 @@
   --enable-pic             enable Position Independant Code for shared objects
   --strip                  enable strip
   --std-allocator          uses standard lib memory allocator
+  --static-modules         uses static modules whenever possible
   --track-memory           enable tracking of all memory allocated by gpac
   --disable-opt            disable GCC optimizations
   --disable-ipv6           disable IPV6 support
@@ -286,6 +293,7 @@
   --disable-ttxt           disable TTXT (3GPP / MPEG-4 Timed Text) support
   --disable-player         disable player (terminal and compositor)
   --disable-scenegraph     disable scenegraph, scene parsers and player (terminal and compositor)
+  --disable-hevc           disable HEVC support
 
 Extra libraries configuration. You can turn a libray off or force using the local version in gpac/extra_lib/
   --use-js=OPT             force SpiderMonkey ECMAScript OPT=[no,local]
@@ -320,6 +328,8 @@
             ;;
         --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`
             ;;
         --make=*) make=`echo $opt | cut -d '=' -f 2`
@@ -404,13 +414,13 @@
     CFLAGS=""
 fi
 
-if test "$win32" = "yes" ; then
-    cross_prefix=""
-fi
+#if test "$win32" = "yes" ; then
+#    cross_prefix=""
+#fi
 
-if test "$mingw32" = "yes" ; then
-    cross_prefix=""
-fi
+#if test "$mingw32" = "yes" ; then
+#    cross_prefix=""
+#fi
 
 
 cc="${cross_prefix}${cc}"
@@ -420,13 +430,14 @@
 ar="${cross_prefix}${ar}"
 ranlib="${cross_prefix}${ranlib}"
 strip="${cross_prefix}${strip}"
-pkg_config="${cross_prefix}${pkg_config}"
+pkg_config="${pkg_config}"
+windres="${cross_prefix}${windres}"
 
 
 #check pkg_config
 if test "$cross_prefix" = "" ; then
     if ! $pkg_config --version >/dev/null 2>&1 ; then
-        echo "$pkg_config not found, configure may detect wrong libraries"
+		pkg_config="no"
     fi
 fi
 
@@ -443,7 +454,9 @@
 
 
 #OS specific
-targetos=`uname -s`
+if test "$targetos" = "" ; then
+    targetos=`uname -s`
+fi
 case $targetos in
     BeOS)
         js_flags=-DXP_BEOS
@@ -474,7 +487,7 @@
     SunOS)
         make="gmake"
         readelf="greadelf"
-        LDFLAGS="${opt#--extra-ldflags=}"
+        LDFLAGS="$LDFLAGS"
         instflags=""
         #check for 64-bit
         cat > $TMPC << EOF
@@ -625,6 +638,9 @@
 
 
 #GCC PIC
+if test "$cross_prefix" != "" ; then
+    want_pic="no"
+fi
 if test "$want_pic"  = "yes" ; then
     CFLAGS="$CFLAGS -fPIC -DPIC"
     CPPFLAGS="$CPPFLAGS -fPIC -DPIC"
@@ -644,12 +660,12 @@
 int main( void ) { if (strcmp(zlibVersion(), ZLIB_VERSION)) { puts("zlib version differs !!!"); return 1; } return 0; }
 EOF
 has_zlib="no"
-if test "$cross_prefix" = "" ; then
+#if test "$cross_prefix" = "" ; then
   if $cc -o $TMPO $TMPC -lz $LDFLAGS 2> /dev/null  ; then
       has_zlib="system"
   fi
-fi
-if test "$has_zlib" = "force-no" ; then
+#fi
+if test "$has_zlib" = "no" ; then
   if $cc -o $TMPO $TMPC -I"$local_inc/zlib" -L$local_lib -lz 2> /dev/null  ; then
     has_zlib="local"
   fi
@@ -687,7 +703,7 @@
     if $cc -o $TMPO $TMPC $js_flags -L$local_lib -ljs -lpthread 2> /dev/null  ; then
         has_js="local"
         #dc added
-    else
+    elif test "$pkg_config" != "no"; then
         #try pkg-config
         if $pkg_config --exists mozilla-js 2> /dev/null  ; then
             mozjs_pkgcfg="mozilla-js"
@@ -785,19 +801,20 @@
         has_js="local"
         #dc added
     else
+
         #try prefix (DC)
         js_inc="$prefix/include/js"
         js_flags="-DXP_UNIX -I$prefix/include/js"
         if $cc -o $TMPO $TMPC $js_flags -L$prefix/lib -ljs 2> /dev/null  ; then
             has_js="prefix"
             #dc added end
-        else
+        elif test "$pkg_config" != "no"; then
             if $pkg_config --exists mozilla-js 2> /dev/null  ; then
-		mozjs_pkgcfg="mozilla-js"
+				mozjs_pkgcfg="mozilla-js"
             elif $pkg_config --exists mozjs 2> /dev/null  ; then
-		mozjs_pkgcfg="mozjs"
+				mozjs_pkgcfg="mozjs"
             elif $pkg_config --exists mozjs185 2> /dev/null  ; then
-		mozjs_pkgcfg="mozjs185"
+				mozjs_pkgcfg="mozjs185"
 	    fi
 
 	    if test mozjs_pkgcfg != "no" ; then
@@ -808,7 +825,8 @@
                     js_lib=`$pkg_config --libs $mozjs_pkgcfg`
                 fi
             fi
-            if test "$has_js" = "no" ; then
+        fi
+	    if test "$has_js" = "no" ; then
                 if $cc -o $TMPO $TMPC $js_flags $LDFLAGS -ljs 2> /dev/null  ; then
                     js_inc="/usr/include"
                     has_js="system"
@@ -836,8 +854,6 @@
                 fi
             fi
         fi
-    fi
-
 fi
 
 if test "$has_js" != "no" ; then
@@ -978,6 +994,35 @@
 
 fi
 
+#look for openhevc support
+
+if test "$darwin" = "yes" ; then
+ohevc_cflags="-I/usr/include -I/usr/local/include"
+ohevc_ldflags="-L/usr/lib -L/usr/local/lib -lLibOpenHevcWrapper -lpthread"
+elif test "$cross_prefix" = "" ; then
+ohevc_cflags=""
+ohevc_ldflags="-lLibOpenHevcWrapper -lpthread -lm"
+else
+ohevc_cflags="-I${prefix}include"
+ohevc_ldflags="-lLibOpenHevcWrapper -lpthread"
+fi
+
+cat > $TMPC << EOF
+#include <stdio.h>
+int libOpenHevcInit();
+int main( void ) { libOpenHevcInit(); return 0; }
+EOF
+if $cc -o $TMPO $TMPC $ohevc_cflags $LDFLAGS $ohevc_ldflags 2> /dev/null  ; then
+  has_openhevc="yes"
+else
+  ohevc_cflags="-I$local_inc"
+  ohevc_ldflags="-lLibOpenHevcWrapper -lpthread -lm"
+  if $cc -o $TMPO $TMPC $ohevc_cflags $LDFLAGS -L$local_lib $ohevc_ldflags 2> /dev/null  ; then
+    has_openhevc="yes"
+    ohevc_ldflags="-L../../$local_lib $ohevc_ldflags"
+  fi
+fi
+
 
 #look for freetype support
 cat > $TMPC << EOF
@@ -1225,13 +1270,14 @@
 
 #look for FFMPEG support
 
-if $pkg_config --exists libavcodec libavformat libswscale 2> /dev/null  ; then
-    ffmpeg_cflags=`$pkg_config --cflags libavcodec libavformat libswscale libavutil`
-    ffmpeg_lflags=`$pkg_config --libs libavcodec libavformat libswscale libavutil`
+ffmpeg_cflags=""
+ffmpeg_lflags="-lz -lavcodec -lavformat -lavutil -lswscale -lavdevice"
+if test "$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`
     has_ffmpeg="system"
-else
-    ffmpeg_cflags=""
-    ffmpeg_lflags="-lz -lavcodec -lavformat"
+  fi
 fi
 
 cat > $TMPC << EOF
@@ -1279,16 +1325,18 @@
 #look for FREENECT support
 freenect_flags=""
 freenect_ld="-lfreenect"
+has_freenect="no"
+if test "$pkg_config" != "no"; then
+  if $pkg_config --exists libfreenect 2> /dev/null  ; then
+    freenect_flags=`$pkg_config --cflags libfreenect`
+    freenect_libs=`$pkg_config --libs libfreenect`
+    has_freenect="system"
+    freenect_flags="-DFREENECT_FLAT_HEADERS $freenect_flags" 
+  fi 
+fi
 
-if $pkg_config --exists libfreenect 2> /dev/null  ; then
-  freenect_flags=`$pkg_config --cflags libfreenect`
-  freenect_libs=`$pkg_config --libs libfreenect`
-  has_freenect="system"
-  freenect_flags="-DFREENECT_FLAT_HEADERS $freenect_flags" 
+if test "$has_freenect" = "no"; then
 
-else
-
-has_freenect="no"
 cat > $TMPC << EOF
 #include <libfreenect/libfreenect.h>
 int main( void ) { return 0; }
@@ -1604,6 +1652,8 @@
 #overwrite detection with manual settings
 for opt do
     case "$opt" in
+        --static-modules) static_modules="yes"
+            ;;
         --sdl-cfg=*) sdl_path=`echo $opt | cut -d '=' -f 2`; sdl_local="yes"
             ;;
         --enable-sdl-static=*) sdl_static="yes"
@@ -1734,7 +1784,8 @@
         --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-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-3d) disable_3d="yes"
@@ -1919,6 +1970,10 @@
             ;;
         --enable-core) disable_core_tools="no"
             ;; 
+        --disable-hevc) disable_hevc="yes"
+            ;;
+        --enable-hevc) disable_hevc="no"
+            ;; 
     esac
 done
 
@@ -2012,13 +2067,15 @@
     xul_flags="-I$xulsdk_path $xul_flags"
 fi
 
-if test "$has_xul" = "no" ; then
+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
             has_xul="system"
             xul_flags="`$pkg_config --cflags libxul` `$pkg_config --libs libxul`" 
         fi
     fi
+  fi
 fi
 
 if test "$has_xul" = "no" ; then
@@ -2079,14 +2136,15 @@
 #look for SDL support
 sdl_too_old=no
 has_sdl=no
-sdl_config="sdl-config"
+
+sdl_config="sdl2-config"
 if test "$sdl_local" = "yes"; then
-    sdl_config="$sdl_path/sdl-config"
+    sdl_config="$sdl_path/sdl2-config"
     sdl_static="yes"
 fi
 
 
-if test "$cross_prefix" = "" ; then
+#if test "$cross_prefix" = "" ; then
     if type $sdl_config >/dev/null 2>&1; then
 
         cat > $TMPC << EOF
@@ -2111,6 +2169,42 @@
             fi
         fi
     fi
+#fi
+
+if test "$has_sdl" = "no" ; then
+
+  sdl_config="sdl-config"
+  if test "$sdl_local" = "yes"; then
+    sdl_config="$sdl_path/sdl-config"
+    sdl_static="yes"
+  fi
+
+  if test "$cross_prefix" = "" ; then
+    if type $sdl_config >/dev/null 2>&1; then
+
+        cat > $TMPC << EOF
+#include <SDL.h>
+#undef main
+int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
+EOF
+
+        if test "$sdl_static" = "yes"; then
+            sdl_lib_flags=`$sdl_config --static-libs`
+        else
+            sdl_lib_flags=`$sdl_config --libs`
+        fi
+        sdl_cflags=`$sdl_config --cflags`
+
+        if $cc -o $TMPO $sdl_cflags $TMPC $LDFLAGS $sdl_lib_flags  > /dev/null 2>&1  ; then
+            _sdlversion=`$sdl_config --version | sed 's/[^0-9]//g'`
+            if test "$_sdlversion" -lt 121 ; then
+                sdl_too_old=yes
+            else
+                has_sdl=yes
+            fi
+        fi
+    fi
+  fi
 fi
 #end SDL check
 
@@ -2222,7 +2316,7 @@
 soname_version="${version_major}.${version_minor}.${version_micro}"
 
 if [ -d ".svn" ]; then
- if which svnversion 2>/dev/null
+ if which svnversion 2> /dev/null
  then
     revision="`svnversion \"$source_path\"`"
     echo "#define GPAC_SVN_REVISION	\"$revision\"" > $source_path/include/gpac/revision.h
@@ -2254,9 +2348,9 @@
 echo "Static build enabled: $static_build"
 echo "Memory tracking enabled: $use_memory_tracking"
 echo "Use standard memory allocator: $use_std_alloc"
-echo "fixed-point version: $use_fixed_point"
+echo "Fixed-Point Version: $use_fixed_point"
 echo "IPV6 Support: $has_ipv6"
-
+echo "Static Modules: $static_modules"
 
 if test "$disable_player" = "yes" ; then
     echo "Player disabled"
@@ -2451,6 +2545,11 @@
     echo "#define GPAC_DISABLE_DASH_CLIENT" >> $TMPH
 fi
 
+if test "$disable_hevc" = "yes" ; then
+    echo "HEVC Support disabled"
+    echo "#define GPAC_DISABLE_HEVC" >> $TMPH
+fi
+
 echo ""
 
 echo "** Detected libraries **"
@@ -2518,6 +2617,7 @@
 fi
 echo "A52 (AC3): $has_a52"
 echo "OpenSVCDecoder: $has_opensvc"
+echo "OpenHEVCDecoder: $has_openhevc"
 echo "Freenect: $has_freenect"
 
 if test "$enable_renoir" = "yes" ; then
@@ -2575,7 +2675,10 @@
 fi
 
 ldir=`pwd`
-CFLAGS="$CFLAGS -fvisibility=\"hidden\" -DGPAC_HAVE_CONFIG_H -I\"$ldir\""
+CFLAGS="$CFLAGS -DGPAC_HAVE_CONFIG_H -I\"$ldir\""
+if test "$win32" = "no" ; then
+    CFLAGS="$CFLAGS -fvisibility=\"hidden\""
+fi
 CPPFLAGS="$CPPFLAGS"
 
 
@@ -2597,11 +2700,13 @@
 echo "AR=$ar" >> config.mak
 echo "RANLIB=$ranlib" >> config.mak
 echo "STRIP=$strip" >> config.mak
+echo "WINDRES=$windres" >> config.mak
 else
 echo "CC=@$cc_naked" >> config.mak
 echo "AR=@$ar" >> config.mak
 echo "RANLIB=@$ranlib" >> config.mak
 echo "STRIP=@$strip" >> config.mak
+echo "WINDRES=$windres" >> config.mak
 fi
 echo "INSTALL=$install" >> config.mak
 echo "LIBTOOL=libtool" >> config.mak
@@ -2613,6 +2718,7 @@
 echo "SHFLAGS=$SHFLAGS" >> config.mak
 echo "libdir=$libdir" >> config.mak
 
+echo "STATIC_MODULES=$static_modules" >> config.mak
 
 #for cross-compilation
 if test "$cross_prefix" != "" ; then
@@ -2870,6 +2976,12 @@
     echo "OSVC_LDFLAGS=$osvc_ldflags" >> config.mak
 fi
 
+echo "CONFIG_OPENHEVC=$has_openhevc" >> config.mak
+if test "$has_openhevc" = "yes" ; then
+    echo "OHEVC_CFLAGS=$ohevc_cflags" >> config.mak
+    echo "OHEVC_LDFLAGS=$ohevc_ldflags" >> config.mak
+fi
+
 echo "MOZILLA_DIR=$moz_path" >> config.mak
 
 echo "CONFIG_XUL=$has_xul" >> config.mak

gpac-0.5.0.svn4296.tar.bz2/doc/configuration.html -> gpac-0.5.0.svn4668.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: 2012-12-06 20:08:32 +0100 (Thu, 06 Dec 2012) $</span></b>
+<b><span style="Font-Size: 18pt">Last Modified $LastChangedDate: 2013-06-13 02:48:56 +0800 (四, 2013-06-13) $</span></b>
 </p>
 
 <br/><br/>
@@ -218,9 +218,9 @@
 <p style="text-indent: 5%">
 Specifies the user prefered language as expressed in ISO 639-1. This is used to select streams in case of alternate content in an audio object.
 </p>
-<b>AlwaysDrawBIFS</b> [value: <i>"yes" "no"</i>]
+<b>DrawLateFrames</b> [value: <i>"yes" "no"</i>]
 <p style="text-indent: 5%">
-If set, late BIFS frame will still be drawn. If not set, the scene won't be redrawn untill BIFS streams are 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 off to keep better sync, but may be usefull when testing heavy content or slow renderers.
 </p>
 <b>ForceSingleClock</b> [value: <i>"yes" "no"</i>]
 <p style="text-indent: 5%">
@@ -240,7 +240,7 @@
 </p>
 <b>TimeSlice</b> [value: <i>unsigned integer</i>]
 <p style="text-indent: 5%">
-Specifies the target maximum time (in ms) of one cycle of the media manager (the media manager will attempts to call all the active decoders within this tişe+; Depending on the threqding şodem this option cqn be ignored;
+Specifies the target maximum time (in ms) of one cycle of the media manager (the media manager will attempts to call all the active decoders within this time. Depending on the threading mode this option can be ignored;
 </p>
 <b>ModuleUnload</b> [value: <i>"yes" "no"</i>]
 <p style="text-indent: 5%">
@@ -321,9 +321,9 @@
 Disables YUV hardware support (YUV hardware support may not be available for the current video output module).</p>
 
 
-<b>ForceOpenGL</b> [value: <i>"yes"  "no"</i>]
+<b>ForceOpenGL</b> [value: <i>"yes", "no", "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.</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. The raster mode only uses OpenGL for pixel IO but does not perform polygin fill (no tesselation).</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>
@@ -716,9 +716,6 @@
 <a name="DASH"></a>
 <span style="text-decoration: underline;"><b>Section "DASH"</b></span> <i><a href="#Overview">Back to top</a></i>
 <p>The "DASH" section of the config file holds all configuration options for DASH or HLS/M3U8 playback.</p>
-<b>MaxCacheDuration</b> [value: <i>positive integer</i>]
-<p style="text-indent: 5%">
-Specifies minimum cache duration in seconds. Default is 30 sec</.p>
 <b>KeepFiles</b> [value: <i>yes, no</i>]
 <p style="text-indent: 5%">
 Specifies whether downloaded files should not be deleted.</p>
@@ -730,13 +727,19 @@
 Disables automatic adaptation logic. Default is no</p>
 <b>MemoryStorage</b> [value: <i>yes, no</i>]
 <p style="text-indent: 5%">
-Files are only stored in memory and destroyed after playback, no disk IO is used. Default is no</p>
+Files are only stored in memory and destroyed after playback, no disk IO is used. Default is yes</p>
 <b>UseMaxResolution</b> [value: <i>yes, no</i>]
 <p style="text-indent: 5%">
 Forces the player to set the output video resolution to the max resolution available instead of resizing the window. Default is yes</p>
 <b>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>]
+<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.
 
 <br/><br/>

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

@@ -34,17 +34,9 @@
 #ifndef _SVCDecoder_ietr_api_h
 #define _SVCDecoder_ietr_api_h
 
-#define WINEXPORT
 
 #include "SvcInterface.h"
 
-#ifndef POCKET_PC
-#ifdef TCPMP
-#include "windows.h"
-#undef WINEXPORT
-#define WINEXPORT WINAPI
-#endif
-#endif
 
 enum {
 	SVC_STATUS_ERROR	= -1,
@@ -59,11 +51,11 @@
 This method initializes the internal resources of the decoder
 @return SVC_STATUS_OK if creation is successful
 ======================================================================================================*/
-int WINEXPORT SVCDecoder_init(void **PlayerStruct);
+int SVCDecoder_init(void **PlayerStruct);
 
 
 /*======================================================================================================
-void WINEXPORT UpdateLayer(int *DqIdTable, int *CurrDqId, int MaxDqId, int Command);
+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.
@@ -74,15 +66,15 @@
 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 temproal scalability
+4: To switch up of temporal scalability
 @return nothing
 =======================================================================================================*/
-void WINEXPORT UpdateLayer(int *DqIdTable, int *CurrDqId, int *TemporalCom, int *TemporalId, int MaxDqId, int Command);
+void UpdateLayer(int *DqIdTable, int *CurrDqId, int *TemporalCom, int *TemporalId, int MaxDqId, int Command);
 
 
 
 /*======================================================================================================
-void WINEXPORT SetCommandLayer(int *Command, int DqIdMax, int CurrDqId, int *TemporalCom, int TemporalId);
+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.
@@ -94,7 +86,7 @@
 3 -> define a specific temporal scalability. (use TemporalId variable to set).
 @return nothing
 =======================================================================================================*/
-void WINEXPORT SetCommandLayer(int *Command, int DqIdMax, int CurrDqId, int *TemporalCom, int TemporalId);
+void SetCommandLayer(int *Command, int DqIdMax, int CurrDqId, int *TemporalCom, int TemporalId);
 
 
 /*======================================================================================================
@@ -116,7 +108,7 @@
 @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 WINEXPORT decodeNAL(void *PlayerStruct, unsigned char* nal, int nal_length, OPENSVCFRAME *Frame, int *LayerCommand); 
+int decodeNAL(void *PlayerStruct, unsigned char* nal, int nal_length, OPENSVCFRAME *Frame, int *LayerCommand); 
 
 
 /*======================================================================================================
@@ -124,5 +116,29 @@
 This method releases the internal resources of the decoder
 @return SVC_STATUS_OK if creation is successfull
 =======================================================================================================*/
-int WINEXPORT SVCDecoder_close(void *PlayerStruct);
+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.svn4296.tar.bz2/extra_lib/include/OpenSVCDecoder/SvcInterface.h -> gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/OpenSVCDecoder/SvcInterface.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/SDL2 Added

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/faad.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/mad.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/neaacdec.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/openHevcWrapper.h Added

@@ -0,0 +1,65 @@
+#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

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/openjpeg.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/xvid.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/lib/x64 Added

gpac-0.5.0.svn4668.tar.bz2/extra_lib/lib/x64/debug Added

gpac-0.5.0.svn4668.tar.bz2/extra_lib/lib/x64/release Added

gpac-0.5.0.svn4296.tar.bz2/generate_installer.bat -> gpac-0.5.0.svn4668.tar.bz2/generate_installer.bat Changed

@@ -6,14 +6,27 @@
 REM ============================================
 
 
+:begin
+IF "%1"=="win32" GOTO next
+IF "%1"=="x64" GOTO next
+echo You must specified target architecture : win32 or x64
+GOTO Abort
+
+:next
 echo:
 REM ============================================
 echo Check NSIS is in your PATH
 REM ============================================
-
-set NSIS_EXEC="%PROGRAMFILES%\NSIS\makensis.exe"
-if not exist "%PROGRAMFILES%\NSIS\makensis.exe" echo   NSIS couldn't be found at default location %NSIS_EXEC%
-if not exist "%PROGRAMFILES%\NSIS\makensis.exe" goto Abort
+if "%PROCESSOR_ARCHITECTURE%" == "AMD64" ( 
+    SET "PRGROOT=%programfiles(x86)%" 
+) 
+if "%PROCESSOR_ARCHITECTURE%" == "x86" ( 
+    SET PRGROOT=%programfiles% 
+)
+
+set NSIS_EXEC="%PRGROOT%\NSIS\makensis.exe"
+if not exist "%PRGROOT%\NSIS\makensis.exe" echo   NSIS couldn't be found at default location %NSIS_EXEC%
+if not exist "%PRGROOT%\NSIS\makensis.exe" goto Abort
 echo   Found NSIS at default location %NSIS_EXEC%
 
 
@@ -38,23 +51,23 @@
 if !"%VarRevisionBuild%"==!"%VarRevisionSVN%" goto Abort
 REM echo   version found: %VarRevisionSVN%
 
-move bin\win32\release\nsis_install\default.out bin\win32\release\nsis_install\default.out_
-echo Name "GPAC Framework ${GPAC_VERSION} revision %VarRevisionSVN%" > bin\win32\release\nsis_install\default.out
-echo OutFile "GPAC.Framework.Setup-${GPAC_VERSION}-rev%VarRevisionSVN%.exe" >> bin\win32\release\nsis_install\default.out
-
+move packagers\win32_64\nsis\default.out packagers\win32_64\nsis\default.out_
+echo Name "GPAC Framework ${GPAC_VERSION} for %1 revision %VarRevisionSVN%" > packagers\win32_64\nsis\default.out
+echo OutFile "GPAC.Framework.Setup-${GPAC_VERSION}-rev%VarRevisionSVN%-%1.exe" >> packagers\win32_64\nsis\default.out
+IF "%1"=="x64" echo !define IS_WIN64 >> packagers\win32_64\nsis\default.out
 
 echo:
 REM ============================================
 echo Executing NSIS
 REM ============================================
-call %NSIS_EXEC% bin\win32\release\nsis_install\gpac_installer.nsi
+call %NSIS_EXEC% packagers\win32_64\nsis\gpac_installer.nsi
 
 
 echo:
 REM ============================================
 echo Removing temporary files
 REM ============================================
-move bin\win32\release\nsis_install\default.out_ bin\win32\release\nsis_install\default.out
+move packagers\win32_64\nsis\default.out_ packagers\win32_64\nsis\default.out
 
 
 echo:

gpac-0.5.0.svn4296.tar.bz2/include/gpac/bitstream.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/bitstream.h Changed

@@ -164,6 +164,21 @@
  *	\return the char value read.
  */
 u32 gf_bs_read_u8(GF_BitStream *bs);
+
+/*!
+ *	\brief align char reading until reaching the given value
+ *
+ *	Reads an integer coded on 8 bits starting at a byte boundary in the bitstream until
+ *  the given appears on the bitstream.
+ *	\note the bytes read in the bitstream will only be update if the delimiter is found
+ *	\param bs the target bitstream 
+ *	\param delimiter the stop condition
+ *  \param out the resulting value
+ *  \param max_lengh 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);
+
 /*!
  *	\brief align short reading
  *
@@ -326,6 +341,7 @@
  *	\param value the integer value to write
  */
 void gf_bs_write_u32(GF_BitStream *bs, u32 value);
+
 /*!
  *	\brief align large integer writing
  *
@@ -335,6 +351,9 @@
  *	\param value the large integer value to write
  */
 void gf_bs_write_u64(GF_BitStream *bs, u64 value);
+
+
+
 /*!
  *	\brief little endian integer writing
  *
@@ -450,6 +469,7 @@
  *\return number of available bits if position is in the last byte of the buffer/stream, 8 otherwise
  */
 u8 gf_bs_bits_available(GF_BitStream *bs);
+
 /*!
  *\brief position query
  *
@@ -458,6 +478,7 @@
  *\return the read/write position of the bitstream
  */
 u64 gf_bs_get_position(GF_BitStream *bs);
+
 /*!
  *\brief size query
  *
@@ -478,7 +499,15 @@
 u64 gf_bs_get_refreshed_size(GF_BitStream *bs);
 
 
-
+/*!
+ *\brief transfer content from source bitstream to destination bitstream
+ *
+ *Returns the size of the associated buffer/file.
+ *\param dst the target bitstream
+ *\param src the source bitstream. This bitstream is empty after calling teh function
+ *\return error if any
+ */
+GF_Err gf_bs_transfer(GF_BitStream *dst, GF_BitStream *src);
 /*! @} */
 
 #ifdef __cplusplus

gpac-0.5.0.svn4296.tar.bz2/include/gpac/configuration.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/configuration.h Changed

@@ -36,19 +36,16 @@
 /*enables GPAC fixed point*/
 //#define GPAC_FIXED_POINT
 
-/*automatic tracking is disabled by default, causes too many problems when reusing parts of gpac*/
-#if 0
-/*enables GPAC memory tracking*/
+/*enables GPAC memory tracking in debug mode only*/
 #if defined(DEBUG) || defined(_DEBUG)
-#define GPAC_MEMORY_TRACKING
-#endif
+//#define GPAC_MEMORY_TRACKING
 #endif
 
 /*platform is big endian*/
 //#define GPAC_BIG_ENDIAN
 
 /*SSL enabled*/
-#ifdef WIN32
+#if defined(WIN32) && !defined(_WIN64)
 #define GPAC_HAS_SSL
 #endif
 
@@ -72,7 +69,7 @@
 
 /*3D compositor disabled*/
 #ifdef GPAC_CONFIG_DARWIN
-#define GPAC_DISABLE_3D
+//#define GPAC_DISABLE_3D
 #endif
 
 /*use TinyGL instead of OpenGL*/
@@ -81,6 +78,17 @@
 /*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
 #endif
 
 
@@ -125,6 +133,9 @@
 #define GPAC_HAS_GLU
 #endif
 
+#if defined(_WIN64)
+#define GPAC_X64
+#endif
 
 /*disables SVG scene graph*/
 //#define GPAC_DISABLE_SVG
@@ -219,5 +230,8 @@
 /*disables IETF RTP/SDP/RTSP*/
 //#define GPAC_DISABLE_STREAMING
 
+/*disables dashclient */
+//#define GPAC_DISABLE_DASH_CLIENT
+
 #endif		/*_GF_CONFIG_H_*/

gpac-0.5.0.svn4296.tar.bz2/include/gpac/constants.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/constants.h Changed

gpac-0.5.0.svn4296.tar.bz2/include/gpac/dash.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/dash.h Changed

@@ -77,14 +77,14 @@
 	/*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*/
-	GF_DASHFileIOSession (*create)(GF_DASHFileIO *dashio, Bool persistent, const char *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);
+	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*/
@@ -117,19 +117,19 @@
 
 /*create a new DASH client:
 	@dash_io: DASH callbacks to the user
-	@max_cache_duration_sec: maximum duration in seconds for the cached media
+	@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_sec, 
+						   u32 max_cache_duration, 
 						   u32 auto_switch_count, 
 						   Bool keep_files, 
 						   Bool disable_switching, 
 						   GF_DASHInitialSelectionMode first_select_mode,
-						   Bool enable_buffering);
+						   Bool enable_buffering, u32 initial_time_shift_percent);
 
 /*delete the DASH client*/
 void gf_dash_del(GF_DashClient *dash);
@@ -186,6 +186,11 @@
 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*/

gpac-0.5.0.svn4296.tar.bz2/include/gpac/download.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/download.h Changed

@@ -191,7 +191,7 @@
         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*/
+        /*response code - only valid for GF_NETIO_PARSE_REPLY. Set to 1 in GF_NETIO_DATA_EXCHANGE to indicate end of chunk transfer*/
         u32 reply;
     } GF_NETIO_Parameter;
 
@@ -459,7 +459,7 @@
     /*!
      * Reassigns session flags and callbacks. This is only possible if the session is not threaded.
 	 * \param sess The session
-	 * \param flags The new flags for the session 
+	 * \param flags The new flags for the session - if flags is 0xFFFFFFFF, existing flags are not modified
 	 * \param user_io The new callback function
 	 * \param cbk The new user data to ba used in the callback function
      * \return GF_OK or error
@@ -480,16 +480,16 @@
      *
      *Sets the maximum rate (per session only at the current time). 
      *\param dm the download manager object
-     *\param rate_in_byte_per_sec the new rate in bytes per sec. If 0, HTTP rate will not be limited
+     *\param rate_in_bits_per_sec the new rate in bits per sec. If 0, HTTP rate will not be limited
      */
-    void gf_dm_set_data_rate(GF_DownloadManager *dm, u32 rate_in_byte_per_sec);
+    void gf_dm_set_data_rate(GF_DownloadManager *dm, u32 rate_in_bits_per_sec);
 
     /*
      *\brief gets download manager max rate per session
      *
      *Sets the maximum rate (per session only at the current time). 
      *\param dm the download manager object
-     *\return the rate in bytes per sec. If 0, HTTP rate is not limited
+     *\return the rate in bits per sec. If 0, HTTP rate is not limited
      */
     u32 gf_dm_get_data_rate(GF_DownloadManager *dm);

gpac-0.5.0.svn4296.tar.bz2/include/gpac/esi.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/esi.h Changed

gpac-0.5.0.svn4296.tar.bz2/include/gpac/events_constants.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/events_constants.h Changed

gpac-0.5.0.svn4668.tar.bz2/include/gpac/html5_media.h Added

@@ -0,0 +1,328 @@
+/*
+ *			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-0.5.0.svn4668.tar.bz2/include/gpac/html5_mse.h Added

@@ -0,0 +1,178 @@
+/*
+ *			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-0.5.0.svn4296.tar.bz2/include/gpac/ietf.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/ietf.h Changed

gpac-0.5.0.svn4296.tar.bz2/include/gpac/internal/compositor_dev.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/internal/compositor_dev.h Changed

@@ -192,9 +192,10 @@
 
 	/*simulation frame rate*/
 	Double frame_rate;
-	Bool no_regulation;
+	Bool no_regulation, video_regulation;
 	u32 frame_duration;
 	u32 frame_time[GF_SR_FPS_COMPUTE_SIZE];
+	u32 frame_dur[GF_SR_FPS_COMPUTE_SIZE];
 	u32 current_frame;
 	u32 last_frame_time, caret_next_draw_time;
 	Bool show_caret;
@@ -586,6 +587,7 @@
 	/*image data for natural media*/
 	char *data;
 	u32 width, height, stride, pixelformat, pixel_ar;
+    Bool is_flipped;
 
 #ifndef GPAC_DISABLE_VRML
 	/*if set texture has been transformed by MatteTexture -> disable blit*/
@@ -1319,7 +1321,7 @@
 	/*called when new video frame is ready to be flushed on screen. time is the terminal global clock in ms*/
 	void (*on_video_frame)(void *udta, u32 time);
 	/*called when video output has been resized*/
-	void (*on_video_reconfig)(void *udta, u32 width, u32 height);
+	void (*on_video_reconfig)(void *udta, u32 width, u32 height, u8 bpp);
 } GF_VideoListener;
 
 GF_Err gf_sc_add_video_listener(GF_Compositor *compositor, GF_VideoListener *vl);

gpac-0.5.0.svn4296.tar.bz2/include/gpac/internal/ietf_dev.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/internal/ietf_dev.h Changed

gpac-0.5.0.svn4296.tar.bz2/include/gpac/internal/isomedia_dev.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/internal/isomedia_dev.h Changed

@@ -356,6 +356,15 @@
 	GF_ISOM_BOX_TYPE_SUBS	= GF_4CC( 's', 'u', 'b', 's' ),
 
 	GF_ISOM_BOX_TYPE_RVCC	= GF_4CC( 'r', 'v', 'c', 'c' ),
+	
+	GF_ISOM_BOX_TYPE_VTTC	= GF_4CC( 'v', 't', 't', 'C' ),
+	GF_ISOM_BOX_TYPE_VTCU	= GF_4CC( 'v', 't', 't', 'c' ),
+	GF_ISOM_BOX_TYPE_VTTE	= GF_4CC( 'v', 't', 't', 'e' ),
+	GF_ISOM_BOX_TYPE_CTIM	= GF_4CC( 'c', 't', 'i', 'm' ),
+	GF_ISOM_BOX_TYPE_IDEN	= GF_4CC( 'i', 'd', 'e', 'n' ),
+	GF_ISOM_BOX_TYPE_STTG	= GF_4CC( 's', 't', 't', 'g' ),
+	GF_ISOM_BOX_TYPE_PAYL	= GF_4CC( 'p', 'a', 'y', 'l' ),
+	GF_ISOM_BOX_TYPE_WVTT	= GF_4CC( 'w', 'v', 't', 't' ),
 
 	/*ALL INTERNAL BOXES - NEVER WRITTEN TO FILE!!*/
 
@@ -2416,7 +2425,7 @@
 	u64 segment_start;
 
 	GF_List *moof_list;
-	Bool use_segments, moof_first, append_segment;
+	Bool use_segments, moof_first, append_segment, styp_written;
 
 	/*used when building single-indexed self initializing media segments*/
 	GF_SegmentIndexBox *root_sidx;
@@ -2424,6 +2433,8 @@
 	u32 root_sidx_index;
 
 	Bool is_index_segment;
+
+	GF_BitStream *segment_bs;
 #endif
 
 	/*this contains ALL the root boxes excepts fragments*/
@@ -2484,7 +2495,7 @@
 GF_Err findEntryForTime(GF_SampleTableBox *stbl, u64 DTS, u8 useCTS, u32 *sampleNumber, u32 *prevSampleNumber);
 /*Reading of the sample tables*/
 GF_Err stbl_GetSampleSize(GF_SampleSizeBox *stsz, u32 SampleNumber, u32 *Size);
-GF_Err stbl_GetSampleCTS(GF_CompositionOffsetBox *ctts, u32 SampleNumber, u32 *CTSoffset);
+GF_Err stbl_GetSampleCTS(GF_CompositionOffsetBox *ctts, u32 SampleNumber, s32 *CTSoffset);
 GF_Err stbl_GetSampleDTS(GF_TimeToSampleBox *stts, u32 SampleNumber, u64 *DTS);
 GF_Err stbl_GetSampleDTS_and_Duration(GF_TimeToSampleBox *stts, u32 SampleNumber, u64 *DTS, u32 *duration);
 
@@ -3381,6 +3392,44 @@
 GF_Err twrp_Size(GF_Box *s);
 #endif
 
+#ifndef GPAC_DISABLE_VTT
+/*WebVTT boxes*/
+GF_Box *boxstring_New(u32 type);
+GF_Box *vtcu_New();
+GF_Box *vtte_New();
+GF_Box *wvtt_New();
+
+void boxstring_del(GF_Box *s);
+void vtcu_del(GF_Box *s);
+void vtte_del(GF_Box *s);
+void wvtt_del(GF_Box *s);
+
+GF_Err boxstring_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err vtcu_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err vtte_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err wvtt_Read(GF_Box *s, GF_BitStream *bs);
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+GF_Err boxstring_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err vtcu_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err vtte_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err wvtt_Write(GF_Box *s, GF_BitStream *bs);
+
+GF_Err boxstring_Size(GF_Box *s);
+GF_Err vtcu_Size(GF_Box *s);
+GF_Err vtte_Size(GF_Box *s);
+GF_Err wvtt_Size(GF_Box *s);
+#endif /* GPAC_DISABLE_ISOM_WRITE */
+
+GF_Err boxstring_dump(GF_Box *a, FILE * trace);
+GF_Err vtcu_dump(GF_Box *a, FILE * trace);
+GF_Err vtte_dump(GF_Box *a, FILE * trace);
+GF_Err wvtt_dump(GF_Box *a, FILE * trace);
+
+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);
+
+#endif /* GPAC_DISABLE_VTT */
 
 /* MPEG-21 functions */
 GF_Box *meta_New();

gpac-0.5.0.svn4296.tar.bz2/include/gpac/internal/media_dev.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/internal/media_dev.h Changed

@@ -212,11 +212,11 @@
 
 
 /*return sps ID or -1 if error*/
-s32 gf_media_avc_read_sps(char *sps_data, u32 sps_size, AVCState *avc, u32 subseq_sps, u32 *vui_flag_pos);
+s32 gf_media_avc_read_sps(const char *sps_data, u32 sps_size, AVCState *avc, u32 subseq_sps, u32 *vui_flag_pos);
 /*return pps ID or -1 if error*/
-s32 gf_media_avc_read_pps(char *pps_data, u32 pps_size, AVCState *avc);
+s32 gf_media_avc_read_pps(const char *pps_data, u32 pps_size, AVCState *avc);
 /*return sps ID or -1 if error*/
-s32 gf_media_avc_read_sps_ext(char *spse_data, u32 spse_size);
+s32 gf_media_avc_read_sps_ext(const char *spse_data, u32 spse_size);
 /*is slice an IDR*/
 Bool gf_media_avc_slice_is_IDR(AVCState *avc);
 /*is slice containing intra MB only*/
@@ -250,6 +250,11 @@
 {
 	u8 profile_space, tier_flag, profile_idc, level_idc;
 	u32 profile_compatibility_flag;
+	Bool general_progressive_source_flag;
+	Bool general_interlaced_source_flag;
+	Bool general_non_packed_constraint_flag;
+	Bool general_frame_only_constraint_flag;
+	u64 general_reserved_44bits;
 	
 	HEVC_SublayerPTL sub_ptl[8];
 } HEVC_ProfileTierLevel;
@@ -266,6 +271,7 @@
 	s32 id, vps_id; 
 	/*used to discard repeated SPSs - 0: not parsed, 1 parsed, 2 stored*/
 	u32 state;
+	u32 crc;
 	u32 width, height;
 
 	HEVC_ProfileTierLevel ptl;
@@ -283,6 +289,15 @@
 
 	u32 num_short_term_ref_pic_sets, num_long_term_ref_pic_sps;
 	HEVC_ReferencePictureSets rps[64];
+
+
+	Bool aspect_ratio_info_present_flag, long_term_ref_pics_present_flag, temporal_mvp_enable_flag, sample_adaptive_offset_enabled_flag;
+	u8 sar_idc;
+	u16 sar_width, sar_height;
+	Bool has_timing_info;
+	u32 num_units_in_tick, time_scale;
+	Bool poc_proportional_to_timing_flag;
+	u32 num_ticks_poc_diff_one_minus1;
 } HEVC_SPS;
 
 typedef struct
@@ -291,10 +306,16 @@
 	u32 sps_id; 
 	/*used to discard repeated SPSs - 0: not parsed, 1 parsed, 2 stored*/
 	u32 state;
+	u32 crc;
 
 	Bool dependent_slice_segments_enabled_flag, tiles_enabled_flag, uniform_spacing_flag;
-	u32 num_extra_slice_header_bits;
-	Bool slice_segment_header_extension_present_flag, output_flag_present_flag;
+	u32 num_extra_slice_header_bits, num_ref_idx_l0_default_active, num_ref_idx_l1_default_active;
+	Bool slice_segment_header_extension_present_flag, output_flag_present_flag, lists_modification_present_flag, cabac_init_present_flag;
+	Bool weighted_pred_flag, weighted_bipred_flag, slice_chroma_qp_offsets_present_flag, deblocking_filter_override_enabled_flag, loop_filter_across_slices_enabled_flag, entropy_coding_sync_enabled_flag;
+	Bool loop_filter_across_tiles_enabled_flag;
+
+	u32 num_tile_columns, num_tile_rows;
+	u32 column_width[22], row_height[20];
 } HEVC_PPS;
 
 typedef struct
@@ -308,7 +329,9 @@
 	s32 id; 
 	/*used to discard repeated SPSs - 0: not parsed, 1 parsed, 2 stored*/
 	u32 state;
+	u32 crc;
 	u8 max_sub_layer;
+	Bool temporal_id_nesting;
 	HEVC_ProfileTierLevel ptl;
 
 	HEVC_SublayerPTL sub_ptl[8];
@@ -336,6 +359,10 @@
 	u32 poc_msb, poc_msb_prev, poc_lsb_prev, frame_num_prev;
 	s32 frame_num_offset, frame_num_offset_prev;
 
+	Bool dependent_slice_segment_flag;
+	Bool first_slice_segment_in_pic_flag;
+	u32 slice_segment_address;
+
 	HEVC_SPS *sps;
 	HEVC_PPS *pps;
 } HEVCSliceInfo;
@@ -412,5 +439,30 @@
 
 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);
 
+#ifndef GPAC_DISABLE_VTT
+
+typedef struct _webvtt_parser GF_WebVTTParser;
+typedef struct _webvtt_sample GF_WebVTTSample;
+
+GF_WebVTTParser *gf_webvtt_parser_new();
+GF_Err gf_webvtt_parser_init(GF_WebVTTParser *parser, const char *input_file, 
+                                    void *user, GF_Err (*report_message)(void *, GF_Err, char *, const char *),
+                                    void (*on_sample_parsed)(void *, GF_WebVTTSample *),
+                                    void (*on_header_parsed)(void *, const char *));
+GF_Err gf_webvtt_parser_parse(GF_WebVTTParser *parser, u32 duration);
+u64 gf_webvtt_parser_last_duration(GF_WebVTTParser *parser);
+void gf_webvtt_parser_del(GF_WebVTTParser *parser);
+
+void gf_webvtt_sample_del(GF_WebVTTSample * samp);
+u64 gf_webvtt_sample_get_start(GF_WebVTTSample * samp);
+
+#ifndef GPAC_DISABLE_ISOM
+GF_Err gf_webvtt_dump_header(FILE *dump, GF_ISOFile *file, u32 track, u32 index);
+GF_Err gf_webvtt_dump_sample(FILE *dump, GF_WebVTTSample *samp);
+GF_Err gf_webvtt_parser_dump_done(GF_WebVTTParser *parser, u32 duration);
+#endif /* GPAC_DISABLE_ISOM */
+
+#endif /* GPAC_DISABLE_VTT */
+
 #endif		/*_GF_MEDIA_DEV_H_*/

gpac-0.5.0.svn4296.tar.bz2/include/gpac/internal/mpd.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/internal/mpd.h Changed

gpac-0.5.0.svn4296.tar.bz2/include/gpac/internal/scenegraph_dev.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/internal/scenegraph_dev.h Changed

@@ -276,6 +276,7 @@
 
 #ifdef GPAC_HAS_SPIDERMONKEY
 	struct __tag_svg_script_ctx *svg_js;
+	struct __tag_html_media_script_ctx *html_media_js;
 #endif
 
 #endif
@@ -990,6 +991,18 @@
 	Bool force_gc;
 } GF_SVGJS;
 
+typedef struct __tag_html_media_script_ctx 
+{
+	/*global script context for the scene*/
+	struct JSContext *js_ctx;
+	/*global object*/
+	struct JSObject *global;
+	/*global event object - used to update the associated DOMEvent (JS private stack) when dispatching events*/
+	struct JSObject *event;
+
+	Bool force_gc;
+} GF_HTMLMediaJS;
+
 #endif	/*GPAC_DISABLE_SVG*/
 
 /*initialize DOM Core (subset) + xmlHTTPRequest API. The global object MUST have private data storage
@@ -1035,6 +1048,15 @@
 	GF_DOM_EXC_INVALID_ACCESS_ERR = 15,
 	GF_DOM_EXC_VALIDATION_ERR = 16,
 	GF_DOM_EXC_TYPE_MISMATCH_ERR = 17,
+	GF_DOM_EXC_SECURITY_ERR = 18,
+    GF_DOM_EXC_NETWORK_ERR = 19,
+    GF_DOM_EXC_ABORT_ERR = 20,
+    GF_DOM_EXC_URL_MISMATCH_ERR = 21,
+    GF_DOM_EXC_QUOTA_EXCEEDED_ERR = 22,
+    GF_DOM_EXC_TIMEOUT_ERR = 23,
+    GF_DOM_EXC_INVALID_NODE_TYPE_ERR = 24,
+    GF_DOM_EXC_DATA_CLONE_ERR = 25,
+
 };
 
 int dom_throw_exception(struct JSContext *c, u32 code);

gpac-0.5.0.svn4296.tar.bz2/include/gpac/internal/smjs_api.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/internal/smjs_api.h Changed

gpac-0.5.0.svn4296.tar.bz2/include/gpac/internal/terminal_dev.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/internal/terminal_dev.h Changed

@@ -163,6 +163,8 @@
 	/*set to 1 to force all sub-resources to share the timeline of this scene*/
 	Bool force_single_timeline;
 
+	/*set to 1 once the forced size has been sez*/
+	Bool force_size_set;
 
 	/*callback to call to dispatch SVG MediaEvent - this is a pointer to function only because of linking issues
 	with static libgpac (avoids depending on SpiderMonkey and OpenGL32 if not needed)*/
@@ -303,7 +305,7 @@
 	GF_TERM_DEAD = 1<<21,
 	GF_TERM_SINGLE_THREAD = 1<<22,
 	GF_TERM_MULTI_THREAD = 1<<23,
-	GF_TERM_SYSDEC_RESYNC = 1<<24,
+	GF_TERM_DROP_LATE_FRAMES = 1<<24,
 	GF_TERM_SINGLE_CLOCK = 1<<25
 };
 
@@ -511,6 +513,7 @@
 	s32 drift;
 	u32 data_timeout;
 	Bool probe_ocr;
+	u32 last_TS_rendered;
 };
 
 /*destroys clock*/
@@ -529,8 +532,8 @@
 void gf_clock_stop(GF_Clock *ck);
 /*return clock time in ms*/
 u32 gf_clock_time(GF_Clock *ck);
-/*return ellapsed time in ms since start of the clock*/
-u32 gf_clock_ellapse_time(GF_Clock *ck);
+/*return elapsed time in ms since start of the clock*/
+u32 gf_clock_elapse_time(GF_Clock *ck);
 /*sets clock time - FIXME: drift updates for OCRs*/
 void gf_clock_set_time(GF_Clock *ck, u32 TS);
 /*return clock time in ms without drift adjustment - used by audio objects only*/
@@ -650,6 +653,9 @@
 	struct _object_clock *clock;
 	/*flag for clock init. Only a channel owning the clock will set this flag on clock init*/
 	Bool IsClockInit;
+	/*indicates that no DTS is signaled and that they should be recomputed if needed (video only)*/
+	Bool recompute_dts;
+	u32 min_ts_inc, min_computed_cts;
 
 	/*duration of last received AU if any, 0 if not known (most of the time)*/
 	u32 au_duration;
@@ -780,6 +786,11 @@
 	u32 last_unit_dts;
 	/*last processed CTS on base layer - seeking detection*/
 	u32 last_unit_cts;
+	/*minimum non-0 CTS(k) - CTS(j) used to reconstruct CTS timing when codec handles reordering internally...*/
+	u32 min_au_duration;
+	/*recomputed CTS for next dispatch*/
+	u32 recomputed_cts;
+	Bool first_frame_dispatched, first_frame_processed;
 	/*SHA signature for the last processed unit. Only for images (Capacity==1)*/
 	u8 last_unit_signature[20];
 	/*in case the codec performs temporal re-ordering itself*/
@@ -787,6 +798,7 @@
 	u32 prev_au_size;
 	u32 bytes_per_sec;
 	Double fps;
+	u32 nb_dispatch_skipped;
 
 	/*statistics*/
 	u32 last_stat_start, cur_bit_size;
@@ -818,6 +830,8 @@
 instance when loading a BT with an animation stream*/
 GF_Codec *gf_codec_use_codec(GF_Codec *codec, GF_ObjectManager *odm);
 
+GF_Err gf_codec_resize_composition_buffer(GF_Codec *dec, u32 NewSize);
+
 /*OD manager*/
 
 enum
@@ -1015,8 +1029,8 @@
 	u32 framesize;
 	/*pointer to data frame */
 	char *frame;
-	/*nodes currently registered with the media object - used to dispatch MediaAccessEvents*/
-	GF_List *nodes;
+	/* used to dispatch Media Access Events and HTML5 Media and Media Source Events */
+	GF_List *evt_targets;
 	/*pointer to the node responsible for the creation of this media object
 	ONLY used for scene media type (animationStreams) 
 	Reset upon creation of the decoder.

gpac-0.5.0.svn4296.tar.bz2/include/gpac/isomedia.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/isomedia.h Changed

@@ -199,6 +199,7 @@
 	GF_ISOM_SUBTYPE_AC3			= GF_4CC( 'a', 'c', '-', '3' ),
 
 	GF_ISOM_SUBTYPE_LSR1		= GF_4CC( 'l', 's', 'r', '1' ),
+	GF_ISOM_SUBTYPE_WVTT		= GF_4CC( 'w', 'v', 't', 't' ),
 };
 
 
@@ -385,8 +386,11 @@
 no information wrt number fragments (which could actually be generated on the fly 
 at the sender side), you must call this function on regular bases in order to
 load newly downloaded fragments. Note this may result in Track/Movie duration changes
-and SampleCount change too ...*/
-GF_Err gf_isom_refresh_fragmented(GF_ISOFile *the_file, u64 *MissingBytes);
+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);
 
 /*check if file has movie info, eg has tracks & dynamic media. Some files may just use
 the base IsoMedia structure without "moov" container*/
@@ -1202,14 +1206,17 @@
 fragment media data for all tracks*/
 GF_Err gf_isom_start_fragment(GF_ISOFile *movie, Bool moof_first);
 
-/*starts a new segment in the file. If SegName is given, the output will be written in the SegName file*/
-GF_Err gf_isom_start_segment(GF_ISOFile *movie, char *SegName);
+/*starts a new segment in the file. If SegName is given, the output will be written in the SegName file. If memory_mode is set, all samples writing is done in memory rather than on disk*/
+GF_Err gf_isom_start_segment(GF_ISOFile *movie, char *SegName, Bool memory_mode);
 
 /*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, u64 *index_start_range, u64 *index_end_range);
+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);
+
+/*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);
 
 /*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, 
@@ -1600,6 +1607,8 @@
 	GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG = 1<<16,
 	/*above mode is applied and all start codes are rewritten*/
 	GF_ISOM_NALU_EXTRACT_ANNEXB_FLAG = 2<<16,
+	/*above mode is applied and VDRD NAL unit is inserted before SVC slice*/
+	GF_ISOM_NALU_EXTRACT_VDRD_FLAG = 1<<18,
 };
 
 GF_Err gf_isom_set_nalu_extract_mode(GF_ISOFile *the_file, u32 trackNumber, u32 nalu_extract_mode);
@@ -1620,6 +1629,9 @@
 /*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)*/
+GF_Err gf_isom_hevc_set_inband_config(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
+
 
 /*creates new AVC config*/
 GF_Err gf_isom_hevc_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_HEVCConfig *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex);
@@ -1678,6 +1690,9 @@
 /*destroy generic subtitle sample handle*/
 void gf_isom_delete_generic_subtitle_sample(GF_GenericSubtitleSample *generic_subtitle_samp);
 
+GF_Err gf_isom_new_webvtt_description(GF_ISOFile *movie, u32 trackNumber, GF_TextSampleDescriptor *desc, char *URLname, char *URNname, u32 *outDescriptionIndex);
+GF_Err gf_isom_update_webvtt_description(GF_ISOFile *movie, u32 trackNumber, u32 descriptionIndex, const char *config);
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 /*Create a new TextSampleDescription in the file. 
@@ -1747,6 +1762,11 @@
 
 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);

gpac-0.5.0.svn4296.tar.bz2/include/gpac/list.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/list.h Changed

@@ -55,6 +55,7 @@
  *	\return new list object
  */
 GF_List *gf_list_new();
+
 /*!
  *	\brief list destructor
  *
@@ -63,6 +64,7 @@
  *	\note It is the caller responsability to destroy the content of the list if needed
  */
 void gf_list_del(GF_List *ptr);
+
 /*!
  *	\brief get count
  *
@@ -71,6 +73,7 @@
  *	\return number of items in the list
  */
 u32 gf_list_count(const GF_List *ptr);
+
 /*!
  *	\brief add item
  *
@@ -79,6 +82,7 @@
  *	\param item item to add
  */
 GF_Err gf_list_add(GF_List *ptr, void* item);
+
 /*!
  *	\brief inserts item
  *
@@ -88,6 +92,7 @@
  *	\param position insertion position. It is expressed between 0 and gf_list_count-1, and any bigger value is equivalent to gf_list_add
  */
 GF_Err gf_list_insert(GF_List *ptr, void *item, u32 position);
+
 /*!
  *	\brief removes item
  *
@@ -97,6 +102,7 @@
  *	\note It is the caller responsability to destroy the content of the list if needed
  */
 GF_Err gf_list_rem(GF_List *ptr, u32 position);
+
 /*!
  *	\brief gets item
  *
@@ -105,6 +111,7 @@
  *	\param position position of the item to get. It is expressed between 0 and gf_list_count-1.
  */
 void *gf_list_get(GF_List *ptr, u32 position);
+
 /*!
  *	\brief finds item
  *
@@ -114,6 +121,7 @@
  *	\return 0-based item position in the list, or -1 if the item could not be found.
  */
 s32 gf_list_find(GF_List *ptr, void *item);
+
 /*!
  *	\brief deletes item
  *
@@ -123,6 +131,7 @@
  *	\return 0-based item position in the list before removal, or -1 if the item could not be found.
  */
 s32 gf_list_del_item(GF_List *ptr, void *item);
+
 /*!
  *	\brief resets list
  *
@@ -131,6 +140,7 @@
  *	\note It is the caller responsability to destroy the content of the list if needed
  */
 void gf_list_reset(GF_List *ptr);
+
 /*!
  *	\brief gets last item
  *
@@ -138,6 +148,15 @@
  *	\param ptr target list object
  */
 void *gf_list_last(GF_List *ptr);
+
+/*!
+ *	\brief reverses the order of the elements in the list container.
+ *
+ *	reverses the order of the elements in the list container.
+ *	\param ptr target list object
+ */
+void gf_list_reverse(GF_List *ptr);
+
 /*!
  *	\brief removes last item
  *
@@ -159,6 +178,16 @@
 void *gf_list_enum(GF_List *ptr, u32 *pos);
 
 /*!
+ *	\brief list enumerator in reversed order
+ *
+ *	Retrieves the given list item in reversed order and update current position
+ *	\param ptr target list object
+ *	\param pos target item position. The position is automatically decrelented regardless of the return value
+ *	\note A typical enumeration in reversed order will start with a value of 0 until NULL is returned.
+ */
+void *gf_list_rev_enum(GF_List *ptr, u32 *pos);
+
+/*!
  *	\brief list swap
  *
  *	Swaps content of two lists
@@ -167,6 +196,35 @@
  */
 GF_Err gf_list_swap(GF_List *l1, GF_List *l2);
 
+/*!
+ *	\brief clone list
+ *
+ *	Returns a new list as an exact copy of the given list
+ *	\param ptr the list to clone
+ *	\return the cloned list
+ */
+GF_List* gf_list_clone(GF_List *ptr);
+
+/*!
+ *	\brief Pop the first element in the list
+ *
+ *	Removes the first element in the list container, effectively reducing its size by one 
+ *  and returns the popped element.
+ *	\param ptr the list to pop
+ *	\return the popped element
+ */
+void* gf_list_pop_front(GF_List *ptr);
+
+/*!
+ *	\brief Pop the last element in the list
+ *
+ *	Removes the last element in the list container, effectively reducing the container size by one
+ *  and return the popped element.
+ *	\param ptr the list to pop
+ *	\return the popped element
+ */
+void* gf_list_pop_back(GF_List *ptr);
+
 /*! @} */
 
 #ifdef __cplusplus

gpac-0.5.0.svn4668.tar.bz2/include/gpac/map.h Added

@@ -0,0 +1,208 @@
+/*
+ *			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-0.5.0.svn4296.tar.bz2/include/gpac/media_tools.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/media_tools.h Changed

@@ -260,6 +260,7 @@
 /* Merge SVC layers*/
 GF_Err gf_media_merge_svc(GF_ISOFile *file, u32 track, Bool mergeAll);
 
+GF_Err gf_media_split_hevc_tiles(GF_ISOFile *file);
 #endif /*GPAC_DISABLE_MEDIA_IMPORT*/
 
 
@@ -297,9 +298,9 @@
 							   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,
-							   Bool segments_start_with_rap, Double dash_duration_sec, char *seg_rad_name, char *seg_ext,
+							   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);
+							   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);
 
 /*returns time to wait until end of currently generated segments*/
 u32 gf_dasher_next_update_time(GF_Config *dash_ctx, u32 mpd_update_time);
@@ -323,7 +324,7 @@
 	/*track dumper types are formatted as flags for conveniency for 
 	authoring tools, but never used as a OR'ed set*/
 	/*native format (JPG, PNG, MP3, etc) if supported*/
-	GF_EXPORT_NATIVE = 1,
+	GF_EXPORT_NATIVE = GF_TRUE,
 	/*raw samples (including hint tracks for rtp)*/
 	GF_EXPORT_RAW_SAMPLES = (1<<1),
 	/*NHNT format (any MPEG-4 media)*/
@@ -351,6 +352,8 @@
 	GF_EXPORT_NHML_FULL = (1<<11),
 	/**/
 	GF_EXPORT_SVC_LAYER = (1<<12),
+	/* Don't merge identical cues in consecutive samples */
+	GF_EXPORT_WEBVTT_NOMERGE = (1<<13),
 	/*ony probes extraction format*/
 	GF_EXPORT_PROBE_ONLY = (1<<30),
 	/*when set by user during export, will abort*/

gpac-0.5.0.svn4296.tar.bz2/include/gpac/mediaobject.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/mediaobject.h Changed

@@ -114,7 +114,7 @@
 
 u32 gf_mo_get_last_frame_time(GF_MediaObject *mo);
 
-Bool gf_mo_get_visual_info(GF_MediaObject *mo, u32 *width, u32 *height, u32 *stride, u32 *pixel_ar, u32 *pixelFormat);
+Bool gf_mo_get_visual_info(GF_MediaObject *mo, u32 *width, u32 *height, u32 *stride, u32 *pixel_ar, u32 *pixelFormat, Bool *is_flipped);
 
 Bool gf_mo_get_audio_info(GF_MediaObject *mo, u32 *sample_rate, u32 *bits_per_sample, u32 *num_channels, u32 *channel_config);
 
@@ -149,6 +149,22 @@
 /*returns scene graph associated with a scene/document object, or NULL if wrong type or not loaded*/
 GF_SceneGraph *gf_mo_get_scenegraph(GF_MediaObject *mo);
 
+#include <gpac/scenegraph_svg.h>
+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);
+GF_DOMEventTarget  *gf_mo_event_target_get(GF_MediaObject *mo, u32 i);
+void                gf_mo_event_target_reset(GF_MediaObject *mo);
+u32                 gf_mo_event_target_count(GF_MediaObject *mo);
+s32                 gf_mo_event_target_find_by_node(GF_MediaObject *mo, GF_Node *node);
+GF_Node            *gf_mo_event_target_enum_node(GF_MediaObject *mo, u32 *i);
+
+GF_Node            *gf_event_target_get_node(GF_DOMEventTarget *target);
+
 #ifdef __cplusplus
 }
 #endif

gpac-0.5.0.svn4296.tar.bz2/include/gpac/module.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/module.h Changed

@@ -120,15 +120,62 @@
 	_ifce->author_name = _ifce_author ? _ifce_author : "gpac distribution";	\
 	
 /*!
+ *\brief module interface function export. Modules that can be compiled in libgpac rather than in sharde libraries shall use this macro to declare the 3 exported functions
+ *\hideinitializer
+ *
+*/
+#ifdef GPAC_STATIC_MODULES
+#define GPAC_MODULE_EXPORT	static
+#else
+#define GPAC_MODULE_EXPORT	GF_EXPORT
+#endif
+
+/*!
+ *\brief Interface Registry
+ *
+ *This structure represent a base interface loader, when not using dynamic / shared libraries
+ */
+typedef struct
+{
+	const char *name;
+	const u32 *(*QueryInterfaces) ();
+	GF_BaseInterface * (*LoadInterface) (u32 InterfaceType);
+	void (*ShutdownInterface) (GF_BaseInterface *interface_obj);
+} GF_InterfaceRegister;
+
+/*!
+ *\brief module interface function export. Modules that can be compiled in libgpac rather than in sharde libraries shall use this macro to declare the 3 exported functions
+ *\hideinitializer
+ *
+*/
+#ifdef GPAC_STATIC_MODULES
+
+#define GPAC_MODULE_STATIC_DELARATION(__name)	\
+	GF_InterfaceRegister *gf_register_module_##__name()	{	\
+		GF_InterfaceRegister *reg;	\
+		GF_SAFEALLOC(reg, GF_InterfaceRegister);	\
+		reg->name = "gsm_" #__name;	\
+		reg->QueryInterfaces = QueryInterfaces;	\
+		reg->LoadInterface = LoadInterface;	\
+		reg->ShutdownInterface = ShutdownInterface;	\
+		return reg;\
+	}	\
+
+#else
+#define GPAC_MODULE_STATIC_DELARATION(__name)
+#endif
+/*!
  *\brief module manager construtcor
  *
  *Constructs a module manager object.
- *\param directory absolute path to the directory where the manager shall look for modules
+ *\param directory absolute path to the directory where the manager shall look for modules \deprecated {Module manager uses now 
+ *  infomation from cfg file}
  *\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
 */
 GF_ModuleManager *gf_modules_new(const char *directory, GF_Config *cfgFile);
+
 /*!
  *\brief module manager destructor
  *
@@ -155,6 +202,16 @@
 u32 gf_modules_get_count(GF_ModuleManager *pm);
 
 /*!
+ *\brief get all modules directories
+ *
+ * Update module manager with all modules directories
+ *\param pm the module manager
+ *\param num_dirs the number of module directories
+ *\return The list of modules directories
+ */
+const char **gf_modules_get_module_directories(GF_ModuleManager *pm, u32* num_dirs);
+
+/*!
  *\brief get module file name
  *
  *Gets a module shared library file name based on its index

gpac-0.5.0.svn4296.tar.bz2/include/gpac/modules/codec.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/modules/codec.h Changed

gpac-0.5.0.svn4296.tar.bz2/include/gpac/modules/font.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/modules/font.h Changed

gpac-0.5.0.svn4296.tar.bz2/include/gpac/modules/hardcoded_proto.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/modules/hardcoded_proto.h Changed

gpac-0.5.0.svn4296.tar.bz2/include/gpac/modules/service.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/modules/service.h Changed

@@ -77,6 +77,9 @@
 	GF_NET_CHAN_RECONFIG,
 	/*signal channel is ISMACryp'ted (net->term only)*/
 	GF_NET_CHAN_DRM_CFG,
+
+	/*reset channel - this is need when we turn off this channel in rtp/mpeg2ts*/
+	GF_NET_CHAN_RESET,
 	
 	/*retrieves ESD for channel - net->term only, for cache configuration*/
 	GF_NET_CHAN_GET_ESD,
@@ -108,6 +111,8 @@
 	/*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,
 } GF_NET_CHAN_CMD;
 
 /*channel command for all commands that don't need params:
@@ -316,6 +321,13 @@
 typedef struct
 {
 	u32 command_type;
+	//input 
+
+	/*drops first segment */
+	Bool drop_first_segment;
+
+	//output
+
 	/*out: next url to play after current one*/
 	const char *next_url;
 	/*out: range in given URL to be played - usually 0-0 as segments are downloaded to cache
@@ -330,6 +342,13 @@
 	/*out: initialization/switching segment of next URL to play, if different from previous init segment*/
 	const char *next_url_init_or_switch_segment;
 	u64 switch_start_range, switch_end_range;
+
+
+	/*indicates that the return URL is the currently downloaded one, not yet completed (progressive mode only).	*/
+	Bool is_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;
+
 } GF_NetURLQuery;
 
 /*GF_NET_SERVICE_QUALITY_SWITCH*/
@@ -342,6 +361,17 @@
 	Bool up;
 } GF_NetQualitySwitch;
 
+/*GF_NET_SERVICE_STATUS_PROXY*/
+typedef struct
+{
+	u32 command_type;
+	GF_Err e;
+	LPNETCHANNEL channel;
+	Bool is_disconnect;
+	Bool is_add_media;
+	GF_Descriptor *desc;
+} GF_NetServiceStatus;
+
 typedef union __netcommand
 {
 	u32 command_type;
@@ -362,6 +392,7 @@
 	GF_NetComMigration migrate;
 	GF_NetURLQuery url_query;
 	GF_NetQualitySwitch switch_quality;
+	GF_NetServiceStatus status;
 } GF_NetworkCommand;
 
 /*
@@ -450,6 +481,7 @@
 /*proxy stuff*/
 	GF_Err (*query_proxy)(struct _netinterface *, GF_NetworkCommand *param);
 	void *proxy_udta;
+	Bool proxy_type; /* 0 corresponds to a proxy without full command support */
 	/*!
 	 * This is needed for modules supporting mime types, when this method is called,
 	 * the module has to call gf_term_register_mime_type() for all the mime-types

gpac-0.5.0.svn4296.tar.bz2/include/gpac/mpeg4_odf.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/mpeg4_odf.h Changed

gpac-0.5.0.svn4296.tar.bz2/include/gpac/mpegts.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/mpegts.h Changed

@@ -64,6 +64,8 @@
 	/* ... */	
 	GF_M2TS_AVC_TIMING_HRD_DESCRIPTOR			= 0x2A,
 	/* ... */
+	GF_M2TS_SVC_EXTENSION_DESCRIPTOR			= 0x30,
+	/* ... */
 	GF_M2TS_MPEG4_ODUPDATE_DESCRIPTOR			= 0x35,
 
 	/* 0x2D - 0x3F - ISO/IEC 13818-6 values */
@@ -206,8 +208,10 @@
 	GF_M2TS_SYSTEMS_MPEG4_SECTIONS	= 0x13,
 
 	GF_M2TS_VIDEO_H264				= 0x1B,
+	GF_M2TS_VIDEO_SVC				= 0x1F,
 	GF_M2TS_VIDEO_HEVC				= 0x24,
 
+	GF_M2TS_VIDEO_DCII				= 0x80,
 	GF_M2TS_AUDIO_AC3				= 0x81,
 	GF_M2TS_AUDIO_DTS				= 0x8A,
 	GF_M2TS_MPE_SECTIONS            = 0x90,
@@ -462,6 +466,8 @@
 	/*for hybrid use-cases we need to know if TDT has already been processed*/
 	Bool tdt_found;
 
+	u32 pid_playing;
+	Bool is_scalable;
 } GF_M2TS_Program;
 
 /*ES flags*/
@@ -479,6 +485,8 @@
 	GF_M2TS_ES_IS_MPEG4_OD = 1<<4,
 	/*ES is a DVB MPE stream*/
 	GF_M2TS_ES_IS_MPE = 1<<5,
+	/*stream is used to send PCR to upper layer*/
+	GF_M2TS_INHERIT_PCR = 1<<6,
 	
 	/*all flags above this mask are used by importers & co*/
 	GF_M2TS_ES_STATIC_FLAGS_MASK = 0x0000FFFF,
@@ -503,7 +511,7 @@
 			s16 component_tag; \
 			void *user; \
 			u64 first_dts; \
-			u32 service_id;
+			u32 service_id; 
 
 struct tag_m2ts_es
 {
@@ -554,6 +562,9 @@
 
 	/*object info*/
 	u32 vid_w, vid_h, vid_par, aud_sr, aud_nb_ch, aud_obj_type;
+
+	u32 depends_on_pid;
+
 	/*user private*/
 
 
@@ -608,7 +619,7 @@
 	u32 running_status;
 	u32 free_CA_mode;
 	u8 service_type;
-	unsigned char *provider, *service;
+	char *provider, *service;
 } GF_M2TS_SDT;
 
 typedef struct
@@ -762,6 +773,7 @@
 	const char *ts_data_chunk;
 	u32 ts_data_chunk_size;
 
+	const char *record_to;
 	/* "Network" =  "MobileIP", "DefaultMCastInterface" */
 	Bool MobileIPEnabled;
 	const char *network_type;
@@ -810,8 +822,12 @@
 
 	const char *dvb_channels_conf_path;
 
-	/*for DASH*/
-	GF_Err (*query_next)(void *udta, Bool query_init_range, const char **next_url, u64 *next_start_range, u64 *next_end_range);
+	/*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;
 
@@ -829,6 +845,7 @@
 void gf_m2ts_reset_parsers(GF_M2TS_Demuxer *ts);
 GF_ESD *gf_m2ts_get_esd(GF_M2TS_ES *es);
 GF_Err gf_m2ts_set_pes_framing(GF_M2TS_PES *pes, u32 mode);
+void gf_m2ts_es_del(GF_M2TS_ES *es, GF_M2TS_Demuxer *ts);
 GF_Err gf_m2ts_process_data(GF_M2TS_Demuxer *ts, char *data, u32 data_size);
 u32 gf_dvb_get_freq_from_url(const char *channels_config_path, const char *url);
 void gf_m2ts_demux_dmscc_init(GF_M2TS_Demuxer *ts);
@@ -1010,6 +1027,9 @@
 	GF_SLHeader sl_header;
 
 	u32 last_aac_time;
+
+	/*list of GF_M2TSDescriptor to add to the MPEG-2 stream. By default set to NULL*/
+	GF_List *loop_descriptors;
 } GF_M2TS_Mux_Stream;
 
 enum {
@@ -1026,7 +1046,6 @@
 	char *data;
 } GF_M2TSDescriptor;
 
-
 struct __m2ts_mux_program {
 	struct __m2ts_mux_program *next;
 
@@ -1052,17 +1071,21 @@
 	GF_Descriptor *iod;
 	/*list of GF_M2TSDescriptor to add to the program descriptor loop. By default set to NULL, if non null will be reset and destroyed upon cleanup*/
 	GF_List *loop_descriptors;
-	Bool mpeg4_signaling;
+	u32 mpeg4_signaling;
 	Bool mpeg4_signaling_for_scene_only;
 
-	/*
-		1: signals to force pat/pmt after current PES
-		2: forces pat to be sent 
-		3: forces pmt to be sent after PAT
-	*/
-	u32 force_pat_pmt_state;
 };
 
+enum
+{
+	GF_SEG_BOUNDARY_NONE=0,
+	GF_SEG_BOUNDARY_START,
+	GF_SEG_BOUNDARY_FORCE_PAT,
+	GF_SEG_BOUNDARY_FORCE_PMT,
+	GF_SEG_BOUNDARY_FORCE_PCR,
+};
+
+
 struct __m2ts_mux {
 	GF_M2TS_Mux_Program *programs;
 	GF_M2TS_Mux_Stream *pat;
@@ -1102,8 +1125,15 @@
 	Bool one_au_per_pes;
 
 	Bool eos_found;
-	u32 pck_sent_over_br_window, last_br_time, avg_br;
+	u32 pck_sent_over_br_window, last_br_time;
 	u64 tot_pck_sent, tot_pad_sent, tot_pes_pad_bytes;
+
+
+	u32 average_birate_kbps;
+
+	Bool flush_pes_at_rap;
+	/*cf enum above*/
+	u32 force_pat_pmt_state;
 };
 
 
@@ -1128,7 +1158,7 @@
 void gf_m2ts_mux_update_config(GF_M2TS_Mux *mux, Bool reset_time);	
 void gf_m2ts_mux_update_bitrate(GF_M2TS_Mux *mux);
 
-const char *gf_m2ts_mux_process(GF_M2TS_Mux *muxer, u32 *status);
+const char *gf_m2ts_mux_process(GF_M2TS_Mux *muxer, u32 *status, u32 *usec_till_next);
 u32 gf_m2ts_get_sys_clock(GF_M2TS_Mux *muxer);
 u32 gf_m2ts_get_ts_clock(GF_M2TS_Mux *muxer);
 
@@ -1146,7 +1176,6 @@
 
 
 #define UDP_BUFFER_SIZE	0x40000
-#define M2TS_BUFFER_MAX 400
 
 
 #ifdef GPAC_HAS_LINUX_DVB
@@ -1180,11 +1209,15 @@
 
 
 #ifndef GPAC_DISABLE_MPEG2TS
-GF_Err TSDemux_Demux_Setup(GF_M2TS_Demuxer *ts, const char *url, Bool loop);
-GF_Err TSDemux_DemuxPlay(GF_M2TS_Demuxer *ts);
-GF_Err TSDemux_CloseDemux(GF_M2TS_Demuxer *ts);
+GF_Err gf_m2ts_demuxer_setup(GF_M2TS_Demuxer *ts, const char *url, Bool loop);
+GF_Err gf_m2ts_demuxer_play(GF_M2TS_Demuxer *ts);
+GF_Err gf_m2ts_demuxer_close(GF_M2TS_Demuxer *ts);
 
 
 #endif /*GPAC_DISABLE_MPEG2TS*/
 
+/*quick hack to get M2TS over IP or UDP socket*/
+GF_Err gf_m2ts_get_socket(const char *url, const char *mcast_ifce_or_mobileip, u32 buf_size, GF_Socket **out_socket);
+
+
 #endif	//_GF_MPEG_TS_H_

gpac-0.5.0.svn4296.tar.bz2/include/gpac/network.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/network.h Changed

@@ -66,6 +66,7 @@
  \note the returned string must be freed by user
  */
 char *gf_url_get_absolute_path(const char *pathName, const char *parentPath);
+
 /*concatenates URL and gets back full URL - returned string must be freed by user*/
 /*!
  *\brief URL concatenation
@@ -100,7 +101,7 @@
 /*!
  *\brief Extract resource name from URL
  *
- *Ectracts the reource name from the URL
+ * Extracts the resource name from the URL
  *\param url input url 
  *\return resource name.
  */
@@ -109,7 +110,7 @@
 /*!
  *\brief Extract resource path from URL
  *
- *Ectracts the reource path from the URL
+ *Extracts the reource path from the URL
  *\param url input url 
  *\param res_path buffer for resulting path storage
  *\return 1 if path was extracted, 0 if url is a single file name.
@@ -117,6 +118,25 @@
 Bool gf_url_get_resource_path(const char *url, char *res_path);
 
 /*!
+ *\brief Remove last delimenter from URL
+ *
+ * Remove last delimenter from URL
+ *\param url input url 
+ *\param res_path buffer for resulting path storage
+ *\return GF_TRUE if delimiter was extracted, otherwise GF_FALSE.
+ */
+Bool gf_url_remove_last_delimiter(const char *sURL, char *res_path);
+
+/*!
+ *\brief Extract extension from a resource path in URL
+ *
+ * Extract a resource path of URL and analyze its extension
+ *\param url input url 
+ *\return The corresponding extension if exists, otherwise NULL.
+ */
+const char* gf_url_get_ressource_extension(const char *sURL);
+
+/*!
  *\brief gets UTC time 
  *
  *Gets UTC time since midnight Jan 1970

gpac-0.5.0.svn4296.tar.bz2/include/gpac/options.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/options.h Changed

gpac-0.5.0.svn4296.tar.bz2/include/gpac/rtp_streamer.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/rtp_streamer.h Changed

gpac-0.5.0.svn4296.tar.bz2/include/gpac/scenegraph_svg.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/scenegraph_svg.h Changed

@@ -264,20 +264,19 @@
 };
 
 /*possible event targets*/
-enum
+typedef enum
 {
 	GF_DOM_EVENT_NODE,
 	GF_DOM_EVENT_DOCUMENT,
-	GF_DOM_EVENT_XHR,
-	GF_DOM_EVENT_TIMER,
-	GF_DOM_EVENT_CONNECTION,
-};
+	GF_DOM_EVENT_JS
+} GF_DOMEventTargetType;
 
 typedef struct 
 {
 	GF_List *evt_list;
 	void *ptr;
-	u32 ptr_type;
+	GF_DOMEventTargetType ptr_type;
+	GF_List *listeners;
 } GF_DOMEventTarget;
 
 GF_Err gf_sg_listener_add(GF_Node *listener, GF_DOMEventTarget *evt_target);
@@ -349,6 +348,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);
 
 /*fires event on the specified node
 BE CAREFULL: event execution may very well destroy ANY node, especially the event target node !!
@@ -366,20 +366,29 @@
 /*listener is simply a node added to the node events list. 
 Only one observer can be attached to a listener. The listener will remove itself from the observer
 event list when destructed.*/
+#define GF_DOM_BASE_LISTENER 	\
+	/* JavaScript context in which the listener is applicable */ \
+	void *js_context; \
+	/*target EventListener object (this) */ \
+	void *evt_listen_obj; \
+	/*function value for spidermonkey - we cannot use JS_CallFunction since it does not work on closures \
+	we use 64 bits to store the value for portability safety*/\
+	u64 js_fun_val;\
+	/*compiled function for the case were CallFunction is needed*/\
+	void *js_fun; \
+	/* 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
 	void (*handle_event)(GF_Node *hdl, GF_DOM_Event *event, GF_Node *observer);
-	/*if handler targets a VRML script, point to the script here*/
-	void *js_context;
-	/*target EventListener object (this) */
-	void *evt_listen_obj;
-	/*function value for spidermonkey - we cannot use JS_CallFunction since it does not work on closures
-	we use 64 bits to store the value for portability safety*/
-	u64 js_fun_val;
-	/*compiled function for the case were CallFunction is needed*/
-	void *js_fun;
+	GF_DOM_BASE_LISTENER
 } GF_DOMHandler;
 
 
@@ -412,6 +421,8 @@
 	/*MediaAccess events*/
 	GF_DOM_EVENT_MEDIA_ACCESS = 1<<11,
 #endif
+	/*HTML Media Source events*/
+	GF_DOM_EVENT_MEDIASOURCE = 1<<12,
 
 	/*fake events - these events are NEVER fired*/
 	GF_DOM_EVENT_FAKE = 1<<31,

gpac-0.5.0.svn4296.tar.bz2/include/gpac/scenegraph_vrml.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/scenegraph_vrml.h Changed

gpac-0.5.0.svn4296.tar.bz2/include/gpac/setup.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/setup.h Changed

gpac-0.5.0.svn4296.tar.bz2/include/gpac/sync_layer.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/sync_layer.h Changed

gpac-0.5.0.svn4296.tar.bz2/include/gpac/thread.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/thread.h Changed

@@ -279,6 +279,80 @@
 */
 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.svn4296.tar.bz2/include/gpac/tools.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/tools.h Changed

@@ -62,7 +62,7 @@
 #define gf_stringizer(x) #x
 
 /*!
- *	\brief Memory allocation
+ *	\brief Memory allocation for a structure
  *	\hideinitializer
  *
  *	Macro allocating memory and zero-ing it
@@ -70,6 +70,14 @@
 #define GF_SAFEALLOC(__ptr, __struct) { __ptr = (__struct *) gf_malloc(sizeof(__struct)); if (__ptr) memset((void *) __ptr, 0, sizeof(__struct)); }
 
 /*!
+ *	\brief Memory allocation for an array of n structs
+ *	\hideinitializer
+ *
+ *	Macro allocating memory for n structures and zero-ing it
+*/
+#define GF_SAFE_ALLOC_N(__ptr, __n, __struct) { __ptr = (__struct *) gf_malloc( __n * sizeof(__struct)); if (__ptr) memset((void *) __ptr, 0, __n * sizeof(__struct)); }
+
+/*!
  *	\brief 4CC Formatting
  *	\hideinitializer
  *
@@ -243,7 +251,15 @@
 	/*! Authentication with the remote host has failed*/
 	GF_AUTHENTICATION_FAILURE				= -50,
 	/*! Script not ready for playback */
-	GF_SCRIPT_NOT_READY						= -51
+	GF_SCRIPT_NOT_READY						= -51,
+	/*! Bad configuration for the current contex */
+	GF_INVALID_CONFIGURATION				= -52,
+	/*! The element has not been found */
+	GF_NOT_FOUND							= -53,
+	/*! The filter is missing at least one requirement */
+	GF_MISSING_REQUIREMENTS					= -54,
+	/*! Unexpected format of data */
+	GF_WRONG_DATAFORMAT						= -55
 } GF_Err;
 
 /*!
@@ -352,12 +368,16 @@
 	GF_LOG_MODULE,
 	/*! Log for threads and mutexes */
 	GF_LOG_MUTEX,
+	/*! Log for threads and condition */
+	GF_LOG_CONDITION,
 	/*! Log for all HTTP streaming */
 	GF_LOG_DASH,
 	/*! Log for all messages coming from GF_Terminal or script alert()*/
 	GF_LOG_CONSOLE,
 	/*! Log for all messages coming the application, not used by libgpac or the modules*/
 	GF_LOG_APP,
+	/*! Log for all messages coming from the scheduler */
+	GF_LOG_SCHEDULER,
 
 	/*! special value used to set a level for all tools*/
 	GF_LOG_ALL,
@@ -693,6 +713,14 @@
 u32 gf_crc_32(const char *data, u32 size);
 
 
+/*!
+ *\brief gets UTC time in milliseconds 
+ *
+ *Gets UTC clock in milliseconds
+ \retrun UTC time in seconds
+ */
+u64 gf_net_get_utc();
+
 /*!\brief run-time system info object
  *
  *The Run-Time Info object is used to get CPU and memory occupation of the calling process.
@@ -830,7 +858,7 @@
  * Output SHA-1(buf)
  */
 void gf_sha1_csum(u8 *buf, u32 buflen, u8 digest[20]);
-
+void gf_sha1_csum_hexa(u8 *buf, u32 buflen, u8 digest[41]);
 
 #ifdef GPAC_ANDROID
 typedef void (*fm_callback_func)(void *cbk_obj, u32 type, u32 param, int *value);

gpac-0.5.0.svn4296.tar.bz2/include/gpac/version.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/version.h Changed

gpac-0.5.0.svn4296.tar.bz2/include/gpac/xml.h -> gpac-0.5.0.svn4668.tar.bz2/include/gpac/xml.h Changed

@@ -138,14 +138,102 @@
 void gf_xml_dom_del(GF_DOMParser *parser);
 GF_Err gf_xml_dom_parse(GF_DOMParser *parser, const char *file, gf_xml_sax_progress OnProgress, void *cbk);
 GF_Err gf_xml_dom_parse_string(GF_DOMParser *dom, char *string);
-GF_XMLNode *gf_xml_dom_get_root(GF_DOMParser *parser);
 const char *gf_xml_dom_get_error(GF_DOMParser *parser);
 u32 gf_xml_dom_get_line(GF_DOMParser *parser);
 
+/*
+ *\brief Serialize a node
+ *
+ * Flush a node in a char
+ *
+ *\param node the node to flush
+ *\param content_only Whether to include or not the parent node
+ *\return The resulting serialization
+ */
 char *gf_xml_dom_serialize(GF_XMLNode *node, Bool content_only);
 
+/*
+ *\brief Create the root element of the DOM
+ *
+ * Create the root element -- the only top level element -- of the document. 
+ *
+ *\param parser the DOM structure
+ *\return The created node if creation occurs properly, otherwise NULL;
+ */
+GF_XMLNode *gf_xml_dom_create_root(GF_DOMParser *parser, const char* name);
+
+/*
+ *\brief Get the root element of the DOM
+ *
+ * Get the root element -- the only top level element -- of the document. 
+ *
+ *\param parser the DOM structure
+ *\return The corresponding node if exists, otherwise NULL;
+ */
+GF_XMLNode *gf_xml_dom_get_root(GF_DOMParser *parser);
 
+/*
+ *\brief Return and detach the root element of the DOM
+ *
+ * Return and detach the root element of the DOM
+ *
+ *\param parser the DOM structure
+ *\return The corresponding node if exists, otherwise NULL;
+ */
 GF_XMLNode *gf_xml_dom_detach_root(GF_DOMParser *parser);
+
+/*
+ *\brief Sets an attribute value for this element.
+ *
+ * Sets an attribute value for this element
+ *
+ *\param node the GF_XMLNode node
+ *\param name the name of the attribute
+ *\param value the value of the attribute
+ *\return The created attribute if setting occurs properly, otherwise NULL;
+ */
+GF_XMLAttribute *gf_xml_dom_set_attribute(GF_XMLNode *node, const char* name, const char* value);
+
+/*
+ *\brief Gets the attribute for this element with the given name.
+ *
+ * Gets the attribute for this element with the given name.
+ *
+ *\param node the GF_XMLNode node
+ *\param name the attribute name
+ *\return The corresponding attribute if exists, otherwise NULL;
+ */
+GF_XMLAttribute *gf_xml_dom_get_attribute(GF_XMLNode *node, const char* name);
+
+/*
+ *\brief Adds the node to the end of the list of children of this node.
+ *
+ * Adds the node to the end of the list of children of this node.
+ *
+ *\param node the GF_XMLNode node
+ *\param child the GF_XMLNode child to append
+ *\return GF_OK if append occurs properly, otherwise a GF_Err
+ */
+GF_Err gf_xml_dom_append_child(GF_XMLNode *node, GF_XMLNode *child);
+
+/*
+ *\brief Node constructor.
+ *
+ * Creates a node with the given name and namespace URI.
+ *
+ *\param ns the node namespace
+ *\param name the name namespace
+ *\return The created GF_XMLNode if creation occurs properly, otherwise NULL;
+ */
+GF_XMLNode* gf_xml_dom_node_new(const char* ns, const char* name);
+
+/*
+ *\brief Node destructor.
+ *
+ * Free a node, its attributes and its childs.
+ *
+ *\param node the node to free
+ */
 void gf_xml_dom_node_del(GF_XMLNode *node);
 
 /*! @} */

gpac-0.5.0.svn4296.tar.bz2/mkdmg.sh -> gpac-0.5.0.svn4668.tar.bz2/mkdmg.sh Changed

@@ -1,12 +1,10 @@
-#!/bin/sh
-#set -e
+#!/bin/sh -e
 
 source_path=.
 
 function rewrite_deps {
-dylib=$1
 # echo rewriting deps for $1
-for ref in `otool -L $1 | grep '/local' | awk '{print $1'}`
+for ref in `otool -L $1 | grep '/local' | awk '{print $1}'`
 do
 # echo changing $ref to @executable_path/lib/`basename $ref` $1
   install_name_tool -change $ref @executable_path/lib/`basename $ref` $1 || { echo "Failed, permissions issue for $1 ? Try with sudo..." ; exit 1 ;}
@@ -28,9 +26,9 @@
 
 #copy all libs
 echo Copying binaries
-if [ -d tmpdmp ]
+if [ -d tmpdmg ]
 then
-rm -fr tmpdmp
+rm -fr tmpdmg
 fi
 mkdir -p tmpdmg/Osmo4.app
 rsync -r --exclude=.svn $source_path/build/osxdmg/Osmo4.app/ ./tmpdmg/Osmo4.app/
@@ -42,6 +40,7 @@
 cp bin/gcc/libgpac.dylib tmpdmg/Osmo4.app/Contents/MacOS/lib
 cp bin/gcc/MP4Client tmpdmg/Osmo4.app/Contents/MacOS/Osmo4
 cp bin/gcc/MP4Box tmpdmg/Osmo4.app/Contents/MacOS/MP4Box
+cp bin/gcc/MP42TS tmpdmg/Osmo4.app/Contents/MacOS/MP42TS
 
 cd tmpdmg/Osmo4.app/Contents/MacOS/
 
@@ -55,8 +54,10 @@
 echo rewriting APPS dependencies
 install_name_tool -change /usr/local/lib/libgpac.dylib @executable_path/lib/libgpac.dylib Osmo4
 install_name_tool -change /usr/local/lib/libgpac.dylib @executable_path/lib/libgpac.dylib MP4Box
+install_name_tool -change /usr/local/lib/libgpac.dylib @executable_path/lib/libgpac.dylib MP42TS
 install_name_tool -change ../bin/gcc/libgpac.dylib @executable_path/lib/libgpac.dylib Osmo4
 install_name_tool -change ../bin/gcc/libgpac.dylib @executable_path/lib/libgpac.dylib MP4Box
+install_name_tool -change ../bin/gcc/libgpac.dylib @executable_path/lib/libgpac.dylib MP42TS
 
 
 cd ../../../..

gpac-0.5.0.svn4296.tar.bz2/modules/Makefile -> gpac-0.5.0.svn4668.tar.bz2/modules/Makefile Changed

@@ -5,6 +5,10 @@
 
 ifeq ($(DISABLE_DASH_CLIENT), no)
 PLUGDIRS+=mpd_in
+ifeq ($(CONFIG_JS),no)
+else
+PLUGDIRS+=mse_in
+endif
 endif
 
 ifeq ($(DISABLE_MEDIA_IMPORT), no)
@@ -27,11 +31,6 @@
 PLUGDIRS+=ft_font
 endif
 
-ifeq ($(CONFIG_FFMPEG), no)
-else
-PLUGDIRS+=ffmpeg_in
-endif
-
 ifeq ($(CONFIG_XVID), no)
 else
 PLUGDIRS+=xvid_dec
@@ -47,18 +46,6 @@
 PLUGDIRS+=freenect
 endif
 
-ifeq ($(CONFIG_AMR_NB), yes)
-PLUGDIRS+=amr_dec
-endif
-
-ifeq ($(CONFIG_AMR_NB_FT), yes)
-PLUGDIRS+=amr_float_dec
-else
-ifeq ($(CONFIG_AMR_WB_FT), yes)
-PLUGDIRS+=amr_float_dec
-endif
-endif
-
 ifeq ($(CONFIG_OSS_AUDIO), no)
 else
 PLUGDIRS+=oss_audio
@@ -92,31 +79,71 @@
 PLUGDIRS+=gpac_js
 endif
 
-ifeq ($(CONFIG_PLATINUM),yes)
-PLUGDIRS+=platinum
+ifeq ($(CONFIG_OPENSVC),yes)
+PLUGDIRS+=opensvc_dec
 endif
 
-ifeq ($(CONFIG_AVCAP),yes)
-PLUGDIRS+=avcap
+#w32 plugins
+ifeq ($(CONFIG_WIN32),yes)
+PLUGDIRS+=wav_out
+ifeq ($(CONFIG_DIRECTX),yes)
+PLUGDIRS+=dx_hw
+endif
 endif
 
-ifeq ($(CONFIG_OPENSVC),yes)
-PLUGDIRS+=opensvc_dec
+
+ifneq ($(CONFIG_FFMPEG), no)
+ifeq ($(CONFIG_OPENHEVC),no)
+PLUGDIRS+=ffmpeg_in
+endif
+endif
+
+ifeq ($(CONFIG_OPENHEVC), yes)
+ifeq ($(CONFIG_FFMPEG), no)
+PLUGDIRS+=openhevc_dec
+endif
+endif
+
+#if static modules are used, disable all previous modules (built-in in libgpac)
+ifeq ($(STATIC_MODULES), yes)
+PLUGDIRS=
+endif
+
+ifneq ($(CONFIG_FFMPEG), no)
+ifeq ($(CONFIG_OPENHEVC),yes)
+PLUGDIRS+=ffmpeg_in openhevc_dec
+endif
+endif
+
+
+#all modules below are not (yet) included in static build
+
+ifeq ($(CONFIG_AMR_NB), yes)
+PLUGDIRS+=amr_dec
+endif
+
+ifeq ($(CONFIG_AMR_NB_FT), yes)
+PLUGDIRS+=amr_float_dec
+else
+ifeq ($(CONFIG_AMR_WB_FT), yes)
+PLUGDIRS+=amr_float_dec
+endif
 endif
 
 ifeq ($(RENOIR_ENABLE),yes)
 PLUGDIRS+=viren_out
 endif
 
-#w32 plugins
-ifeq ($(CONFIG_WIN32),yes)
-PLUGDIRS+=wav_out
-ifeq ($(CONFIG_DIRECTX),yes)
-PLUGDIRS+=dx_hw
+
+ifeq ($(CONFIG_PLATINUM),yes)
+PLUGDIRS+=platinum
 endif
 
+ifeq ($(CONFIG_AVCAP),yes)
+PLUGDIRS+=avcap
 endif
 
+
 ifeq ($(DISABLE_PLAYER), yes)
 PLUGDIRS=
 endif

gpac-0.5.0.svn4296.tar.bz2/modules/aac_in/aac_in.c -> gpac-0.5.0.svn4668.tar.bz2/modules/aac_in/aac_in.c Changed

@@ -53,7 +53,7 @@
 	Bool done;
 	u32 is_inline;
 
-	unsigned char *data;
+	char *data;
 	u32 data_size;
 	GF_SLHeader sl_hdr;
 
@@ -303,7 +303,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((const char *)read->data, read->data_size, GF_BITSTREAM_READ);
 		sync = ADTS_SyncFrame(bs, 0, &hdr);
 		gf_bs_del(bs);
 		if (!sync) return;
@@ -326,7 +326,7 @@
 	/*need a full adts header*/
 	if (read->data_size<=7) return;
 
-	bs = gf_bs_new(read->data, read->data_size, GF_BITSTREAM_READ);
+	bs = gf_bs_new((const char *)read->data, read->data_size, GF_BITSTREAM_READ);
 	hdr.frame_size = pos = 0;
 	while (ADTS_SyncFrame(bs, 0, &hdr)) {
 		pos = (u32) gf_bs_get_position(bs);
@@ -934,7 +934,7 @@
 
 #ifndef DONT_USE_TERMINAL_MODULE_API
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
@@ -955,7 +955,7 @@
 void DeleteFAADDec(GF_BaseDecoder *ifcg);
 #endif
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 #ifndef GPAC_DISABLE_AV_PARSERS
@@ -967,7 +967,7 @@
 	return NULL;
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 void ShutdownInterface(GF_BaseInterface *ifce)
 {
 	switch (ifce->InterfaceType) {
@@ -983,4 +983,7 @@
 #endif
 	}
 }
+
+GPAC_MODULE_STATIC_DELARATION( aac_in )
+
 #endif

gpac-0.5.0.svn4296.tar.bz2/modules/aac_in/faad_dec.c -> gpac-0.5.0.svn4668.tar.bz2/modules/aac_in/faad_dec.c Changed

@@ -23,11 +23,20 @@
  *
  */
 
+#include <gpac/setup.h>
+
 #ifdef GPAC_HAS_FAAD
 
 #ifdef __GNUC__
 #pragma GCC diagnostic ignored "-Wunknown-pragmas"
 #endif
+
+#if !defined(__GNUC__)
+# if defined(_WIN32_WCE) || defined (WIN32)
+#  pragma comment(lib, "libfaad")
+# endif
+#endif
+
 #include <faad.h>
 
 #include <gpac/modules/codec.h>
@@ -73,7 +82,7 @@
 	}
 
 #ifndef GPAC_DISABLE_AV_PARSERS
-	e = gf_m4a_get_config((unsigned char *) esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &a_cfg);
+	e = gf_m4a_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &a_cfg);
 	if (e) return e;
 #endif
 	if (faacDecInit2(ctx->codec, (unsigned char *)esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, (unsigned long*)&ctx->sample_rate, (u8*)&ctx->num_channels) < 0) 
@@ -254,7 +263,7 @@
 	}
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[FAAD] Decoding AU\n"));
-	buffer = faacDecDecode(ctx->codec, &ctx->info, inBuffer, inBufferLength);
+	buffer = faacDecDecode(ctx->codec, &ctx->info, (unsigned char *) inBuffer, inBufferLength);
 	if (ctx->info.error>0) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[FAAD] Error decoding AU %s\n", faacDecGetErrorMessage(ctx->info.error) ));
 		*outBufferLength = 0;
@@ -355,7 +364,7 @@
 	/*this codec currently requires AAC config in ESD*/
 	if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data) return GF_CODEC_NOT_SUPPORTED;
 #ifndef GPAC_DISABLE_AV_PARSERS
-	if (gf_m4a_get_config((unsigned char *) esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &a_cfg) != GF_OK) return GF_CODEC_NOT_SUPPORTED;
+	if (gf_m4a_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &a_cfg) != GF_OK) return GF_CODEC_NOT_SUPPORTED;
 
 	switch (a_cfg.base_object_type) {
 	case GF_M4A_AAC_MAIN:
@@ -410,4 +419,3 @@
 
 
 #endif
-

gpac-0.5.0.svn4296.tar.bz2/modules/ac3_in/ac3_in.c -> gpac-0.5.0.svn4668.tar.bz2/modules/ac3_in/ac3_in.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/ac3_in/liba52_dec.c -> gpac-0.5.0.svn4668.tar.bz2/modules/ac3_in/liba52_dec.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/alsa/alsa.c -> gpac-0.5.0.svn4668.tar.bz2/modules/alsa/alsa.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/amr_dec/amr_dec.c -> gpac-0.5.0.svn4668.tar.bz2/modules/amr_dec/amr_dec.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/amr_dec/amr_in.c -> gpac-0.5.0.svn4668.tar.bz2/modules/amr_dec/amr_in.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/amr_float_dec/amr_float_dec.c -> gpac-0.5.0.svn4668.tar.bz2/modules/amr_float_dec/amr_float_dec.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/audio_filter/audio_filter.c -> gpac-0.5.0.svn4668.tar.bz2/modules/audio_filter/audio_filter.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/avcap/avcap.cpp -> gpac-0.5.0.svn4668.tar.bz2/modules/avcap/avcap.cpp Changed

@@ -1,433 +1,502 @@
-/*
- *			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)
-	{
-		memset(&m_pSLHeader, 0, sizeof(GF_SLHeader));
-		m_pSLHeader.compositionTimeStampFlag = 1;
-	}
-	virtual ~GPACCaptureHandler() {}
-
-	GF_ClientService *m_pService;
-	LPNETCHANNEL m_pChannel;
-	GF_SLHeader m_pSLHeader;
-
-public:
-	/* 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();
-	gf_term_on_sl_packet(m_pService, m_pChannel, (char *) io_buf->getPtr(), 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;
-} AVCapIn;
-
-
-Bool AVCap_CanHandleURL(GF_InputService *plug, const char *url)
-{
-	if (!strnicmp(url, "camera://", 9)) return 1;
-	if (!strnicmp(url, "video://", 8)) return 1;
-	return 0;
-}
-
-
-GF_Err AVCap_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
-{
-	GF_ESD *esd;
-	GF_BitStream *bs;
-	GF_ObjectDescriptor *od;
-	AVCapIn *vcap = (AVCapIn *) plug->priv;
-
-	if (!vcap || !serv || !url) return GF_BAD_PARAM;
-
-	vcap->state = 0;
-	vcap->service = serv;
-
-	if (!vcap->device_desc) {
-		Format *format;
-		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);
-
-		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)) {
-			}
-
-			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();
-		
-		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;
-		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, 0);
-
-	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);
-		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 0;
-}
-
-
-GF_EXPORT
-const u32 *QueryInterfaces() 
-{
-	static u32 si [] = {
-		GF_NET_CLIENT_INTERFACE,
-		0
-	};
-	return si;
-}
-
-GF_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;
-}
-
-GF_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);
-	}
-}
-
-
-#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;
+	}
+	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.svn4296.tar.bz2/modules/bifs_dec/bifs_dec.c -> gpac-0.5.0.svn4668.tar.bz2/modules/bifs_dec/bifs_dec.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/ctx_load/ctx_load.c -> gpac-0.5.0.svn4668.tar.bz2/modules/ctx_load/ctx_load.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/demo_is/demo_is.c -> gpac-0.5.0.svn4668.tar.bz2/modules/demo_is/demo_is.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/directfb_out/directfb_out.c -> gpac-0.5.0.svn4668.tar.bz2/modules/directfb_out/directfb_out.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/droid_audio/droidaudio.c -> gpac-0.5.0.svn4668.tar.bz2/modules/droid_audio/droidaudio.c Changed

@@ -55,7 +55,8 @@
 static jmethodID mPlay;
 static jmethodID mStop;
 static jmethodID mRelease;
-static jmethodID mWrite;
+static jmethodID mWriteB;
+static jmethodID mWriteS;
 static jmethodID mFlush;
 
 #include <android/log.h>
@@ -90,8 +91,8 @@
 	u32 channelConfig; //AudioFormat.CHANNEL_OUT_MONO
 	u32 audioFormat; //AudioFormat.ENCODING_PCM_16BIT
 	s32 mbufferSizeInBytes;
-        u32 volume;
-        u32 pan;
+		u32 volume;
+		u32 pan;
 	jarray buff;
 } DroidContext;
 
@@ -102,23 +103,23 @@
 {
 	DroidContext *ctx = (DroidContext *)dr->opaque;
 	JNIEnv* env = GetEnv();
-    	int channels;
-    	int bytes;
-        LOGV("[Android Audio] Setup for %d buffers", num_buffers);
+	int channels;
+	int bytes;
+	LOGV("[Android Audio] Setup for %d buffers", num_buffers);
 
 	ctx->force_config = (num_buffers && total_duration) ? 1 : 0;
 	ctx->cfg_num_buffers = num_buffers;
 	if (ctx->cfg_num_buffers <= 1) ctx->cfg_num_buffers = 2;
 	ctx->cfg_duration = total_duration;
 	if (!ctx->force_config) ctx->num_buffers = 1;
-        ctx->volume = 100;
-        ctx->pan = 50;
+		ctx->volume = 100;
+		ctx->pan = 50;
 
 	if (!cAudioTrack){
 		cAudioTrack = (*env)->FindClass(env, "android/media/AudioTrack");
-        	if (!cAudioTrack) {
-            		return GF_NOT_SUPPORTED;
-        	}
+		if (!cAudioTrack) {
+				return GF_NOT_SUPPORTED;
+		}
 
 		cAudioTrack = (*env)->NewGlobalRef(env, cAudioTrack);
 
@@ -127,7 +128,8 @@
 		mPlay = (*env)->GetMethodID(env, cAudioTrack, "play", "()V");
 		mStop = (*env)->GetMethodID(env, cAudioTrack, "stop", "()V");
 		mRelease = (*env)->GetMethodID(env, cAudioTrack, "release", "()V");
-		mWrite = (*env)->GetMethodID(env, cAudioTrack, "write", "([BII)I");
+		mWriteB = (*env)->GetMethodID(env, cAudioTrack, "write", "([BII)I");
+		mWriteS = (*env)->GetMethodID(env, cAudioTrack, "write", "([SII)I");
 		mFlush = (*env)->GetMethodID(env, cAudioTrack, "flush", "()V");
 		setStereoVolume = (*env)->GetMethodID(env, cAudioTrack, "setStereoVolume", "(FF)I");
 	}
@@ -139,14 +141,30 @@
 static void WAV_Shutdown(GF_AudioOutput *dr)
 {
 	DroidContext *ctx = (DroidContext *)dr->opaque;
-	JNIEnv* env = ctx->env;
+	JNIEnv* env = NULL;
+	jint res = 0;
+
+	LOGV("[Android Audio] Shutdown START.", 0);
+
+	res = (*GetJavaVM())->GetEnv(GetJavaVM(), (void**)&env, JNI_VERSION_1_2);
+	if ( res == JNI_EDETACHED ) {
+		(*GetJavaVM())->AttachCurrentThread(GetJavaVM(), &env, NULL);
+	}
 
 	(*env)->CallNonvirtualVoidMethod(env, mtrack, cAudioTrack, mStop);
 	(*env)->CallNonvirtualVoidMethod(env, mtrack, cAudioTrack, mRelease);
 
 	(*env)->PopLocalFrame(env, NULL);
 
-	(*GetJavaVM())->DetachCurrentThread(GetJavaVM());
+	(*env)->DeleteGlobalRef(env, ctx->buff);
+	(*env)->DeleteGlobalRef(env, mtrack);
+	(*env)->DeleteGlobalRef(env, cAudioTrack);
+
+	//if ( res == JNI_EDETACHED ) {
+		(*GetJavaVM())->DetachCurrentThread(GetJavaVM());
+	//}
+
+	LOGV("[Android Audio] Shutdown DONE.", 0);
 }
 
 
@@ -170,13 +188,17 @@
 	(*GetJavaVM())->AttachCurrentThread(GetJavaVM(), &env, NULL);
 	ctx->env = env;
 	LOGV("[Android Audio] SampleRate : %d",ctx->sampleRateInHz);
-        LOGV("[Android Audio] BitPerSample : %d", *nbBitsPerSample);
+	LOGV("[Android Audio] BitPerSample : %d", *nbBitsPerSample);
 
 	(*env)->PushLocalFrame(env, 2);
 
 	ctx->num_buffers = 1;
 	ctx->mbufferSizeInBytes = (*env)->CallStaticIntMethod(env, cAudioTrack, mGetMinBufferSize,
-			ctx->sampleRateInHz, ctx->channelConfig, ctx->audioFormat);
+		ctx->sampleRateInHz, ctx->channelConfig, ctx->audioFormat);
+
+	//ctx->mbufferSizeInBytes *= 3;
+
+	LOGV("[Android Audio] Buffer Size : %d", ctx->mbufferSizeInBytes);
 
 	i = 1;
 	if ( ctx->channelConfig == CHANNEL_CONFIGURATION_STEREO )
@@ -186,22 +208,35 @@
 
 	ctx->total_length_ms =  1000 * ctx->num_buffers * ctx->mbufferSizeInBytes / i / ctx->sampleRateInHz;
 
+	LOGV("[Android Audio] Buffer Length ms : %d", ctx->total_length_ms);
+
 	/*initial delay is full buffer size*/
 	ctx->delay = ctx->total_length_ms;
 
 	mtrack = (*env)->NewObject(env, cAudioTrack, mAudioTrack, STREAM_MUSIC, ctx->sampleRateInHz,
 		ctx->channelConfig, ctx->audioFormat, ctx->mbufferSizeInBytes, MODE_STREAM); //AudioTrack.MODE_STREAM
-        if (mtrack){
-          mtrack = (*env)->NewGlobalRef(env, mtrack);
-          ctx->mtrack = mtrack;
-          (*env)->CallNonvirtualVoidMethod(env, mtrack, cAudioTrack, mPlay);
-        }  else {
+	if (mtrack){
+	  mtrack = (*env)->NewGlobalRef(env, mtrack);
+	  ctx->mtrack = mtrack;
+	  (*env)->CallNonvirtualVoidMethod(env, mtrack, cAudioTrack, mPlay);
+//	  (*env)->CallNonvirtualVoidMethod(env, mtrack, cAudioTrack, mStop);
+	}  else {
 		LOGV("[Android Audio] mtrack = %p", mtrack);
 		return GF_NOT_SUPPORTED;
 	}
 
-	ctx->buff = (*env)->NewByteArray(env, ctx->mbufferSizeInBytes);
-        LOGV("[Android Audio] ConfigureOutput DONE.", *NbChannels);
+	if ( ctx->audioFormat == ENCODING_PCM_8BIT )
+		ctx->buff = (*env)->NewByteArray(env, ctx->mbufferSizeInBytes);
+	else
+		ctx->buff = (*env)->NewShortArray(env, ctx->mbufferSizeInBytes/2);
+	if ( ctx->buff ){
+		ctx->buff = (*env)->NewGlobalRef(env, ctx->buff);
+	} else {
+		LOGV("[Android Audio] ctx->buff = %p", ctx->buff );
+		return GF_NOT_SUPPORTED;
+	}
+
+	LOGV("[Android Audio] ConfigureOutput DONE.", *nbBitsPerSample);
 	return GF_OK;
 }
 
@@ -209,15 +244,15 @@
 static void WAV_WriteAudio(GF_AudioOutput *dr)
 {
 	DroidContext *ctx = (DroidContext *)dr->opaque;
-        if (!ctx)
-          return;
+		if (!ctx)
+		  return;
 	JNIEnv* env = ctx->env;
 	u32 written;
 	void* pBuffer;
-        if (!env)
-          return;
+		if (!env)
+		  return;
 #ifdef DROID_EXTREME_LOGS
-        LOGV("[Android Audio] WAV_WriteAudio() : entering",ctx->sampleRateInHz);
+		LOGV("[Android Audio] WAV_WriteAudio() : entering",ctx->sampleRateInHz);
 #endif /* DROID_EXTREME_LOGS */
 	pBuffer = (*env)->GetPrimitiveArrayCritical(env, ctx->buff, NULL);
 	if (pBuffer)
@@ -226,7 +261,10 @@
 		(*env)->ReleasePrimitiveArrayCritical(env, ctx->buff, pBuffer, 0);
 		if (written)
 		{
-			(*env)->CallNonvirtualIntMethod(env, mtrack, cAudioTrack, mWrite, ctx->buff, 0, ctx->mbufferSizeInBytes);
+			if ( ctx->audioFormat == ENCODING_PCM_8BIT )
+				(*env)->CallNonvirtualIntMethod(env, mtrack, cAudioTrack, mWriteB, ctx->buff, 0, ctx->mbufferSizeInBytes);
+			else
+				(*env)->CallNonvirtualIntMethod(env, mtrack, cAudioTrack, mWriteS, ctx->buff, 0, ctx->mbufferSizeInBytes/2);
 		}
 	}
 	else
@@ -248,56 +286,57 @@
 
 	switch ( PlayType )
 	{
-	case 0:
-		// Stop playing
-		(*env)->CallNonvirtualVoidMethod(env, mtrack, cAudioTrack, mStop);
-		// Clear the internal buffers
-		(*env)->CallNonvirtualVoidMethod(env, mtrack, cAudioTrack, mFlush);
-		break;
-	case 1:
-	case 2:
-		(*env)->CallNonvirtualVoidMethod(env, mtrack, cAudioTrack, mPlay);
-		break;
-        default:
-                LOGW("[Android Audio] Unknown Play method=%d.\n", PlayType);
+		case 0:
+			// Stop playing
+			(*env)->CallNonvirtualVoidMethod(env, mtrack, cAudioTrack, mStop);
+			// Clear the internal buffers
+			(*env)->CallNonvirtualVoidMethod(env, mtrack, cAudioTrack, mFlush);
+			break;
+		case 2:
+			(*env)->CallNonvirtualVoidMethod(env, mtrack, cAudioTrack, mFlush);
+		case 1:
+			(*env)->CallNonvirtualVoidMethod(env, mtrack, cAudioTrack, mPlay);
+			break;
+		default:
+			LOGW("[Android Audio] Unknown Play method=%d.\n", PlayType);
 	}
 	LOGV("[Android Audio] Play DONE (%d).\n", PlayType);
 }
 
 static void WAV_UpdateVolume(DroidContext *ctx){
-        float lV, rV;
-        JNIEnv* env = GetEnv();
-        if (!ctx)
-          return;
-        if (ctx->pan > 100)
-          ctx->pan = 100;
-        lV =rV = ctx->volume / 100.0;
-        if (ctx->pan > 50){
-          float m = (100 - ctx->pan) / 50.0;
-          lV*=m;
-        } else if (ctx->pan < 50){
-          float m = ctx->pan / 50.0;
-          rV*=m;
-        }
-        if (env && setStereoVolume && mtrack && cAudioTrack){
-          int success;
-          if (0!= (success=((*env)->CallNonvirtualIntMethod(env, mtrack, cAudioTrack, setStereoVolume, lV, rV))))
-            LOGE3("SetVolume(%f,%f) returned Error code %d", lV, rV, success );
-        } else {
-            LOGD2("SetVolume(%f,%f)", lV, rV );
-        }
+		float lV, rV;
+		JNIEnv* env = GetEnv();
+		if (!ctx)
+			return;
+		if (ctx->pan > 100)
+			ctx->pan = 100;
+		lV =rV = ctx->volume / 100.0;
+		if (ctx->pan > 50){
+			float m = (100 - ctx->pan) / 50.0;
+			lV*=m;
+		} else if (ctx->pan < 50){
+			float m = ctx->pan / 50.0;
+			rV*=m;
+		}
+		if (env && setStereoVolume && mtrack && cAudioTrack){
+			int success;
+			if (0!= (success=((*env)->CallNonvirtualIntMethod(env, mtrack, cAudioTrack, setStereoVolume, lV, rV))))
+				LOGE3("SetVolume(%f,%f) returned Error code %d", lV, rV, success );
+		} else {
+			LOGD2("SetVolume(%f,%f)", lV, rV );
+		}
 }
 
 static void WAV_SetVolume(GF_AudioOutput *dr, u32 Volume) {
 	DroidContext *ctx = (DroidContext *)dr->opaque;
-        ctx->volume = Volume;
-        WAV_UpdateVolume(ctx);
+	ctx->volume = Volume;
+	WAV_UpdateVolume(ctx);
 }
 
 static void WAV_SetPan(GF_AudioOutput *dr, u32 Pan)
 {
-        DroidContext *ctx = (DroidContext *)dr->opaque;
-        WAV_UpdateVolume(ctx);
+	DroidContext *ctx = (DroidContext *)dr->opaque;
+	WAV_UpdateVolume(ctx);
 }
 
 /* Called by the audio thread */
@@ -419,12 +458,13 @@
 void DeleteWAVRender(void *ifce)
 {
 	GF_AudioOutput *dr = (GF_AudioOutput *) ifce;
-        if (!ifce)
-          return;
+	if (!ifce)
+		return;
 	gf_free(dr);
 }
 //----------------------------------------------------------------------
-GF_EXPORT
+
+GPAC_MODULE_EXPORT
 const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
@@ -434,14 +474,14 @@
 	return si;
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 	if (InterfaceType == GF_AUDIO_OUTPUT_INTERFACE) return NewWAVRender();
 	return NULL;
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 void ShutdownInterface(GF_BaseInterface *ifce)
 {
 	switch (ifce->InterfaceType) {
@@ -450,3 +490,5 @@
 		break;
 	}
 }
+
+GPAC_MODULE_STATIC_DELARATION( droid_audio )

gpac-0.5.0.svn4296.tar.bz2/modules/droid_cam/droid_cam.c -> gpac-0.5.0.svn4668.tar.bz2/modules/droid_cam/droid_cam.c Changed

@@ -1,715 +1,729 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Ivica Arsov, Jean Le Feuvre
- *			Copyright (c) Mines-Telecom 2009-
- *					All rights reserved
- *
- *  This file is part of GPAC / Android camera 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/terminal.h>
-#include <gpac/internal/terminal_dev.h>
-#include <gpac/modules/codec.h>
-#include <gpac/constants.h>
-#include <gpac/modules/service.h>
-#include <gpac/thread.h>
-#include <gpac/media_tools.h>
-
-#include <jni.h>
-#include <android/log.h>
-
-#define LOG_TAG "ANDROID_CAMERA"
-#ifdef ANDROID
-#  define LOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)
-#  define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
-#else
-#  define QUOTEME_(x) #x
-#  define QUOTEME(x) QUOTEME_(x)
-#  define LOGI(...) fprintf(stderr, "I/" LOG_TAG " (" __FILE__ ":" QUOTEME(__LINE__) "): " __VA_ARGS__)
-#  define LOGE(...) fprintf(stderr, "E/" LOG_TAG "(" ")" __VA_ARGS__)
-#endif
-
-static JavaVM* javaVM = 0;
-static jclass camCtrlClass;
-static jmethodID cid;
-static jmethodID startCamera;
-static jmethodID stopCamera;
-static jmethodID startProcessing;
-static jmethodID stopProcessing;
-static jmethodID getImageFormat;
-static jmethodID getImageHeight;
-static jmethodID getImageWidth;
-
-jint JNI_OnLoad(JavaVM* vm, void* reserved)
-{
-	JNIEnv* env = 0;
-  javaVM = vm;
-
-	if ( (*javaVM)->GetEnv(javaVM, (void**)&env, JNI_VERSION_1_2) != JNI_OK )
-		return -1;
-
-	// Get the class and its methods in the main env
-
-	// Get the CameraController class
-	// This is just a local refenrece. Cannot be used in the other JNI calls.
-	camCtrlClass = (*env)->FindClass(env, "com/gpac/Osmo4/Preview");
-	if (camCtrlClass == 0)
-	{
-		LOGE("CameraController class = null [myCamera.c, startCameraNative()]");
-		return -1;
-	}
-
-	// Get Global Reference to be able to use the class
-	camCtrlClass = (*env)->NewGlobalRef(env, camCtrlClass);
-	if ( camCtrlClass == 0 )
-	{
-		LOGE("[MPEG-V_IN] Cannot create Global Reference\n");
-		return -1;
-	}
-
-	// Get the method ID for the CameraController constructor.
-	cid = (*env)->GetMethodID(env, camCtrlClass, "<init>", "()V");
-	if (cid == 0)
-	{
-		LOGE("Method ID for CameraController constructor is null [myCamera.c, startCameraNative()]");
-		return -1;
-	}
-
-	// Get startCamera() method from class CameraController
-	startCamera = (*env)->GetMethodID(env, camCtrlClass, "initializeCamera", "(Z)Z");
-	if (startCamera == 0)
-	{
-		LOGE("[ANDROID_CAMERA] Function startCamera not found");
-		return -1;
-	}
-
-	stopCamera = (*env)->GetMethodID(env, camCtrlClass, "stopCamera", "()V");
-	if (stopCamera == 0)
-	{
-		LOGE("[ANDROID_CAMERA] Function stopCamera not found");
-		return -1;
-	}
-
-	startProcessing = (*env)->GetMethodID(env, camCtrlClass, "resumePreview", "()V");
-	if (startProcessing == 0)
-	{
-		LOGE("[ANDROID_CAMERA] Function startProcessing not found");
-		return -1;
-	}
-
-	stopProcessing = (*env)->GetMethodID(env, camCtrlClass, "pausePreview", "()V");
-	if (stopProcessing == 0)
-	{
-		LOGE("[ANDROID_CAMERA] Function stopProcessing not found");
-		return -1;
-	}
-
-	getImageFormat = (*env)->GetMethodID(env, camCtrlClass, "getPreviewFormat", "()I");
-	if (getImageFormat == 0)
-	{
-		LOGE("[ANDROID_CAMERA] Function getImageFormat not found");
-		return -1;
-	}
-
-	getImageHeight = (*env)->GetMethodID(env, camCtrlClass, "getImageHeight", "()I");
-	if (getImageHeight == 0)
-	{
-		LOGE("[ANDROID_CAMERA] Function getImageHeight not found");
-		return -1;
-	}
-
-	getImageWidth = (*env)->GetMethodID(env, camCtrlClass, "getImageWidth", "()I");
-	if (getImageWidth == 0)
-	{
-		LOGE("[ANDROID_CAMERA] Function getImageWidth not found");
-		return -1;
-	}
-
-	return JNI_VERSION_1_2;
-}
-//----------------------------------------------------------------------
-JavaVM* GetJavaVM()
-{
-    return javaVM;
-}
-
-JNIEnv* GetEnv()
-{
-	JNIEnv* env;
-	if ( (*GetJavaVM())->GetEnv(GetJavaVM(), (void**)&env, JNI_VERSION_1_2) != JNI_OK )
-		return NULL;
-
-	return env;
-}
-
-void JNI_OnUnload(JavaVM *vm, void *reserved)
-{
-	JNIEnv* env = 0;
-  	
-	if ( (*vm)->GetEnv(vm, (void**)&env, JNI_VERSION_1_2) != JNI_OK )
-		return;
-	
-	(*env)->DeleteGlobalRef(env, camCtrlClass);
-}
-//----------------------------------------------------------------------
-
-
-#define CAM_PIXEL_FORMAT GF_PIXEL_NV21
-//GF_PIXEL_RGB_32
-#define CAM_PIXEL_SIZE 1.5f
-//4
-#define CAM_WIDTH 640
-#define CAM_HEIGHT 480
-
-//GF_PIXEL_RGB_24;
-
-typedef struct
-{
-	GF_InputService *input;
-	/*the service we're responsible for*/
-	GF_ClientService *service;
-	LPNETCHANNEL* channel;
-
-	/*input file*/
-	u32 time_scale;
-
-	u32 base_track_id;
-
-	struct _tag_terminal *term;
-
-	u32 cntr;
-
-	u32 width;
-	u32 height;
-
-	Bool started;
-
-	JNIEnv* env;
-	u8 isAttached;
-	jclass camCtrlClass;
-	jmethodID cid;
-	jobject camCtrlObj;
-	jmethodID startCamera;
-	jmethodID stopCamera;
-	jmethodID startProcessing;
-	jmethodID stopProcessing;
-	jmethodID getImageFormat;
-	jmethodID getImageHeight;
-	jmethodID getImageWidth;
-
-} ISOMReader;
-
-ISOMReader* globReader;
-
-void loadCameraControler(ISOMReader *read);
-void camStartCamera(ISOMReader *read);
-void camStopCamera(ISOMReader *read);
-
-Bool CAM_CanHandleURL(GF_InputService *plug, const char *url)
-{
-	if (!strnicmp(url, "hw://camera", 11)) return 1;
-
-	return 0;
-}
-
-void unloadCameraControler(ISOMReader *read)
-{
-	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] unloadCameraControler: %d\n", gf_th_id()));
-	if ( read->isAttached )
-	{
-		//(*rc->env)->PopLocalFrame(rc->env, NULL);
-		(*GetJavaVM())->DetachCurrentThread(GetJavaVM());
-		read->isAttached = 0;
-	}
-
-	read->env = NULL;
-}
-
-u32 unregisterFunc(void* data)
-{
-	unloadCameraControler(globReader);
-}
-
-void loadCameraControler(ISOMReader *read)
-{
-	JNIEnv* env = NULL;
-	jint res = 0;
-
-	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] loadCameraControler: %d\n", gf_th_id()));
-
-	// Get the JNI interface pointer
-	res = (*GetJavaVM())->GetEnv(javaVM, (void**)&env, JNI_VERSION_1_2);
-	if ( res == JNI_EDETACHED )
-	{
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] The current thread is not attached to the VM, assuming native thread\n"));
-		if ( res = (*GetJavaVM())->AttachCurrentThread(GetJavaVM(), &env, NULL) )
-		{
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] Attach current thread failed: %d\n", res));
-			return;
-		}
-		gf_register_before_exit_function(gf_th_current(), unregisterFunc);
-		read->isAttached = 1;
-		//(*rc->env)->PushLocalFrame(rc->env, 2);
-	}
-	else 
-		if ( res == JNI_EVERSION )
-		{
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] The specified version is not supported\n"));
-			return;
-		}
-
-	read->env = env;
-	read->camCtrlClass = camCtrlClass;
-	read->cid = cid;
-	read->startCamera = startCamera;
-	read->stopCamera = stopCamera;
-	read->startProcessing = startProcessing;
-	read->stopProcessing = stopProcessing;
-	read->getImageFormat = getImageFormat;
-	read->getImageHeight = getImageHeight;
-	read->getImageWidth = getImageWidth;
-
-	// Create the object.
-	read->camCtrlObj = (*env)->NewObject(env, read->camCtrlClass, read->cid);
-	if (read->camCtrlObj == 0)
-	{
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("CameraController object creation failed. [myCamera.c, startCameraNative()]"));
-		return;
-	}
-}
-
-GF_Err CAM_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
-{
-	ISOMReader *read;
-	if (!plug || !plug->priv || !serv) return GF_SERVICE_ERROR;
-	read = (ISOMReader *) plug->priv;
-
-	read->input = plug;
-	read->service = serv;
-	read->base_track_id = 1;
-	read->time_scale = 1000;
-
-	read->term = serv->term;
-
-	loadCameraControler(read);
-
-	/*reply to user*/
-	gf_term_on_connect(serv, NULL, GF_OK);
-	//if (read->no_service_desc) isor_declare_objects(read);
-
-	return GF_OK;
-}
-
-GF_Err CAM_CloseService(GF_InputService *plug)
-{
-	GF_Err reply;
-	ISOMReader *read;
-	if (!plug || !plug->priv) return GF_SERVICE_ERROR;
-	read = (ISOMReader *) plug->priv;
-	reply = GF_OK;
-
-	(*GetEnv())->DeleteLocalRef( GetEnv(), read->camCtrlObj ); 
-
-	//unloadCameraControler(read);
-
-	gf_term_on_disconnect(read->service, NULL, reply);
-	return GF_OK;
-}
-
-u32 getWidth(ISOMReader *read);
-u32 getHeight(ISOMReader *read);
-
-static GF_Descriptor *CAM_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
-{
-	u32 trackID;
-	GF_ESD *esd;
-	ISOMReader *read;
-	GF_ObjectDescriptor *od;
-	GF_BitStream *bs;
-	char *buf;
-	u32 buf_size;
-	if (!plug || !plug->priv) return NULL;
-	read = (ISOMReader *) plug->priv;
-
-	trackID = 0;
-	trackID = read->base_track_id;
-	read->base_track_id = 0;
-
-	if (trackID && (expect_type==GF_MEDIA_OBJECT_VIDEO) ) {
-		od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-		od->objectDescriptorID = 1;
-
-		esd = gf_odf_desc_esd_new(0);
-		esd->slConfig->timestampResolution = 1000;
-		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
-		esd->ESID = 1;
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_RAW_MEDIA_STREAM;
-		
-		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-
-		read->width = getWidth(read);
-		read->height = getHeight(read);
-
-		gf_bs_write_u32(bs, CAM_PIXEL_FORMAT); // fourcc
-		gf_bs_write_u16(bs, read->width); // width
-		gf_bs_write_u16(bs, read->height); // height
-		gf_bs_write_u32(bs, read->width * read->height * CAM_PIXEL_SIZE); // framesize
-		gf_bs_write_u32(bs, read->width * CAM_PIXEL_SIZE); // stride
-
-		gf_bs_align(bs);
-		gf_bs_get_content(bs, &buf, &buf_size);
-		gf_bs_del(bs);
-
-		esd->decoderConfig->decoderSpecificInfo->data = buf;
-		esd->decoderConfig->decoderSpecificInfo->dataLength = buf_size;
-
-		gf_list_add(od->ESDescriptors, esd);
-		return (GF_Descriptor *) od;
-	}
-
-	return NULL;
-}
-
-
-
-
-GF_Err CAM_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
-{
-	GF_Err e;
-	ISOMReader *read;
-	if (!plug || !plug->priv) return GF_SERVICE_ERROR;
-	read = (ISOMReader *) plug->priv;
-
-	e = GF_OK;
-	if (upstream) {
-		e = GF_ISOM_INVALID_FILE;
-	}
-
-	read->channel = channel;
-
-	camStartCamera(read);
-
-	gf_term_on_connect(read->service, channel, e);
-	return e;
-}
-
-GF_Err CAM_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	GF_Err e;
-	ISOMReader *read;
-	if (!plug || !plug->priv) return GF_SERVICE_ERROR;
-	read = (ISOMReader *) plug->priv;
-
-	e = GF_OK;
-
-	camStopCamera(read);
-
-	gf_term_on_disconnect(read->service, channel, e);
-	return e;
-}
-
-int* decodeYUV420SP( char* yuv420sp, int width, int height)
-{
-	int frameSize = width * height;
-	int j, yp, uvp, i, y, y1192, r, g, b, u, v;
-	int ti, tj;
-
-	int* rgb = (int*)gf_malloc(width*height*4);
-	for (j = 0, yp = 0, tj=height-1; j < height; j++, tj--)
-	{
-		uvp = frameSize + (j >> 1) * width, u = 0, v = 0;
-		for (i = 0, ti=0; i < width; i++, yp++, ti+=width)
-		{
-			y = (0xff & ((int) yuv420sp[yp])) - 16;
-			if (y < 0) y = 0;
-			if ((i & 1) == 0)
-			{
-				v = (0xff & yuv420sp[uvp++]) - 128;
-				u = (0xff & yuv420sp[uvp++]) - 128;
-			}
-
-			y1192 = 1192 * y;
-			r = (y1192 + 1634 * v);
-			g = (y1192 - 833 * v - 400 * u);
-			b = (y1192 + 2066 * u);
-
-			if (r < 0)
-				r = 0;
-			else if (r > 262143)
-				r = 262143;
-			if (g < 0)
-				g = 0;
-			else if (g > 262143)
-				g = 262143;
-			if (b < 0)
-				b = 0;
-			else if (b > 262143)
-				b = 262143;
-
-			rgb[yp] = 0xff000000 | ((r << 6) & 0xff0000)
-						| ((g >> 2) & 0xff00) | ((b >> 10) & 0xff);
-//			rgb[ti+tj] = 0xff000000 | ((r << 6) & 0xff0000)
-//					| ((g >> 2) & 0xff00) | ((b >> 10) & 0xff);
-		}
-	}
-	return rgb;
-}
-
-void Java_com_gpac_Osmo4_Preview_processFrameBuf( JNIEnv* env, jobject thiz, jbyteArray arr)
-{
-	u8* data;
-	u32 datasize;
-	ISOMReader* ctx = globReader;
-	GF_SLHeader hdr;
-	u32 cts = 0;
-	u32 convTime = 0;
-	u32 j = 0;
-	jbyte *jdata;
-	jsize len;
-
-	if ( ctx->started )
-	{
-		len = (*env)->GetArrayLength(env, arr);
-		jdata = (*env)->GetByteArrayElements(env,arr,0);
-
-		convTime = gf_term_get_time(ctx->term);
-
-		data = (u8*)jdata;//(u8*)decodeYUV420SP((char*)jdata, ctx->width, ctx->height); //
-		datasize = len;//ctx->width * ctx->height * CAM_PIXEL_SIZE;//
-
-		cts = gf_term_get_time(ctx->term);
-
-		convTime = cts - convTime;
-
-		memset(&hdr, 0, sizeof(hdr));
-		hdr.compositionTimeStampFlag = 1;
-		hdr.compositionTimeStamp = cts;
-		gf_term_on_sl_packet(ctx->service, ctx->channel, (void*)data, datasize, &hdr, GF_OK);
-
-		//gf_free(data);
-
-		(*env)->ReleaseByteArrayElements(env,arr,jdata,JNI_ABORT);
-
-		//GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Camera Frame Sent %d\n", gf_sys_clock()));
-	}
-}
-
-void CallCamMethod(ISOMReader *read, jmethodID methodID)
-{
-	JNIEnv* env = NULL;
-	jint res = 0;
-	u8 isAttached = 0;
-
-	// Get the JNI interface pointer
-	res = (*GetJavaVM())->GetEnv(javaVM, (void**)&env, JNI_VERSION_1_2);
-	if ( res == JNI_EDETACHED )
-	{
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] The current thread is not attached to the VM, assuming native thread\n"));
-		if ( res = (*GetJavaVM())->AttachCurrentThread(GetJavaVM(), &env, NULL) )
-		{
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] Attach current thread failed: %d\n", res));
-			return;
-		}
-		if ( env != read->env )
-			isAttached = 1;
-	}
-
-	(*env)->CallNonvirtualVoidMethod(env, read->camCtrlObj, read->camCtrlClass, methodID);
-
-	if (isAttached)
-	{	
-		(*GetJavaVM())->DetachCurrentThread(GetJavaVM());
-	}
-}
-
-void camStartCamera(ISOMReader *read)
-{
-	JNIEnv* env = NULL;
-	jboolean isPortrait = JNI_FALSE;
-
-	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] startCamera: %d\n", gf_th_id()));
-
-	// Get the JNI interface pointer
-	env = read->env;
-
-	(*env)->CallNonvirtualBooleanMethod(env, read->camCtrlObj, read->camCtrlClass, read->startCamera, isPortrait);
-}
-
-void camStopCamera(ISOMReader *read)
-{
-	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] stopCamera: %d\n", gf_th_id()));
-
-	CallCamMethod(read, read->stopCamera);
-}
-
-void pauseCamera(ISOMReader *read)
-{
-	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] pauseCamera: %d\n", gf_th_id()));
-
-	read->started = 0;
-	CallCamMethod(read, read->stopProcessing);
-}
-
-void resumeCamera(ISOMReader *read)
-{
-	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] resumeCamera: %d\n", gf_th_id()));
-
-	read->started = 1;
-	CallCamMethod(read, read->startProcessing);
-}
-
-u32 getWidth(ISOMReader *read)
-{
-	JNIEnv* env = NULL;
-
-	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] getWidth: %d\n", gf_th_id()));
-
-	// Get the JNI interface pointer
-	env = read->env;
-
-	return (*env)->CallNonvirtualIntMethod(env, read->camCtrlObj, read->camCtrlClass, read->getImageWidth);
-}
-
-u32 getHeight(ISOMReader *read)
-{
-	JNIEnv* env = NULL;
-
-	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] getHeight: %d\n", gf_th_id()));
-
-	// Get the JNI interface pointer
-	env = read->env;
-
-	return (*env)->CallNonvirtualIntMethod(env, read->camCtrlObj, read->camCtrlClass, read->getImageHeight);
-}
-
-GF_Err CAM_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
-{
-	ISOMReader *read;
-	GF_BitStream *bs;
-	char *buf;
-	u32 buf_size;
-	if (!plug || !plug->priv || !com) return GF_SERVICE_ERROR;
-	read = (ISOMReader *) plug->priv;
-
-	if (com->command_type==GF_NET_SERVICE_INFO) {
-		return GF_OK;
-	}
-	if (com->command_type==GF_NET_SERVICE_HAS_AUDIO) {
-		return GF_NOT_SUPPORTED;
-	}
-	if (!com->base.on_channel) return GF_NOT_SUPPORTED;
-
-	switch (com->command_type) {
-	case GF_NET_CHAN_INTERACTIVE:
-		return GF_OK;
-	case GF_NET_CHAN_BUFFER:
-		com->buffer.max = com->buffer.min = 0;
-		return GF_OK;
-	case GF_NET_CHAN_PLAY:
-		resumeCamera(read);
-		return GF_OK;
-	case GF_NET_CHAN_STOP:
-		pauseCamera(read);
-		return GF_OK;
-	/*nothing to do on MP4 for channel config*/
-	case GF_NET_CHAN_CONFIG:
-		return GF_OK;
-	case GF_NET_CHAN_GET_PIXEL_AR:
-		return 1<<16;//gf_isom_get_pixel_aspect_ratio(read->mov, ch->track, 1, &com->par.hSpacing, &com->par.vSpacing);
-	case GF_NET_CHAN_GET_DSI:
-		{
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cam get DSI\n"));
-			/*it may happen that there are conflicting config when using ESD URLs...*/
-			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-
-			read->width = getWidth(read);
-			read->height = getHeight(read);
-
-			gf_bs_write_u32(bs, CAM_PIXEL_FORMAT); // fourcc
-			gf_bs_write_u16(bs, read->width); // width
-			gf_bs_write_u16(bs, read->height); // height
-			gf_bs_write_u32(bs, read->width * read->height * CAM_PIXEL_SIZE); // framesize
-			gf_bs_write_u32(bs, read->width * CAM_PIXEL_SIZE); // stride
-
-			gf_bs_align(bs);
-			gf_bs_get_content(bs, &buf, &buf_size);
-			gf_bs_del(bs);
-
-			com->get_dsi.dsi = buf;
-			com->get_dsi.dsi_len = buf_size;
-			return GF_OK;
-		}
-	}
-	return GF_NOT_SUPPORTED;
-}
-
-GF_InputService *CAM_client_load()
-{
-	ISOMReader *reader;
-	GF_InputService *plug;
-	GF_SAFEALLOC(plug, GF_InputService);
-	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC Camera Plugin", "gpac distribution")
-	plug->CanHandleURL = CAM_CanHandleURL;
-	plug->ConnectService = CAM_ConnectService;
-	plug->CloseService = CAM_CloseService;
-	plug->GetServiceDescriptor = CAM_GetServiceDesc;
-	plug->ConnectChannel = CAM_ConnectChannel;
-	plug->DisconnectChannel = CAM_DisconnectChannel;
-	plug->ServiceCommand = CAM_ServiceCommand;
-
-	GF_SAFEALLOC(reader, ISOMReader);
-	plug->priv = reader;
-	globReader = reader;
-	return plug;
-}
-
-void CAM_client_del(GF_BaseInterface *bi)
-{
-	GF_InputService *plug = (GF_InputService *) bi;
-	ISOMReader *read = (ISOMReader *)plug->priv;
-
-	gf_free(read);
-	gf_free(bi);
-}
-
-GF_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-		GF_NET_CLIENT_INTERFACE,
-		0
-	};
-	return si;
-}
-
-GF_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	if (InterfaceType == GF_NET_CLIENT_INTERFACE)
-		return (GF_BaseInterface *)CAM_client_load();
-	return NULL;
-}
-
-GF_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-	case GF_NET_CLIENT_INTERFACE: CAM_client_del(ifce); break;
-	}
-}
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Ivica Arsov, Jean Le Feuvre
+ *			Copyright (c) Mines-Telecom 2009-
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Android camera 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/terminal.h>
+#include <gpac/internal/terminal_dev.h>
+#include <gpac/internal/compositor_dev.h>
+#include <gpac/modules/codec.h>
+#include <gpac/constants.h>
+#include <gpac/modules/service.h>
+#include <gpac/thread.h>
+#include <gpac/media_tools.h>
+
+#include <jni.h>
+#include <android/log.h>
+
+#define LOG_TAG "ANDROID_CAMERA"
+#ifdef ANDROID
+#  define LOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)
+#  define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
+#else
+#  define QUOTEME_(x) #x
+#  define QUOTEME(x) QUOTEME_(x)
+#  define LOGI(...) fprintf(stderr, "I/" LOG_TAG " (" __FILE__ ":" QUOTEME(__LINE__) "): " __VA_ARGS__)
+#  define LOGE(...) fprintf(stderr, "E/" LOG_TAG "(" ")" __VA_ARGS__)
+#endif
+
+static JavaVM* javaVM = 0;
+static jclass camCtrlClass;
+static jmethodID cid;
+static jmethodID startCamera;
+static jmethodID stopCamera;
+static jmethodID startProcessing;
+static jmethodID stopProcessing;
+static jmethodID getImageFormat;
+static jmethodID getImageHeight;
+static jmethodID getImageWidth;
+
+jint JNI_OnLoad(JavaVM* vm, void* reserved)
+{
+	JNIEnv* env = 0;
+  javaVM = vm;
+
+	if ( (*javaVM)->GetEnv(javaVM, (void**)&env, JNI_VERSION_1_2) != JNI_OK )
+		return -1;
+
+	// Get the class and its methods in the main env
+
+	// Get the CameraController class
+	// This is just a local refenrece. Cannot be used in the other JNI calls.
+	camCtrlClass = (*env)->FindClass(env, "com/gpac/Osmo4/Preview");
+	if (camCtrlClass == 0)
+	{
+		LOGE("CameraController class = null [myCamera.c, startCameraNative()]");
+		return -1;
+	}
+
+	// Get Global Reference to be able to use the class
+	camCtrlClass = (*env)->NewGlobalRef(env, camCtrlClass);
+	if ( camCtrlClass == 0 )
+	{
+		LOGE("[MPEG-V_IN] Cannot create Global Reference\n");
+		return -1;
+	}
+
+	// Get the method ID for the CameraController constructor.
+	cid = (*env)->GetMethodID(env, camCtrlClass, "<init>", "()V");
+	if (cid == 0)
+	{
+		LOGE("Method ID for CameraController constructor is null [myCamera.c, startCameraNative()]");
+		return -1;
+	}
+
+	// Get startCamera() method from class CameraController
+	startCamera = (*env)->GetMethodID(env, camCtrlClass, "initializeCamera", "(Z)Z");
+	if (startCamera == 0)
+	{
+		LOGE("[ANDROID_CAMERA] Function startCamera not found");
+		return -1;
+	}
+
+	stopCamera = (*env)->GetMethodID(env, camCtrlClass, "stopCamera", "()V");
+	if (stopCamera == 0)
+	{
+		LOGE("[ANDROID_CAMERA] Function stopCamera not found");
+		return -1;
+	}
+
+	startProcessing = (*env)->GetMethodID(env, camCtrlClass, "resumePreview", "()V");
+	if (startProcessing == 0)
+	{
+		LOGE("[ANDROID_CAMERA] Function startProcessing not found");
+		return -1;
+	}
+
+	stopProcessing = (*env)->GetMethodID(env, camCtrlClass, "pausePreview", "()V");
+	if (stopProcessing == 0)
+	{
+		LOGE("[ANDROID_CAMERA] Function stopProcessing not found");
+		return -1;
+	}
+
+	getImageFormat = (*env)->GetMethodID(env, camCtrlClass, "getPreviewFormat", "()I");
+	if (getImageFormat == 0)
+	{
+		LOGE("[ANDROID_CAMERA] Function getImageFormat not found");
+		return -1;
+	}
+
+	getImageHeight = (*env)->GetMethodID(env, camCtrlClass, "getImageHeight", "()I");
+	if (getImageHeight == 0)
+	{
+		LOGE("[ANDROID_CAMERA] Function getImageHeight not found");
+		return -1;
+	}
+
+	getImageWidth = (*env)->GetMethodID(env, camCtrlClass, "getImageWidth", "()I");
+	if (getImageWidth == 0)
+	{
+		LOGE("[ANDROID_CAMERA] Function getImageWidth not found");
+		return -1;
+	}
+
+	return JNI_VERSION_1_2;
+}
+//----------------------------------------------------------------------
+JavaVM* GetJavaVM()
+{
+    return javaVM;
+}
+
+JNIEnv* GetEnv()
+{
+	JNIEnv* env;
+	if ( (*GetJavaVM())->GetEnv(GetJavaVM(), (void**)&env, JNI_VERSION_1_2) != JNI_OK )
+		return NULL;
+
+	return env;
+}
+
+void JNI_OnUnload(JavaVM *vm, void *reserved)
+{
+	JNIEnv* env = 0;
+  	
+	if ( (*vm)->GetEnv(vm, (void**)&env, JNI_VERSION_1_2) != JNI_OK )
+		return;
+	
+	(*env)->DeleteGlobalRef(env, camCtrlClass);
+}
+//----------------------------------------------------------------------
+
+
+#define CAM_PIXEL_FORMAT GF_PIXEL_NV21
+//GF_PIXEL_RGB_32
+#define CAM_PIXEL_SIZE 1.5f
+//4
+#define CAM_WIDTH 640
+#define CAM_HEIGHT 480
+
+//GF_PIXEL_RGB_24;
+
+typedef struct
+{
+	GF_InputService *input;
+	/*the service we're responsible for*/
+	GF_ClientService *service;
+	LPNETCHANNEL channel;
+
+	/*input file*/
+	u32 time_scale;
+
+	u32 base_track_id;
+
+	struct _tag_terminal *term;
+
+	u32 cntr;
+
+	u32 width;
+	u32 height;
+
+	Bool started;
+
+	JNIEnv* env;
+	u8 isAttached;
+	jclass camCtrlClass;
+	jmethodID cid;
+	jobject camCtrlObj;
+	jmethodID startCamera;
+	jmethodID stopCamera;
+	jmethodID startProcessing;
+	jmethodID stopProcessing;
+	jmethodID getImageFormat;
+	jmethodID getImageHeight;
+	jmethodID getImageWidth;
+
+} ISOMReader;
+
+ISOMReader* globReader;
+
+void loadCameraControler(ISOMReader *read);
+void camStartCamera(ISOMReader *read);
+void camStopCamera(ISOMReader *read);
+
+Bool CAM_CanHandleURL(GF_InputService *plug, const char *url)
+{
+	if (!strnicmp(url, "hw://camera", 11)) return 1;
+
+	return 0;
+}
+
+void unloadCameraControler(ISOMReader *read)
+{
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] unloadCameraControler: %d\n", gf_th_id()));
+	if ( read->isAttached )
+	{
+		//(*rc->env)->PopLocalFrame(rc->env, NULL);
+		(*GetJavaVM())->DetachCurrentThread(GetJavaVM());
+		read->isAttached = 0;
+	}
+
+	read->env = NULL;
+}
+
+u32 unregisterFunc(void* data)
+{
+	unloadCameraControler(globReader);
+}
+
+void loadCameraControler(ISOMReader *read)
+{
+	JNIEnv* env = NULL;
+	jint res = 0;
+
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] loadCameraControler: %d\n", gf_th_id()));
+
+	// Get the JNI interface pointer
+	res = (*GetJavaVM())->GetEnv(javaVM, (void**)&env, JNI_VERSION_1_2);
+	if ( res == JNI_EDETACHED )
+	{
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] The current thread is not attached to the VM, assuming native thread\n"));
+		if ( res = (*GetJavaVM())->AttachCurrentThread(GetJavaVM(), &env, NULL) )
+		{
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] Attach current thread failed: %d\n", res));
+			return;
+		}
+		gf_register_before_exit_function(gf_th_current(), unregisterFunc);
+		read->isAttached = 1;
+		//(*rc->env)->PushLocalFrame(rc->env, 2);
+	}
+	else 
+		if ( res == JNI_EVERSION )
+		{
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] The specified version is not supported\n"));
+			return;
+		}
+
+	read->env = env;
+	read->camCtrlClass = camCtrlClass;
+	read->cid = cid;
+	read->startCamera = startCamera;
+	read->stopCamera = stopCamera;
+	read->startProcessing = startProcessing;
+	read->stopProcessing = stopProcessing;
+	read->getImageFormat = getImageFormat;
+	read->getImageHeight = getImageHeight;
+	read->getImageWidth = getImageWidth;
+
+	// Create the object.
+	read->camCtrlObj = (*env)->NewObject(env, read->camCtrlClass, read->cid);
+	if (read->camCtrlObj == 0)
+	{
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("CameraController object creation failed. [myCamera.c, startCameraNative()]"));
+		return;
+	}
+}
+
+GF_Err CAM_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
+{
+	ISOMReader *read;
+	if (!plug || !plug->priv || !serv) return GF_SERVICE_ERROR;
+	read = (ISOMReader *) plug->priv;
+
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] CAM_ConnectService: %d\n", gf_th_id()));
+
+	read->input = plug;
+	read->service = serv;
+	read->base_track_id = 1;
+	read->time_scale = 1000;
+
+	read->term = serv->term;
+
+	loadCameraControler(read);
+
+	/*reply to user*/
+	gf_term_on_connect(serv, NULL, GF_OK);
+	//if (read->no_service_desc) isor_declare_objects(read);
+
+	return GF_OK;
+}
+
+GF_Err CAM_CloseService(GF_InputService *plug)
+{
+	GF_Err reply;
+	ISOMReader *read;
+	if (!plug || !plug->priv) return GF_SERVICE_ERROR;
+	read = (ISOMReader *) plug->priv;
+
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] CAM_CloseService: %d\n", gf_th_id()));
+
+	reply = GF_OK;
+
+	(*GetEnv())->DeleteLocalRef( GetEnv(), read->camCtrlObj ); 
+	read->camCtrlObj = NULL;
+
+	//unloadCameraControler(read);
+
+	gf_term_on_disconnect(read->service, NULL, reply);
+	return GF_OK;
+}
+
+u32 getWidth(ISOMReader *read);
+u32 getHeight(ISOMReader *read);
+
+static GF_Descriptor *CAM_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
+{
+	u32 trackID;
+	GF_ESD *esd;
+	ISOMReader *read;
+	GF_ObjectDescriptor *od;
+	GF_BitStream *bs;
+	char *buf;
+	u32 buf_size;
+	if (!plug || !plug->priv) return NULL;
+	read = (ISOMReader *) plug->priv;
+
+	trackID = 0;
+	trackID = read->base_track_id;
+	read->base_track_id = 0;
+
+	if (trackID && (expect_type==GF_MEDIA_OBJECT_VIDEO) ) {
+		od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
+		od->objectDescriptorID = 1;
+
+		esd = gf_odf_desc_esd_new(0);
+		esd->slConfig->timestampResolution = 1000;
+		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
+		esd->ESID = 1;
+		esd->decoderConfig->objectTypeIndication = GPAC_OTI_RAW_MEDIA_STREAM;
+		
+		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+
+		read->width = getWidth(read);
+		read->height = getHeight(read);
+
+		gf_bs_write_u32(bs, CAM_PIXEL_FORMAT); // fourcc
+		gf_bs_write_u16(bs, read->width); // width
+		gf_bs_write_u16(bs, read->height); // height
+		gf_bs_write_u32(bs, read->width * read->height * CAM_PIXEL_SIZE); // framesize
+		gf_bs_write_u32(bs, read->width * CAM_PIXEL_SIZE); // stride
+
+		gf_bs_align(bs);
+		gf_bs_get_content(bs, &buf, &buf_size);
+		gf_bs_del(bs);
+
+		esd->decoderConfig->decoderSpecificInfo->data = buf;
+		esd->decoderConfig->decoderSpecificInfo->dataLength = buf_size;
+
+		gf_list_add(od->ESDescriptors, esd);
+		return (GF_Descriptor *) od;
+	}
+
+	return NULL;
+}
+
+
+
+
+GF_Err CAM_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
+{
+	GF_Err e;
+	ISOMReader *read;
+	if (!plug || !plug->priv) return GF_SERVICE_ERROR;
+	read = (ISOMReader *) plug->priv;
+
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] CAM_ConnectChannel: %d\n", gf_th_id()));
+
+	e = GF_OK;
+	if (upstream) {
+		e = GF_ISOM_INVALID_FILE;
+	}
+
+	read->channel = channel;
+
+	camStartCamera(read);
+
+	gf_term_on_connect(read->service, channel, e);
+	return e;
+}
+
+GF_Err CAM_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
+{
+	GF_Err e;
+	ISOMReader *read;
+	if (!plug || !plug->priv) return GF_SERVICE_ERROR;
+	read = (ISOMReader *) plug->priv;
+
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] CAM_DisconnectChannel: %d\n", gf_th_id()));
+
+	e = GF_OK;
+
+	camStopCamera(read);
+
+	gf_term_on_disconnect(read->service, channel, e);
+	return e;
+}
+
+int* decodeYUV420SP( char* yuv420sp, int width, int height)
+{
+	int frameSize = width * height;
+	int j, yp, uvp, i, y, y1192, r, g, b, u, v;
+	int ti, tj;
+
+	int* rgb = (int*)gf_malloc(width*height*4);
+	for (j = 0, yp = 0, tj=height-1; j < height; j++, tj--)
+	{
+		uvp = frameSize + (j >> 1) * width, u = 0, v = 0;
+		for (i = 0, ti=0; i < width; i++, yp++, ti+=width)
+		{
+			y = (0xff & ((int) yuv420sp[yp])) - 16;
+			if (y < 0) y = 0;
+			if ((i & 1) == 0)
+			{
+				v = (0xff & yuv420sp[uvp++]) - 128;
+				u = (0xff & yuv420sp[uvp++]) - 128;
+			}
+
+			y1192 = 1192 * y;
+			r = (y1192 + 1634 * v);
+			g = (y1192 - 833 * v - 400 * u);
+			b = (y1192 + 2066 * u);
+
+			if (r < 0)
+				r = 0;
+			else if (r > 262143)
+				r = 262143;
+			if (g < 0)
+				g = 0;
+			else if (g > 262143)
+				g = 262143;
+			if (b < 0)
+				b = 0;
+			else if (b > 262143)
+				b = 262143;
+
+			rgb[yp] = 0xff000000 | ((r << 6) & 0xff0000)
+						| ((g >> 2) & 0xff00) | ((b >> 10) & 0xff);
+//			rgb[ti+tj] = 0xff000000 | ((r << 6) & 0xff0000)
+//					| ((g >> 2) & 0xff00) | ((b >> 10) & 0xff);
+		}
+	}
+	return rgb;
+}
+
+void Java_com_gpac_Osmo4_Preview_processFrameBuf( JNIEnv* env, jobject thiz, jbyteArray arr)
+{
+	u8* data;
+	u32 datasize;
+	ISOMReader* ctx = globReader;
+	GF_SLHeader hdr;
+	u32 cts = 0;
+	u32 convTime = 0;
+	u32 j = 0;
+	jbyte *jdata;
+	jsize len;
+
+	if ( ctx && ctx->started && ctx->term && ctx->term->compositor && ctx->term->compositor->audio_renderer)
+	{
+		len = (*env)->GetArrayLength(env, arr);
+		if ( len <= 0 ) return;
+		jdata = (*env)->GetByteArrayElements(env,arr,0);
+
+		//convTime = gf_term_get_time(ctx->term);
+
+		data = (u8*)jdata;//(u8*)decodeYUV420SP((char*)jdata, ctx->width, ctx->height); //
+		datasize = len;//ctx->width * ctx->height * CAM_PIXEL_SIZE;//
+
+		cts = gf_term_get_time(ctx->term);
+
+		//convTime = cts - convTime;
+
+		memset(&hdr, 0, sizeof(hdr));
+		hdr.compositionTimeStampFlag = 1;
+		hdr.compositionTimeStamp = cts;
+		gf_term_on_sl_packet(ctx->service, ctx->channel, (void*)data, datasize, &hdr, GF_OK);
+		
+		//gf_free(data);
+
+		(*env)->ReleaseByteArrayElements(env,arr,jdata,JNI_ABORT);
+
+		//GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Camera Frame Sent %d\n", gf_sys_clock()));
+	}
+}
+
+void CallCamMethod(ISOMReader *read, jmethodID methodID)
+{
+	JNIEnv* env = NULL;
+	jint res = 0;
+	u8 isAttached = 0;
+
+	// Get the JNI interface pointer
+	res = (*GetJavaVM())->GetEnv(javaVM, (void**)&env, JNI_VERSION_1_2);
+	if ( res == JNI_EDETACHED )
+	{
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] The current thread is not attached to the VM, assuming native thread\n"));
+		if ( res = (*GetJavaVM())->AttachCurrentThread(GetJavaVM(), &env, NULL) )
+		{
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] Attach current thread failed: %d\n", res));
+			return;
+		}
+		if ( env != read->env )
+			isAttached = 1;
+	}
+
+	(*env)->CallNonvirtualVoidMethod(env, read->camCtrlObj, read->camCtrlClass, methodID);
+
+	if (isAttached)
+	{	
+		(*GetJavaVM())->DetachCurrentThread(GetJavaVM());
+	}
+}
+
+void camStartCamera(ISOMReader *read)
+{
+	JNIEnv* env = NULL;
+	jboolean isPortrait = JNI_FALSE;
+
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] startCamera: %d\n", gf_th_id()));
+
+	// Get the JNI interface pointer
+	env = read->env;
+
+	(*env)->CallNonvirtualBooleanMethod(env, read->camCtrlObj, read->camCtrlClass, read->startCamera, isPortrait);
+}
+
+void camStopCamera(ISOMReader *read)
+{
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] stopCamera: %d\n", gf_th_id()));
+
+	CallCamMethod(read, read->stopCamera);
+}
+
+void pauseCamera(ISOMReader *read)
+{
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] pauseCamera: %d\n", gf_th_id()));
+
+	read->started = 0;
+	CallCamMethod(read, read->stopProcessing);
+}
+
+void resumeCamera(ISOMReader *read)
+{
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] resumeCamera: %d\n", gf_th_id()));
+
+	read->started = 1;
+	CallCamMethod(read, read->startProcessing);
+}
+
+u32 getWidth(ISOMReader *read)
+{
+	JNIEnv* env = NULL;
+
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] getWidth: %d\n", gf_th_id()));
+
+	// Get the JNI interface pointer
+	env = read->env;
+
+	return (*env)->CallNonvirtualIntMethod(env, read->camCtrlObj, read->camCtrlClass, read->getImageWidth);
+}
+
+u32 getHeight(ISOMReader *read)
+{
+	JNIEnv* env = NULL;
+
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] getHeight: %d\n", gf_th_id()));
+
+	// Get the JNI interface pointer
+	env = read->env;
+
+	return (*env)->CallNonvirtualIntMethod(env, read->camCtrlObj, read->camCtrlClass, read->getImageHeight);
+}
+
+GF_Err CAM_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
+{
+	ISOMReader *read;
+	GF_BitStream *bs;
+	char *buf;
+	u32 buf_size;
+	if (!plug || !plug->priv || !com) return GF_SERVICE_ERROR;
+	read = (ISOMReader *) plug->priv;
+
+	if (com->command_type==GF_NET_SERVICE_INFO) {
+		return GF_OK;
+	}
+	if (com->command_type==GF_NET_SERVICE_HAS_AUDIO) {
+		return GF_NOT_SUPPORTED;
+	}
+	if (!com->base.on_channel) return GF_NOT_SUPPORTED;
+
+	switch (com->command_type) {
+	case GF_NET_CHAN_INTERACTIVE:
+		return GF_OK;
+	case GF_NET_CHAN_BUFFER:
+		com->buffer.max = com->buffer.min = 0;
+		return GF_OK;
+	case GF_NET_CHAN_PLAY:
+		resumeCamera(read);
+		return GF_OK;
+	case GF_NET_CHAN_STOP:
+		pauseCamera(read);
+		return GF_OK;
+	/*nothing to do on MP4 for channel config*/
+	case GF_NET_CHAN_CONFIG:
+		return GF_OK;
+	case GF_NET_CHAN_GET_PIXEL_AR:
+		return 1<<16;//gf_isom_get_pixel_aspect_ratio(read->mov, ch->track, 1, &com->par.hSpacing, &com->par.vSpacing);
+	case GF_NET_CHAN_GET_DSI:
+		{
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cam get DSI\n"));
+			/*it may happen that there are conflicting config when using ESD URLs...*/
+			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+
+			read->width = getWidth(read);
+			read->height = getHeight(read);
+
+			gf_bs_write_u32(bs, CAM_PIXEL_FORMAT); // fourcc
+			gf_bs_write_u16(bs, read->width); // width
+			gf_bs_write_u16(bs, read->height); // height
+			gf_bs_write_u32(bs, read->width * read->height * CAM_PIXEL_SIZE); // framesize
+			gf_bs_write_u32(bs, read->width * CAM_PIXEL_SIZE); // stride
+
+			gf_bs_align(bs);
+			gf_bs_get_content(bs, &buf, &buf_size);
+			gf_bs_del(bs);
+
+			com->get_dsi.dsi = buf;
+			com->get_dsi.dsi_len = buf_size;
+			return GF_OK;
+		}
+	}
+	return GF_NOT_SUPPORTED;
+}
+
+GF_InputService *CAM_client_load()
+{
+	ISOMReader *reader;
+	GF_InputService *plug;
+	GF_SAFEALLOC(plug, GF_InputService);
+	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC Camera Plugin", "gpac distribution")
+	plug->CanHandleURL = CAM_CanHandleURL;
+	plug->ConnectService = CAM_ConnectService;
+	plug->CloseService = CAM_CloseService;
+	plug->GetServiceDescriptor = CAM_GetServiceDesc;
+	plug->ConnectChannel = CAM_ConnectChannel;
+	plug->DisconnectChannel = CAM_DisconnectChannel;
+	plug->ServiceCommand = CAM_ServiceCommand;
+
+	GF_SAFEALLOC(reader, ISOMReader);
+	plug->priv = reader;
+	globReader = reader;
+	return plug;
+}
+
+void CAM_client_del(GF_BaseInterface *bi)
+{
+	GF_InputService *plug = (GF_InputService *) bi;
+	ISOMReader *read = (ISOMReader *)plug->priv;
+
+	gf_free(read);
+	gf_free(bi);
+}
+
+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)
+		return (GF_BaseInterface *)CAM_client_load();
+	return NULL;
+}
+
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+	switch (ifce->InterfaceType) {
+	case GF_NET_CLIENT_INTERFACE: CAM_client_del(ifce); break;
+	}
+}
+
+GPAC_MODULE_STATIC_DELARATION( droid_cam )

gpac-0.5.0.svn4296.tar.bz2/modules/droid_mpegv/droid_mpegv.c -> gpac-0.5.0.svn4668.tar.bz2/modules/droid_mpegv/droid_mpegv.c Changed

@@ -1,391 +1,489 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Ivica Arsov, Jean Le Feuvre
- *			Copyright (c) Mines-Telecom 2009-
- *					All rights reserved
- *
- *  This file is part of GPAC / MPEG-V Input sensor for android
- *
- *  GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *		
- */
-
-#include <jni.h>
-#include <android/log.h>
-
-/*driver interfaces*/
-
-#include <gpac/list.h>
-#include <gpac/constants.h>
-
-#include <gpac/setup.h>
-
-#include <gpac/modules/codec.h>
-#include <gpac/scenegraph_vrml.h>
-
-#include <gpac/thread.h>
-
-#define LOG_TAG "MPEG-V_IN"
-#ifdef ANDROID
-#  define LOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)
-#  define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
-#else
-#  define QUOTEME_(x) #x
-#  define QUOTEME(x) QUOTEME_(x)
-#  define LOGI(...) fprintf(stderr, "I/" LOG_TAG " (" __FILE__ ":" QUOTEME(__LINE__) "): " __VA_ARGS__)
-#  define LOGE(...) fprintf(stderr, "E/" LOG_TAG "(" ")" __VA_ARGS__)
-#endif
-
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_MPEGVSensor_sendData( JNIEnv* env, jobject thiz, jint ptr, jstring data);
-
-static JavaVM* javaVM = 0;
-static jclass sensCtrlClass;
-static jmethodID cid;
-static jmethodID startSensor;
-static jmethodID stopSensor;
-
-//----------------------------------------------------------------------
-jint JNI_OnLoad(JavaVM* vm, void* reserved)
-{
-	JNIEnv* env = 0;
-  	javaVM = vm;
-
-	if ( (*javaVM)->GetEnv(javaVM, (void**)&env, JNI_VERSION_1_2) != JNI_OK )
-		return -1;
-
-	// Get the class and its methods in the main env
-
-	// Get the CameraController class
-	// This is just a local refenrece. Cannot be used in the other JNI calls.
-	sensCtrlClass = (*env)->FindClass(env, "com/gpac/Osmo4/MPEGVSensor");
-	if (sensCtrlClass == 0)
-	{
-		LOGE("[MPEG-V_IN] Class MPEGVSensor not found\n");
-		return -1;
-	}
-
-	// Get Global Reference to be able to use the class
-	sensCtrlClass = (*env)->NewGlobalRef(env, sensCtrlClass);
-	if ( sensCtrlClass == 0 )
-	{
-		LOGE("[MPEG-V_IN] Caanot create Global Reference\n");
-		return -1;
-	}
-
-	// Get the method ID for the CameraController constructor.
-	cid = (*env)->GetMethodID(env, sensCtrlClass, "<init>", "()V");
-	if (cid == 0)
-	{
-		LOGE("[MPEG-V_IN] MPEGVSensor Constructor not found\n");
-		return -1;
-	}
-
-	// Get startCamera() method from class CameraController
-	startSensor = (*env)->GetMethodID(env, sensCtrlClass, "startSensor", "(II)V");
-	if (startSensor == 0)
-	{
-		LOGE("[MPEG-V_IN] Function startSensor not found\n");
-		return -1;
-	}
-
-	stopSensor = (*env)->GetMethodID(env, sensCtrlClass, "stopSensor", "()V");
-	if (stopSensor == 0)
-	{
-		LOGE("[MPEG-V_IN] Function stopSensor not found\n");
-		return -1;
-	}
-
-	return JNI_VERSION_1_2;
-}
-
-void JNI_OnUnload(JavaVM *vm, void *reserved)
-{
-	JNIEnv* env = 0;
-  	
-	if ( (*vm)->GetEnv(vm, (void**)&env, JNI_VERSION_1_2) != JNI_OK )
-		return;
-	
-	(*env)->DeleteGlobalRef(env, sensCtrlClass);
-}
-//----------------------------------------------------------------------
-JavaVM* GetJavaVM()
-{
-	return javaVM;
-}
-//----------------------------------------------------------------------
-
-typedef struct
-{
-	char sensor[50];
-	u16 sensorAndroidType;
-	u8 isAttached;
-
-	GF_Thread *trd;
-	u8 stop;
-
-	JNIEnv* env;
-	jclass sensCtrlClass;
-	jmethodID cid;
-	jobject sensCtrlObj;
-	jmethodID startSensor;
-	jmethodID stopSensor;
-} MPEGVSensorContext;
-
-#define MPEGVSCTX	MPEGVSensorContext *rc = (MPEGVSensorContext *)dr->udta
-
-void unloadSensorController(MPEGVSensorContext *rc)
-{
-	if ( rc->isAttached )
-	{
-		(*rc->env)->PopLocalFrame(rc->env, NULL);
-		(*GetJavaVM())->DetachCurrentThread(GetJavaVM());
-		rc->isAttached = 0;
-	}
-
-	rc->env = NULL;
-}
-
-void loadSensorControler(MPEGVSensorContext *rc)
-{
-	JNIEnv* env = NULL;
-	jint res = 0;
-
-	// Here we can be in a thread
-
-	res = (*GetJavaVM())->GetEnv(javaVM, (void**)&env, JNI_VERSION_1_2);
-	if ( res == JNI_EDETACHED )
-	{
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[MPEG-V_IN] The current thread is not attached to the VM, assuming native thread\n"));
-		if ( res = (*GetJavaVM())->AttachCurrentThread(GetJavaVM(), &env, NULL) )
-		{
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[MPEG-V_IN] Attach current thread failed: %d\n", res));
-			return;
-		}
-		rc->isAttached = 1;
-		(*env)->PushLocalFrame(env, 2);
-	}
-	else 
-		if ( res == JNI_EVERSION )
-		{
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[MPEG-V_IN] The specified version is not supported\n"));
-			return;
-		}
-	
-	rc->env = env;
-	rc->sensCtrlClass = sensCtrlClass;
-	rc->cid = cid;
-	rc->startSensor = startSensor;
-	rc->stopSensor = stopSensor;	
-
-	// Create the sensor object in the thread
-	rc->sensCtrlObj = (*rc->env)->NewObject(rc->env, rc->sensCtrlClass, rc->cid);
-	if (rc->sensCtrlObj == 0)
-	{
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[MPEG-V_IN] Cannot create MPEGVSensor object\n"));
-		return;
-	}
-}
-
-Bool MPEGVS_RegisterDevice(struct __input_device *dr, const char *urn, GF_BitStream *dsi, void (*AddField)(struct __input_device *_this, u32 fieldType, const char *name))
-{
-	MPEGVSCTX;
-	
-	//"MPEG-V:siv:OrientationSensorType"
-
-	if ( strnicmp(urn, "MPEG-V", 6) )
-		return 0;
-
-	if ( strlen(urn) <= 6 )
-	{
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[MPEG-V] No sensor type specified\n"));
-		return 0;
-	}
-	
-	if ( strnicmp(urn+6, ":siv:", 5) )
-	{
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[MPEG-V] Not valid sensor type specified\n"));
-		return 0;
-	}
-
-	strcpy(rc->sensor, urn+11);
-
-	if ( !strcmp(rc->sensor, "OrientationSensorType") )
-	{
-		AddField(dr, GF_SG_VRML_SFVEC3F, "Orientation");
-
-		rc->sensorAndroidType = 3;
-		
-		AddField(dr, GF_SG_VRML_SFVEC3F, "pos");
-
-		return 1;
-	}
-	else
-	{
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[MPEG-V_IN] Unsupported sensor type: %s\n", rc->sensor));
-		return 0;
-	}
-}
-
-u32 MPEGVS_OnData(struct __input_device * dr, const char* data)
-{
-	GF_BitStream *bs;
-	char *buf;
-	u32 buf_size;
-	float x, y, z;
-	
-	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-
-	sscanf(data, "%f;%f;%f;", &x, &y, &z);
-
-	gf_bs_write_int(bs, 1, 1);
-	gf_bs_write_float(bs, x);
-	gf_bs_write_float(bs, y);
-	gf_bs_write_float(bs, z);
-
-	gf_bs_align(bs);
-	gf_bs_get_content(bs, &buf, &buf_size);
-	gf_bs_del(bs);
-
-	dr->DispatchFrame(dr, (u8*)buf, buf_size);
-	gf_free(buf);
-
-	return GF_OK;
-}
-
-JNIEXPORT void Java_com_gpac_Osmo4_MPEGVSensor_sendData( JNIEnv* env, jobject thiz, jint ptr, jstring data)
-{
-	jboolean isCopy;
-	const char * cData = (*env)->GetStringUTFChars(env, data, &isCopy);
-
-	MPEGVS_OnData((struct __input_device *)ptr, cData);
-
-	(*env)->ReleaseStringUTFChars(env, data, cData);
-}
-
-u32 ThreadRun(void* param)
-{
-	struct __input_device * dr = (struct __input_device *)param;
-	MPEGVSCTX;
-
-	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[MPEG-V_IN] Start: %d\n", gf_th_id()));
-
-	loadSensorControler(rc);
-
-	if (!rc->env || !rc->sensCtrlObj)
-		return;
-
-	(*rc->env)->CallNonvirtualVoidMethod(rc->env, rc->sensCtrlObj, rc->sensCtrlClass, rc->startSensor, (s32)dr, rc->sensorAndroidType);
-
-	while (!rc->stop)
-		gf_sleep(10);
-	
-	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[MPEG-V_IN] Stop: %d\n", gf_th_id()));
-
-	if (!rc->env)
-		return;
-
-	if ( rc->sensCtrlObj )
- 	{
-		(*rc->env)->CallNonvirtualVoidMethod(rc->env, rc->sensCtrlObj, rc->sensCtrlClass, rc->stopSensor);
-
-		(*rc->env)->DeleteLocalRef( rc->env, rc->sensCtrlObj );
-	}
-
-	unloadSensorController(rc);
-}
-
-void MPEGVS_Start(struct __input_device * dr)
-{
-	MPEGVSCTX;
-	
-	rc->trd = gf_th_new("MPEG-V_IN");
-	gf_th_run(rc->trd, ThreadRun, dr);
-}
-
-void MPEGVS_Stop(struct __input_device * dr)
-{
-	MPEGVSCTX;
-
-	if ( rc->trd )
-	{
-		rc->stop = 1;
-		while ( gf_th_status(rc->trd) == GF_THREAD_STATUS_RUN )
-			gf_sleep(5);
-
-		gf_th_del(rc->trd);
-		rc->trd = NULL;
-		rc->stop = 0;
-	}
-}
-
-GF_InputSensorDevice* NewMPEGVSInputSesor()
-{
-	MPEGVSensorContext* ctx = NULL;
-	GF_InputSensorDevice* driv = NULL;
-	
-	driv = (GF_InputSensorDevice *) gf_malloc(sizeof(GF_InputSensorDevice));
-	memset(driv, 0, sizeof(GF_InputSensorDevice));
-	GF_REGISTER_MODULE_INTERFACE(driv, GF_INPUT_DEVICE_INTERFACE, "MPEG-V Sensors Input Module", "gpac distribution");
-
-	driv->RegisterDevice = MPEGVS_RegisterDevice;
-	driv->Start = MPEGVS_Start;
-	driv->Stop = MPEGVS_Stop;
-
-	ctx = (MPEGVSensorContext*) gf_malloc (sizeof(MPEGVSensorContext));
-	memset(ctx, 0, sizeof(MPEGVSensorContext));
-	
-	driv->udta = (void*)ctx;
-
-	return driv;
-}
-
-void DeleteMPEGVSInputSensor(GF_InputSensorDevice* dev)
-{
-	MPEGVS_Stop(dev);
-	gf_free(dev->udta);
-	gf_free(dev);
-}
-
-/*interface query*/
-GF_EXPORT
-const u32 *QueryInterfaces() 
-{
-	static u32 si [] = {
-		GF_INPUT_DEVICE_INTERFACE,
-		0
-	};
-	return si; 
-}
-
-/*interface create*/
-GF_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	if (InterfaceType == GF_INPUT_DEVICE_INTERFACE) return (GF_BaseInterface *) NewMPEGVSInputSesor();
-	return NULL;
-}
-
-/*interface destroy*/
-GF_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-	case GF_INPUT_DEVICE_INTERFACE:
-		DeleteMPEGVSInputSensor((GF_InputSensorDevice *)ifce);
-		break;
-	}
-}
-
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Ivica Arsov, Jean Le Feuvre
+ *			Copyright (c) Mines-Telecom 2009-
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / MPEG-V Input sensor for android
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *		
+ */
+
+#include <jni.h>
+#include <android/log.h>
+
+/*driver interfaces*/
+
+#include <gpac/list.h>
+#include <gpac/constants.h>
+
+#include <gpac/setup.h>
+
+#include <gpac/modules/codec.h>
+#include <gpac/scenegraph_vrml.h>
+
+#include <gpac/thread.h>
+
+#define LOG_TAG "MPEG-V_IN"
+#ifdef ANDROID
+#  define LOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)
+#  define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
+#else
+#  define QUOTEME_(x) #x
+#  define QUOTEME(x) QUOTEME_(x)
+#  define LOGI(...) fprintf(stderr, "I/" LOG_TAG " (" __FILE__ ":" QUOTEME(__LINE__) "): " __VA_ARGS__)
+#  define LOGE(...) fprintf(stderr, "E/" LOG_TAG "(" ")" __VA_ARGS__)
+#endif
+
+JNIEXPORT void JNICALL Java_com_gpac_Osmo4_MPEGVSensor_sendData( JNIEnv* env, jobject thiz, jint ptr, jstring data);
+
+static JavaVM* javaVM = 0;
+static jclass sensCtrlClass;
+static jmethodID cid;
+static jmethodID startSensor;
+static jmethodID stopSensor;
+
+//----------------------------------------------------------------------
+jint JNI_OnLoad(JavaVM* vm, void* reserved)
+{
+	JNIEnv* env = 0;
+  	javaVM = vm;
+
+	if ( (*javaVM)->GetEnv(javaVM, (void**)&env, JNI_VERSION_1_2) != JNI_OK )
+		return -1;
+
+	// Get the class and its methods in the main env
+
+	// Get the CameraController class
+	// This is just a local refenrece. Cannot be used in the other JNI calls.
+	sensCtrlClass = (*env)->FindClass(env, "com/gpac/Osmo4/MPEGVSensor");
+	if (sensCtrlClass == 0)
+	{
+		LOGE("[MPEG-V_IN] Class MPEGVSensor not found\n");
+		return -1;
+	}
+
+	// Get Global Reference to be able to use the class
+	sensCtrlClass = (*env)->NewGlobalRef(env, sensCtrlClass);
+	if ( sensCtrlClass == 0 )
+	{
+		LOGE("[MPEG-V_IN] Caanot create Global Reference\n");
+		return -1;
+	}
+
+	// Get the method ID for the CameraController constructor.
+	cid = (*env)->GetMethodID(env, sensCtrlClass, "<init>", "()V");
+	if (cid == 0)
+	{
+		LOGE("[MPEG-V_IN] MPEGVSensor Constructor not found\n");
+		return -1;
+	}
+
+	// Get startCamera() method from class CameraController
+	startSensor = (*env)->GetMethodID(env, sensCtrlClass, "startSensor", "(II)V");
+	if (startSensor == 0)
+	{
+		LOGE("[MPEG-V_IN] Function startSensor not found\n");
+		return -1;
+	}
+
+	stopSensor = (*env)->GetMethodID(env, sensCtrlClass, "stopSensor", "()V");
+	if (stopSensor == 0)
+	{
+		LOGE("[MPEG-V_IN] Function stopSensor not found\n");
+		return -1;
+	}
+
+	return JNI_VERSION_1_2;
+}
+
+void JNI_OnUnload(JavaVM *vm, void *reserved)
+{
+	JNIEnv* env = 0;
+  	
+	if ( (*vm)->GetEnv(vm, (void**)&env, JNI_VERSION_1_2) != JNI_OK )
+		return;
+	
+	(*env)->DeleteGlobalRef(env, sensCtrlClass);
+}
+//----------------------------------------------------------------------
+JavaVM* GetJavaVM()
+{
+	return javaVM;
+}
+//----------------------------------------------------------------------
+
+typedef struct
+{
+	char sensor[50];
+	u16 sensorAndroidType;
+	u8 isAttached;
+
+	GF_Thread *trd;
+	u8 stop;
+
+	JNIEnv* env;
+	jclass sensCtrlClass;
+	jmethodID cid;
+	jobject sensCtrlObj;
+	jmethodID startSensor;
+	jmethodID stopSensor;
+} MPEGVSensorContext;
+
+#define MPEGVSCTX	MPEGVSensorContext *rc = (MPEGVSensorContext *)dr->udta
+
+void unloadSensorController(MPEGVSensorContext *rc)
+{
+	if ( rc->isAttached )
+	{
+		(*rc->env)->PopLocalFrame(rc->env, NULL);
+		(*GetJavaVM())->DetachCurrentThread(GetJavaVM());
+		rc->isAttached = 0;
+	}
+
+	rc->env = NULL;
+}
+
+void loadSensorControler(MPEGVSensorContext *rc)
+{
+	JNIEnv* env = NULL;
+	jint res = 0;
+
+	// Here we can be in a thread
+
+	res = (*GetJavaVM())->GetEnv(javaVM, (void**)&env, JNI_VERSION_1_2);
+	if ( res == JNI_EDETACHED )
+	{
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[MPEG-V_IN] The current thread is not attached to the VM, assuming native thread\n"));
+		if ( res = (*GetJavaVM())->AttachCurrentThread(GetJavaVM(), &env, NULL) )
+		{
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[MPEG-V_IN] Attach current thread failed: %d\n", res));
+			return;
+		}
+		rc->isAttached = 1;
+		(*env)->PushLocalFrame(env, 2);
+	}
+	else 
+		if ( res == JNI_EVERSION )
+		{
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[MPEG-V_IN] The specified version is not supported\n"));
+			return;
+		}
+	
+	rc->env = env;
+	rc->sensCtrlClass = sensCtrlClass;
+	rc->cid = cid;
+	rc->startSensor = startSensor;
+	rc->stopSensor = stopSensor;	
+
+	// Create the sensor object in the thread
+	rc->sensCtrlObj = (*rc->env)->NewObject(rc->env, rc->sensCtrlClass, rc->cid);
+	if (rc->sensCtrlObj == 0)
+	{
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[MPEG-V_IN] Cannot create MPEGVSensor object\n"));
+		return;
+	}
+}
+
+Bool MPEGVS_RegisterDevice(struct __input_device *dr, const char *urn, GF_BitStream *dsi, void (*AddField)(struct __input_device *_this, u32 fieldType, const char *name))
+{
+	MPEGVSCTX;
+	
+	//"MPEG-V:siv:OrientationSensorType"
+
+	if ( strnicmp(urn, "MPEG-V", 6) )
+		return 0;
+
+	if ( strlen(urn) <= 6 )
+	{
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[MPEG-V] No sensor type specified\n"));
+		return 0;
+	}
+	
+	if ( strnicmp(urn+6, ":siv:", 5) )
+	{
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[MPEG-V] Not valid sensor type specified\n"));
+		return 0;
+	}
+
+	strcpy(rc->sensor, urn+11);
+
+	if ( !strcmp(rc->sensor, "OrientationSensorType") )
+	{
+		AddField(dr, GF_SG_VRML_SFVEC3F, "Orientation");
+
+		rc->sensorAndroidType = 3;
+
+		return 1;
+	}
+	else if ( !strcmp(rc->sensor, "AccelerationSensorType") )
+	{
+		AddField(dr, GF_SG_VRML_SFVEC3F, "Acceleration");
+
+		rc->sensorAndroidType = 1;
+
+		return 1;
+	}
+	else if ( !strcmp(rc->sensor, "AngularVelocitySensorType") )
+	{
+		AddField(dr, GF_SG_VRML_SFVEC3F, "AngularVelocity");
+
+		rc->sensorAndroidType = 4;
+
+		return 1;
+	}
+	else if ( !strcmp(rc->sensor, "MagneticFieldSensorType") )
+	{
+		AddField(dr, GF_SG_VRML_SFVEC3F, "MagneticField");
+
+		rc->sensorAndroidType = 2;
+
+		return 1;
+	}
+	else if ( !strcmp(rc->sensor, "LightSensorType") )
+	{
+		AddField(dr, GF_SG_VRML_SFFLOAT, "Light");
+
+		rc->sensorAndroidType = 5;
+
+		return 1;
+	}
+	else if ( !strcmp(rc->sensor, "AtmosphericPressureSensorType") )
+	{
+		AddField(dr, GF_SG_VRML_SFFLOAT, "AtmosphericPressure");
+
+		rc->sensorAndroidType = 6;
+
+		return 1;
+	}
+	else if ( !strcmp(rc->sensor, "RotationVectorSensorType") )
+	{
+		AddField(dr, GF_SG_VRML_SFVEC3F, "RotationVector");
+
+		rc->sensorAndroidType = 11;
+
+		return 1;
+	}
+	else if ( !strcmp(rc->sensor, "GlobalPositionSensorType") )
+	{
+		AddField(dr, GF_SG_VRML_SFVEC3F, "Position");
+		AddField(dr, GF_SG_VRML_SFFLOAT, "Accuracy");
+		AddField(dr, GF_SG_VRML_SFFLOAT, "Bearing");
+
+		rc->sensorAndroidType = 100;
+
+		return 1;
+	}
+	else
+	{
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[MPEG-V_IN] Unsupported sensor type: %s\n", rc->sensor));
+		return 0;
+	}
+}
+
+u32 MPEGVS_OnData(struct __input_device * dr, const char* data)
+{
+	GF_BitStream *bs;
+	char *buf;
+	u32 buf_size;
+	float x, y, z, q, a, b;
+	MPEGVSCTX;
+	
+	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+
+	if ( rc->sensorAndroidType == 1 
+			|| rc->sensorAndroidType == 2
+			|| rc->sensorAndroidType == 3
+			|| rc->sensorAndroidType == 4 )
+	{
+		sscanf(data, "%f;%f;%f;", &x, &y, &z);
+		gf_bs_write_int(bs, 1, 1);
+		gf_bs_write_float(bs, x);
+		gf_bs_write_float(bs, y);
+		gf_bs_write_float(bs, z);
+	}
+	else
+	if ( rc->sensorAndroidType == 5
+			|| rc->sensorAndroidType == 6 )
+	{
+		sscanf(data, "%f;", &x);
+		
+		gf_bs_write_int(bs, 1, 1);
+		gf_bs_write_float(bs, x);
+	}
+	else 
+	if ( rc->sensorAndroidType == 11 )
+	{
+		sscanf(data, "%f;%f;%f;", &x, &y, &z);
+
+		gf_bs_write_int(bs, 1, 1);
+		gf_bs_write_float(bs, x);
+		gf_bs_write_float(bs, y);
+		gf_bs_write_float(bs, z);
+		/*gf_bs_write_float(bs, q);*/
+	}
+	else 
+	if ( rc->sensorAndroidType == 100 )
+	{
+		sscanf(data, "%f;%f;%f;%f;%f;", &x, &y, &z, &a, &b);
+
+		gf_bs_write_int(bs, 1, 1);
+		gf_bs_write_float(bs, x);
+		gf_bs_write_float(bs, y);
+		gf_bs_write_float(bs, z);
+		gf_bs_write_int(bs, 1, 1);
+		gf_bs_write_float(bs, a);
+		gf_bs_write_int(bs, 1, 1);
+		gf_bs_write_float(bs, b);
+		/*gf_bs_write_float(bs, q);*/
+	}
+
+	gf_bs_align(bs);
+	gf_bs_get_content(bs, &buf, &buf_size);
+	gf_bs_del(bs);
+
+	dr->DispatchFrame(dr, (u8*)buf, buf_size);
+	gf_free(buf);
+
+	return GF_OK;
+}
+
+JNIEXPORT void Java_com_gpac_Osmo4_MPEGVSensor_sendData( JNIEnv* env, jobject thiz, jint ptr, jstring data)
+{
+	jboolean isCopy;
+	const char * cData = (*env)->GetStringUTFChars(env, data, &isCopy);
+
+	MPEGVS_OnData((struct __input_device *)ptr, cData);
+
+	(*env)->ReleaseStringUTFChars(env, data, cData);
+}
+
+u32 ThreadRun(void* param)
+{
+	struct __input_device * dr = (struct __input_device *)param;
+	MPEGVSCTX;
+
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[MPEG-V_IN] Start: %d\n", gf_th_id()));
+
+	loadSensorControler(rc);
+
+	if (!rc->env || !rc->sensCtrlObj)
+		return;
+
+	(*rc->env)->CallNonvirtualVoidMethod(rc->env, rc->sensCtrlObj, rc->sensCtrlClass, rc->startSensor, (s32)dr, rc->sensorAndroidType);
+
+	while (!rc->stop)
+		gf_sleep(10);
+	
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[MPEG-V_IN] Stop: %d\n", gf_th_id()));
+
+	if (!rc->env)
+		return;
+
+	if ( rc->sensCtrlObj )
+ 	{
+		(*rc->env)->CallNonvirtualVoidMethod(rc->env, rc->sensCtrlObj, rc->sensCtrlClass, rc->stopSensor);
+
+		(*rc->env)->DeleteLocalRef( rc->env, rc->sensCtrlObj );
+	}
+
+	unloadSensorController(rc);
+}
+
+void MPEGVS_Start(struct __input_device * dr)
+{
+	MPEGVSCTX;
+	
+	rc->trd = gf_th_new("MPEG-V_IN");
+	gf_th_run(rc->trd, ThreadRun, dr);
+}
+
+void MPEGVS_Stop(struct __input_device * dr)
+{
+	MPEGVSCTX;
+
+	if ( rc->trd )
+	{
+		rc->stop = 1;
+		while ( gf_th_status(rc->trd) == GF_THREAD_STATUS_RUN )
+			gf_sleep(5);
+
+		gf_th_del(rc->trd);
+		rc->trd = NULL;
+		rc->stop = 0;
+	}
+}
+
+GF_InputSensorDevice* NewMPEGVSInputSesor()
+{
+	MPEGVSensorContext* ctx = NULL;
+	GF_InputSensorDevice* driv = NULL;
+	
+	driv = (GF_InputSensorDevice *) gf_malloc(sizeof(GF_InputSensorDevice));
+	memset(driv, 0, sizeof(GF_InputSensorDevice));
+	GF_REGISTER_MODULE_INTERFACE(driv, GF_INPUT_DEVICE_INTERFACE, "MPEG-V Sensors Input Module", "gpac distribution");
+
+	driv->RegisterDevice = MPEGVS_RegisterDevice;
+	driv->Start = MPEGVS_Start;
+	driv->Stop = MPEGVS_Stop;
+
+	ctx = (MPEGVSensorContext*) gf_malloc (sizeof(MPEGVSensorContext));
+	memset(ctx, 0, sizeof(MPEGVSensorContext));
+	
+	driv->udta = (void*)ctx;
+
+	return driv;
+}
+
+void DeleteMPEGVSInputSensor(GF_InputSensorDevice* dev)
+{
+	MPEGVS_Stop(dev);
+	gf_free(dev->udta);
+	gf_free(dev);
+}
+
+/*interface query*/
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces() 
+{
+	static u32 si [] = {
+		GF_INPUT_DEVICE_INTERFACE,
+		0
+	};
+	return si; 
+}
+
+/*interface create*/
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
+{
+	if (InterfaceType == GF_INPUT_DEVICE_INTERFACE) return (GF_BaseInterface *) NewMPEGVSInputSesor();
+	return NULL;
+}
+
+/*interface destroy*/
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+	switch (ifce->InterfaceType) {
+	case GF_INPUT_DEVICE_INTERFACE:
+		DeleteMPEGVSInputSensor((GF_InputSensorDevice *)ifce);
+		break;
+	}
+}
+
+GPAC_MODULE_STATIC_DELARATION( droid_mpegv )

gpac-0.5.0.svn4296.tar.bz2/modules/droid_out/droid_vout-bitmap.c -> gpac-0.5.0.svn4668.tar.bz2/modules/droid_out/droid_vout-bitmap.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/droid_out/droid_vout.c -> gpac-0.5.0.svn4668.tar.bz2/modules/droid_out/droid_vout.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/dummy_in/dummy_in.c -> gpac-0.5.0.svn4668.tar.bz2/modules/dummy_in/dummy_in.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/dx_hw/Makefile -> gpac-0.5.0.svn4668.tar.bz2/modules/dx_hw/Makefile Changed

gpac-0.5.0.svn4296.tar.bz2/modules/dx_hw/dx_2d.c -> gpac-0.5.0.svn4668.tar.bz2/modules/dx_hw/dx_2d.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/dx_hw/dx_hw.h -> gpac-0.5.0.svn4668.tar.bz2/modules/dx_hw/dx_hw.h Changed

gpac-0.5.0.svn4296.tar.bz2/modules/dx_hw/dx_hw.rc -> gpac-0.5.0.svn4668.tar.bz2/modules/dx_hw/dx_hw.rc Changed

gpac-0.5.0.svn4296.tar.bz2/modules/dx_hw/dx_video.c -> gpac-0.5.0.svn4668.tar.bz2/modules/dx_hw/dx_video.c Changed

@@ -287,6 +287,7 @@
 #elif !defined(_WIN32_WCE)
     PIXELFORMATDESCRIPTOR pfd; 
     s32 pixelformat;
+	int bits_depth = 24;
 	u32 i;
 
 	/*already setup*/
@@ -314,7 +315,8 @@
     pfd.iPixelType = PFD_TYPE_RGBA;
     pfd.cColorBits = 32;
 	sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "GLNbBitsDepth");
-	pfd.cDepthBits = sOpt ? atoi(sOpt) : 16;
+	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; 
@@ -351,9 +353,9 @@
 			WGL_RED_BITS_ARB, 8,
 			WGL_GREEN_BITS_ARB, 8,
 			WGL_BLUE_BITS_ARB, 8, 
-/*
-			WGL_DEPTH_BITS_ARB, 16,
-			WGL_BIND_TO_TEXTURE_RGBA_ARB, TRUE,
+
+			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,
@@ -378,8 +380,11 @@
 	/*special care for Firefox: XUL and OpenGL do not go well together, there is a stack overflow in WM_PAINT
 	for our plugin window - avoid this by overriding the WindowProc once OpenGL is setup!!*/
 	if ((dd->bound_hwnd==dd->os_hwnd) && dd->orig_wnd_proc)
+#ifdef _WIN64
+        SetWindowLongPtr(dd->os_hwnd, GWLP_WNDPROC, (DWORD) DD_WindowProc);
+#else
 		SetWindowLong(dd->os_hwnd, GWL_WNDPROC, (DWORD) DD_WindowProc);
-
+#endif
 
 	if (dd->output_3d_type==1) {
 		memset(&evt, 0, sizeof(GF_Event));
@@ -604,6 +609,7 @@
 		return GF_OK;
 	}
 	
+	hr = dd->pDD->lpVtbl->WaitForVerticalBlank(dd->pDD, DDWAITVB_BLOCKBEGIN, NULL);
 	if (dest) {
 		POINT pt;
 		pt.x = dest->x;
@@ -716,7 +722,7 @@
 }
 
 /*interface query*/
-GF_EXPORT
+GPAC_MODULE_EXPORT
 const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
@@ -727,7 +733,7 @@
 	return si;
 }
 /*interface create*/
-GF_EXPORT
+GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 	if (InterfaceType == GF_VIDEO_OUTPUT_INTERFACE) return NewDXVideoOutput();
@@ -735,7 +741,7 @@
 	return NULL;
 }
 /*interface destroy*/
-GF_EXPORT
+GPAC_MODULE_EXPORT
 void ShutdownInterface(GF_BaseInterface *ifce)
 {
 	switch (ifce->InterfaceType) {
@@ -747,3 +753,5 @@
 		break;
 	}
 }
+
+GPAC_MODULE_STATIC_DELARATION( dx_out )

gpac-0.5.0.svn4296.tar.bz2/modules/dx_hw/dx_window.c -> gpac-0.5.0.svn4668.tar.bz2/modules/dx_hw/dx_window.c Changed

@@ -50,7 +50,7 @@
 }
 #else
 
-static void DD_GetCoordinates(DWORD lParam, GF_Event *evt)
+static void DD_GetCoordinates(LPARAM lParam, GF_Event *evt)
 {
 	POINTS pt = MAKEPOINTS(lParam);
 	evt->mouse.x = pt.x;
@@ -58,10 +58,10 @@
 }
 #endif
 
-static void w32_translate_key(u32 wParam, u32 lParam, GF_EventKey *evt)
+static void w32_translate_key(WPARAM wParam, LPARAM lParam, GF_EventKey *evt)
 {
 	evt->flags = 0;
-	evt->hw_code = wParam;
+	evt->hw_code = (u32) wParam;
 	switch (wParam) {
 	case VK_BACK: evt->key_code = GF_KEY_BACKSPACE; break;
 	case VK_TAB: evt->key_code = GF_KEY_TAB; break;
@@ -283,8 +283,8 @@
 	/*thru VK_9 are the same as ASCII '0' thru '9' (0x30 - 0x39) */
 	/* VK_A thru VK_Z are the same as ASCII 'A' thru 'Z' (0x41 - 0x5A) */
 	default: 
-		if ((wParam>=0x30) && (wParam<=0x39))  evt->key_code = GF_KEY_0 + wParam-0x30;
-		else if ((wParam>=0x41) && (wParam<=0x5A))  evt->key_code = GF_KEY_A + wParam-0x41;
+		if ((wParam>=0x30) && (wParam<=0x39))  evt->key_code = GF_KEY_0 + (u32) (wParam-0x30);
+		else if ((wParam>=0x41) && (wParam<=0x5A))  evt->key_code = GF_KEY_A + (u32) (wParam-0x41);
 		/*DOM 3 Events: Implementations that are unable to identify a key must use the key identifier "Unidentified".*/
 		else
 			evt->key_code = GF_KEY_UNIDENTIFIED;
@@ -321,13 +321,16 @@
 	mouse_start_timer(ctx, hWnd, vout);
 }
 
-LRESULT APIENTRY DD_WindowProc(HWND hWnd, UINT msg, UINT wParam, LONG lParam)
+LRESULT APIENTRY DD_WindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	Bool ret = 1;
 	GF_Event evt;
 	DDContext *ctx;
+#ifdef _WIN64
+    GF_VideoOutput *vout = (GF_VideoOutput *) GetWindowLongPtr(hWnd, GWLP_USERDATA);
+#else
 	GF_VideoOutput *vout = (GF_VideoOutput *) GetWindowLong(hWnd, GWL_USERDATA);
-
+#endif
 	if (!vout) return DefWindowProc(hWnd, msg, wParam, lParam);
 	ctx = (DDContext *)vout->opaque;
 
@@ -369,7 +372,11 @@
 			PostQuitMessage (0);
 		} else if (ctx->orig_wnd_proc) {
 			/*restore window proc*/
+#ifdef _WIN64
+            SetWindowLongPtr(ctx->os_hwnd, GWLP_WNDPROC, ctx->orig_wnd_proc);
+#else
 			SetWindowLong(ctx->os_hwnd, GWL_WNDPROC, ctx->orig_wnd_proc);
+#endif
 			ctx->orig_wnd_proc = 0L;
 		}
 		break;
@@ -596,7 +603,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) {
-				u32 len;
+				size_t len;
 				HGLOBAL hglbCopy;
 				LPTSTR lptstrCopy;
 				if (!IsClipboardFormatAvailable(CF_TEXT)) break;
@@ -617,6 +624,10 @@
 			}
 		}
 		ret = vout->on_event(vout->evt_cbk_hdl, &evt);
+		
+		if ( !ctx->ctrl_down && !ctx->alt_down
+			&& evt.key.key_code != GF_KEY_CONTROL && evt.key.key_code != GF_KEY_ALT )
+			ret = 1;
 		break;
 
 	case WM_UNICHAR:
@@ -625,7 +636,7 @@
 //		if (wParam>=32) 
 		{
 			evt.type = GF_EVENT_TEXTINPUT;
-			evt.character.unicode_char = wParam;
+			evt.character.unicode_char = (u32) wParam;
 			ret = vout->on_event(vout->evt_cbk_hdl, &evt);
 		}
 		break;
@@ -796,8 +807,11 @@
 			return 0;
 		}
 		ShowWindow(ctx->fs_hwnd, SW_HIDE);
-
+#ifdef _WIN64
+        SetWindowLongPtr(ctx->fs_hwnd, GWLP_USERDATA, (LONG) vout);
+#else
 		SetWindowLong(ctx->fs_hwnd, GWL_USERDATA, (LONG) vout);
+#endif
 	} else {
 		ctx->fs_hwnd = ctx->os_hwnd;
 	}
@@ -806,7 +820,11 @@
 	if (!ctx->switch_res) SetFocus(ctx->os_hwnd);
 
 	ctx->switch_res = 0;
+#ifdef _WIN64
+    SetWindowLongPtr(ctx->os_hwnd, GWLP_USERDATA, (LONG) vout);
+#else
 	SetWindowLong(ctx->os_hwnd, GWL_USERDATA, (LONG) vout);
+#endif
 
 	/*load cursors*/
 	ctx->curs_normal = LoadCursor(NULL, IDC_ARROW);
@@ -849,8 +867,13 @@
 	if (ctx->os_hwnd) {
 		/*override window proc*/
 		if (!(flags & GF_TERM_NO_WINDOWPROC_OVERRIDE) ) {
+#ifdef _WIN64
+            ctx->orig_wnd_proc = GetWindowLongPtr(ctx->os_hwnd, GWLP_WNDPROC);
+            SetWindowLongPtr(ctx->os_hwnd, GWLP_WNDPROC, (DWORD) DD_WindowProc);
+#else
 			ctx->orig_wnd_proc = GetWindowLong(ctx->os_hwnd, GWL_WNDPROC);
 			SetWindowLong(ctx->os_hwnd, GWL_WNDPROC, (DWORD) DD_WindowProc);
+#endif
 		}
 		ctx->parent_wnd = GetParent(ctx->os_hwnd);
 	}
@@ -880,14 +903,23 @@
 		dd_closewindow(ctx->os_hwnd);
 	} else if (ctx->orig_wnd_proc) {
 		/*restore window proc*/
+#ifdef _WIN64
+        SetWindowLongPtr(ctx->os_hwnd, GWLP_WNDPROC, ctx->orig_wnd_proc);
+#else
 		SetWindowLong(ctx->os_hwnd, GWL_WNDPROC, ctx->orig_wnd_proc);
+#endif
 		ctx->orig_wnd_proc = 0L;
 	}
 
 	if (ctx->fs_hwnd != ctx->os_hwnd) {
 		dd_closewindow(ctx->fs_hwnd);
+#ifdef _WIN64
+        SetWindowLongPtr(ctx->fs_hwnd, GWLP_USERDATA, (LONG) NULL);
+        SetWindowLongPtr(ctx->fs_hwnd, GWLP_WNDPROC, (DWORD) DefWindowProc);
+#else
 		SetWindowLong(ctx->fs_hwnd, GWL_USERDATA, (LONG) NULL);
 		SetWindowLong(ctx->fs_hwnd, GWL_WNDPROC, (DWORD) DefWindowProc);
+#endif
 	}
 
 #ifndef GPAC_DISABLE_3D
@@ -904,7 +936,11 @@
 
 	/*special care for Firefox: the windows created by our NP plugin may still be called
 	after the shutdown of the plugin !!*/
+#ifdef _WIN64
+    SetWindowLongPtr(ctx->os_hwnd, GWLP_USERDATA, (LONG) NULL);
+#else
 	SetWindowLong(ctx->os_hwnd, GWL_USERDATA, (LONG) NULL);
+#endif
 
 #ifdef _WIN32_WCE
 	UnregisterClass(_T("GPAC DirectDraw Output"), GetModuleHandle(_T("gm_dx_hw.dll")) );
@@ -955,7 +991,7 @@
 	return ((DDContext*)the_video_output->opaque)->os_hwnd;
 }
 
-u32 get_sys_col(int idx)
+static u32 get_sys_col(int idx)
 {
 	u32 res;
 	DWORD val = GetSysColor(idx);

gpac-0.5.0.svn4296.tar.bz2/modules/epoc_hw/epoc_vout.cpp -> gpac-0.5.0.svn4668.tar.bz2/modules/epoc_hw/epoc_vout.cpp Changed

gpac-0.5.0.svn4296.tar.bz2/modules/ffmpeg_in/ffmpeg_decode.c -> gpac-0.5.0.svn4668.tar.bz2/modules/ffmpeg_in/ffmpeg_decode.c Changed

@@ -38,7 +38,9 @@
 #undef USE_AVCODEC2
 #endif
 
-#if (LIBAVCODEC_VERSION_MAJOR >= 54) && (LIBAVCODEC_VERSION_MINOR >= 35)
+#if (LIBAVCODEC_VERSION_MAJOR >= 55) 
+#define USE_AVCTX3
+#elif (LIBAVCODEC_VERSION_MAJOR >= 54) && (LIBAVCODEC_VERSION_MINOR >= 35)
 #define USE_AVCTX3
 #endif
 
@@ -391,6 +393,7 @@
 	}
 	return GF_OK;
 }
+
 static GF_Err FFDEC_DetachStream(GF_BaseDecoder *plug, u16 ES_ID)
 {
 	AVCodecContext **ctx;
@@ -625,10 +628,11 @@
 		if (ffd->frame_start>inBufferLength) ffd->frame_start = 0;
 
 redecode:
-		gotpic = AVCODEC_MAX_AUDIO_FRAME_SIZE;
 #ifdef USE_AVCODEC2
+		gotpic = 192000;
 		len = avcodec_decode_audio3(ctx, (short *)ffd->audio_buf, &gotpic, &pkt);
 #else
+		gotpic = AVCODEC_MAX_AUDIO_FRAME_SIZE;
 		len = avcodec_decode_audio2(ctx, (short *)ffd->audio_buf, &gotpic, inBuffer + ffd->frame_start, inBufferLength - ffd->frame_start);
 #endif
 		if (len<0) { ffd->frame_start = 0; return GF_NON_COMPLIANT_BITSTREAM; }
@@ -727,7 +731,7 @@
 				/* FIXME : SOUCHAY : not sure of exact behaviour, but old one was reading non-allocated memory */
 				while ((end+3) < bufferEnd) {
 					if (!end[0] && !end[1] && !end[2] && (end[3]==0x01)) {
-						nalu_size = end - start - 4;
+						nalu_size = (u32) (end - start - 4);
 						start[0] = (nalu_size>>24)&0xFF;
 						start[1] = (nalu_size>>16)&0xFF;
 						start[2] = (nalu_size>>8)&0xFF;
@@ -738,7 +742,7 @@
 					}
 					end++;
 				}
-				nalu_size = (inBuffer+inBufferLength) - start - 4;
+				nalu_size = (u32) ((inBuffer+inBufferLength) - start - 4);
 				start[0] = (nalu_size>>24)&0xFF;
 				start[1] = (nalu_size>>16)&0xFF;
 				start[2] = (nalu_size>>8)&0xFF;
@@ -747,7 +751,7 @@
 			}
 			/*if we had ISMA E&A and lost it this is likely due to a pck loss - do NOT switch back to regular*/
 			else if (ffd->check_h264_isma == 1) {
-				ffd->check_h264_isma = 0;
+				ffd->check_h264_isma = GF_FALSE;
 			}
 		}
 
@@ -763,7 +767,7 @@
 			/*switch to H263 (ffmpeg MPEG-4 codec doesn't understand short headers)*/
 			{
 				u32 old_codec = (*codec)->id;
-				ffd->check_short_header = 0;
+				ffd->check_short_header = GF_FALSE;
 				/*OK we loose the DSI stored in the codec context, but H263 doesn't need any, and if we're
 				here this means the DSI was broken, so no big deal*/
 				avcodec_close(ctx);
@@ -1002,7 +1006,7 @@
 	else if (StreamType==GF_STREAM_VISUAL) {
 
 		/*fixme - we should use some priority rather than declare ffmpeg can't handle svc*/
-		if (esd->decoderConfig->objectTypeIndication == GPAC_OTI_VIDEO_AVC) {
+		if (esd->decoderConfig->objectTypeIndication == GPAC_OTI_VIDEO_AVC){
 			if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
 				Bool is_svc = 0;
 				u32 i, count;
@@ -1026,7 +1030,7 @@
 				gf_odf_avc_cfg_del(cfg);
 				return (is_svc || esd->decoderConfig->rvc_config || esd->decoderConfig->predefined_rvc_config) ? GF_CODEC_MAYBE_SUPPORTED : GF_CODEC_SUPPORTED;
 			}
-			if (esd->decoderConfig->rvc_config || esd->decoderConfig->predefined_rvc_config) return GF_CODEC_MAYBE_SUPPORTED;
+			if (esd->decoderConfig->rvc_config || esd->decoderConfig->predefined_rvc_config || esd->has_ref_base) return GF_CODEC_MAYBE_SUPPORTED;
 			return GF_CODEC_SUPPORTED;
 		}
 
@@ -1034,7 +1038,8 @@
 		/*MPEG-4 v1 simple profile*/
 		case GPAC_OTI_VIDEO_MPEG4_PART2: codec_id = CODEC_ID_MPEG4; break;
 		/*H264 (not std OTI, just the way we use it internally)*/
-		case GPAC_OTI_VIDEO_AVC: codec_id = CODEC_ID_H264; break;
+		case GPAC_OTI_VIDEO_AVC:
+			codec_id = CODEC_ID_H264; break;
 		/*MPEG1 video*/
 		case GPAC_OTI_VIDEO_MPEG1:
 		/*MPEG2 video*/

gpac-0.5.0.svn4296.tar.bz2/modules/ffmpeg_in/ffmpeg_demux.c -> gpac-0.5.0.svn4668.tar.bz2/modules/ffmpeg_in/ffmpeg_demux.c Changed

@@ -88,7 +88,7 @@
 	seek_to = (s64) (AV_TIME_BASE*ffd->seek_time);
 	map_video_time = !ffd->seekable;
 
-	video_init = (seek_to && ffd->video_ch) ? 0 : 1;
+	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);
@@ -341,7 +341,7 @@
 			} else if (!strstr(szExtList, szExt)) {
 				u32 len;
 				char *buf;
-				len = strlen(szExtList) + strlen(szExt) + 10;
+				len = (u32) (strlen(szExtList) + strlen(szExt) + 10);
 				buf = gf_malloc(sizeof(char)*len);
 				sprintf(buf, "\"%s ", szExt);
 				strcat(buf, &szExtList[1]);
@@ -929,11 +929,11 @@
 	FFDemux *ffd;
 	const char *this_url;
 	if (!plug || !url)
-		return 0;
+		return GF_FALSE;
 	ffd = (FFDemux *)plug->priv;
 	this_url = gf_term_get_service_url(ffd->service);
 	if (!this_url)
-		return 0;
+		return GF_FALSE;
 
 	strcpy(szURL, this_url);
 	sep = strrchr(szURL, '#');
@@ -943,7 +943,7 @@
 	sep = strrchr(url, '#');
 	if (sep && !stricmp(sep, "#video") && (ffd->video_st>=0)) return 1;
 	if (sep && !stricmp(sep, "#audio") && (ffd->audio_st>=0)) return 1;
-	return 0;
+	return GF_FALSE;
 }
 
 void *New_FFMPEG_Demux()

gpac-0.5.0.svn4296.tar.bz2/modules/ffmpeg_in/ffmpeg_in.h -> gpac-0.5.0.svn4668.tar.bz2/modules/ffmpeg_in/ffmpeg_in.h Changed

gpac-0.5.0.svn4296.tar.bz2/modules/ffmpeg_in/ffmpeg_load.c -> gpac-0.5.0.svn4668.tar.bz2/modules/ffmpeg_in/ffmpeg_load.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/freenect/freenect.c -> gpac-0.5.0.svn4668.tar.bz2/modules/freenect/freenect.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/ft_font/ft_font.c -> gpac-0.5.0.svn4668.tar.bz2/modules/ft_font/ft_font.c Changed

@@ -29,6 +29,15 @@
 #include <gpac/utf.h>
 #include <gpac/tools.h>
 
+#if !defined(__GNUC__)
+# if defined(_WIN32_WCE)
+#  pragma comment(lib, "freetype")
+# elif defined (WIN32)
+#  pragma comment(lib, "freetype")
+# endif
+#endif
+
+
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_GLYPH_H
@@ -86,9 +95,9 @@
 	for (i = 0 ; listOfFonts[i]; i++){
 		const char * best = listOfFonts[i];
 		if (!stricmp(best, fontName))
-			return 1;
+			return GF_TRUE;
 		if (currentBestFont && !stricmp(best, currentBestFont))
-			return 0;
+			return GF_FALSE;
 	}
 	/* Nothing has been found, the font is the best if none has been choosen before */
 	return currentBestFont == NULL;
@@ -481,7 +490,7 @@
 	return GF_NOT_SUPPORTED;
 }
 
-static GF_Err ft_get_font_info(GF_FontReader *dr, char **font_name, s32 *em_size, s32 *ascent, s32 *descent, s32 *underline, s32 *line_spacing, s32 *max_advance_h, s32 *max_advance_v)
+static GF_Err ft_get_font_info(GF_FontReader *dr, char **font_name, u32 *em_size, s32 *ascent, s32 *descent, s32 *underline, s32 *line_spacing, s32 *max_advance_h, s32 *max_advance_v)
 {
 	FTBuilder *ftpriv = (FTBuilder *)dr->udta;
 	if (!ftpriv->active_face) return GF_BAD_PARAM;
@@ -500,6 +509,7 @@
 
 static GF_Err ft_get_glyphs(GF_FontReader *dr, const char *utf_string, u32 *glyph_buffer, u32 *io_glyph_buffer_size, const char *xml_lang, Bool *is_rtl)
 {
+	size_t _len;
 	u32 len;
 	u32 i;
 	u16 *conv;
@@ -510,7 +520,7 @@
 
 	/*TODO: glyph substitution / ligature */
 
-	len = utf_string ? strlen(utf_string) : 0;
+	len = utf_string ? (u32) strlen(utf_string) : 0;
 	if (!len) {
 		*io_glyph_buffer_size = 0;
 		return GF_OK;
@@ -519,8 +529,9 @@
 		*io_glyph_buffer_size = len+1;
 		return GF_BUFFER_TOO_SMALL;
 	}
-	len = gf_utf8_mbstowcs((u16*) glyph_buffer, *io_glyph_buffer_size, (const char **) &utf8);
-	if ((s32)len<0) return GF_IO_ERR;
+	_len = gf_utf8_mbstowcs((u16*) glyph_buffer, *io_glyph_buffer_size, (const char **) &utf8);
+	if (_len==(size_t)-1) return GF_IO_ERR;
+	len = (u32) _len;
 	if (utf8) return GF_IO_ERR;
 
 	/*perform bidi relayout*/
@@ -691,7 +702,7 @@
 
 #ifndef GPAC_STANDALONE_RENDER_2D
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 const u32 *QueryInterfaces() 
 {
 	static u32 si [] = {
@@ -701,14 +712,14 @@
 	return si;
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface(u32 InterfaceType) 
 {
 	if (InterfaceType == GF_FONT_READER_INTERFACE) return (GF_BaseInterface *)ft_load();
 	return NULL;
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 void ShutdownInterface(GF_BaseInterface *ifce)
 {
 	switch (ifce->InterfaceType) {
@@ -718,5 +729,7 @@
 	}
 }
 
+GPAC_MODULE_STATIC_DELARATION( ftfont )
+
 #endif

gpac-0.5.0.svn4296.tar.bz2/modules/gapi/gapi.cpp -> gpac-0.5.0.svn4668.tar.bz2/modules/gapi/gapi.cpp Changed

@@ -55,7 +55,7 @@
 
 #endif
 
-static Bool landscape = 0;
+static Bool landscape = GF_FALSE;
 
 
 #define PRINT(__str) OutputDebugString(_T(__str))
@@ -435,7 +435,7 @@
 		ctx->hThread = CreateThread (NULL, 0, (LPTHREAD_START_ROUTINE) GAPI_WindowThread, (LPVOID) dr, 0, &(ctx->ThreadID) );
 		while (!ctx->hWnd && ctx->hThread) gf_sleep(10);
 		if (!ctx->hThread) return;
-		ctx->owns_hwnd = 1;
+		ctx->owns_hwnd = GF_TRUE;
 	} else {
 		ctx->orig_wnd_proc = GetWindowLong(ctx->hWnd, GWL_WNDPROC);
 		/*override window proc*/
@@ -452,7 +452,7 @@
 
 
 #ifdef GPAC_USE_OGL_ES
-	ctx->use_pbuffer = 1;
+	ctx->use_pbuffer = GF_TRUE;
 	dr->hw_caps |= GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA;
 	e = GAPI_SetupOGL_ES_Offscreen(dr, 20, 20);
 	if (e!=GF_OK) {
@@ -465,7 +465,7 @@
 		dr->hw_caps |= GF_VIDEO_HW_OPENGL_OFFSCREEN;
 		return;
 	}
-	ctx->use_pbuffer = 0;
+	ctx->use_pbuffer = GF_FALSE;
 
 	WNDCLASS wc;
 	HINSTANCE hInst;
@@ -521,7 +521,7 @@
 GF_Err GAPI_Clear(GF_VideoOutput *dr, u32 color)
 {
 	GAPICTX(dr);
-	gctx->erase_dest = 1;
+	gctx->erase_dest = GF_TRUE;
 	return GF_OK;
 }
 
@@ -637,7 +637,7 @@
 	atts[i++] = EGL_NONE;
 
 	/*whenever window is resized we must reinit OGL-ES*/
-	GAPI_ReleaseOGL_ES(gctx, 0);
+	GAPI_ReleaseOGL_ES(gctx, GF_FALSE);
 
 	if (!gctx->fullscreen) {
 		RECT rc;
@@ -712,7 +712,7 @@
 
 	GAPICTX(dr)
 
-	GAPI_ReleaseOGL_ES(gctx, 1);
+	GAPI_ReleaseOGL_ES(gctx, GF_TRUE);
 
 	if (!gctx->use_pbuffer) {
 		SetWindowPos(gctx->gl_hwnd, NULL, 0, 0, width, height, SWP_NOZORDER | SWP_NOMOVE);
@@ -777,7 +777,7 @@
 	ctx->raw_ptr = NULL;
 
 #ifdef GPAC_USE_OGL_ES
-	if (ctx->output_3d_type) GAPI_ReleaseOGL_ES(ctx, 0);
+	if (ctx->output_3d_type) GAPI_ReleaseOGL_ES(ctx, GF_FALSE);
 	else
 #endif
     if (ctx->bitmap) DeleteObject(ctx->bitmap);
@@ -795,7 +795,7 @@
 	ctx->hdc = NULL;
 }
 
-GF_Err GAPI_Setup(GF_VideoOutput *dr, void *os_handle, void *os_display, Bool noover)
+GF_Err GAPI_Setup(GF_VideoOutput *dr, void *os_handle, void *os_display, u32 noover)
 {
 	struct GXDisplayProperties gx = GXGetDisplayProperties();
 	RECT rc;
@@ -861,12 +861,12 @@
 
 static GF_Err GAPI_SetFullScreen(GF_VideoOutput *dr, Bool bOn, u32 *outWidth, u32 *outHeight)
 {
-	Bool is_wide_scene = (bOn==2) ? 1 : 0;
+	Bool is_wide_scene = (bOn==2) ? GF_TRUE : GF_FALSE;
 	GF_Err e;
 	GAPICTX(dr);
 
 	if (!gctx) return GF_BAD_PARAM;
-	if (is_wide_scene) bOn = 1;
+	if (is_wide_scene) bOn = GF_TRUE;
 	if (bOn == gctx->fullscreen) return GF_OK;
 
 #ifdef GPAC_USE_OGL_ES
@@ -883,25 +883,25 @@
 	if (bOn) {
 		if (!GXOpenDisplay(GetParent(gctx->hWnd), 0L/*GX_FULLSCREEN*/)) {
 			GXOpenDisplay(gctx->hWnd, 0L);
-			gctx->fullscreen = 0;
+			gctx->fullscreen = GF_FALSE;
 			e = GF_IO_ERR;
 		} else {
-			gctx->fullscreen = 1;
+			gctx->fullscreen = GF_TRUE;
 		}
 	} else {
 		GXOpenDisplay(gctx->hWnd, 0L);
-		gctx->fullscreen = 0;
+		gctx->fullscreen = GF_FALSE;
 	}
 
-	landscape = 0;
+	landscape = GF_FALSE;
 	if (!e) {
 		if (gctx->fullscreen) {
 			gctx->backup_w = *outWidth;
 			gctx->backup_h = *outHeight;
 
-			if (is_wide_scene && (gctx->screen_w < gctx->screen_h)) landscape = 1;
-			else if (!is_wide_scene && (gctx->screen_w > gctx->screen_h)) landscape = 1;
-			else landscape = 0;
+			if (is_wide_scene && (gctx->screen_w < gctx->screen_h)) landscape = GF_TRUE;
+			else if (!is_wide_scene && (gctx->screen_w > gctx->screen_h)) landscape = GF_TRUE;
+			else landscape = GF_FALSE;
 
 			if (landscape) {
 				gctx->fs_w = gctx->screen_h;
@@ -953,20 +953,20 @@
 	src.pitch_x = gctx->BPP;
 	src.pitch_y = gctx->y_pitch;
 	src.pixel_format = gctx->pixel_format;
-	src.is_hardware_memory = 0;
+	src.is_hardware_memory = GF_FALSE;
 
 
 	dst.width = gctx->dst_blt.w;
 	dst.height = gctx->dst_blt.h;
 	dst.pixel_format = gctx->pixel_format;
-	dst.is_hardware_memory = 1;
+	dst.is_hardware_memory = GF_TRUE;
 	dst.video_buffer = (char*)ptr;
 	dst.pitch_x = gctx->x_pitch;
 	dst.pitch_y = gctx->y_pitch;
 
 	if (gctx->fullscreen) {
 		if (gctx->erase_dest) {
-			gctx->erase_dest = 0;
+			gctx->erase_dest = GF_FALSE;
 			GAPI_ClearFS(gctx, ptr);
 		}
 	} else {
@@ -1018,13 +1018,13 @@
 #endif
 			if (gctx->erase_dest) {
 				InvalidateRect(gctx->hWnd, NULL, TRUE);
-				gctx->erase_dest = 0;
+				gctx->erase_dest = GF_FALSE;
 			}
 			eglSwapBuffers(gctx->egldpy, gctx->surface);
 #ifndef GLES_NO_PIXMAP
 		} else {
 		    InvalidateRect(gctx->hWnd, NULL, gctx->erase_dest);
-			gctx->erase_dest = 0;
+			gctx->erase_dest = GF_FALSE;
 		}
 #endif
 		gf_mx_v(gctx->mx);
@@ -1044,7 +1044,7 @@
 		if (gctx->gx_mode) {
 			if (!gctx->fullscreen && gctx->erase_dest) {
 				InvalidateRect(gctx->hWnd, NULL, TRUE);
-				gctx->erase_dest = 0;
+				gctx->erase_dest = GF_FALSE;
 			}
 			e = GAPI_FlipBackBuffer(dr);
 		} else {
@@ -1056,7 +1056,7 @@
 			BitBlt(dc, gctx->dst_blt.x, gctx->dst_blt.y, gctx->bb_width, gctx->bb_height, gctx->hdcBitmap, 0, 0, SRCCOPY);
 			ReleaseDC(NULL, dc);
 #endif
-			gctx->erase_dest = 0;
+			gctx->erase_dest = GF_FALSE;
 		}
 	}
 	gf_mx_v(gctx->mx);
@@ -1163,9 +1163,9 @@
 
 	gctx->sys_w = GetSystemMetrics(SM_CXSCREEN);
 	gctx->sys_h = GetSystemMetrics(SM_CYSCREEN);
-	gctx->scale_coords = 0;
-	if (gctx->sys_w != width) gctx->scale_coords = 1;
-	else if (gctx->sys_h != height) gctx->scale_coords = 1;
+	gctx->scale_coords = GF_FALSE;
+	if (gctx->sys_w != width) gctx->scale_coords = GF_TRUE;
+	else if (gctx->sys_h != height) gctx->scale_coords = GF_TRUE;
 
 	if (gctx->scale_coords) {
 		gctx->off_x = gctx->off_x * width / gctx->sys_w;
@@ -1177,7 +1177,7 @@
 	dr->dpi_y = (u32) (height * 25.4 / GetDeviceCaps(hdc, VERTSIZE) );
 	ReleaseDC(gctx->hWnd, hdc);
 
-	if ((gctx->screen_w==width) && (gctx->screen_h==height)) return 0;
+	if ((gctx->screen_w==width) && (gctx->screen_h==height)) return GF_FALSE;
 
 	GF_Event evt;
 	dr->max_screen_width = gctx->screen_w = width;
@@ -1188,7 +1188,7 @@
 	evt.size.height = dr->max_screen_height;
 	dr->on_event(the_video_driver->evt_cbk_hdl, &evt);
 
-	return 1;
+	return GF_TRUE;
 }
 
 #ifndef GETRAWFRAMEBUFFER
@@ -1236,11 +1236,11 @@
 				((DCWidth == GXInfo.cxWidth && DCHeight == GXInfo.cyHeight) ||
 				 (DCWidth == GXInfo.cyHeight && DCHeight == GXInfo.cxWidth)))
 			{
-				Bool Detect = 0;
+				Bool Detect = GF_FALSE;
 				int* p = (int*)GXInfo.pvFrameBuffer;
 				COLORREF Old = GetPixel(DC,0,0);
 				*p ^= -1;
-				Detect = GetPixel(DC,0,0) != Old;
+				Detect = (Bool) ( GetPixel(DC,0,0) != Old );
 				*p ^= -1;
 
 				if (Detect)
@@ -1321,7 +1321,7 @@
 	GetWindowRect(gctx->hWnd, &rc);
 	gctx->off_x = rc.left;
 	gctx->off_y = rc.top;
-	gctx->erase_dest = 1;
+	gctx->erase_dest = GF_TRUE;
 
 	const char *opt = gf_modules_get_option((GF_BaseInterface *)dr, "GAPI", "FBAccess");
 	if (!opt || !strcmp(opt, "raw")) gx_mode = 2;
@@ -1364,7 +1364,7 @@
 	if (gctx->gx_mode) {
 		gctx->backbuffer = (char *) gf_malloc(sizeof(unsigned char) * gctx->bb_size);
 
-		gctx->contiguous_mem = ((gctx->x_pitch==gctx->BPP) && (gctx->y_pitch==gctx->screen_w*gctx->BPP)) ? 1 : 0;
+		gctx->contiguous_mem = ((gctx->x_pitch==gctx->BPP) && (gctx->y_pitch==gctx->screen_w*gctx->BPP)) ? GF_TRUE : GF_FALSE;
 	} else {
 		createPixmap(gctx, 0);
 	}
@@ -1429,7 +1429,7 @@
 		vi->height = gctx->bb_height;
 		vi->video_buffer = gctx->backbuffer;
 		vi->pixel_format = gctx->pixel_format;
-		vi->is_hardware_memory = 0;
+		vi->is_hardware_memory = GF_FALSE;
 		vi->pitch_x = gctx->x_pitch;
 		vi->pitch_y = gctx->y_pitch;
 
@@ -1483,7 +1483,7 @@
 
 
 /*interface query*/
-GF_EXPORT
+GPAC_MODULE_EXPORT
 const u32 *QueryInterfaces() 
 {
 	static u32 si [] = {
@@ -1494,7 +1494,7 @@
 }
 
 /*interface create*/
-GF_EXPORT
+GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 	if (InterfaceType == GF_VIDEO_OUTPUT_INTERFACE) return (GF_BaseInterface *) NewGAPIVideoOutput();
@@ -1502,7 +1502,7 @@
 }
 
 /*interface destroy*/
-GF_EXPORT
+GPAC_MODULE_EXPORT
 void ShutdownInterface(GF_BaseInterface *ifce)
 {
 	GF_VideoOutput *dd = (GF_VideoOutput *)ifce;
@@ -1513,6 +1513,7 @@
 	}
 }
 
+GPAC_MODULE_STATIC_DELARATION( gapi )
 
 #ifdef __cplusplus
 }

gpac-0.5.0.svn4296.tar.bz2/modules/gdip_raster/gdip_font.cpp -> gpac-0.5.0.svn4668.tar.bz2/modules/gdip_raster/gdip_font.cpp Changed

@@ -62,13 +62,14 @@
 
 static GF_Err gdip_get_glyphs(GF_FontReader *dr, const char *utf_string, u32 *glyph_buffer, u32 *io_glyph_buffer_size, const char *xml_lang, Bool *is_rtl)
 {
+	size_t _len;
 	u32 len;
 	u32 i;
 	u16 *conv;
 	char *utf8 = (char*) utf_string;
 	FontPriv *priv = (FontPriv*)dr->udta;
 
-	len = utf_string ? strlen(utf_string) : 0;
+	len = utf_string ? (u32) strlen(utf_string) : 0;
 	if (!len) {
 		*io_glyph_buffer_size = 0;
 		return GF_OK;
@@ -77,8 +78,9 @@
 		*io_glyph_buffer_size = len+1;
 		return GF_BUFFER_TOO_SMALL;
 	}
-	len = gf_utf8_mbstowcs((u16*) glyph_buffer, *io_glyph_buffer_size, (const char **) &utf8);
-	if ((s32) len<0) return GF_IO_ERR;
+	_len = gf_utf8_mbstowcs((u16*) glyph_buffer, *io_glyph_buffer_size, (const char **) &utf8);
+	if (_len==(size_t)-1) return GF_IO_ERR;
+	len = (u32) _len;
 	if (utf8) return GF_IO_ERR;
 
 	/*perform bidi relayout*/
@@ -101,7 +103,7 @@
 		i++;
 	}
 	if (whiteSpaceWidth<0) return;
-	len = gf_utf8_wcslen(string);
+	len = (u32) gf_utf8_wcslen(string);
 	if (i != len) {
 		i = len - 1;
 		while (string[i] == (unsigned short) ' ') {
@@ -153,7 +155,7 @@
 	else if (!stricmp(fontName, "SERIF")) fontName = ctx->font_serif;
 	else if (!stricmp(fontName, "TYPEWRITER") || !stricmp(fontName, "monospace")) fontName = ctx->font_fixed;
 
-	MultiByteToWideChar(CP_ACP, 0, fontName, strlen(fontName)+1, 
+	MultiByteToWideChar(CP_ACP, 0, fontName, (u32)strlen(fontName)+1, 
 						wcFontName, sizeof(wcFontName)/sizeof(wcFontName[0]) );
 
 
@@ -170,7 +172,7 @@
 	return GF_OK;
 }
 
-static GF_Err gdip_get_font_info(GF_FontReader *dr, char **font_name, s32 *em_size, s32 *ascent, s32 *descent, s32 *underline, s32 *line_spacing, s32 *max_advance_h, s32 *max_advance_v)
+static GF_Err gdip_get_font_info(GF_FontReader *dr, char **font_name, u32 *em_size, s32 *ascent, s32 *descent, s32 *underline, s32 *line_spacing, s32 *max_advance_h, s32 *max_advance_v)
 {
 	UINT16 val, em;
 	FontPriv *ctx = (FontPriv *)dr->udta;
@@ -365,7 +367,7 @@
 extern "C" {
 #endif
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 const u32 *QueryInterfaces() 
 {
 	static u32 si [] = {
@@ -376,7 +378,7 @@
 	return si;
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 	if (InterfaceType==GF_FONT_READER_INTERFACE) return (GF_BaseInterface *)gdip_new_font_driver();
@@ -384,7 +386,7 @@
 	return NULL;
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 void ShutdownInterface(GF_BaseInterface *ifce)
 {
 	switch (ifce->InterfaceType) {
@@ -397,6 +399,8 @@
 	}
 }
 
+GPAC_MODULE_STATIC_DELARATION( gdiplus )
+
 #ifdef __cplusplus
 }
 #endif

gpac-0.5.0.svn4296.tar.bz2/modules/gdip_raster/gdip_grad.cpp -> gpac-0.5.0.svn4668.tar.bz2/modules/gdip_raster/gdip_grad.cpp Changed

@@ -95,7 +95,7 @@
 	GPSTEN();
 	CHECK2_RET(GF_STENCIL_LINEAR_GRADIENT, GF_STENCIL_RADIAL_GRADIENT);
 	_sten->spread = mode;
-	_sten->needs_rebuild = 1;
+	_sten->needs_rebuild = GF_TRUE;
 	return GF_OK;
 }
 
@@ -114,7 +114,7 @@
 	GdipCreateLineBrush(&_sten->start, &_sten->end, 0xFF000000, 0xFFFFFFFF, WrapModeTile, &_sten->pLinear);
 	if (!_sten->pLinearMat) GdipCreateMatrix(&_sten->pLinearMat);
 	GdipGetLineTransform(_sten->pLinear, _sten->pLinearMat);
-	_sten->needs_rebuild = 1;
+	_sten->needs_rebuild = GF_TRUE;
 	return GF_OK;
 }
 
@@ -126,7 +126,7 @@
 	GPSTEN();
 
 	if (!_sten->needs_rebuild) return;
-	_sten->needs_rebuild = 0;
+	_sten->needs_rebuild = GF_FALSE;
 
 	if (_sten->pLinear) GdipDeleteBrush(_sten->pLinear);
 	GdipCreateLineBrush(&_sten->start, &_sten->end, 0xFFFF0000, 0xFFFF00FF, WrapModeTile, &_sten->pLinear);
@@ -191,7 +191,7 @@
 
 
 	if (!_sten->needs_rebuild) return;
-	_sten->needs_rebuild = 0;
+	_sten->needs_rebuild = GF_FALSE;
 
 
 	if (_sten->pRadial) {
@@ -324,7 +324,7 @@
 	_sten->center.Y = FIX2FLT(cy);
 	_sten->focal.X = FIX2FLT(fx);
 	_sten->focal.Y = FIX2FLT(fy);
-	_sten->needs_rebuild = 1;
+	_sten->needs_rebuild = GF_TRUE;
 	return GF_OK;
 }
 
@@ -343,7 +343,7 @@
 	for (i=0; i<count; i++) _sten->pos[i] = FIX2FLT(pos[i]);
 	memcpy(_sten->cols, col, sizeof(ARGB)*count);
 	_sten->num_pos = count;
-	_sten->needs_rebuild = 1;
+	_sten->needs_rebuild = GF_TRUE;
 	return GF_OK;
 }

gpac-0.5.0.svn4296.tar.bz2/modules/gdip_raster/gdip_priv.h -> gpac-0.5.0.svn4668.tar.bz2/modules/gdip_raster/gdip_priv.h Changed

gpac-0.5.0.svn4296.tar.bz2/modules/gdip_raster/gdip_rend.cpp -> gpac-0.5.0.svn4668.tar.bz2/modules/gdip_raster/gdip_rend.cpp Changed

gpac-0.5.0.svn4296.tar.bz2/modules/gdip_raster/gdip_texture.cpp -> gpac-0.5.0.svn4668.tar.bz2/modules/gdip_raster/gdip_texture.cpp Changed

@@ -44,21 +44,21 @@
 	gdip_cmat_reset(&_sten->cmat);
 	isBGR = 0;
 	BPP = 4;
-	copy = 0;
-	is_yuv = 0;
+	copy = GF_FALSE;
+	is_yuv = GF_FALSE;
 	/*is pixel format supported ?*/
 	switch (pixelFormat) {
 	case GF_PIXEL_GREYSCALE:
 		pFormat = PixelFormat24bppRGB;
 		BPP = 1;
 		/*no support for 8bit greyscale not indexed in GDIPlus ...*/
-		copy = 1;
+		copy = GF_TRUE;
 		break;
 	case GF_PIXEL_ALPHAGREY:
 		pFormat = PixelFormat32bppARGB;
 		BPP = 2;
 		/*cannot get it to work without using 32bpp argb*/
-		copy = 1;
+		copy = GF_TRUE;
 		break;
 	case GF_PIXEL_RGB_555:
 		pFormat = PixelFormat16bppRGB555;
@@ -90,7 +90,7 @@
 	case GF_PIXEL_RGBA:
 		pFormat = PixelFormat32bppARGB;
 		BPP = 4;
-		copy = 1;
+		copy = GF_TRUE;
 		_sten->orig_buf = (unsigned char *) pixels;
 		break;
 	case GF_PIXEL_YV12:
@@ -98,11 +98,11 @@
 	case GF_PIXEL_I420:
 		if ( (width*3)%4) return GF_NOT_SUPPORTED;
 		_sten->orig_format = GF_PIXEL_YV12;
-		is_yuv = 1;
+		is_yuv = GF_TRUE;
 		break;
 	case GF_PIXEL_YUVA:
 		_sten->orig_format = GF_PIXEL_YUVA;
-		is_yuv = 1;
+		is_yuv = GF_TRUE;
 		break;
 	default:
 		return GF_NOT_SUPPORTED;
@@ -116,18 +116,18 @@
 	if (is_yuv) {
 		_sten->orig_buf = (unsigned char*)pixels;
 		_sten->orig_stride = stride;
-		_sten->is_converted = 0;
+		_sten->is_converted = GF_FALSE;
 		return GF_OK;
 	}
 
-	_sten->is_converted = 1;
+	_sten->is_converted = GF_TRUE;
 	_sten->format = pFormat;
 
 	/*GDIplus limitation : horiz_stride shall be multiple of 4 and no support for pure grayscale without palette*/
 	if (!copy && pixels && !(stride%4)) {
 		if (no_copy && isBGR) return GF_NOT_SUPPORTED;
 		GdipCreateBitmapFromScan0(_sten->width, _sten->height, stride, pFormat, (unsigned char*)pixels, &_sten->pBitmap);
-		_sten->invert_br = isBGR;
+		_sten->invert_br = isBGR ? GF_TRUE : GF_FALSE;
 	}
 	/*all other cases: create a local bitmap in desired format*/
 	else {
@@ -235,7 +235,7 @@
 	_sten->pBitmap = NULL;
 	_sten->width = width;
 	_sten->height = height;
-	_sten->is_converted = 1;
+	_sten->is_converted = GF_TRUE;
 	_sten->format = pFormat;
 	GdipCreateBitmapFromScan0(_sten->width, _sten->height, 0, pFormat, NULL, &_sten->pBitmap);
 	return GF_OK;
@@ -266,7 +266,7 @@
 	GPSTEN();
 	if (!cmat || cmat->identity) {
 		_sten->texture_invalid = _sten->has_cmat;
-		_sten->has_cmat = 0;
+		_sten->has_cmat = GF_FALSE;
 	} else {
 		if (_sten->invert_br) {
 			GF_ColorMatrix fin, rev;
@@ -282,9 +282,9 @@
 		} else {
 			cmat_gpac_to_gdip(cmat, &_sten->cmat);
 		}
-		_sten->has_cmat = 1;
+		_sten->has_cmat = GF_TRUE;
 	}
-	_sten->texture_invalid = 1;
+	_sten->texture_invalid = GF_TRUE;
 	return GF_OK;
 }
 
@@ -294,7 +294,7 @@
 	GPSTEN();
 	if (_sten->alpha != alpha) {
 		_sten->alpha = alpha;
-		_sten->texture_invalid = 1;
+		_sten->texture_invalid = GF_TRUE;
 	}
 	return GF_OK;
 }
@@ -385,9 +385,9 @@
 {
 	GPSTEN();
 	if (_sten->orig_buf && (_sten->format == PixelFormat32bppARGB)) {
-		gdip_set_texture(_this, (char *) _sten->orig_buf, _sten->width, _sten->height, _sten->width * 4, GF_PIXEL_RGBA, GF_PIXEL_RGBA, 0);
+		gdip_set_texture(_this, (char *) _sten->orig_buf, _sten->width, _sten->height, _sten->width * 4, GF_PIXEL_RGBA, GF_PIXEL_RGBA, GF_FALSE);
 	}
-	_sten->texture_invalid = 1;
+	_sten->texture_invalid = GF_TRUE;
 }
 
 void gdip_init_driver_texture(GF_Raster2D *driver)
@@ -435,11 +435,11 @@
 	dst.pitch_y = BPP*sten->width;
 	dst.video_buffer = (char*)sten->conv_buf;
 
-	gf_stretch_bits(&dst, &src, NULL, NULL, 0xFF, 0, NULL, NULL);
+	gf_stretch_bits(&dst, &src, NULL, NULL, 0xFF, GF_FALSE, NULL, NULL);
 
 	if (sten->pBitmap) GdipDisposeImage(sten->pBitmap);
 	GdipCreateBitmapFromScan0(sten->width, sten->height, BPP*sten->width, format, sten->conv_buf, &sten->pBitmap);
-	sten->is_converted = 1;
+	sten->is_converted = GF_TRUE;
 }
 
 void gdip_load_texture(struct _stencil *sten)
@@ -453,7 +453,7 @@
 	}
 	/*nothing to do*/
 	if (sten->is_converted && sten->pTexture) return;
-	sten->texture_invalid = 0;
+	sten->texture_invalid = GF_FALSE;
 
 	/*convert*/
 	if (!sten->is_converted) gdip_convert_texture(sten);

gpac-0.5.0.svn4296.tar.bz2/modules/gpac_js/gpac_js.c -> gpac-0.5.0.svn4668.tar.bz2/modules/gpac_js/gpac_js.c Changed

@@ -23,6 +23,11 @@
  *
  */
 
+
+#include <gpac/setup.h>
+
+#ifdef GPAC_HAS_SPIDERMONKEY
+
 /*base SVG type*/
 #include <gpac/nodes_svg.h>
 #include <gpac/nodes_mpeg4.h>
@@ -36,14 +41,18 @@
 #include <gpac/xml.h>
 
 
-#ifdef GPAC_HAS_SPIDERMONKEY
-
 #if defined(GPAC_ANDROID) && !defined(XP_UNIX)
 #define XP_UNIX
 #endif
 
 #if !defined(__GNUC__)
+# if defined(_WIN32_WCE)
 #  pragma comment(lib, "js32")
+# elif defined (_WIN64)
+#  pragma comment(lib, "js")
+# elif defined (WIN32)
+#  pragma comment(lib, "js")
+# endif
 #endif
 
 #include <gpac/internal/scenegraph_dev.h>
@@ -125,7 +134,7 @@
 		*vp = BOOLEAN_TO_JSVAL( on_battery ? JS_TRUE : JS_FALSE );
 	}
 	else if (!strcmp(prop_name, "batteryCharging")) {
-		Bool on_charge = 0;
+		u32 on_charge = 0;
 		gf_sys_get_battery_state(NULL, &on_charge, NULL, NULL, NULL);
 		*vp = BOOLEAN_TO_JSVAL( on_charge ? JS_TRUE : JS_FALSE );
 	}
@@ -231,10 +240,13 @@
 		SMJS_FREE(c, (char*)evt.caption.caption);
 	}
 	else if (!strcmp(prop_name, "fullscreen")) {
+		/*no fullscreen for iOS (always on)*/
+#ifndef GPAC_IPHONE
 		Bool res = (JSVAL_TO_BOOLEAN(*vp)==JS_TRUE) ? 1 : 0;
 		if (term->compositor->fullscreen != res) {
 			gf_term_set_option(term, GF_OPT_FULLSCREEN, res);
 		}
+#endif
 	}
 	else if (!strcmp(prop_name, "volume")) {
 		if (JSVAL_IS_NUMBER(*vp)) {
@@ -265,7 +277,7 @@
 	}
 	else if (!strcmp(prop_name, "http_bitrate")) {
 		u32 new_rate = JSVAL_TO_INT(*vp);
-		gf_dm_set_data_rate(term->downloader, new_rate * 128 /*1024/8*/);
+		gf_dm_set_data_rate(term->downloader, new_rate);
 	}
 
 	SMJS_FREE(c, prop_name);
@@ -368,7 +380,7 @@
 	JS_DefineProperty(cbk->c, obj, "name", STRING_TO_JSVAL(s), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
 
 	sep=NULL;
-	len = strlen(file_path);
+	len = (u32) strlen(file_path);
 	for (i=0; i<len; i++) {
 		sep = strchr("/\\", file_path[len-i-1]);
 		if (sep) {
@@ -843,6 +855,24 @@
 	SMJS_SET_RVAL( OBJECT_TO_JSVAL(scene_obj) );
 	return JS_TRUE;
 }
+
+static JSBool SMJS_FUNCTION(gpac_show_keyboard)
+{
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_Terminal *term = gpac_get_term(c, obj);
+	if (!argc) return JS_FALSE;
+
+	if (JSVAL_IS_BOOLEAN(argv[0])) {
+		Bool show = JSVAL_TO_BOOLEAN(argv[0])==JS_TRUE;
+		GF_Event evt;
+        memset(&evt, 0, sizeof(GF_Event));
+	  	evt.type = show ? GF_EVENT_TEXT_EDITING_START : GF_EVENT_TEXT_EDITING_END;
+        gf_term_user_event(term, &evt);
+	} 
+	return JS_TRUE;
+}
+
 static void gjs_load(GF_JSUserExtension *jsext, GF_SceneGraph *scene, JSContext *c, JSObject *global, Bool unload)
 {
 	GF_GPACJSExt *gjs;
@@ -885,6 +915,7 @@
 		SMJS_FUNCTION_SPEC("set_focus",			gpac_set_focus, 1),
 		SMJS_FUNCTION_SPEC("get_scene",			gpac_get_scene, 1),
 		SMJS_FUNCTION_SPEC("error_string",		gpac_error_string, 1),
+		SMJS_FUNCTION_SPEC("show_keyboard",		gpac_show_keyboard, 1),
 		
 
 		SMJS_FUNCTION_SPEC(0, 0, 0)
@@ -995,7 +1026,7 @@
 #endif
 
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 const u32 *QueryInterfaces() 
 {
 	static u32 si [] = {
@@ -1007,7 +1038,7 @@
 	return si;
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface(u32 InterfaceType) 
 {
 #ifdef GPAC_HAS_SPIDERMONKEY
@@ -1016,7 +1047,7 @@
 	return NULL;
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 void ShutdownInterface(GF_BaseInterface *ifce)
 {
 	switch (ifce->InterfaceType) {
@@ -1027,3 +1058,5 @@
 #endif
 	}
 }
+
+GPAC_MODULE_STATIC_DELARATION( gpac_js )

gpac-0.5.0.svn4296.tar.bz2/modules/hyb_in/hyb_in.c -> gpac-0.5.0.svn4668.tar.bz2/modules/hyb_in/hyb_in.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/img_in/bmp_dec.c -> gpac-0.5.0.svn4668.tar.bz2/modules/img_in/bmp_dec.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/img_in/img_dec.c -> gpac-0.5.0.svn4668.tar.bz2/modules/img_in/img_dec.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/img_in/img_in.c -> gpac-0.5.0.svn4668.tar.bz2/modules/img_in/img_in.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/img_in/jp2_dec.c -> gpac-0.5.0.svn4668.tar.bz2/modules/img_in/jp2_dec.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/img_in/jpeg_dec.c -> gpac-0.5.0.svn4668.tar.bz2/modules/img_in/jpeg_dec.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/img_in/png_dec.c -> gpac-0.5.0.svn4668.tar.bz2/modules/img_in/png_dec.c Changed

gpac-0.5.0.svn4668.tar.bz2/modules/ios_cam Added

gpac-0.5.0.svn4668.tar.bz2/modules/ios_cam/CameraObject.h Added

@@ -0,0 +1,64 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Ivica Arsov, Jean Le Feuvre
+ *			Copyright (c) Mines-Telecom 2009-
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / iOS camera 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.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+#import <AVFoundation/AVFoundation.h>
+
+#include "cam_wrap.h"
+
+@interface CameraObject : NSObject
+<AVCaptureVideoDataOutputSampleBufferDelegate>
+{
+    //    AVCaptureSession *session;
+    //    AVCaptureDevice *device;
+    AVCaptureDeviceInput *input;
+    AVCaptureVideoDataOutput *output;
+    
+    int desiredWidth;
+    int desiredHeight;
+    int desiredColor;
+    
+    int m_width;
+    int m_height;
+    int m_color;
+    int m_stride;
+    
+    GetPixelsCallback *callback;
+}
+
+@property (retain) AVCaptureSession *captureSession;
+
+- (int) setupFormat:(int)width :(int)height :(int)color;
+- (int) getFormat:(unsigned int*)width :(unsigned int*)height :(int*)color :(int*)stride;
+- (int) startCam;
+- (int) stopCam;
+- (int) isCamStarted;
+- (int) setCallback:(GetPixelsCallback*) func;
+
+- (void)captureOutput:(AVCaptureOutput *)captureOutput
+didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
+       fromConnection:(AVCaptureConnection *)connection;
+
+@end

gpac-0.5.0.svn4668.tar.bz2/modules/ios_cam/CameraObject.m Added

@@ -0,0 +1,170 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Ivica Arsov, Jean Le Feuvre
+ *			Copyright (c) Mines-Telecom 2009-
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / iOS camera 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.
+ *
+ */
+
+#import "CameraObject.h"
+
+@implementation CameraObject
+
+- (id)init {
+	if ((self = [super init])) {
+        @autoreleasepool {
+            AVCaptureSession* tmp = [[AVCaptureSession alloc] init];
+            [self setCaptureSession:tmp];
+            [tmp release];
+        
+            input = NULL;
+            output = NULL;
+            callback = NULL;
+        
+            m_width = 640;
+            m_height = 480;
+            m_color = kCVPixelFormatType_32BGRA;
+            m_stride = m_width * 4;
+        }
+	}
+	return self;
+}
+
+- (void)dealloc{
+    
+    [super dealloc];
+}
+
+- (int) setupFormat:(int)width :(int)height :(int)color
+{
+    desiredWidth = width;
+    desiredHeight = height;
+    desiredColor = color;
+    return 0;
+}
+
+- (int) getFormat:(unsigned int*)width :(unsigned int*)height :(int*)color :(int*)stride
+{
+    if ( !m_width || !m_height )
+        return 1;
+    *width = m_width;
+    *height = m_height;
+    *color = m_color;
+    *stride = m_stride;
+    
+    return 0;
+}
+
+- (int) startCam
+{
+    NSError *error = nil;
+    
+    // Configure the session to produce lower resolution video frames, if your
+    // processing algorithm can cope. We'll specify medium quality for the
+    // chosen device.
+    
+    [self captureSession].sessionPreset = AVCaptureSessionPreset640x480;
+    
+    // Find a suitable AVCaptureDevice
+    AVCaptureDevice *device = [AVCaptureDevice
+                               defaultDeviceWithMediaType:AVMediaTypeVideo];
+    
+    // Create a device input with the device and add it to the session.
+    input = [AVCaptureDeviceInput deviceInputWithDevice:device
+                                                  error:&error];
+    if (!input) {
+        // Handling the error appropriately.
+    }
+    [[self captureSession] addInput:input];
+    
+    // Create a VideoDataOutput and add it to the session
+    output = [[[AVCaptureVideoDataOutput alloc] init] autorelease];
+    [[self captureSession] addOutput:output];
+    
+    // Configure your output.
+    dispatch_queue_t queue = dispatch_queue_create("myQueue", NULL);
+    [output setSampleBufferDelegate:self queue:queue];
+    dispatch_release(queue);
+    
+    // Specify the pixel format
+    output.videoSettings =
+    [NSDictionary dictionaryWithObject:
+     [NSNumber numberWithInt:kCVPixelFormatType_32BGRA]
+                                forKey:(id)kCVPixelBufferPixelFormatTypeKey];
+    
+    
+    // If you wish to cap the frame rate to a known value, such as 15 fps, set
+    // minFrameDuration.
+    output.minFrameDuration = CMTimeMake(1, 15);
+    
+    // Start the session running to start the flow of data
+    [[self captureSession] startRunning];
+    
+    return 0;
+}
+
+- (void)captureOutput:(AVCaptureOutput *)captureOutput
+didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
+       fromConnection:(AVCaptureConnection *)connection
+{
+    if ( !callback )
+        return;
+    
+    CVPixelBufferRef pixelBuffer = (CVPixelBufferRef)CMSampleBufferGetImageBuffer(sampleBuffer);
+    CVPixelBufferLockBaseAddress(pixelBuffer, 0);
+    
+    void *baseAddress = CVPixelBufferGetBaseAddress(pixelBuffer);
+    
+    //size_t bytesPerRow = CVPixelBufferGetBytesPerRow(pixelBuffer);
+    // Get the pixel buffer width and height
+    //size_t width = CVPixelBufferGetWidth(pixelBuffer);
+    //size_t height = CVPixelBufferGetHeight(pixelBuffer);
+    
+    unsigned int size = m_height * m_stride;//CVPixelBufferGetDataSize(pixelBuffer);
+    
+    callback(baseAddress, size);
+    
+    CVPixelBufferUnlockBaseAddress(pixelBuffer,0);
+}
+
+- (int) setCallback:(GetPixelsCallback*) func
+{
+    callback = func;
+    
+    return 0;
+}
+
+- (int) stopCam
+{
+    [[self captureSession] stopRunning];
+    [[self captureSession] removeInput: input];
+    input = NULL;
+    [[self captureSession] removeOutput: output];
+    output = NULL;
+    
+    return 0;
+}
+
+- (int) isCamStarted
+{
+    return [self captureSession].running;
+}
+
+@end

gpac-0.5.0.svn4668.tar.bz2/modules/ios_cam/cam_wrap.h Added

@@ -0,0 +1,55 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Ivica Arsov, Jean Le Feuvre
+ *			Copyright (c) Mines-Telecom 2009-
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / iOS camera 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 _cam_wrap_h
+#define _cam_wrap_h
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef void (GetPixelsCallback)(unsigned char* pixels, unsigned int size);
+
+void* CAM_CreateInstance();
+
+int CAM_DestroyInstance(void** inst);
+
+int CAM_SetupFormat(void* inst, int width, int height, int color);
+
+int CAM_GetCurrentFormat(void* inst, unsigned int* width, unsigned int* height, int* color, int* stride);
+
+int CAM_Start(void* inst);
+
+int CAM_Stop(void* inst);
+
+int CAM_IsStarted(void* inst);
+
+int CAM_SetCallback(void* inst, GetPixelsCallback *callback);
+    
+#ifdef __cplusplus
+}
+#endif
+
+#endif

gpac-0.5.0.svn4668.tar.bz2/modules/ios_cam/cam_wrap.m Added

@@ -0,0 +1,82 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Ivica Arsov, Jean Le Feuvre
+ *			Copyright (c) Mines-Telecom 2009-
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / iOS camera 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 "cam_wrap.h"
+#include <stdlib.h>
+
+#include "CameraObject.h"
+
+void* CAM_CreateInstance(){
+    void* obj = [[CameraObject alloc] init];
+    return obj;
+}
+
+int CAM_DestroyInstance(void** inst){
+    [(id)*inst dealloc];
+    *inst = NULL;
+    return 0;
+}
+
+int CAM_SetupFormat(void* inst, int width, int height, int color) {
+    if ( !inst )
+        return 1;
+    
+    return [(id)inst setupFormat: width :height :color];
+}
+
+int CAM_GetCurrentFormat(void* inst, unsigned int* width, unsigned int* height, int* color, int* stride) {
+    if ( !inst )
+        return 1;
+    
+    return [(id)inst getFormat: width :height :color :stride];
+}
+
+int CAM_Start(void* inst){
+    if ( !inst )
+        return 1;
+    
+    return [(id)inst startCam];
+}
+
+int CAM_Stop(void* inst){
+    if ( !inst )
+        return 1;
+           
+    return [(id)inst stopCam];
+}
+
+int CAM_IsStarted(void* inst){
+    if ( !inst )
+        return 1;
+                    
+    return [(id)inst isCamStarted];
+}
+
+int CAM_SetCallback(void* inst, GetPixelsCallback *callback){
+    if ( !inst )
+        return 1;
+                            
+    return [(id)inst setCallback: callback];
+}

gpac-0.5.0.svn4668.tar.bz2/modules/ios_cam/ios_cam.c Added

@@ -0,0 +1,431 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Ivica Arsov, Jean Le Feuvre
+ *			Copyright (c) Mines-Telecom 2009-
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / iOS camera 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/terminal.h>
+#include <gpac/internal/terminal_dev.h>
+#include <gpac/internal/compositor_dev.h>
+#include <gpac/modules/codec.h>
+#include <gpac/constants.h>
+#include <gpac/modules/service.h>
+#include <gpac/thread.h>
+#include <gpac/media_tools.h>
+
+#include "cam_wrap.h"
+
+
+#define CAM_PIXEL_FORMAT GF_PIXEL_BGR_32
+//GF_PIXEL_RGB_32
+#define CAM_PIXEL_SIZE 4.f
+//4
+#define CAM_WIDTH 640
+#define CAM_HEIGHT 480
+
+//GF_PIXEL_RGB_24;
+
+typedef struct
+{
+	GF_InputService *input;
+	/*the service we're responsible for*/
+	GF_ClientService *service;
+	LPNETCHANNEL channel;
+    
+	/*input file*/
+	u32 time_scale;
+    
+	u32 base_track_id;
+    
+	struct _tag_terminal *term;
+    
+	u32 cntr;
+    
+	u32 width;
+	u32 height;
+    
+	Bool started;
+    
+    void* camInst;
+    
+} IOSCamCtx;
+
+IOSCamCtx* globReader = NULL;
+
+void camStartCamera(IOSCamCtx *read);
+void camStopCamera(IOSCamCtx *read);
+void processFrameBuf( unsigned char* data, unsigned int dataSize);
+
+Bool CAM_CanHandleURL(GF_InputService *plug, const char *url)
+{
+	if (!strnicmp(url, "hw://camera", 11)) return 1;
+    
+	return 0;
+}
+
+GF_Err CAM_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
+{
+	IOSCamCtx *read;
+	if (!plug || !plug->priv || !serv) return GF_SERVICE_ERROR;
+	read = (IOSCamCtx *) plug->priv;
+    
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] CAM_ConnectService: %d\n", gf_th_id()));
+    
+    globReader = read;
+    
+	read->input = plug;
+	read->service = serv;
+	read->base_track_id = 1;
+	read->time_scale = 1000;
+    
+	read->term = serv->term;
+    
+	read->camInst = CAM_CreateInstance();
+    CAM_SetCallback(read->camInst, processFrameBuf);
+    
+	/*reply to user*/
+	gf_term_on_connect(serv, NULL, GF_OK);
+	//if (read->no_service_desc) isor_declare_objects(read);
+    
+	return GF_OK;
+}
+
+GF_Err CAM_CloseService(GF_InputService *plug)
+{
+	GF_Err reply;
+	IOSCamCtx *read;
+	if (!plug || !plug->priv) return GF_SERVICE_ERROR;
+	read = (IOSCamCtx *) plug->priv;
+    
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] CAM_CloseService: %d\n", gf_th_id()));
+    
+	reply = GF_OK;
+    
+	CAM_DestroyInstance(&read->camInst);
+    
+	gf_term_on_disconnect(read->service, NULL, reply);
+	return GF_OK;
+}
+
+u32 getWidth(IOSCamCtx *read);
+u32 getHeight(IOSCamCtx *read);
+
+static GF_Descriptor *CAM_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
+{
+	u32 trackID;
+	GF_ESD *esd;
+	IOSCamCtx *read;
+	GF_ObjectDescriptor *od;
+	GF_BitStream *bs;
+	char *buf;
+	u32 buf_size;
+    s32 color;
+    s32 stride;
+	if (!plug || !plug->priv) return NULL;
+	read = (IOSCamCtx *) plug->priv;
+    
+	trackID = read->base_track_id;
+	read->base_track_id = 0;
+    
+	if (trackID && (expect_type==GF_MEDIA_OBJECT_VIDEO) ) {
+		od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
+		od->objectDescriptorID = 1;
+        
+		esd = gf_odf_desc_esd_new(0);
+		esd->slConfig->timestampResolution = 1000;
+		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
+		esd->ESID = 1;
+		esd->decoderConfig->objectTypeIndication = GPAC_OTI_RAW_MEDIA_STREAM;
+		
+		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+        
+        CAM_GetCurrentFormat(read->camInst, &read->width, &read->height, &color, &stride);
+        
+		gf_bs_write_u32(bs, CAM_PIXEL_FORMAT); // fourcc
+		gf_bs_write_u16(bs, read->width); // width
+		gf_bs_write_u16(bs, read->height); // height
+		gf_bs_write_u32(bs, read->height * stride); // framesize
+		gf_bs_write_u32(bs, stride); // stride
+        gf_bs_write_u8(bs, 1); // is_flipped
+        
+		gf_bs_align(bs);
+		gf_bs_get_content(bs, &buf, &buf_size);
+		gf_bs_del(bs);
+        
+		esd->decoderConfig->decoderSpecificInfo->data = buf;
+		esd->decoderConfig->decoderSpecificInfo->dataLength = buf_size;
+        
+		gf_list_add(od->ESDescriptors, esd);
+		return (GF_Descriptor *) od;
+	}
+    
+	return NULL;
+}
+
+GF_Err CAM_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
+{
+	GF_Err e;
+	IOSCamCtx *read;
+	if (!plug || !plug->priv) return GF_SERVICE_ERROR;
+	read = (IOSCamCtx *) plug->priv;
+    
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] CAM_ConnectChannel: %d\n", gf_th_id()));
+    
+	e = GF_OK;
+	if (upstream) {
+		e = GF_ISOM_INVALID_FILE;
+	}
+    
+	read->channel = channel;
+    
+	camStartCamera(read);
+    
+	gf_term_on_connect(read->service, channel, e);
+	return e;
+}
+
+GF_Err CAM_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
+{
+	GF_Err e;
+	IOSCamCtx *read;
+	if (!plug || !plug->priv) return GF_SERVICE_ERROR;
+	read = (IOSCamCtx *) plug->priv;
+    
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] CAM_DisconnectChannel: %d\n", gf_th_id()));
+    
+	e = GF_OK;
+    
+	camStopCamera(read);
+    
+	gf_term_on_disconnect(read->service, channel, e);
+	return e;
+}
+
+int* decodeYUV420SP( char* yuv420sp, int width, int height)
+{
+	int frameSize = width * height;
+	int j, yp, uvp, i, y, y1192, r, g, b, u, v;
+	int ti, tj;
+    
+	int* rgb = (int*)gf_malloc(width*height*4);
+	for (j = 0, yp = 0, tj=height-1; j < height; j++, tj--)
+	{
+		uvp = frameSize + (j >> 1) * width, u = 0, v = 0;
+		for (i = 0, ti=0; i < width; i++, yp++, ti+=width)
+		{
+			y = (0xff & ((int) yuv420sp[yp])) - 16;
+			if (y < 0) y = 0;
+			if ((i & 1) == 0)
+			{
+				v = (0xff & yuv420sp[uvp++]) - 128;
+				u = (0xff & yuv420sp[uvp++]) - 128;
+			}
+            
+			y1192 = 1192 * y;
+			r = (y1192 + 1634 * v);
+			g = (y1192 - 833 * v - 400 * u);
+			b = (y1192 + 2066 * u);
+            
+			if (r < 0)
+				r = 0;
+			else if (r > 262143)
+				r = 262143;
+			if (g < 0)
+				g = 0;
+			else if (g > 262143)
+				g = 262143;
+			if (b < 0)
+				b = 0;
+			else if (b > 262143)
+				b = 262143;
+            
+			rgb[yp] = 0xff000000 | ((r << 6) & 0xff0000)
+            | ((g >> 2) & 0xff00) | ((b >> 10) & 0xff);
+            //			rgb[ti+tj] = 0xff000000 | ((r << 6) & 0xff0000)
+            //					| ((g >> 2) & 0xff00) | ((b >> 10) & 0xff);
+		}
+	}
+	return rgb;
+}
+
+void processFrameBuf( unsigned char* data, unsigned int dataSize)
+{
+	IOSCamCtx* ctx = globReader;
+	GF_SLHeader hdr;
+	u32 cts = 0;
+	    
+	cts = gf_term_get_time(ctx->term);
+        
+	memset(&hdr, 0, sizeof(hdr));
+	hdr.compositionTimeStampFlag = 1;
+	hdr.compositionTimeStamp = cts;
+	gf_term_on_sl_packet(ctx->service, ctx->channel, (void*)data, dataSize, &hdr, GF_OK);
+
+}
+
+void camStartCamera(IOSCamCtx *read)
+{
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] startCamera: %d\n", gf_th_id()));
+    
+	//CAM_Start(read->camInst);
+}
+
+void camStopCamera(IOSCamCtx *read)
+{
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] stopCamera: %d\n", gf_th_id()));
+    
+    //CAM_Stop(read->camInst);
+}
+
+void pauseCamera(IOSCamCtx *read)
+{
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] pauseCamera: %d\n", gf_th_id()));
+    
+	read->started = 0;
+	CAM_Stop(read->camInst);
+}
+
+void resumeCamera(IOSCamCtx *read)
+{
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ANDROID_CAMERA] resumeCamera: %d\n", gf_th_id()));
+    
+	read->started = 1;
+	CAM_Start(read->camInst);
+}
+
+GF_Err CAM_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
+{
+	IOSCamCtx *read;
+	GF_BitStream *bs;
+	char *buf;
+	u32 buf_size;
+	if (!plug || !plug->priv || !com) return GF_SERVICE_ERROR;
+	read = (IOSCamCtx *) plug->priv;
+    
+	if (com->command_type==GF_NET_SERVICE_INFO) {
+		return GF_OK;
+	}
+	if (com->command_type==GF_NET_SERVICE_HAS_AUDIO) {
+		return GF_NOT_SUPPORTED;
+	}
+	if (!com->base.on_channel) return GF_NOT_SUPPORTED;
+    
+	switch (com->command_type) {
+        case GF_NET_CHAN_INTERACTIVE:
+            return GF_OK;
+        case GF_NET_CHAN_BUFFER:
+            com->buffer.max = com->buffer.min = 0;
+            return GF_OK;
+        case GF_NET_CHAN_PLAY:
+            resumeCamera(read);
+            return GF_OK;
+        case GF_NET_CHAN_STOP:
+            pauseCamera(read);
+            return GF_OK;
+            /*nothing to do on MP4 for channel config*/
+        case GF_NET_CHAN_CONFIG:
+            return GF_OK;
+        case GF_NET_CHAN_GET_PIXEL_AR:
+            return 1<<16;//gf_isom_get_pixel_aspect_ratio(read->mov, ch->track, 1, &com->par.hSpacing, &com->par.vSpacing);
+        case GF_NET_CHAN_GET_DSI:
+		{
+            s32 color;
+            s32 stride;
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cam get DSI\n"));
+			/*it may happen that there are conflicting config when using ESD URLs...*/
+			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+            
+			CAM_GetCurrentFormat(read->camInst, &read->width, &read->height, &color, &stride);
+            
+			gf_bs_write_u32(bs, CAM_PIXEL_FORMAT); // fourcc
+			gf_bs_write_u16(bs, read->width); // width
+			gf_bs_write_u16(bs, read->height); // height
+			gf_bs_write_u32(bs, read->height * stride); // framesize
+			gf_bs_write_u32(bs, stride); // stride
+            
+			gf_bs_align(bs);
+			gf_bs_get_content(bs, &buf, &buf_size);
+			gf_bs_del(bs);
+            
+			com->get_dsi.dsi = buf;
+			com->get_dsi.dsi_len = buf_size;
+			return GF_OK;
+		}
+	}
+	return GF_NOT_SUPPORTED;
+}
+
+GF_InputService *CAM_client_load()
+{
+	IOSCamCtx *reader;
+	GF_InputService *plug;
+	GF_SAFEALLOC(plug, GF_InputService);
+	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC Camera Plugin", "gpac distribution")
+	plug->CanHandleURL = CAM_CanHandleURL;
+	plug->ConnectService = CAM_ConnectService;
+	plug->CloseService = CAM_CloseService;
+	plug->GetServiceDescriptor = CAM_GetServiceDesc;
+	plug->ConnectChannel = CAM_ConnectChannel;
+	plug->DisconnectChannel = CAM_DisconnectChannel;
+	plug->ServiceCommand = CAM_ServiceCommand;
+    
+	GF_SAFEALLOC(reader, IOSCamCtx);
+	plug->priv = reader;
+	return plug;
+}
+
+void CAM_client_del(GF_BaseInterface *bi)
+{
+	GF_InputService *plug = (GF_InputService *) bi;
+	IOSCamCtx *read = (IOSCamCtx *)plug->priv;
+    
+	gf_free(read);
+	gf_free(bi);
+}
+
+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)
+		return (GF_BaseInterface *)CAM_client_load();
+	return NULL;
+}
+
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+	switch (ifce->InterfaceType) {
+        case GF_NET_CLIENT_INTERFACE: CAM_client_del(ifce); break;
+	}
+}
+
+GPAC_MODULE_STATIC_DELARATION( ios_cam )

gpac-0.5.0.svn4668.tar.bz2/modules/ios_mpegv Added

gpac-0.5.0.svn4668.tar.bz2/modules/ios_mpegv/SensorAcces.m Added

@@ -0,0 +1,209 @@
+//
+//  ios_mpegv.m
+//  ios_mpegv
+//
+//  Created by mac on 3/8/13.
+//
+//
+
+#import "SensorAccess.h"
+
+@implementation SensorAccess
+
+- (id)init {
+	if ((self = [super init])) {
+        @autoreleasepool {
+            self.motionManager = [[[CMMotionManager alloc] init] autorelease];
+            self.queue = [[[NSOperationQueue alloc] init] autorelease];
+            
+            self.locMngr = [[[CLLocationManager alloc] init] autorelease];
+            self.locMngr.delegate = self;
+            self.locMngr.desiredAccuracy = kCLLocationAccuracyBest;
+            self.locMngr.distanceFilter = 2;
+            
+            sensorCallbak = NULL;
+            userData = NULL;
+            sensorType = -1;
+            gpsActive = 0;
+        }
+	}
+	return self;
+}
+
+- (void)dealloc{
+    self.locMngr.delegate = NULL;
+    [super dealloc];
+}
+
+- (int) setSensorType :(int) type
+{
+    sensorType = type;
+    return 0;
+}
+
+- (int) getSensorType
+{
+    return sensorType;
+}
+
+- (int) setSensorCallback:(SensorDataCallback*)callback :(void*)user
+{
+    sensorCallbak = callback;
+    userData = user;
+    return 0;
+}
+
+- (int) startSensor
+{
+    switch (sensorType) {
+        case SENSOR_ACCELEROMETER:
+            if ( ![[self motionManager] isAccelerometerAvailable] )
+                return 1;
+            [[self motionManager] startAccelerometerUpdatesToQueue:[self queue] withHandler:^(CMAccelerometerData* data, NSError* error) {
+                    if ( sensorCallbak ) {
+                        char cdata[100];
+                        sprintf(cdata, "%f;%f;%f;", data.acceleration.x, data.acceleration.y, data.acceleration.z);
+                        sensorCallbak(userData, cdata);
+                    }
+                }
+             ];
+            return 0;
+            break;
+        case SENSOR_GYROSCOPE:
+            if ( ![[self motionManager] isGyroAvailable] )
+                return 1;
+            [[self motionManager] startGyroUpdatesToQueue:[self queue] withHandler:^(CMGyroData* data, NSError* error) {
+                if ( sensorCallbak ) {
+                    char cdata[100];
+                    sprintf(cdata, "%f;%f;%f;", data.rotationRate.x, data.rotationRate.y, data.rotationRate.z);
+                    sensorCallbak(userData, cdata);
+                }
+            }
+             ];
+            return 0;
+            break;
+        case SENSOR_MAGNETOMETER:
+            if ( ![[self motionManager] isMagnetometerAvailable] )
+                return 1;
+            [[self motionManager] startMagnetometerUpdatesToQueue:[self queue] withHandler:^(CMMagnetometerData* data, NSError* error) {
+                if ( sensorCallbak ) {
+                    char cdata[100];
+                    sprintf(cdata, "%f;%f;%f;", data.magneticField.x, data.magneticField.y, data.magneticField.z);
+                    sensorCallbak(userData, cdata);
+                }
+            }
+             ];
+            return 0;
+            break;
+        case SENSOR_GPS:
+            [self.locMngr startUpdatingLocation];
+            gpsActive = 1;
+            return 0;
+            break;
+    }
+
+    return 1;
+}
+
+- (int) stopSensor
+{
+    switch (sensorType) {
+        case SENSOR_ACCELEROMETER:
+            [[self motionManager] stopAccelerometerUpdates];
+            return 0;
+            break;
+        case SENSOR_GYROSCOPE:
+            [[self motionManager] stopGyroUpdates];
+            return 0;
+            break;
+        case SENSOR_MAGNETOMETER:
+            [[self motionManager] stopMagnetometerUpdates];
+            return 0;
+        case SENSOR_GPS:
+            [self.locMngr stopUpdatingLocation];
+            gpsActive = 0;
+            return 0;
+            break;
+    }
+    return 1;
+}
+
+- (int) isSensorStarted
+{
+    switch (sensorType) {
+        case SENSOR_ACCELEROMETER:
+            return [[self motionManager] isAccelerometerActive];
+            break;
+        case SENSOR_GYROSCOPE:
+            return [[self motionManager] isGyroActive];
+            break;
+        case SENSOR_MAGNETOMETER:
+            return [[self motionManager] isMagnetometerActive];
+        case SENSOR_GPS:
+            return gpsActive;
+            break;
+    }
+    return 0;
+}
+
+- (void)locationManager:(CLLocationManager *)manager didUpdateToLocation:(CLLocation *)location fromLocation:(CLLocation *)oldLocation {
+    char cdata[100];
+    sprintf(cdata, "%f;%f;%f;%f;%f;", (float)location.coordinate.latitude, (float)location.coordinate.longitude, (float)location.altitude,
+            (float)location.horizontalAccuracy, 0.f);
+    sensorCallbak(userData, cdata);
+}
+
+@end
+
+void* SENS_CreateInstance() {
+    void* obj = [[SensorAccess alloc] init];
+    return obj;
+}
+
+int SENS_DestroyInstance(void** inst) {
+    [(id)*inst dealloc];
+    *inst = NULL;
+    return 0;
+}
+
+int SENS_SetSensorType(void* inst, int type) {
+    if ( !inst )
+        return 1;
+    
+    return [(id)inst setSensorType:type];
+}
+
+int SENS_GetCurrentSensorType(void* inst) {
+    if ( !inst )
+        return 1;
+    
+    return [(id)inst getSensorType];
+}
+
+int SENS_Start(void* inst) {
+    if ( !inst )
+        return 1;
+    
+    return [(id)inst startSensor];
+}
+
+int SENS_Stop(void* inst) {
+    if ( !inst )
+        return 1;
+    
+    return [(id)inst stopSensor];
+}
+
+int SENS_IsStarted(void* inst) {
+    if ( !inst )
+        return 1;
+    
+    return [(id)inst isSensorStarted];
+}
+
+int SENS_SetCallback(void* inst, SensorDataCallback *callback, void* user) {
+    if ( !inst )
+        return 1;
+    
+    return [(id)inst setSensorCallback:callback :user];
+}

gpac-0.5.0.svn4668.tar.bz2/modules/ios_mpegv/SensorAccess.h Added

gpac-0.5.0.svn4668.tar.bz2/modules/ios_mpegv/ios_mpegv-Prefix.pch Added

gpac-0.5.0.svn4668.tar.bz2/modules/ios_mpegv/ios_mpegv.c Added

@@ -0,0 +1,309 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Ivica Arsov, Jean Le Feuvre
+ *			Copyright (c) Mines-Telecom 2009-
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / MPEG-V Input sensor for android
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *		
+ */
+
+/*driver interfaces*/
+
+#include <gpac/list.h>
+#include <gpac/constants.h>
+
+#include <gpac/setup.h>
+
+#include <gpac/modules/codec.h>
+#include <gpac/scenegraph_vrml.h>
+
+#include <gpac/thread.h>
+
+#include "sensor_wrap.h"
+
+typedef struct
+{
+	char sensor[50];
+	u16 sensorIOSType;
+	u8 isAttached;
+    
+    GF_Mutex* mx;
+
+	void* inst;
+
+} MPEGVSensorContext;
+
+#define MPEGVSCTX	MPEGVSensorContext *rc = (MPEGVSensorContext *)dr->udta
+
+Bool MPEGVS_RegisterDevice(struct __input_device *dr, const char *urn, GF_BitStream *dsi, void (*AddField)(struct __input_device *_this, u32 fieldType, const char *name))
+{
+	MPEGVSCTX;
+	
+	//"MPEG-V:siv:OrientationSensorType"
+
+	if ( strnicmp(urn, "MPEG-V", 6) )
+		return 0;
+
+	if ( strlen(urn) <= 6 )
+	{
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[MPEG-V] No sensor type specified\n"));
+		return 0;
+	}
+	
+	if ( strnicmp(urn+6, ":siv:", 5) )
+	{
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[MPEG-V] Not valid sensor type specified\n"));
+		return 0;
+	}
+
+	strcpy(rc->sensor, urn+11);
+
+	if ( !strcmp(rc->sensor, "OrientationSensorType") )
+	{
+		//AddField(dr, GF_SG_VRML_SFVEC3F, "Orientation");
+
+		//rc->sensorIOSType = 3;
+
+		return 0;
+	}
+	else if ( !strcmp(rc->sensor, "AccelerationSensorType") )
+	{
+		AddField(dr, GF_SG_VRML_SFVEC3F, "Acceleration");
+
+		rc->sensorIOSType = SENSOR_ACCELEROMETER;
+
+		return 1;
+	}
+	else if ( !strcmp(rc->sensor, "AngularVelocitySensorType") )
+	{
+		AddField(dr, GF_SG_VRML_SFVEC3F, "AngularVelocity");
+
+		rc->sensorIOSType = SENSOR_GYROSCOPE;
+
+		return 1;
+	}
+	else if ( !strcmp(rc->sensor, "MagneticFieldSensorType") )
+	{
+		AddField(dr, GF_SG_VRML_SFVEC3F, "MagneticField");
+
+		rc->sensorIOSType = SENSOR_MAGNETOMETER;
+
+		return 1;
+	}
+	else if ( !strcmp(rc->sensor, "LightSensorType") )
+	{
+		//AddField(dr, GF_SG_VRML_SFFLOAT, "Light");
+
+		//rc->sensorIOSType = 5;
+
+		return 0;
+	}
+	else if ( !strcmp(rc->sensor, "AtmosphericPressureSensorType") )
+	{
+		//AddField(dr, GF_SG_VRML_SFFLOAT, "AtmosphericPressure");
+
+		//rc->sensorIOSType = 6;
+
+		return 0;
+	}
+	else if ( !strcmp(rc->sensor, "RotationVectorSensorType") )
+	{
+		//AddField(dr, GF_SG_VRML_SFVEC3F, "RotationVector");
+
+		//rc->sensorIOSType = 11;
+
+		return 0;
+	}
+	else if ( !strcmp(rc->sensor, "GlobalPositionSensorType") )
+	{
+		AddField(dr, GF_SG_VRML_SFVEC3F, "Position");
+		AddField(dr, GF_SG_VRML_SFFLOAT, "Accuracy");
+		AddField(dr, GF_SG_VRML_SFFLOAT, "Bearing");
+
+		rc->sensorIOSType = SENSOR_GPS;
+
+		return 1;
+	}
+	else
+	{
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[MPEG-V_IN] Unsupported sensor type: %s\n", rc->sensor));
+		return 0;
+	}
+}
+
+void MPEGVSensorCallback( void* ptr, const char* data)
+{
+	GF_BitStream *bs;
+	char *buf;
+	u32 buf_size;
+	float x, y, z, a, b;
+    struct __input_device * dr = (struct __input_device *)ptr;
+	MPEGVSCTX;
+    
+    if (!gf_mx_try_lock(rc->mx))
+        return;
+    
+	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+
+	if ( rc->sensorIOSType == SENSOR_ACCELEROMETER 
+			|| rc->sensorIOSType == SENSOR_GYROSCOPE
+			//|| rc->sensorIOSType == 3
+			|| rc->sensorIOSType == SENSOR_MAGNETOMETER )
+	{
+		sscanf(data, "%f;%f;%f;", &x, &y, &z);
+		gf_bs_write_int(bs, 1, 1);
+		gf_bs_write_float(bs, x);
+		gf_bs_write_float(bs, y);
+		gf_bs_write_float(bs, z);
+	}
+	else
+	if ( rc->sensorIOSType == 5
+			|| rc->sensorIOSType == 6 )
+	{
+		sscanf(data, "%f;", &x);
+		
+		gf_bs_write_int(bs, 1, 1);
+		gf_bs_write_float(bs, x);
+	}
+	else 
+	if ( rc->sensorIOSType == 11 )
+	{
+		sscanf(data, "%f;%f;%f;", &x, &y, &z);
+
+		gf_bs_write_int(bs, 1, 1);
+		gf_bs_write_float(bs, x);
+		gf_bs_write_float(bs, y);
+		gf_bs_write_float(bs, z);
+		/*gf_bs_write_float(bs, q);*/
+	}
+	else 
+	if ( rc->sensorIOSType == SENSOR_GPS )
+	{
+		sscanf(data, "%f;%f;%f;%f;%f;", &x, &y, &z, &a, &b);
+
+		gf_bs_write_int(bs, 1, 1);
+		gf_bs_write_float(bs, x);
+		gf_bs_write_float(bs, y);
+		gf_bs_write_float(bs, z);
+		gf_bs_write_int(bs, 1, 1);
+		gf_bs_write_float(bs, a);
+		gf_bs_write_int(bs, 1, 1);
+		gf_bs_write_float(bs, b);
+		/*gf_bs_write_float(bs, q);*/
+	}
+
+	gf_bs_align(bs);
+	gf_bs_get_content(bs, &buf, &buf_size);
+	gf_bs_del(bs);
+
+	dr->DispatchFrame(dr, (u8*)buf, buf_size);
+	gf_free(buf);
+    
+    gf_mx_v(rc->mx);
+}
+
+void MPEGVS_Start(struct __input_device * dr)
+{
+	MPEGVSCTX;
+    
+    GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[MPEG-V_IN] Start: %d\n", gf_th_id()));
+
+    if ( rc->inst ) {
+        SENS_Stop(rc->inst);
+        SENS_DestroyInstance(&rc->inst);
+    }
+	
+    rc->inst = SENS_CreateInstance();
+    SENS_SetSensorType(rc->inst, rc->sensorIOSType);
+    SENS_SetCallback(rc->inst, MPEGVSensorCallback, dr);
+    SENS_Start(rc->inst);
+}
+
+void MPEGVS_Stop(struct __input_device * dr)
+{
+	MPEGVSCTX;
+    
+    GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[MPEG-V_IN] Stop: %d\n", gf_th_id()));
+
+    SENS_Stop(rc->inst);
+    SENS_DestroyInstance(&rc->inst);
+}
+
+GF_InputSensorDevice* NewMPEGVSInputSesor()
+{
+	MPEGVSensorContext* ctx = NULL;
+	GF_InputSensorDevice* driv = NULL;
+	
+	driv = (GF_InputSensorDevice *) gf_malloc(sizeof(GF_InputSensorDevice));
+	memset(driv, 0, sizeof(GF_InputSensorDevice));
+	GF_REGISTER_MODULE_INTERFACE(driv, GF_INPUT_DEVICE_INTERFACE, "MPEG-V Sensors Input Module", "gpac distribution");
+
+	driv->RegisterDevice = MPEGVS_RegisterDevice;
+	driv->Start = MPEGVS_Start;
+	driv->Stop = MPEGVS_Stop;
+
+	ctx = (MPEGVSensorContext*) gf_malloc (sizeof(MPEGVSensorContext));
+	memset(ctx, 0, sizeof(MPEGVSensorContext));
+    ctx->mx = gf_mx_new(NULL);
+	
+	driv->udta = (void*)ctx;
+
+	return driv;
+}
+
+void DeleteMPEGVSInputSensor(GF_InputSensorDevice* dev)
+{
+	MPEGVS_Stop(dev);
+    MPEGVSensorContext* ctx = (MPEGVSensorContext*)dev->udta;
+    gf_mx_del(ctx->mx);
+	gf_free(dev->udta);
+	gf_free(dev);
+}
+
+/*interface query*/
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces() 
+{
+	static u32 si [] = {
+		GF_INPUT_DEVICE_INTERFACE,
+		0
+	};
+	return si; 
+}
+
+/*interface create*/
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
+{
+	if (InterfaceType == GF_INPUT_DEVICE_INTERFACE) return (GF_BaseInterface *) NewMPEGVSInputSesor();
+	return NULL;
+}
+
+/*interface destroy*/
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+	switch (ifce->InterfaceType) {
+	case GF_INPUT_DEVICE_INTERFACE:
+		DeleteMPEGVSInputSensor((GF_InputSensorDevice *)ifce);
+		break;
+	}
+}
+
+GPAC_MODULE_STATIC_DELARATION( ios_mpegv )

gpac-0.5.0.svn4668.tar.bz2/modules/ios_mpegv/sensor_wrap.h Added

gpac-0.5.0.svn4296.tar.bz2/modules/ismacryp/Makefile -> gpac-0.5.0.svn4668.tar.bz2/modules/ismacryp/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/ismacryp/isma_ea.c Added

@@ -0,0 +1,366 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre 
+ *			Copyright (c) Telecom ParisTech 2005-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / LASeR decoder module
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#include <gpac/ismacryp.h>
+#include <gpac/crypt.h>
+#include <gpac/base_coding.h>
+#include <gpac/download.h>
+#include <gpac/internal/terminal_dev.h>
+#include <gpac/modules/ipmp.h>
+
+#ifndef GPAC_DISABLE_MCRYPT
+
+#define OMA_DRM_MP4MC
+
+
+enum
+{
+	ISMAEA_STATE_ERROR,
+	ISMAEA_STATE_SETUP,
+	ISMAEA_STATE_PLAY,
+};
+
+typedef struct 
+{
+	GF_Crypt *crypt;
+	char key[16], salt[8];
+	u64 last_IV;
+	u32 state;
+	u32 nb_allow_play;
+	Bool is_oma;
+	u32 preview_range;
+} ISMAEAPriv;
+
+
+static void ISMA_KMS_NetIO(void *cbck, GF_NETIO_Parameter *par)
+{
+}
+
+static GF_Err ISMA_GetGPAC_KMS(ISMAEAPriv *priv, GF_Channel *ch, const char *kms_url)
+{
+	GF_Err e;
+	FILE *t;
+	GF_DownloadSession * sess;
+	if (!strnicmp(kms_url, "(ipmp)", 6)) return GF_NOT_SUPPORTED;
+	else if (!strnicmp(kms_url, "(uri)", 5)) kms_url += 5;
+	else if (!strnicmp(kms_url, "file://", 7)) kms_url += 7;
+
+	e = GF_OK;
+	/*try local*/
+	t = (strstr(kms_url, "://") == NULL) ? gf_f64_open(kms_url, "r") : NULL;
+	if (t) {
+		fclose(t);
+		return gf_ismacryp_gpac_get_info(ch->esd->ESID, (char *)kms_url, priv->key, priv->salt);
+	}
+	/*note that gpac doesn't have TLS support -> not really usefull. As a general remark, ISMACryp
+	is supported as a proof of concept, crypto and IPMP being the last priority on gpac...*/
+	GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ISMA E&A] 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;
+	/*start our download (threaded)*/
+	gf_dm_sess_process(sess);
+
+	while (1) {
+		e = gf_dm_sess_get_stats(sess, NULL, NULL, NULL, NULL, NULL, NULL);
+		if (e) break;
+	}
+	if (e==GF_EOS) {
+		e = gf_ismacryp_gpac_get_info(ch->esd->ESID, (char *) gf_dm_sess_get_cache_name(sess), priv->key, priv->salt);
+	}
+	gf_term_download_del(sess);
+	return e;
+}
+
+
+static GF_Err ISMA_Setup(ISMAEAPriv *priv, GF_IPMPEvent *evt)
+{
+	GF_Err e;
+	GF_ISMACrypConfig *cfg = (GF_ISMACrypConfig*)evt->config_data;
+
+	priv->state = ISMAEA_STATE_ERROR;
+
+	if (cfg->scheme_type != GF_4CC('i','A','E','C')) return GF_NOT_SUPPORTED;
+	if (cfg->scheme_version != 1) return GF_NOT_SUPPORTED;
+
+	if (!cfg->kms_uri) return GF_NON_COMPLIANT_BITSTREAM;
+
+	/*try to fetch the keys*/
+	/*base64 inband encoding*/
+	if (!strnicmp(cfg->kms_uri, "(key)", 5)) {
+		char data[100];
+		gf_base64_decode((char*)cfg->kms_uri+5, (u32)strlen(cfg->kms_uri)-5, data, 100);
+		memcpy(priv->key, data, sizeof(char)*16);
+		memcpy(priv->salt, data+16, sizeof(char)*8);
+	}
+	/*hexadecimal inband encoding*/
+	else if (!strnicmp(cfg->kms_uri, "(key-hexa)", 10)) {
+		u32 v;
+		char szT[3], *k;
+		u32 i;
+		szT[2] = 0;
+		if (strlen(cfg->kms_uri) < 10+32+16) return GF_NON_COMPLIANT_BITSTREAM;
+
+		k = (char *)cfg->kms_uri + 10;
+		for (i=0; i<16; i++) { 
+			szT[0] = k[2*i]; szT[1] = k[2*i + 1];
+			sscanf(szT, "%X", &v); 
+			priv->key[i] = v;
+		}
+
+		k = (char *)cfg->kms_uri + 10 + 32;
+		for (i=0; i<8; i++) { 
+			szT[0] = k[2*i]; szT[1] = k[2*i + 1];
+			sscanf(szT, "%X", &v); 
+			priv->salt[i] = v;
+		}
+	}
+	/*MPEG4-IP KMS*/
+	else if (!stricmp(cfg->kms_uri, "AudioKey") || !stricmp(cfg->kms_uri, "VideoKey")) {
+		if (!gf_ismacryp_mpeg4ip_get_info((char *) cfg->kms_uri, priv->key, priv->salt)) {
+			return GF_BAD_PARAM;
+		}
+	}
+	/*gpac default scheme is used, fetch file from KMS and load keys*/
+	else if (cfg->scheme_uri && !stricmp(cfg->scheme_uri, "urn:gpac:isma:encryption_scheme")) {
+		e = ISMA_GetGPAC_KMS(priv, evt->channel, cfg->kms_uri);
+		if (e) return e;
+	}
+	/*hardcoded keys*/
+	else {
+		static u8 mysalt[] = { 8,7,6,5,4,3,2,1, 0,0,0,0,0,0,0,0 };
+		static u8 mykey[][16]  = {
+	{ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+	  0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 } };
+		memcpy(priv->salt, mysalt, sizeof(char)*8);
+		memcpy(priv->key, mykey, sizeof(char)*16);
+	}
+	priv->state = ISMAEA_STATE_SETUP;
+	//priv->nb_allow_play = 1;
+	return GF_OK;
+}
+
+static GF_Err ISMA_Access(ISMAEAPriv *priv, GF_IPMPEvent *evt)
+{
+	GF_Err e;
+	char IV[16];
+	
+	if (evt->event_type==GF_IPMP_TOOL_GRANT_ACCESS) {
+		if (priv->state != ISMAEA_STATE_SETUP) return GF_SERVICE_ERROR;
+		assert(!priv->crypt);
+
+		//if (!priv->nb_allow_play) return GF_AUTHENTICATION_FAILURE;
+		//priv->nb_allow_play--;
+		
+		/*init decrypter*/
+		priv->crypt = gf_crypt_open("AES-128", "CTR");
+		if (!priv->crypt) return GF_IO_ERR;
+
+		memset(IV, 0, sizeof(char)*16);
+		memcpy(IV, priv->salt, sizeof(char)*8);
+		e = gf_crypt_init(priv->crypt, priv->key, 16, IV);
+		if (e) return e;
+
+		priv->state = ISMAEA_STATE_PLAY;
+		return GF_OK;
+	}
+	if (evt->event_type==GF_IPMP_TOOL_RELEASE_ACCESS) {
+		if (priv->state != ISMAEA_STATE_PLAY) return GF_SERVICE_ERROR;
+		if (priv->crypt) gf_crypt_close(priv->crypt);
+		priv->crypt = NULL;
+		priv->state = ISMAEA_STATE_SETUP;
+		return GF_OK;
+	}
+	return GF_BAD_PARAM;
+}
+
+static GF_Err ISMA_ProcessData(ISMAEAPriv *priv, GF_IPMPEvent *evt)
+{
+	if (!priv->crypt) return GF_SERVICE_ERROR;
+	
+	if (!evt->is_encrypted) return GF_OK;
+
+	/*resync IV*/
+	if (!priv->last_IV || (priv->last_IV != evt->isma_BSO)) {
+		char IV[17];
+		u64 count;
+		u32 remain;
+		GF_BitStream *bs;
+		count = evt->isma_BSO / 16;
+		remain = (u32) (evt->isma_BSO % 16);
+
+		/*format IV to begin of counter*/
+		bs = gf_bs_new(IV, 17, GF_BITSTREAM_WRITE);
+		gf_bs_write_u8(bs, 0);	/*begin of counter*/
+		gf_bs_write_data(bs, priv->salt, 8);
+		gf_bs_write_u64(bs, (s64) count);
+		gf_bs_del(bs);
+		gf_crypt_set_state(priv->crypt, IV, 17);
+
+		/*decrypt remain bytes*/
+		if (remain) {
+			char dummy[20];
+			gf_crypt_decrypt(priv->crypt, dummy, remain);
+		}
+		priv->last_IV = evt->isma_BSO;
+	}
+	/*decrypt*/
+	gf_crypt_decrypt(priv->crypt, evt->data, evt->data_size);
+	priv->last_IV += evt->data_size;
+	return GF_OK;
+}
+
+
+#ifdef OMA_DRM_MP4MC
+static GF_Err OMA_DRM_Setup(ISMAEAPriv *priv, GF_IPMPEvent *evt)
+{
+	u32 hdr_pos;
+	GF_OMADRM2Config *cfg = (GF_OMADRM2Config*)evt->config_data;
+
+	priv->state = ISMAEA_STATE_ERROR;
+
+	if (cfg->scheme_type != GF_4CC('o','d','k','m')) return GF_NOT_SUPPORTED;
+	if (cfg->scheme_version != 0x00000200) return GF_NOT_SUPPORTED;
+
+	hdr_pos = 0;
+	while (hdr_pos<cfg->oma_drm_textual_headers_len) {
+		u32 len;
+		char *sep;
+		if (!strncmp(cfg->oma_drm_textual_headers + hdr_pos, "PreviewRange", 12)) {
+			sep = strchr(cfg->oma_drm_textual_headers + hdr_pos, ':');
+			if (sep) priv->preview_range = atoi(sep+1);
+		}
+		len = (u32) strlen(cfg->oma_drm_textual_headers + hdr_pos);
+		hdr_pos += len+1;
+	}
+	priv->is_oma = GF_TRUE;
+
+	/*TODO: call DRM agent, fetch keys*/
+	if (!cfg->kms_uri) return GF_NON_COMPLIANT_BITSTREAM;
+	priv->state = ISMAEA_STATE_SETUP;
+	//priv->nb_allow_play = 1;
+	
+	/*we have preview*/
+	if (priv->preview_range) return GF_OK;
+	return GF_NOT_SUPPORTED;
+}
+#endif
+
+static GF_Err ISMA_Process(GF_IPMPTool *plug, GF_IPMPEvent *evt)
+{
+	ISMAEAPriv *priv = (ISMAEAPriv *)plug->udta;
+
+	switch (evt->event_type) {
+	case GF_IPMP_TOOL_SETUP:
+		if (evt->config_data_code == GF_4CC('i','s','m','a')) return ISMA_Setup(priv, evt);
+#ifdef OMA_DRM_MP4MC
+		if (evt->config_data_code == GF_4CC('o','d','r','m')) return OMA_DRM_Setup(priv, evt);
+#endif
+		return GF_NOT_SUPPORTED;
+		
+	case GF_IPMP_TOOL_GRANT_ACCESS:
+	case GF_IPMP_TOOL_RELEASE_ACCESS:
+		if (priv->is_oma) {
+		} else {
+			return ISMA_Access(priv, evt);
+		}
+		break;
+	case GF_IPMP_TOOL_PROCESS_DATA:
+		if (priv->is_oma) {
+			if (evt->is_encrypted) {
+				evt->restart_requested = GF_TRUE;
+				return GF_EOS;
+			}
+			return GF_OK;
+		}
+		return ISMA_ProcessData(priv, evt);
+	}
+	return GF_OK;
+}
+
+void DeleteISMACrypTool(GF_IPMPTool *plug)
+{
+	ISMAEAPriv *priv = (ISMAEAPriv *)plug->udta;
+	/*in case something went wrong*/
+	if (priv->crypt) gf_crypt_close(priv->crypt);
+	gf_free(priv);
+	gf_free(plug);
+}
+
+GF_IPMPTool *NewISMACrypTool()
+{
+	ISMAEAPriv *priv;
+	GF_IPMPTool *tmp;
+	
+	GF_SAFEALLOC(tmp, GF_IPMPTool);
+	if (!tmp) return NULL;
+	GF_SAFEALLOC(priv, ISMAEAPriv);
+	tmp->udta = priv;
+	tmp->process = ISMA_Process;
+	GF_REGISTER_MODULE_INTERFACE(tmp, GF_IPMP_TOOL_INTERFACE, "GPAC ISMACryp tool", "gpac distribution")
+	return (GF_IPMPTool *) tmp;
+}
+
+#endif /*GPAC_DISABLE_MCRYPT*/
+
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces() 
+{
+	static u32 si [] = {
+#ifndef GPAC_DISABLE_MCRYPT
+		GF_IPMP_TOOL_INTERFACE,
+#endif
+		0
+	};
+	return si;
+}
+
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
+{
+	switch (InterfaceType) {
+#ifndef GPAC_DISABLE_MCRYPT
+	case GF_IPMP_TOOL_INTERFACE:
+		return (GF_BaseInterface *)NewISMACrypTool();
+#endif
+	default:
+		return NULL;
+	}
+}
+
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+	switch (ifce->InterfaceType) {
+#ifndef GPAC_DISABLE_MCRYPT
+	case GF_IPMP_TOOL_INTERFACE:
+		DeleteISMACrypTool((GF_IPMPTool *)ifce);
+		break;
+#endif
+	}
+}
+
+GPAC_MODULE_STATIC_DELARATION( isma_ea )
+

gpac-0.5.0.svn4296.tar.bz2/modules/isom_in/Makefile -> gpac-0.5.0.svn4668.tar.bz2/modules/isom_in/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/isom_in/isom_cache.c Added

@@ -0,0 +1,267 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre 
+ *			Copyright (c) Telecom ParisTech 2000-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / MP4 cache module
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *		
+ */
+
+#include "isom_in.h"
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+static GF_Err ISOW_Open(GF_StreamingCache *mc, GF_ClientService *serv, const char *location_and_name, Bool keep_existing_files)
+{
+	char szRoot[GF_MAX_PATH], szPath[GF_MAX_PATH], *ext;
+	ISOMReader *cache = (ISOMReader *)mc->priv;
+	if (cache->mov || cache->service) return GF_BAD_PARAM;
+
+	strcpy(szRoot, location_and_name);
+	ext = strrchr(szRoot, '.');
+	if (ext) ext[0] = 0;
+	strcpy(szPath, szRoot);
+	strcat(szPath, ".mp4");
+	if (keep_existing_files) {
+		FILE *f = gf_f64_open(szPath, "rb");
+		if (f) {
+			u32 i=0;
+			fclose(f);
+			while (1) {
+				sprintf(szPath, "%s_%04d.mp4", szRoot, i);
+				f = gf_f64_open(szPath, "rb");
+				if (!f) break;
+				fclose(f);
+				i++;
+			}
+		}
+	}
+	
+	/*create a new movie in write mode (eg no editing)*/
+	cache->mov = gf_isom_open(szPath, GF_ISOM_OPEN_WRITE, NULL);
+	if (!cache->mov) return gf_isom_last_error(NULL);
+	cache->service = serv;
+	return GF_OK;
+}
+
+static GF_Err ISOW_Close(GF_StreamingCache *mc, Bool delete_cache)
+{
+	GF_Err e;
+	ISOMReader *cache = (ISOMReader *)mc->priv;
+	if (!cache->mov || !cache->service) return GF_BAD_PARAM;
+
+	while (gf_list_count(cache->channels)) {
+		ISOMChannel *ch = (ISOMChannel *)gf_list_get(cache->channels, 0);
+		gf_list_rem(cache->channels, 0);
+		if (ch->cache_sample) {
+			gf_isom_add_sample(cache->mov, ch->track, 1, ch->cache_sample);
+			gf_isom_sample_del(&ch->cache_sample);
+		}
+		gf_free(ch);
+	}
+	if (delete_cache) {
+		gf_isom_delete(cache->mov);
+		e = GF_OK;
+	} else {
+		e = gf_isom_close(cache->mov);
+	}
+	cache->mov = NULL;
+	cache->service = NULL;
+	return e;
+}
+static GF_Err ISOW_Write(GF_StreamingCache *mc, LPNETCHANNEL ch, char *data, u32 data_size, GF_SLHeader *sl_hdr)
+{
+	ISOMChannel *mch;
+	GF_ESD *esd;
+	u32 di, mtype;
+	u64 DTS, CTS;
+	ISOMReader *cache = (ISOMReader *)mc->priv;
+	if (!cache->mov || !cache->service) return GF_BAD_PARAM;
+
+	mch = isor_get_channel(cache, ch);
+	if (!mch) {
+		Bool mapped;
+		GF_NetworkCommand com;
+		com.base.on_channel = ch;
+		com.base.command_type = GF_NET_CHAN_GET_ESD;
+		gf_term_on_command(cache->service, &com, GF_OK);
+		if (!com.cache_esd.esd) return GF_SERVICE_ERROR;
+
+		esd = (GF_ESD *)com.cache_esd.esd;
+		switch (esd->decoderConfig->streamType) {
+		case GF_STREAM_OD: mtype = GF_ISOM_MEDIA_OD; break;
+		case GF_STREAM_SCENE: mtype = GF_ISOM_MEDIA_SCENE; break;
+		case GF_STREAM_VISUAL: mtype = GF_ISOM_MEDIA_VISUAL; break;
+		case GF_STREAM_AUDIO: mtype = GF_ISOM_MEDIA_AUDIO; break;
+		case GF_STREAM_MPEG7: mtype = GF_ISOM_MEDIA_MPEG7; break;
+		case GF_STREAM_OCI: mtype = GF_ISOM_MEDIA_OCI; break;
+		case GF_STREAM_IPMP: mtype = GF_ISOM_MEDIA_IPMP; break;
+		case GF_STREAM_MPEGJ: mtype = GF_ISOM_MEDIA_MPEGJ; break;
+		case GF_STREAM_TEXT: mtype = GF_ISOM_MEDIA_TEXT; break;
+		default: return GF_NOT_SUPPORTED;
+		}
+		GF_SAFEALLOC(mch, ISOMChannel);
+		mch->time_scale = esd->slConfig->timestampResolution;
+		mch->streamType = esd->decoderConfig->streamType;
+		mch->track = gf_isom_new_track(cache->mov, com.cache_esd.esd->ESID, mtype, mch->time_scale);
+		mch->is_playing = 1;
+		mch->channel = ch;
+		mch->owner = cache;
+		gf_isom_set_track_enabled(cache->mov, mch->track, 1);
+		/*translate 3GP streams to MP4*/
+		mapped = 0;
+		if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_MEDIA_GENERIC) {
+			char szCode[5];
+			strncpy(szCode, esd->decoderConfig->decoderSpecificInfo->data, 4);
+			szCode[4]=0;
+			if (!stricmp(szCode, "samr") || !stricmp(szCode, "amr ") || !stricmp(szCode, "sawb")) {
+				GF_3GPConfig amrc;
+				mapped = 1;
+				memset(&amrc, 0, sizeof(GF_3GPConfig));
+
+				amrc.frames_per_sample = (u32) esd->decoderConfig->decoderSpecificInfo->data[13];
+				amrc.type = (!stricmp(szCode, "sawb")) ? GF_ISOM_SUBTYPE_3GP_AMR_WB : GF_ISOM_SUBTYPE_3GP_AMR;
+				amrc.vendor = GF_4CC('G','P','A','C');
+				gf_isom_3gp_config_new(cache->mov, mch->track, &amrc, NULL, NULL, &di);
+			} else if (!stricmp(szCode, "h263")) {
+				GF_3GPConfig h263c;
+				memset(&h263c, 0, sizeof(GF_3GPConfig));
+				h263c.type = GF_ISOM_SUBTYPE_3GP_H263;
+				h263c.vendor = GF_4CC('G','P','A','C');
+				gf_isom_3gp_config_new(cache->mov, mch->track, &h263c, NULL, NULL, &di);
+				mapped = 1;
+			}
+		} 
+		if (!mapped) gf_isom_new_mpeg4_description(cache->mov, mch->track, esd, NULL, NULL, &di);
+		if (com.cache_esd.is_iod_stream) gf_isom_add_track_to_root_od(cache->mov, mch->track);
+		gf_list_add(cache->channels, mch);
+	}
+
+	/*first sample, cache it*/
+	if (!mch->cache_sample) {
+		mch->cache_seed_ts = sl_hdr->decodingTimeStamp;
+		mch->cache_sample = gf_isom_sample_new();
+		mch->cache_sample->IsRAP = sl_hdr->randomAccessPointFlag;
+		mch->cache_sample->dataLength = data_size;
+		mch->cache_sample->data = (char*)gf_malloc(sizeof(char)*data_size);
+		memcpy(mch->cache_sample->data, data, sizeof(char)*data_size);
+		return GF_OK;
+	}
+
+	/*adjust DTS/CTS*/
+	DTS = sl_hdr->decodingTimeStamp - mch->cache_seed_ts;
+
+	if ((mch->streamType==GF_STREAM_VISUAL) && (DTS<=mch->cache_sample->DTS)) {
+		assert(DTS>mch->prev_dts);
+		CTS = mch->cache_sample->DTS + mch->cache_sample->CTS_Offset;
+		mch->cache_sample->CTS_Offset = 0;
+
+		/*first time, shift all CTS*/
+		if (!mch->frame_cts_offset) {
+			u32 i, count = gf_isom_get_sample_count(cache->mov, mch->track);
+			mch->frame_cts_offset = (u32) (DTS-mch->prev_dts);
+			for (i=0; i<count; i++) {
+				gf_isom_modify_cts_offset(cache->mov, mch->track, i+1, mch->frame_cts_offset);
+			}
+			mch->cache_sample->CTS_Offset += mch->frame_cts_offset;
+		}
+		mch->cache_sample->DTS = mch->prev_dts + mch->frame_cts_offset;
+		mch->cache_sample->CTS_Offset += (u32) (CTS-mch->cache_sample->DTS);
+	}
+	/*deal with reference picture insertion: if no CTS offset and biggest CTS until now, this is 
+	a reference insertion - we must check that in order to make sure we have strictly increasing DTSs*/
+	if (mch->max_cts && !mch->cache_sample->CTS_Offset && (mch->cache_sample->DTS+mch->cache_sample->CTS_Offset > mch->max_cts)) {
+		assert(mch->cache_sample->DTS > mch->prev_dts + mch->frame_cts_offset);
+		CTS = mch->cache_sample->DTS + mch->cache_sample->CTS_Offset;
+		mch->cache_sample->DTS = mch->prev_dts + mch->frame_cts_offset;
+		mch->cache_sample->CTS_Offset = (u32) (CTS-mch->cache_sample->DTS);
+	}
+	if (mch->cache_sample->CTS_Offset) 
+		mch->max_cts = mch->cache_sample->DTS+mch->cache_sample->CTS_Offset;
+
+	/*add cache*/
+	gf_isom_add_sample(cache->mov, mch->track, 1, mch->cache_sample);
+	assert(!mch->prev_dts || (mch->prev_dts < mch->cache_sample->DTS));
+	mch->prev_dts = mch->cache_sample->DTS;
+	mch->duration = MAX(mch->max_cts, mch->prev_dts);
+	gf_isom_sample_del(&mch->cache_sample);
+
+	/*store sample*/
+	mch->cache_sample = gf_isom_sample_new();
+	mch->cache_sample->IsRAP = sl_hdr->randomAccessPointFlag;
+	mch->cache_sample->DTS = DTS + mch->frame_cts_offset;
+	mch->cache_sample->CTS_Offset = (u32) (sl_hdr->compositionTimeStamp - mch->cache_seed_ts - DTS);
+	mch->cache_sample->dataLength = data_size;
+	mch->cache_sample->data = (char*)gf_malloc(sizeof(char)*data_size);
+	memcpy(mch->cache_sample->data, data, sizeof(char)*data_size);
+	return GF_OK;
+}
+static GF_Err ISOW_ServiceCommand(GF_StreamingCache *mc, GF_NetworkCommand *com)
+{
+	ISOMReader *cache = (ISOMReader *)mc->priv;
+	if (!cache->mov || !cache->service) return GF_BAD_PARAM;
+
+	return GF_OK;
+}
+static GF_Err ISOW_ChannelGetSLP(GF_StreamingCache *mc, LPNETCHANNEL channel, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr, Bool *sl_compressed, GF_Err *out_reception_status, Bool *is_new_data)
+{
+	ISOMReader *cache = (ISOMReader *)mc->priv;
+	if (!cache->mov || !cache->service) return GF_BAD_PARAM;
+
+	return GF_OK;
+}
+static GF_Err ISOW_ChannelReleaseSLP(GF_StreamingCache *mc, LPNETCHANNEL channel)
+{
+	ISOMReader *cache = (ISOMReader *)mc->priv;
+	if (!cache->mov || !cache->service) return GF_BAD_PARAM;
+
+	return GF_OK;
+}
+
+GF_BaseInterface *isow_load_cache()
+{
+	ISOMReader *cache;
+	GF_StreamingCache *plug;
+	GF_SAFEALLOC(plug, GF_StreamingCache);
+	GF_REGISTER_MODULE_INTERFACE(plug, GF_STREAMING_MEDIA_CACHE, "GPAC IsoMedia Cache", "gpac distribution")
+
+	plug->Open = ISOW_Open;
+	plug->Close = ISOW_Close;
+	plug->Write = ISOW_Write;
+	plug->ChannelGetSLP = ISOW_ChannelGetSLP;
+	plug->ChannelReleaseSLP = ISOW_ChannelReleaseSLP;
+	plug->ServiceCommand = ISOW_ServiceCommand;
+
+	GF_SAFEALLOC(cache, ISOMReader);
+	cache->channels = gf_list_new();
+	plug->priv = cache;
+	return (GF_BaseInterface *) plug;
+}
+
+void isow_delete_cache(GF_BaseInterface *bi)
+{
+	GF_StreamingCache *mc = (GF_StreamingCache*) bi;
+	ISOMReader *cache = (ISOMReader *)mc->priv;
+	gf_list_del(cache->channels);
+	gf_free(cache);
+	gf_free(bi);
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+

gpac-0.5.0.svn4296.tar.bz2/modules/isom_in/isom_in.h -> gpac-0.5.0.svn4668.tar.bz2/modules/isom_in/isom_in.h Changed

gpac-0.5.0.svn4296.tar.bz2/modules/isom_in/load.c -> gpac-0.5.0.svn4668.tar.bz2/modules/isom_in/load.c Changed

@@ -77,7 +77,7 @@
 	/*generate an IOD with our private dynamic OD stream*/
 	GF_InitialObjectDescriptor *fake_iod = (GF_InitialObjectDescriptor *) gf_odf_desc_new(GF_ODF_IOD_TAG);
 	isor_emulate_chapters(read->mov, fake_iod);
-	read->no_service_desc = 1;
+	read->no_service_desc = GF_TRUE;
 	return (GF_Descriptor *)fake_iod;
 }
 
@@ -87,6 +87,7 @@
 	GF_ESD *esd;
 	const char *tag;
 	u32 i, count, ocr_es_id, tlen, base_track, j, track_id;
+	Bool highest_stream;
 
 	ocr_es_id = 0;
 
@@ -107,34 +108,32 @@
 			continue;
 		}
 		
-		/*we declare only the base track (i.e base_track == 0)*/
-		gf_isom_get_reference(read->mov, i+1, GF_ISOM_REF_BASE, 1, &base_track);
-		if (base_track)
+		/*we declare only the highest video track (i.e the track we play)*/
+		highest_stream = GF_TRUE;
+		track_id = gf_isom_get_track_id(read->mov, i+1);
+		for (j = 0; j < count; j++) {
+			if (gf_isom_has_track_reference(read->mov, j+1, GF_ISOM_REF_SCAL, track_id) > 0) {
+				highest_stream = GF_FALSE;
+				break;
+			}
+		}
+		if ((gf_isom_get_media_type(read->mov, i+1) == GF_ISOM_MEDIA_VISUAL) && !highest_stream)
 			continue;
 		esd = gf_media_map_esd(read->mov, i+1);
 		if (esd) {
-			esd->has_ref_base = 0;
-			track_id = gf_isom_get_track_id(read->mov, i+1);
-			for (j = 0; j < count; j++)
-			{
-				if (gf_isom_has_track_reference(read->mov, j+1, GF_ISOM_REF_BASE, track_id))
-				{
-					esd->has_ref_base = 1;
-					break;
-				}
-				if (gf_isom_get_avc_svc_type(read->mov, j+1, 1)>=GF_ISOM_AVCTYPE_AVC_SVC) {
-					esd->has_ref_base = 1;
-					break;
-				}
-			}
-
+			gf_isom_get_reference(read->mov, i+1, GF_ISOM_REF_BASE, 1, &base_track);
+			esd->has_ref_base = base_track ? GF_TRUE : GF_FALSE;
 			od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
 			od->service_ifce = read->input;
 			od->objectDescriptorID = 0;
 			if (!ocr_es_id) ocr_es_id = esd->ESID;
 			esd->OCRESID = ocr_es_id;
 			gf_list_add(od->ESDescriptors, esd);
-			gf_term_add_media(read->service, (GF_Descriptor*)od, 1);
+			if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
+				send_proxy_command(read, GF_FALSE, GF_TRUE, GF_OK, (GF_Descriptor*)od, NULL);
+			} else {
+				gf_term_add_media(read->service, (GF_Descriptor*)od, GF_TRUE);
+			}
 		}
 	}
 	/*if cover art, extract it in cache*/
@@ -157,7 +156,7 @@
 			t = gf_f64_open(szName, "wb");
 
 			if (t) {
-				Bool isom_contains_video = 0;
+				Bool isom_contains_video = GF_FALSE;
 
 				/*write cover data*/
 				assert(!(tlen & 0x80000000));
@@ -169,7 +168,7 @@
 					if (!gf_isom_is_track_enabled(read->mov, i+1))
 						continue;
 					if (gf_isom_get_media_type(read->mov, i+1) == GF_ISOM_MEDIA_VISUAL) {
-						isom_contains_video = 1;
+						isom_contains_video = GF_TRUE;
 						break;
 					}
 				}
@@ -179,18 +178,26 @@
 					od->service_ifce = read->input;
 					od->objectDescriptorID = GF_MEDIA_EXTERNAL_ID;
 					od->URLString = gf_strdup(szName);
-					gf_term_add_media(read->service, (GF_Descriptor*)od, 1);
+					if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
+						send_proxy_command(read, GF_FALSE, GF_TRUE, GF_OK, (GF_Descriptor*)od, NULL);
+					} else {
+						gf_term_add_media(read->service, (GF_Descriptor*)od, GF_TRUE);
+					}
 				}
 			}
 		}
 	}
-	gf_term_add_media(read->service, NULL, 0);
+	if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
+		send_proxy_command(read, GF_FALSE, GF_TRUE, GF_OK, NULL, NULL);
+	} else {
+		gf_term_add_media(read->service, NULL, GF_FALSE);
+	} 
 }
 
 #endif /*GPAC_DISABLE_ISOM*/
 
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 const u32 *QueryInterfaces() 
 {
 	static u32 si [] = {
@@ -205,7 +212,7 @@
 	return si;
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface(u32 InterfaceType) 
 {
 #ifndef GPAC_DISABLE_ISOM
@@ -219,7 +226,7 @@
 	return NULL;
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 void ShutdownInterface(GF_BaseInterface *ifce)
 {
 	switch (ifce->InterfaceType) {
@@ -232,3 +239,4 @@
 	}
 }
 
+GPAC_MODULE_STATIC_DELARATION( isom )

gpac-0.5.0.svn4296.tar.bz2/modules/isom_in/read.c -> gpac-0.5.0.svn4668.tar.bz2/modules/isom_in/read.c Changed

@@ -55,11 +55,11 @@
 
 static GFINLINE Bool isor_is_local(const char *url)
 {
-	if (!strnicmp(url, "file://", 7)) return 1;
-	if (!strnicmp(url, "gmem://", 7)) return 1;
-	if (strstr(url, "://")) return 0;
+	if (!strnicmp(url, "file://", 7)) return GF_TRUE;
+	if (!strnicmp(url, "gmem://", 7)) return GF_TRUE;
+	if (strstr(url, "://")) return GF_FALSE;
 	/*the rest is local (mounted on FS)*/
-	return 1;
+	return GF_TRUE;
 }
 
 static const char * ISOR_MIME_TYPES[] = {
@@ -85,24 +85,34 @@
 Bool ISOR_CanHandleURL(GF_InputService *plug, const char *url)
 {
 	char *ext;
-	if (!strnicmp(url, "rtsp://", 7)) return 0;
-	ext = strrchr(url, '.');
+	if (!strnicmp(url, "rtsp://", 7)) return GF_FALSE;
+	ext = (char *)strrchr(url, '.');
 	{
 	    u32 i;
 	    /* We don't start at 0 since first one is specific */
 	    for (i = 3 ; ISOR_MIME_TYPES[i]; i+=3)
 	      if (gf_term_check_extension(plug, ISOR_MIME_TYPES[i], ISOR_MIME_TYPES[i+1], ISOR_MIME_TYPES[i+2], ext))
-		return 1;
+		return GF_TRUE;
 	}
 
 	if (ext && gf_isom_probe_file(url)) {
 		gf_term_check_extension(plug, ISOR_MIME_TYPES[0], ext+1, ISOR_MIME_TYPES[2], ext);
-		return 1;
+		return GF_TRUE;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
-
+void send_proxy_command(ISOMReader *read, Bool is_disconnect, Bool is_add_media, GF_Err e, GF_Descriptor *desc, LPNETCHANNEL channel)
+{
+	GF_NetworkCommand command;
+	command.command_type = GF_NET_SERVICE_STATUS_PROXY;
+	command.status.e = e;
+	command.status.channel = channel;
+	command.status.is_disconnect = is_disconnect;
+	command.status.is_add_media = is_add_media;
+	command.status.desc = desc;
+	read->input->query_proxy(read->input, &command);
+}
 
 void isor_net_io(void *cbk, GF_NETIO_Parameter *param)
 {
@@ -125,7 +135,14 @@
 
 	if (e<GF_OK) {
 		/*error opening service*/
-		if (!read->mov) gf_term_on_connect(read->service, NULL, e);
+		if (!read->mov) {
+            /* if there is an intermediate between this module and the terminal, report to it */
+            if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
+                send_proxy_command(read, GF_FALSE, GF_FALSE, e, NULL, NULL);
+            } else {
+                gf_term_on_connect(read->service, NULL, e);
+            }
+        }
 		return;
 	}
 
@@ -135,26 +152,47 @@
 		if (read->mov) return;
 		local_name = gf_dm_sess_get_cache_name(read->dnload);
 		if (!local_name) {
-			gf_term_on_connect(read->service, NULL, GF_SERVICE_ERROR);
+            if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
+                send_proxy_command(read, GF_FALSE, GF_FALSE, GF_SERVICE_ERROR, NULL, NULL);
+            } else {
+                gf_term_on_connect(read->service, NULL, GF_SERVICE_ERROR);
+            }
 			return;
 		}
 		e = GF_OK;
 		read->mov = gf_isom_open(local_name, GF_ISOM_OPEN_READ, NULL);
 		if (!read->mov) e = gf_isom_last_error(NULL);
 		else read->time_scale = gf_isom_get_timescale(read->mov);
-		gf_term_on_connect(read->service, NULL, GF_OK);
+        if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
+            send_proxy_command(read, GF_FALSE, GF_FALSE, GF_OK, NULL, NULL);
+        } else {
+            gf_term_on_connect(read->service, NULL, GF_OK);
+        }
 		if (read->no_service_desc) isor_declare_objects(read);
 	}
 	
 	if (!size) return;
 
 	/*service is opened, nothing to do*/
-	if (read->mov) return;
+	if (read->mov) {
+		/*end of chunk*/
+		if (read->frag_type && (param->reply==1) ) {
+			u64 bytesMissing = 0;
+			gf_mx_p(read->segment_mutex);
+			e = gf_isom_refresh_fragmented(read->mov, &bytesMissing, NULL);
+			gf_mx_v(read->segment_mutex);
+		}
+		return;
+	}
 
 	/*try to open the service*/
 	local_name = (char *)gf_dm_sess_get_cache_name(read->dnload);
 	if (!local_name) {
-		gf_term_on_connect(read->service, NULL, GF_SERVICE_ERROR);
+        if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
+            send_proxy_command(read, GF_FALSE, GF_FALSE, GF_SERVICE_ERROR, NULL, NULL);
+        } else {
+            gf_term_on_connect(read->service, NULL, GF_SERVICE_ERROR);
+        }
 		return;
 	}
 
@@ -171,14 +209,22 @@
 	case GF_OK:
 		break;
 	default:
-		gf_term_on_connect(read->service, NULL, e);
+        if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
+            send_proxy_command(read, GF_FALSE, GF_FALSE, e, NULL, NULL);
+        } else {
+            gf_term_on_connect(read->service, NULL, e);
+        }
 		return;
 	}
 	read->frag_type = gf_isom_is_fragmented(read->mov) ? 1 : 0;
 	
 	/*ok let's go*/
 	read->time_scale = gf_isom_get_timescale(read->mov);
-	gf_term_on_connect(read->service, NULL, GF_OK);
+    if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
+        send_proxy_command(read, GF_FALSE, GF_FALSE, GF_OK, NULL, NULL);
+    } else {
+        gf_term_on_connect(read->service, NULL, GF_OK);
+    }
 	if (read->no_service_desc) isor_declare_objects(read);
 }
 
@@ -188,7 +234,11 @@
 	ISOMReader *read = (ISOMReader *) plug->priv;
 	read->dnload = gf_term_download_new(read->service, url, 0, isor_net_io, read);
 	if (!read->dnload) {
-		gf_term_on_connect(read->service, NULL, GF_NOT_SUPPORTED);
+        if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
+            send_proxy_command(read, GF_FALSE, GF_FALSE, GF_NOT_SUPPORTED, NULL, NULL);
+        } else {
+            gf_term_on_connect(read->service, NULL, GF_NOT_SUPPORTED);
+        }
 	} else {
 		/*start our download (threaded)*/
 		gf_dm_sess_process(read->dnload);
@@ -196,8 +246,6 @@
 	/*service confirm is done once IOD can be fetched*/
 }
 
-
-
 GF_Err ISOR_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
 {
 	char szURL[2048];
@@ -242,15 +290,26 @@
 		e = gf_isom_open_progressive(szURL, start_range, end_range, &read->mov, &read->missing_bytes);
 		if (e != GF_OK){
 		    GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[IsoMedia] : error while opening %s, error=%s\n", szURL, gf_error_to_string(e)));
-			gf_term_on_connect(serv, NULL, e);
+            if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
+                send_proxy_command(read, 0, 0, e, NULL, NULL);
+            } else {
+                gf_term_on_connect(read->service, NULL, e);
+            }
 			return GF_OK;
 		}
 		read->frag_type = gf_isom_is_fragmented(read->mov) ? 1 : 0;
+		read->seg_opened = 2;
 
 		read->time_scale = gf_isom_get_timescale(read->mov);
 		/*reply to user*/
-		gf_term_on_connect(serv, NULL, GF_OK);
+        if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
+            send_proxy_command(read, GF_FALSE, GF_FALSE, GF_OK, NULL, NULL);
+        } else {
+            gf_term_on_connect(read->service, NULL, GF_OK);
+        }
+
 		if (read->no_service_desc) isor_declare_objects(read);
+
 	} else {
 		/*setup downloader*/
 		isor_setup_download(plug, szURL);
@@ -278,21 +337,26 @@
 	if (read->dnload) gf_term_download_del(read->dnload);
 	read->dnload = NULL;
 
-	gf_term_on_disconnect(read->service, NULL, reply);
+    if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
+        send_proxy_command(read, GF_TRUE, GF_FALSE, reply, NULL, NULL);
+    } else {
+        gf_term_on_disconnect(read->service, NULL, reply);
+    }
 	return GF_OK;
 }
 
 static Bool check_mpeg4_systems(GF_InputService *plug, GF_ISOFile *mov)
 {
 	char *opt, *bname, *br, *next;
-	u32 i, count, brand, has_mpeg4;
+	u32 i, count, brand;
+	Bool has_mpeg4;
 	GF_Err e;
 	e = gf_isom_get_brand_info(mov, &brand, &i, &count);
 	/*no brand == MP4 v1*/
-	if (e || !brand) return 1;
+	if (e || !brand) return GF_TRUE;
 
-	has_mpeg4 = 0;
-	if ((brand==GF_ISOM_BRAND_MP41) || (brand==GF_ISOM_BRAND_MP42)) has_mpeg4 = 1;
+	has_mpeg4 = GF_FALSE;
+	if ((brand==GF_ISOM_BRAND_MP41) || (brand==GF_ISOM_BRAND_MP42)) has_mpeg4 = GF_TRUE;
 
 	opt = (char*) gf_modules_get_option((GF_BaseInterface *)plug, "ISOReader", "IgnoreMPEG-4ForBrands");
 	if (!opt) {
@@ -302,19 +366,19 @@
 
 	for (i=0; i<count; i++) {
 		e = gf_isom_get_alternate_brand(mov, i+1, &brand);
-		if (e) return 0;
+		if (e) return GF_FALSE;
 		if ((brand==GF_ISOM_BRAND_MP41) || (brand==GF_ISOM_BRAND_MP42)) {
-			has_mpeg4 = 1;
+			has_mpeg4 = GF_TRUE;
 			continue;
 		}
 		bname = (char*)gf_4cc_to_str(brand);
 		br = opt;
 		while (br) {
-			Bool ignore = 0;
+			Bool ignore = GF_FALSE;
 			u32 orig_len, len;
 			next = strchr(br, ' ');
 			if (next) next[0] = 0;
-			len = orig_len = strlen(br);
+			len = orig_len = (u32) strlen(br);
 
 			while (len) {
 				if (br[len-1]=='*') {
@@ -325,8 +389,8 @@
 				}
 			}
 			/*ignor all brands*/
-			if (!len) ignore = 1;
-			else if (!strncmp(bname, br, len)) ignore = 1;
+			if (!len) ignore = GF_TRUE;
+			else if (!strncmp(bname, br, len)) ignore = GF_TRUE;
 
 			while (len<orig_len) {
 				br[len] = '*';
@@ -338,7 +402,7 @@
 			} else {
 				br = NULL;
 			}
-			if (ignore) return 0;
+			if (ignore) return GF_FALSE;
 		}
 	}
 	return has_mpeg4;
@@ -355,7 +419,7 @@
 		cur++;
 		if (cur==idx) return gf_isom_get_track_id(mov, i+1);
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 /*fixme, this doesn't work properly with respect to @expect_type*/
@@ -377,7 +441,7 @@
 		trackID = read->base_track_id;
 		read->base_track_id = 0;
 	} else {
-		char *ext = strrchr(sub_url, '#');
+		char *ext = (char *)strrchr(sub_url, '#');
 		if (!ext) {
 			trackID = 0;
 		} else {
@@ -510,7 +574,7 @@
 
 	track = 0;
 	ch = NULL;
-	is_esd_url = 0;
+	is_esd_url = GF_FALSE;
 	e = GF_OK;
 	if (upstream) {
 		e = GF_ISOM_INVALID_FILE;
@@ -522,12 +586,12 @@
 		sscanf(url, "ES_ID=%ud", &ESID);
 	} else {
 		/*handle url like mypath/myfile.mp4#trackID*/
-		char *track_id = strrchr(url, '.');
+		char *track_id = (char *)strrchr(url, '.');
 		if (track_id) {
-			track_id = strchr(url, '#');
+			track_id = (char *)strchr(url, '#');
 			if (track_id) track_id ++;
 		}
-		is_esd_url = 1;
+		is_esd_url = GF_TRUE;
 
 		ESID = 0;
 		/*if only one track ok*/
@@ -595,12 +659,16 @@
 		break;
 	}
 
-	ch->has_edit_list = gf_isom_get_edit_list_type(ch->owner->mov, ch->track, &ch->dts_offset) ? 1 : 0;
-	ch->has_rap = (gf_isom_has_sync_points(ch->owner->mov, ch->track)==1) ? 1 : 0;
+	ch->has_edit_list = gf_isom_get_edit_list_type(ch->owner->mov, ch->track, &ch->dts_offset) ? GF_TRUE : GF_FALSE;
+	ch->has_rap = (gf_isom_has_sync_points(ch->owner->mov, ch->track)==1) ? GF_TRUE : GF_FALSE;
 	ch->time_scale = gf_isom_get_media_timescale(ch->owner->mov, ch->track);
 
 exit:
-	gf_term_on_connect(read->service, channel, e);
+    if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
+        send_proxy_command(read, GF_FALSE, GF_FALSE, e, NULL, channel);
+    } else {
+        gf_term_on_connect(read->service, channel, e);
+    }
 	/*if esd url reconfig SL layer*/
 	if (!e && is_esd_url) {
 		GF_ESD *esd;
@@ -617,22 +685,33 @@
 			com.cfg.sl_config.timestampResolution = ch->time_scale;
 			com.cfg.sl_config.useRandomAccessPointFlag = 1;
 		}
-		gf_term_on_command(read->service, &com, GF_OK);
+        if (read->input->query_proxy && read->input->proxy_udta) {
+            read->input->query_proxy(read->input, &com);
+        } else {
+            gf_term_on_command(read->service, &com, GF_OK);
+        }
 	}
 	if (!e && track && gf_isom_is_track_encrypted(read->mov, track)) {
 		memset(&com, 0, sizeof(GF_NetworkCommand));
 		com.base.on_channel = channel;
 		com.command_type = GF_NET_CHAN_DRM_CFG;
-		ch->is_encrypted = 1;
+		ch->is_encrypted = GF_TRUE;
 		if (gf_isom_is_ismacryp_media(read->mov, track, 1)) {
 			gf_isom_get_ismacryp_info(read->mov, track, 1, NULL, &com.drm_cfg.scheme_type, &com.drm_cfg.scheme_version, &com.drm_cfg.scheme_uri, &com.drm_cfg.kms_uri, NULL, NULL, NULL);
-			gf_term_on_command(read->service, &com, GF_OK);
+            if (read->input->query_proxy && read->input->proxy_udta) {
+                read->input->query_proxy(read->input, &com);
+            } else {
+                gf_term_on_command(read->service, &com, GF_OK);
+            }
 		} else if (gf_isom_is_omadrm_media(read->mov, track, 1)) {
 			gf_isom_get_omadrm_info(read->mov, track, 1, NULL, &com.drm_cfg.scheme_type, &com.drm_cfg.scheme_version, &com.drm_cfg.contentID, &com.drm_cfg.kms_uri, &com.drm_cfg.oma_drm_textual_headers, &com.drm_cfg.oma_drm_textual_headers_len, NULL, &com.drm_cfg.oma_drm_crypt_type, NULL, NULL, NULL);
 
 			gf_media_get_file_hash(gf_isom_get_filename(read->mov), com.drm_cfg.hash);
-			gf_term_on_command(read->service, &com, GF_OK);
-
+            if (read->input->query_proxy && read->input->proxy_udta) {
+                read->input->query_proxy(read->input, &com);
+            } else {
+                gf_term_on_command(read->service, &com, GF_OK);
+            }
 		}
 	}
 	return e;
@@ -659,7 +738,11 @@
 	assert(!isor_get_channel(read, channel));
 
 exit:
-	gf_term_on_disconnect(read->service, channel, e);
+    if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
+        send_proxy_command(read, 1, 0, e, NULL, channel);
+    } else {
+        gf_term_on_disconnect(read->service, channel, e);
+    }
 	return e;
 }
 
@@ -675,17 +758,19 @@
 
 	*out_data_ptr = NULL;
 	*out_data_size = 0;
-	*sl_compressed = 0;
+	*sl_compressed = GF_FALSE;
 	*out_reception_status = GF_OK;
 	ch = isor_get_channel(read, channel);
 	if (!ch) return GF_STREAM_NOT_FOUND;
 	if (!ch->is_playing) return GF_OK;
 
-	*is_new_data = 0;
+	*is_new_data = GF_FALSE;
 	if (!ch->sample) {
 		/*get sample*/
+		gf_mx_p(read->segment_mutex);
 		isor_reader_get_sample(ch);
-		*is_new_data = ch->sample ? 1 : 0;
+		gf_mx_v(read->segment_mutex);
+		*is_new_data = ch->sample ? GF_TRUE : GF_FALSE;
 	}
 
 	if (ch->sample) {
@@ -694,6 +779,9 @@
 		*out_sl_hdr = ch->current_slh;
 	}
 	*out_reception_status = ch->last_state;
+	if (read->waiting_for_data)
+		*out_reception_status = GF_BUFFER_TOO_SMALL;
+	
 	return GF_OK;
 }
 
@@ -843,7 +931,13 @@
 	case GF_NET_CHAN_INTERACTIVE:
 		return GF_OK;
 	case GF_NET_CHAN_BUFFER:
-		com->buffer.max = com->buffer.min = 0;
+		//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;
+		} else {
+			com->buffer.max = com->buffer.min = 0;
+		}
 		return GF_OK;
 	case GF_NET_CHAN_DURATION:
 		if (!ch->track) {
@@ -921,18 +1015,18 @@
 	char szURL[2048], *sep;
 	ISOMReader *read = (ISOMReader *)plug->priv;
 	const char *this_url = gf_term_get_service_url(read->service);
-	if (!this_url || !url) return 0;
+	if (!this_url || !url) return GF_FALSE;
 
-	if (!strcmp(this_url, url)) return 1;
+	if (!strcmp(this_url, url)) return GF_TRUE;
 
 	strcpy(szURL, this_url);
 	sep = strrchr(szURL, '#');
 	if (sep) sep[0] = 0;
 
 	/*direct addressing in service*/
-	if (url[0] == '#') return 1;
-	if (strnicmp(szURL, url, sizeof(char)*strlen(szURL))) return 0;
-	return 1;
+	if (url[0] == '#') return GF_TRUE;
+	if (strnicmp(szURL, url, sizeof(char)*strlen(szURL))) return GF_FALSE;
+	return GF_TRUE;
 }
 
 GF_InputService *isor_client_load()

gpac-0.5.0.svn4296.tar.bz2/modules/isom_in/read_ch.c -> gpac-0.5.0.svn4668.tar.bz2/modules/isom_in/read_ch.c Changed

@@ -42,7 +42,7 @@
 	ch->is_playing = 0;
 }
 
-static void check_segment_switch(ISOMReader *read)
+void isor_segment_switch_or_refresh(ISOMReader *read, u32 progressive_refresh)
 {
 	GF_NetworkCommand param;
 	u32 i, count;
@@ -51,77 +51,162 @@
 	/*access to the segment switching must be protected in case several decoders are threaded on the file using GetSLPacket */
 	gf_mx_p(read->segment_mutex);
 
-	if (!read->frag_type || !read->input->query_proxy) {
+	if (!read->frag_type || !read->input->query_proxy ) {
 		gf_mx_v(read->segment_mutex);
 		return;
 	}
 
+	memset(&param, 0, sizeof(GF_NetworkCommand));
+	param.command_type = GF_NET_SERVICE_QUERY_NEXT;
+
 	count = gf_list_count(read->channels);
-	for (i=0; i<count; i++) {
-		ISOMChannel *ch = gf_list_get(read->channels, i);
-		/*check all playing channels are waiting for next segment*/
-		if (ch->is_playing && !ch->wait_for_segment_switch) {
-			gf_mx_v(read->segment_mutex);
-			return;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Refresh seg: progressive %d - seg opened %d\n", progressive_refresh , read->seg_opened));
+
+	if (progressive_refresh && !read->seg_opened)
+		progressive_refresh = 0;
+
+	if ((read->seg_opened==1) && !progressive_refresh) {
+		gf_mx_v(read->segment_mutex);
+		return;
+	}
+
+	//if first time trying to fetch next segment, check if we have to discard it
+	if (!progressive_refresh && (read->seg_opened==2)) {
+		for (i=0; i<count; i++) {
+			ISOMChannel *ch = gf_list_get(read->channels, i);
+			/*check all playing channels are waiting for next segment*/
+			if (ch->is_playing && !ch->wait_for_segment_switch) {
+				gf_mx_v(read->segment_mutex);
+				return;
+			}
 		}
+
+		/*close current segment*/
+		gf_isom_release_segment(read->mov, 1);
+		read->seg_opened = 0;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Done playing segment - querying new one\n"));
+
+		/*drop this segment*/
+		param.url_query.drop_first_segment = 1;
 	}
-	/*close current segment*/
-	gf_isom_release_segment(read->mov, 1);
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Done playing segment - querying new one\n"));
+
 
 	/*update current fragment if any*/
-	param.command_type = GF_NET_SERVICE_QUERY_NEXT;
-	if ((read->input->query_proxy(read->input, &param)==GF_OK) && param.url_query.next_url){
-		if (param.url_query.discontinuity_type==2)
-			gf_isom_reset_fragment_info(read->mov);
-
-		if (param.url_query.next_url_init_or_switch_segment) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Switching between files - opening new init segment %s\n", param.url_query.next_url_init_or_switch_segment));
-			if (read->mov) gf_isom_close(read->mov);
-			e = gf_isom_open_progressive(param.url_query.next_url_init_or_switch_segment, param.url_query.switch_start_range, param.url_query.switch_end_range, &read->mov, &read->missing_bytes);
-		}
+	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 (param.url_query.next_url){
+
+			//refresh file
+			if (progressive_refresh) {
+				//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;
+					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() ));
+					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) ));
+					}
+				}
+				//we did the last refresh and the segment is downloaded, move to fully parsed mode
+				if (! param.url_query.is_current_download) {
+					read->seg_opened = 2;
+				}
+				gf_mx_v(read->segment_mutex);
+				return;
+			}
+
+			//we have to open the file
 
-		e = gf_isom_open_segment(read->mov, param.url_query.next_url, param.url_query.start_range, param.url_query.end_range);
+			if (param.url_query.discontinuity_type==2)
+				gf_isom_reset_fragment_info(read->mov);
+
+			if (param.url_query.next_url_init_or_switch_segment) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Switching between files - opening new init segment %s\n", param.url_query.next_url_init_or_switch_segment));
+				if (read->mov) gf_isom_close(read->mov);
+				e = gf_isom_open_progressive(param.url_query.next_url_init_or_switch_segment, param.url_query.switch_start_range, param.url_query.switch_end_range, &read->mov, &read->missing_bytes);
+			}
+
+			e = gf_isom_open_segment(read->mov, param.url_query.next_url, param.url_query.start_range, param.url_query.end_range);
+
+			if (progressive_refresh && (e==GF_ISOM_INCOMPLETE_FILE)) {
+				e = GF_OK;
+			}
 
 #ifndef GPAC_DISABLE_LOG
-		if (e<0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[IsoMedia] Error opening new segment %s: %s\n", param.url_query.next_url, gf_error_to_string(e) ));
-		} else if (param.url_query.end_range) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Playing new range in %s: "LLU"-"LLU"\n", param.url_query.next_url, param.url_query.start_range, param.url_query.end_range ));
-		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] playing new segment %s\n", param.url_query.next_url));
-		}
+			if (e<0) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[IsoMedia] Error opening new segment %s at UTC "LLU": %s\n", param.url_query.next_url, gf_net_get_utc(), gf_error_to_string(e) ));
+			} else if (param.url_query.end_range) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Playing new range in %s: "LLU"-"LLU"\n", param.url_query.next_url, param.url_query.start_range, param.url_query.end_range ));
+			} else {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] playing new segment %s\n", param.url_query.next_url));
+			}
 #endif
 
-		for (i=0; i<count; i++) {
-			ISOMChannel *ch = gf_list_get(read->channels, i);
-			ch->wait_for_segment_switch = 0;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Track %d - cur sample %d - new sample count %d\n", ch->track, ch->sample_num, gf_isom_get_sample_count(ch->owner->mov, ch->track) ));
-			if (param.url_query.next_url_init_or_switch_segment) {
-				ch->track = gf_isom_get_track_by_id(read->mov, ch->track_id);
-				if (!ch->track) {
-					if (gf_isom_get_track_count(read->mov)==1) {
-						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Mismatch between track IDs of different representations\n"));
-						ch->track = 1;
-					} else {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[IsoMedia] Mismatch between track IDs of different representations\n"));
+			if (e<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 ) {
+				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"));
+			}
+
+			for (i=0; i<count; i++) {
+				ISOMChannel *ch = gf_list_get(read->channels, i);
+				ch->wait_for_segment_switch = 0;
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Track %d - cur sample %d - new sample count %d\n", ch->track, ch->sample_num, gf_isom_get_sample_count(ch->owner->mov, ch->track) ));
+				if (param.url_query.next_url_init_or_switch_segment) {
+					ch->track = gf_isom_get_track_by_id(read->mov, ch->track_id);
+					if (!ch->track) {
+						if (gf_isom_get_track_count(read->mov)==1) {
+							GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Mismatch between track IDs of different representations\n"));
+							ch->track = 1;
+						} else {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[IsoMedia] Mismatch between track IDs of different representations\n"));
+						}
 					}
-				}
 
-				/*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);
+					/*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);
+					/*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);
+				}
+				ch->last_state = GF_OK;
 			}
+
+			read->use_memory = !strncmp(param.url_query.next_url, "gmem://", 7) ? GF_TRUE : GF_FALSE;
 		}
-	} else {
+		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) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Next segment is not yet available\n"));
+			read->waiting_for_data = GF_TRUE;
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[IsoMedia] Corrupted state in low latency mode !!\n"));
+		}
+	} else {
+		/*consider we are done*/
+		read->frag_type = 2;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[IsoMedia] Error fetching next DASH segment: no more segments\n"));
 	}
 	gf_mx_v(read->segment_mutex);
 }
@@ -130,7 +215,7 @@
 {
 	u32 ivar;
 	if (ch->wait_for_segment_switch) {
-		check_segment_switch(ch->owner);
+		isor_segment_switch_or_refresh(ch->owner, 0);
 		if (ch->wait_for_segment_switch) 
 			return;
 	}
@@ -198,6 +283,17 @@
 	u32 ivar;
 	if (ch->sample) return;
 
+	if (ch->next_track) {
+		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) {
+		isor_segment_switch_or_refresh(ch->owner, 1);
+	}
+
 	if (ch->to_init) {
 		init_reader(ch);
 	} else if (ch->has_edit_list) {
@@ -297,16 +393,18 @@
 	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_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;
-			} else {
-				ch->last_state = GF_ISOM_INCOMPLETE_FILE;
+			ch->last_state = GF_ISOM_INCOMPLETE_FILE;
+			if (ch->owner->dnload) {
+				u32 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;
+				}
 			}
 		} 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 (!ch->wait_for_segment_switch) {
+				//if segment is fully opened and no more data, this track is done, wait for next segment
+				if (!ch->wait_for_segment_switch && ch->owner->input->query_proxy && (ch->owner->seg_opened==2) ) {
 					ch->wait_for_segment_switch = 1;
 					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Track #%d end of segment reached - waiting for sample %d - current count %d\n", ch->track, ch->sample_num, gf_isom_get_sample_count(ch->owner->mov, ch->track) ));
 				}
@@ -321,7 +419,7 @@
 			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)
-			check_segment_switch(ch->owner);
+			isor_segment_switch_or_refresh(ch->owner, 0);
 		return;
 	}
 	ch->last_state = GF_OK;

gpac-0.5.0.svn4296.tar.bz2/modules/jack/jack.c -> gpac-0.5.0.svn4668.tar.bz2/modules/jack/jack.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/laser_dec/laser_dec.c -> gpac-0.5.0.svn4668.tar.bz2/modules/laser_dec/laser_dec.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/libplayer/libplayer.c -> gpac-0.5.0.svn4668.tar.bz2/modules/libplayer/libplayer.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/modules_export.cpp -> gpac-0.5.0.svn4668.tar.bz2/modules/modules_export.cpp Changed

gpac-0.5.0.svn4296.tar.bz2/modules/mp3_in/mad_dec.c -> gpac-0.5.0.svn4668.tar.bz2/modules/mp3_in/mad_dec.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/mp3_in/mp3_in.c -> gpac-0.5.0.svn4668.tar.bz2/modules/mp3_in/mp3_in.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/mpd_in/mpd_in.c -> gpac-0.5.0.svn4668.tar.bz2/modules/mpd_in/mpd_in.c Changed

@@ -45,7 +45,7 @@
 	Bool connection_ack_sent;
 	Bool in_seek;
 	Bool memory_storage;
-	Bool use_max_res, immediate_switch;
+	Bool use_max_res, immediate_switch, use_low_latency;
     Double previous_start_range;
 	/*max width & height in all active representations*/
 	u32 width, height;
@@ -56,6 +56,8 @@
 	GF_InputService *segment_ifce;
 	Bool service_connected;
 	Bool service_descriptor_fetched;
+	Bool netio_assigned;
+	Bool has_new_data;
 } GF_MPDGroup;
 
 const char * MPD_MPD_DESC = "MPEG-DASH Streaming";
@@ -120,14 +122,14 @@
 		return GF_SERVICE_ERROR;
 	}
 
-	/*gets URL and byte range of next segment - if needed, adds butstream switching segment info*/
+	/*gets URL and byte range of next segment - if needed, adds bitstream switching segment info*/
 	if (param->command_type==GF_NET_SERVICE_QUERY_NEXT) {
 		Bool group_done;
 		u32 nb_segments_cached;
 		u32 group_idx=0;
 		GF_MPDGroup *group=NULL;
 		const char *src_url;
-		Bool discard_first_cache_entry = 1;
+		Bool discard_first_cache_entry = param->url_query.drop_first_segment;
         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));
 
@@ -153,6 +155,7 @@
 		}
 
 		if (discard_first_cache_entry) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Discarding first segment in cache\n"));
 			gf_dash_group_discard_segment(mpdin->dash, group_idx);
 		}
 
@@ -178,9 +181,24 @@
 				} 
 				return GF_EOS;
 			}
-            gf_sleep(30);
+
+			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 (param->url_query.next_url) {
+					param->url_query.is_current_download = 1;
+					param->url_query.has_new_data = group->has_new_data;
+					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;
 		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"));
@@ -199,9 +217,9 @@
                 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")\n", src_url, param->url_query.start_range, 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() ));
 			} else {
-	            GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[MPD_IN] Switching segment playback to %s\n", src_url));
+	            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] segment start time %g sec\n", gf_dash_group_current_segment_start_time(mpdin->dash, group_idx) ));
 
@@ -310,13 +328,24 @@
 	return segment_ifce->DisconnectChannel(segment_ifce, channel);
 }
 
+
+static void mpdin_dash_segment_netio(void *cbk, GF_NETIO_Parameter *param)
+{
+	GF_MPDGroup *group = (GF_MPDGroup *)cbk;
+	if (param->msg_type == GF_NETIO_DATA_EXCHANGE) {
+		group->has_new_data = 1;
+	}
+}
+
+
 void mpdin_dash_io_delete_cache_file(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, const char *cache_url)
 {
 	gf_dm_delete_cached_file_entry_session((GF_DownloadSession *)session, cache_url);
 }
 
-GF_DASHFileIOSession mpdin_dash_io_create(GF_DASHFileIO *dashio, Bool persistent, const char *url)
+GF_DASHFileIOSession mpdin_dash_io_create(GF_DASHFileIO *dashio, Bool persistent, const char *url, s32 group_idx)
 {
+	GF_MPDGroup *group = NULL;
 	GF_DownloadSession *sess;
 	u32 flags = GF_NETIO_SESSION_NOT_THREADED;
 	GF_MPD_In *mpdin = (GF_MPD_In *)dashio->udta;
@@ -324,7 +353,16 @@
 		flags |= GF_NETIO_SESSION_MEMORY_CACHE;
 
 	if (persistent) flags |= GF_NETIO_SESSION_PERSISTENT;
-	sess = gf_term_download_new(mpdin->service, url, flags, NULL, NULL);
+
+	if (group_idx>=0) {
+		group = gf_dash_get_group_udta(mpdin->dash, group_idx);
+	}
+	if (group) {
+		group->netio_assigned = GF_TRUE;
+		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);
+	}
 	return (GF_DASHFileIOSession ) sess;
 }
 void mpdin_dash_io_del(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
@@ -335,8 +373,16 @@
 {
     gf_dm_sess_abort((GF_DownloadSession *)session);
 }
-GF_Err mpdin_dash_io_setup_from_url(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, const char *url)
+GF_Err mpdin_dash_io_setup_from_url(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, const char *url, s32 group_idx)
 {
+	if (group_idx>=0) {
+		GF_MPD_In *mpdin = (GF_MPD_In *)dashio->udta;
+		GF_MPDGroup *group = gf_dash_get_group_udta(mpdin->dash, group_idx);
+		if (!group->netio_assigned) {
+			group->netio_assigned = GF_TRUE;
+			gf_dm_sess_reassign((GF_DownloadSession *)session, 0xFFFFFFFF, mpdin_dash_segment_netio, group);
+		}
+	}
 	return gf_dm_sess_setup_from_url((GF_DownloadSession *)session, url);
 }
 GF_Err mpdin_dash_io_set_range(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, u64 start_range, u64 end_range, Bool discontinue_cache)
@@ -366,14 +412,14 @@
 u32 mpdin_dash_io_get_bytes_per_sec(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
 {
 	u32 bps=0;
-	GF_DownloadSession *sess = (GF_DownloadSession *)session;
+//	GF_DownloadSession *sess = (GF_DownloadSession *)session;
     gf_dm_sess_get_stats((GF_DownloadSession *)session, NULL, NULL, NULL, NULL, &bps, NULL);
 	return bps;
 }
 u32 mpdin_dash_io_get_total_size(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
 {
 	u32 size=0;
-	GF_DownloadSession *sess = (GF_DownloadSession *)session;
+//	GF_DownloadSession *sess = (GF_DownloadSession *)session;
     gf_dm_sess_get_stats((GF_DownloadSession *)session, NULL, NULL, &size, NULL, NULL, NULL);
 	return size;
 }
@@ -484,7 +530,7 @@
     GF_MPD_In *mpdin = (GF_MPD_In*) plug->priv;
     const char *opt;
     GF_Err e;
-	u32 max_cache_duration, auto_switch_count;
+	u32 max_cache_duration, auto_switch_count, init_timeshift;
 	GF_DASHInitialSelectionMode first_select_mode;
 	Bool keep_files, disable_switching, enable_buffering;
 
@@ -510,9 +556,8 @@
 	mpdin->dash_io.get_total_size = mpdin_dash_io_get_total_size;
 	mpdin->dash_io.on_dash_event = mpdin_dash_io_on_dash_event;
 
-	max_cache_duration = 30;
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "MaxCacheDuration");
-    if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "MaxCacheDuration", "30");
+	max_cache_duration = 0;
+	opt = gf_modules_get_option((GF_BaseInterface *)plug, "Network", "BufferLength");
     if (opt) max_cache_duration = atoi(opt);
 
     auto_switch_count = 0;
@@ -541,7 +586,7 @@
     else first_select_mode = GF_DASH_SELECT_BANDWIDTH_LOWEST;
 
 	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "MemoryStorage");
-	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "MemoryStorage", "no");
+	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "MemoryStorage", "yes");
 	mpdin->memory_storage = (opt && !strcmp(opt, "yes")) ? 1 : 0;
 
 	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "UseMaxResolution");
@@ -556,10 +601,19 @@
 	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "EnableBuffering", "yes");
 	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;
+
 	mpdin->in_seek = 0;
 	mpdin->previous_start_range = -1;
 
-	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 = 0;
+	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "InitialTimeshift");
+	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "InitialTimeshift", "0");
+	if (opt) init_timeshift = atoi(opt);
+
+	mpdin->dash = gf_dash_new(&mpdin->dash_io, max_cache_duration, auto_switch_count, keep_files, disable_switching, first_select_mode, 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));
@@ -686,13 +740,13 @@
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Received Play command from terminal on channel %p on Service (%p)\n", com->base.on_channel, mpdin->service));
 
 			if (!gf_dash_in_period_setup(mpdin->dash) && !com->play.dash_segment_switch && ! mpdin->in_seek) {
-				Bool skip_seek;
+				//Bool skip_seek;
 				
 				mpdin->in_seek = 1;
 				
 				/*if start range request is the same as previous one, don't process it
 				- this happens at period switch when new objects are declared*/
-				skip_seek = (mpdin->previous_start_range==com->play.start_range) ? 1 : 0;
+				//skip_seek = (mpdin->previous_start_range==com->play.start_range) ? 1 : 0;
 				mpdin->previous_start_range = com->play.start_range;
 
 				gf_dash_seek(mpdin->dash, com->play.start_range);
@@ -769,13 +823,11 @@
 		return 1;
 	} else {
 		GF_MPDGroup *mudta;
-		GF_InputService *segment_ifce = NULL;
 		u32 i;
 		for (i=0;i<gf_dash_get_group_count(mpdin->dash); i++) {
 			if (!gf_dash_is_group_selected(mpdin->dash, i)) continue;
 			
 			mudta = gf_dash_get_group_udta(mpdin->dash, i);
-			segment_ifce = mudta->segment_ifce;
 			if (mudta && mudta->segment_ifce && mudta->segment_ifce->CanHandleURLInService) {
 				return mudta->segment_ifce->CanHandleURLInService(plug, url);
 			}
@@ -784,7 +836,7 @@
 	}
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 const u32 *QueryInterfaces()
 {
     static u32 si [] = {
@@ -794,7 +846,7 @@
     return si;
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
     GF_MPD_In *mpdin;
@@ -820,7 +872,7 @@
     return (GF_BaseInterface *)plug;
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 void ShutdownInterface(GF_BaseInterface *bi)
 {
 	GF_MPD_In *mpdin;
@@ -837,4 +889,7 @@
 	gf_free(bi);
 }
 
+
+GPAC_MODULE_STATIC_DELARATION( mpd_in )
+
 #endif //GPAC_DISABLE_DASH_CLIENT

gpac-0.5.0.svn4296.tar.bz2/modules/mpegts_in/mpegts_in.c -> gpac-0.5.0.svn4668.tar.bz2/modules/mpegts_in/mpegts_in.c Changed

@@ -34,6 +34,8 @@
 
 static const char * MIMES[] = { "video/mpeg-2", "video/mp2t", "video/mpeg", NULL};
 
+#define M2TS_BUFFER_MAX 200
+
 typedef struct {
 	char *fragment;
 	u32 id;
@@ -52,6 +54,8 @@
 	Bool ts_setup;
 	Bool request_all_pids;
 	Bool is_connected;
+	Bool low_latency_mode;
+	Bool in_segment_download;
 
 	Bool epg_requested;
 	Bool has_eit;
@@ -155,12 +159,10 @@
 	return ret;
 }
 
-static GF_ObjectDescriptor *MP2TS_GetOD(M2TSIn *m2ts, GF_M2TS_PES *stream, char *dsi, u32 dsi_size, u32 *streamType)
+static GF_ESD *MP2TS_GetESD(M2TSIn *m2ts, GF_M2TS_PES *stream, char *dsi, u32 dsi_size)
 {
-	GF_ObjectDescriptor *od;
 	GF_ESD *esd;
 
-	/*create a stream description for this channel*/
 	esd = gf_odf_desc_esd_new(0);
 	esd->ESID = stream->mpeg4_es_id ? stream->mpeg4_es_id : stream->pid;
 
@@ -170,6 +172,7 @@
 		esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_MPEG1;
 		break;
 	case GF_M2TS_VIDEO_MPEG2:
+	case GF_M2TS_VIDEO_DCII:
 		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
 		esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_MPEG2_422;
 		break;
@@ -181,6 +184,10 @@
 		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
 		esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_AVC;
 		break;
+	case GF_M2TS_VIDEO_SVC:
+		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
+		esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_SVC;
+		break;
 	case GF_M2TS_VIDEO_HEVC:
 		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
 		esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_HEVC;
@@ -203,7 +210,9 @@
 				NB: we removed "no file regulation" since we may get broken files where PMT declares an AAC stream but no AAC PID is in the MUX
 				(filtered out). In this case, "no regulation" will make the entire TS to be read as fast as possible
 			*/
-			m2ts->ts->file_regulate = 2;
+			if (m2ts->ts->file)
+				m2ts->ts->file_regulate = 2;
+
 			gf_m2ts_set_pes_framing(stream, GF_M2TS_PES_FRAMING_DEFAULT);
 			gf_odf_desc_del((GF_Descriptor *)esd);
 			return NULL;
@@ -237,6 +246,18 @@
 		memcpy(esd->decoderConfig->decoderSpecificInfo->data, dsi, sizeof(char)*dsi_size);
 		esd->decoderConfig->decoderSpecificInfo->dataLength = dsi_size;
 	}
+	return esd;
+}
+
+static GF_ObjectDescriptor *MP2TS_GetOD(M2TSIn *m2ts, GF_M2TS_PES *stream, char *dsi, u32 dsi_size, u32 *streamType)
+{
+	GF_ObjectDescriptor *od;
+	GF_ESD *esd;
+	u32 cur_ES, i, count;
+
+	/*create a stream description for this channel*/
+	esd = MP2TS_GetESD(m2ts, stream, dsi, dsi_size);
+	if (!esd) return NULL;
 
 	/*declare object to terminal*/
 	od = (GF_ObjectDescriptor*)gf_odf_desc_new(GF_ODF_OD_TAG);
@@ -246,6 +267,24 @@
 	/*remember program number for service/program selection*/
 	od->ServiceID = stream->program->number;
 	od->service_ifce = m2ts->owner;
+
+	/*create a stream description for the channels depending on this channel, set esd->dependsOnESID and add to od*/
+	cur_ES = esd->ESID;
+	count = gf_list_count(stream->program->streams);
+	for (i = 0; i < count; i++) {
+		GF_M2TS_ES *es = (GF_M2TS_ES *)gf_list_get(stream->program->streams, i);
+		if ((es->flags & GF_M2TS_ES_IS_PES) && ( ((GF_M2TS_PES *)es)->depends_on_pid == cur_ES)) {
+			GF_ESD *the_esd;
+			the_esd = MP2TS_GetESD(m2ts, (GF_M2TS_PES *)es, dsi, dsi_size);
+			if (the_esd) {
+				the_esd->dependsOnESID = cur_ES;
+				the_esd->has_ref_base = GF_TRUE;
+				gf_list_add(od->ESDescriptors, the_esd);
+			}
+			cur_ES = the_esd->ESID;
+		}
+	}
+
 	return od;
 }
 
@@ -275,11 +314,15 @@
 #endif
 
 	/*TS is a file, start regulation regardless of how the TS is access (with or without fragment URI)*/
-	if (m2ts->ts->file || m2ts->ts->dnload) m2ts->ts->file_regulate = 1;
+	if (m2ts->ts->file || m2ts->ts->dnload || m2ts->owner->query_proxy) 
+		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 ((es->flags & GF_M2TS_ES_IS_PES) && ((GF_M2TS_PES *)es)->depends_on_pid ) 
+			continue;
+
 		/*move to skip mode for all ES until asked for playback*/
 		if (!es->user)
 			gf_m2ts_set_pes_framing((GF_M2TS_PES *)es, GF_M2TS_PES_FRAMING_SKIP);
@@ -398,7 +441,7 @@
 		count = gf_list_count(m2ts->ts->SDTs);
 		for (j=0; j<count; j++) {
 			GF_M2TS_SDT *sdt = gf_list_get(m2ts->ts->SDTs, j);
-			if (!stricmp(sdt->service, req_prog->fragment)) req_prog->id = sdt->service_id;
+			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) {
@@ -528,7 +571,8 @@
 		if (!pck->stream->first_dts) {
 			gf_m2ts_set_pes_framing(pck->stream, GF_M2TS_PES_FRAMING_SKIP_NO_RESET);
 			MP2TS_DeclareStream(m2ts, pck->stream, pck->data, pck->data_len);
-			if (ts->file || ts->dnload) ts->file_regulate = 1;
+			if (ts->file || ts->dnload) 
+				ts->file_regulate = 1;
 			pck->stream->first_dts=1;
 			/*force scene regeneration*/
 			gf_term_add_media(m2ts->service, NULL, 0);
@@ -603,14 +647,14 @@
 					while (ts->run_state) {
 						gf_term_on_command(m2ts->service, &com, GF_OK);
 						if (com.buffer.occupancy < M2TS_BUFFER_MAX) {
-							GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[M2TS In] Demux not going to sleep: buffer occupancy %d ms\n", com.buffer.occupancy));
+							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*/
 #ifndef GPAC_DISABLE_LOG
 						if (!nb_sleep) {
-							GF_LOG(GF_LOG_DEBUG, 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 (buffer occupancy %d ms)\n", com.buffer.occupancy));
 						}
 						nb_sleep++;
 #endif
@@ -618,7 +662,7 @@
 					}
 #ifndef GPAC_DISABLE_LOG
 					if (nb_sleep) {
-						GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[M2TS In] Demux resume after %d ms - current buffer occupancy %d ms\n", sleep_for*nb_sleep, com.buffer.occupancy));
+						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;
@@ -668,10 +712,11 @@
 	}
 }
 
+#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;
+//		M2TSIn *m2ts = ts->user;
 		GF_M2TS_PES_PCK *pck = param;
 		if (!ts->nb_playing) {
 			ts->nb_playing = pck->stream->pid;
@@ -681,6 +726,7 @@
 		}
 	}
 }
+#endif
 
 void m2ts_net_io(void *cbk, GF_NETIO_Parameter *param)
 {
@@ -745,7 +791,7 @@
 	}
 }
 
-static GF_Err M2TS_QueryNextFile(void *udta, Bool query_init, const char **out_url, u64 *out_start_range, u64 *out_end_range)
+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)
 {
 	GF_NetworkCommand param;
 	GF_Err query_ret;
@@ -757,24 +803,52 @@
 	if (out_start_range) *out_start_range = 0;
 	if (out_end_range) *out_end_range = 0;
 
-	param.command_type = query_init ? GF_NET_SERVICE_QUERY_INIT_RANGE : GF_NET_SERVICE_QUERY_NEXT;
+	param.command_type = (query_type==0) ? GF_NET_SERVICE_QUERY_INIT_RANGE : GF_NET_SERVICE_QUERY_NEXT;
 	param.url_query.next_url = NULL;
-	query_ret = m2ts->owner->query_proxy(m2ts->owner, &param);
+	param.url_query.drop_first_segment = (query_type==1) ? 1 : 0;
 
+	//we are downloading the segment we play, don't delete it
+	if (m2ts->in_segment_download)
+		param.url_query.drop_first_segment = 0;
 
-	if ((query_ret==GF_OK) && !query_init && !param.url_query.next_url){
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TS In] Cannot query next file: no file provided but no error raised\n"));
+	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"));
+	} else if ((query_ret==GF_OK) && query_type && !param.url_query.next_url){
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[M2TS In] Cannot query next file: no file provided but no error raised\n"));
 	} else if (query_ret) {
-		GF_LOG((query_ret<0) ? GF_LOG_ERROR : GF_LOG_INFO, GF_LOG_CONTAINER, ("[M2TS In] Cannot query next file: error: %s\n", gf_error_to_string(query_ret)));
+		GF_LOG((query_ret<0) ? GF_LOG_ERROR : GF_LOG_INFO, GF_LOG_DASH, ("[M2TS In] Cannot query next file: error: %s\n", gf_error_to_string(query_ret)));
 	} else {
 		if (out_url) *out_url = param.url_query.next_url;
 		if (out_start_range) *out_start_range = param.url_query.start_range;
 		if (out_end_range) *out_end_range = param.url_query.end_range;
+
+		/*the segment is being downloaded now, start monitoring refresh*/
+		if (param.url_query.is_current_download) {
+			m2ts->low_latency_mode = 1;
+			if (is_refresh) *is_refresh = GF_TRUE;
+			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;
+		} else {
+			if (is_refresh) {
+				//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;
+				} else {
+					*is_refresh = GF_FALSE;
+				}
+			}
+			m2ts->in_segment_download = 0;
+		}
 	}
 	return query_ret;
 }
 
-
 static GF_Err M2TS_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
 {
 	GF_Err e;	
@@ -790,6 +864,8 @@
 		m2ts->hybrid_on = 1;
 	}	
 
+	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;
@@ -801,16 +877,16 @@
 		gf_m2ts_demux_dmscc_init(m2ts->ts);
 	}
 
-	if (!strnicmp(url, "http://", 7)) {
+	if (url && !strnicmp(url, "http://", 7)) {
 		m2ts->ts->dnload = gf_term_download_new(m2ts->service, url, GF_NETIO_SESSION_NOT_THREADED | GF_NETIO_SESSION_NOT_CACHED, m2ts_net_io, m2ts);
 		if (!m2ts->ts->dnload){
 			gf_term_on_connect(m2ts->service, NULL, GF_NOT_SUPPORTED);
 			return GF_OK;
 		} else {
-			e = TSDemux_DemuxPlay(m2ts->ts);
+			e = gf_m2ts_demuxer_play(m2ts->ts);
 		}
 	} else {
-		e = TSDemux_Demux_Setup(m2ts->ts,url,0);
+		e = gf_m2ts_demuxer_setup(m2ts->ts,url,0);
 	}
 
 	if (e) {
@@ -824,7 +900,7 @@
 	M2TSIn *m2ts = plug->priv;
 	GF_M2TS_Demuxer* ts = m2ts->ts;
 
-	TSDemux_CloseDemux(ts);	
+	gf_m2ts_demuxer_close(ts);	
 	
 	
 	if (ts->dnload) gf_term_download_del(ts->dnload);
@@ -916,7 +992,7 @@
 	/* 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;
-		TSDemux_DemuxPlay(m2ts->ts);
+		gf_m2ts_demuxer_play(m2ts->ts);
 	}
 
 	return NULL;
@@ -974,6 +1050,11 @@
 				pes->user = channel;
 				e = GF_OK;
 			}
+			/*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);
@@ -1003,6 +1084,44 @@
 	return GF_OK;
 }
 
+static void gf_m2ts_switch_quality(GF_M2TS_Program *prog, GF_M2TS_Demuxer *ts, Bool switch_up)
+{
+	GF_M2TS_ES *es;
+	u32 i, count;
+	GF_NetworkCommand com;
+
+	if (!prog->is_scalable)
+		return;
+
+	if (switch_up) {
+		for (i = 0; i < GF_M2TS_MAX_STREAMS; i++) {
+			es = ts->ess[i];
+			if (es && (es->flags & GF_M2TS_ES_IS_PES) && (((GF_M2TS_PES *)es)->depends_on_pid == prog->pid_playing)) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("Turn on ES%d\n", es->pid));
+				gf_m2ts_set_pes_framing((GF_M2TS_PES *)ts->ess[es->pid], GF_M2TS_PES_FRAMING_DEFAULT);
+				prog->pid_playing = es->pid;
+				return;
+			}
+		}
+	}
+	else {
+		count = gf_list_count(prog->streams);
+		for (i = 0; i < count; i++) {
+			es = (GF_M2TS_ES *)gf_list_get(prog->streams, i);
+			if (es && (es->pid == prog->pid_playing) && ((GF_M2TS_PES *)es)->depends_on_pid) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("Turn off ES%d - playing ES%d\n", es->pid, ((GF_M2TS_PES *)es)->depends_on_pid));
+				gf_m2ts_set_pes_framing((GF_M2TS_PES *)ts->ess[es->pid], GF_M2TS_PES_FRAMING_SKIP);
+				memset(&com, 0, sizeof(com));
+				com.command_type = GF_NET_CHAN_RESET;
+				com.base.on_channel = ((GF_M2TS_PES *)es)->user;
+				gf_term_on_command(((M2TSIn *)ts->user)->service, &com, GF_OK);
+				prog->pid_playing = ((GF_M2TS_PES *)es)->depends_on_pid;
+				return;
+			}
+		}
+	}
+}
+
 static GF_Err M2TS_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
 {
 	GF_M2TS_PES *pes;
@@ -1014,6 +1133,15 @@
 		if (frag && !strnicmp(frag, "#pid=", 5)) return GF_NOT_SUPPORTED;
 		return GF_OK;
 	}
+	if (com->command_type == GF_NET_SERVICE_QUALITY_SWITCH) {
+		u32 i, count;
+		count = gf_list_count(ts->programs);
+		for (i = 0; i < count; i++) {
+			GF_M2TS_Program *prog = (GF_M2TS_Program *)gf_list_get(ts->programs, i);
+			gf_m2ts_switch_quality(prog, ts, com->switch_quality.up);
+		}
+		return GF_OK;
+	}
 	if (!com->base.on_channel) return GF_NOT_SUPPORTED;
 	switch (com->command_type) {
 	/*we cannot pull complete AUs from the stream*/
@@ -1023,8 +1151,14 @@
 	case GF_NET_CHAN_INTERACTIVE:
 		return GF_NOT_SUPPORTED;
 	case GF_NET_CHAN_BUFFER:
-		com->buffer.max = M2TS_BUFFER_MAX;
-		com->buffer.min = 0;
+		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;
@@ -1051,7 +1185,7 @@
 
 			/*start demuxer*/
 			if (ts->run_state!=1) {
-				return TSDemux_DemuxPlay(ts);
+				return gf_m2ts_demuxer_play(ts);
 			}
 		}
 		ts->nb_playing++;
@@ -1074,7 +1208,7 @@
 			if (gf_list_count(m2ts->ts->requested_progs)) {
 				ts->file_regulate = 0;
 				gf_m2ts_set_pes_framing(pes, GF_M2TS_PES_FRAMING_SKIP);
-				return TSDemux_DemuxPlay(ts);
+				return gf_m2ts_demuxer_play(ts);
 			}
 		}
 		gf_m2ts_set_pes_framing(pes, GF_M2TS_PES_FRAMING_SKIP);
@@ -1196,7 +1330,7 @@
 #endif
 
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
@@ -1208,7 +1342,7 @@
 	return si;
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 	switch (InterfaceType) {
@@ -1219,7 +1353,7 @@
 	}
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 void ShutdownInterface(GF_BaseInterface *ifce)
 {
 	switch (ifce->InterfaceType) {
@@ -1228,3 +1362,5 @@
 #endif
 	}
 }
+
+GPAC_MODULE_STATIC_DELARATION( mpegts_in )

gpac-0.5.0.svn4668.tar.bz2/modules/mse_in Added

gpac-0.5.0.svn4668.tar.bz2/modules/mse_in/Makefile Added

@@ -0,0 +1,64 @@
+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

gpac-0.5.0.svn4668.tar.bz2/modules/mse_in/mse_in.c Added

@@ -0,0 +1,369 @@
+/*
+ *          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-0.5.0.svn4296.tar.bz2/modules/odf_dec/odf_dec.c -> gpac-0.5.0.svn4668.tar.bz2/modules/odf_dec/odf_dec.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/ogg/ogg_in.c -> gpac-0.5.0.svn4668.tar.bz2/modules/ogg/ogg_in.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/ogg/ogg_load.c -> gpac-0.5.0.svn4668.tar.bz2/modules/ogg/ogg_load.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/opencv_is/opencv_is.c -> gpac-0.5.0.svn4668.tar.bz2/modules/opencv_is/opencv_is.c Changed

gpac-0.5.0.svn4668.tar.bz2/modules/openhevc_dec Added

gpac-0.5.0.svn4668.tar.bz2/modules/openhevc_dec/Makefile Added

gpac-0.5.0.svn4668.tar.bz2/modules/openhevc_dec/openhevc_dec.c Added

@@ -0,0 +1,447 @@
+/*
+ *			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-0.5.0.svn4296.tar.bz2/modules/opensvc_dec/opensvc_dec.c -> gpac-0.5.0.svn4668.tar.bz2/modules/opensvc_dec/opensvc_dec.c Changed

@@ -27,6 +27,7 @@
 #include <gpac/modules/codec.h>
 #include <gpac/avparse.h>
 #include <gpac/constants.h>
+#include <gpac/internal/media_dev.h>
 
 
 #if (defined(WIN32) || defined(_WIN32_WCE)) && !defined(__GNUC__)
@@ -34,25 +35,22 @@
 #endif
 
 #include <OpenSVCDecoder/SVCDecoder_ietr_api.h>
-#include <OpenSVCDecoder/ParseAU.h>
 
 typedef struct
 {
 	u16 ES_ID;
-	u32 width, stride, height, out_size, pixel_ar, layer;
-	Bool first_frame;
+	u16 baseES_ID;
+	u32 width, stride, height, out_size, pixel_ar;
 
 	u32 nalu_size_length;
+	Bool init_layer_set;
+	Bool state_found;
 
 	/*OpenSVC things*/
 	void *codec;
-	int InitParseAU;
-	int svc_init_done;
-	int save_Width;
-	int save_Height;
-	int CurrDqId;
+	int CurrentDqId;
 	int MaxDqId;
-	int DqIdTable [8];
+	int DqIdTable[8];
     int TemporalId;
     int TemporalCom;
 } OSVCDec;
@@ -65,17 +63,20 @@
 	int Layer[4];
 	OSVCDec *ctx = (OSVCDec*) ifcg->privateStack;
 
-	/*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;
-	
+	/*todo: we should check base layer of this stream is indeed our base layer*/ 	
+	if (!ctx->ES_ID) {
+		ctx->ES_ID = esd->ESID;
+	 	ctx->width = ctx->height = ctx->out_size = 0;
+		if (!esd->dependsOnESID) ctx->baseES_ID = esd->ESID;
+	}
+
 	if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
 		GF_AVCConfig *cfg = gf_odf_avc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
 		if (!cfg) return GF_NON_COMPLIANT_BITSTREAM;
-		ctx->nalu_size_length = cfg->nal_unit_size;
-		if (SVCDecoder_init(&ctx->codec) == SVC_STATUS_ERROR) return GF_IO_ERR;
+		if (!esd->dependsOnESID) {
+			ctx->nalu_size_length = cfg->nal_unit_size;
+			if (SVCDecoder_init(&ctx->codec) == SVC_STATUS_ERROR) return GF_IO_ERR;
+		}
 
 		/*decode all NALUs*/
 		count = gf_list_count(cfg->sequenceParameterSets);
@@ -100,25 +101,34 @@
 			if (res<0) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[SVC Decoder] Error decoding SPS %d\n", res));
 			}
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[SVC Decoder] Attach: SPS id=\"%d\" code=\"%d\" size=\"%d\"\n", slc->id, slc->data[0] & 0x1F, slc->size));
 		}
 
 		count = gf_list_count(cfg->pictureParameterSets);
 		for (i=0; i<count; i++) {
+			u32 sps_id, pps_id;
 			GF_AVCConfigSlot *slc = gf_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);
 			if (res<0) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[SVC Decoder] Error decoding PPS %d\n", res));
 			}
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[SVC Decoder] Attach: PPS id=\"%d\" code=\"%d\" size=\"%d\" sps_id=\"%d\"\n", pps_id, slc->data[0] & 0x1F, slc->size, sps_id));
 		}
-
+		ctx->state_found = 1;
 		gf_odf_avc_cfg_del(cfg);
 	} else {
+		if (ctx->nalu_size_length) {
+			return GF_NOT_SUPPORTED;
+		}
 		ctx->nalu_size_length = 0;
-		if (SVCDecoder_init(&ctx->codec) == SVC_STATUS_ERROR) return GF_IO_ERR;
+		if (!esd->dependsOnESID) {
+			if (SVCDecoder_init(&ctx->codec) == SVC_STATUS_ERROR) return GF_IO_ERR;
+		}
+		ctx->pixel_ar = (1<<16) || 1;
 	}
 	ctx->stride = ctx->width + 32;
-	ctx->layer = 0;
-	ctx->CurrDqId = ctx->layer;
+	ctx->CurrentDqId = ctx->MaxDqId = 0;
 	ctx->out_size = ctx->stride * ctx->height * 3 / 2;
 	return GF_OK;
 }
@@ -184,13 +194,13 @@
 	case GF_CODEC_MEDIA_SWITCH_QUALITY:
 
 		if (capability.cap.valueInt) {
-			if (ctx->CurrDqId < ctx->MaxDqId)
+			if (ctx->CurrentDqId < ctx->MaxDqId)
 				// set layer up (command=1)
-				UpdateLayer( ctx->DqIdTable, &ctx->CurrDqId, &ctx->TemporalCom, &ctx->TemporalId, ctx->MaxDqId, 1 );
+				UpdateLayer( ctx->DqIdTable, &ctx->CurrentDqId, &ctx->TemporalCom, &ctx->TemporalId, ctx->MaxDqId, 1 );
 		} else {
-			if (ctx->CurrDqId > 0)
+			if (ctx->CurrentDqId > 0)
 				// set layer down (command=0)
-				UpdateLayer( ctx->DqIdTable, &ctx->CurrDqId, &ctx->TemporalCom, &ctx->TemporalId, ctx->MaxDqId, 0 );
+				UpdateLayer( ctx->DqIdTable, &ctx->CurrentDqId, &ctx->TemporalCom, &ctx->TemporalId, ctx->MaxDqId, 0 );
 		}
 		return GF_OK;
 	}
@@ -209,10 +219,12 @@
 	s32 got_pic;
 	OPENSVCFRAME pic;
     int Layer[4];
+	u32 i, nalu_size, sc_size;
+	u8 *ptr;
 	OSVCDec *ctx = (OSVCDec*) ifcg->privateStack;
 	u32 curMaxDqId = ctx->MaxDqId;
 
-	if (!ES_ID || (ES_ID!=ctx->ES_ID) || !ctx->codec) {
+	if (!ES_ID || !ctx->codec) {
 		*outBufferLength = 0;
 		return GF_OK;
 	}
@@ -222,62 +234,109 @@
 	}
 
 	ctx->MaxDqId = GetDqIdMax(inBuffer, inBufferLength, ctx->nalu_size_length, ctx->DqIdTable, ctx->nalu_size_length ? 1 : 0);
-	if(!ctx->InitParseAU){
-		if (ctx->MaxDqId == -1) {
-			//AVC stream in a h264 file 
+	if (!ctx->init_layer_set) {
+		//AVC stream in a h264 file 
+		if (ctx->MaxDqId == -1) 
 			ctx->MaxDqId = 0;
-		} else {
-			//Firts time only, we parse the first AU to know the file configuration
-			//does not need to ba called again ever after, unless SPS or PPS changed
-			ParseAuPlayers(ctx->codec, inBuffer, inBufferLength, ctx->nalu_size_length, ctx->nalu_size_length ? 1 : 0);
-		}
-		ctx->InitParseAU = 1;
+		
+		ctx->CurrentDqId = ctx->MaxDqId;
+		ctx->init_layer_set = 1;
 	}
-/*
 	if (curMaxDqId != ctx->MaxDqId)
-	{
-		if (ctx->MaxDqId == -1)
-			ctx->MaxDqId = 0;
-		else
-			ParseAuPlayers(ctx->codec, inBuffer, inBufferLength, ctx->nalu_size_length, ctx->nalu_size_length ? 1 : 0);
-		ctx->CurrDqId = ctx->MaxDqId;
-	}
-//	SetCommandLayer(Layer, ctx->MaxDqId, ctx->CurrDqId, &ctx->TemporalCom, ctx->TemporalId);
-*/
-	ctx->TemporalCom = 0;
-	SetCommandLayer(Layer, ctx->MaxDqId, ctx->MaxDqId, &ctx->TemporalCom, 0);
+		ctx->CurrentDqId = ctx->MaxDqId;
+	/*decode only current layer*/
+	SetCommandLayer(Layer, ctx->MaxDqId, ctx->CurrentDqId, &ctx->TemporalCom, ctx->TemporalId);
 
 	got_pic = 0;
-	if (ctx->nalu_size_length) {
-		u32 i, nalu_size = 0;
-		u8 *ptr = inBuffer;
+	nalu_size = 0;
+	ptr = inBuffer;
+
+	if (!ctx->nalu_size_length) {
+		u32 size;
+		sc_size = 0;
+		size = gf_media_nalu_next_start_code(inBuffer, inBufferLength, &sc_size);
+		if (sc_size) {
+			ptr += size+sc_size;
+			assert(inBufferLength >= size+sc_size);
+			inBufferLength -= size+sc_size;
+		} else {
+			/*no annex-B start-code found, discard */
+			*outBufferLength = 0;
+			return GF_OK;
+		}
+	}
 
-		while (inBufferLength) {
+	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 {
+			u32 sc_size;
+			nalu_size = gf_media_nalu_next_start_code(ptr, inBufferLength, &sc_size);
+		}
+#ifndef GPAC_DISABLE_LOG
+		switch (ptr[0] & 0x1F) {
+			case GF_AVC_NALU_SEQ_PARAM:
+			case GF_AVC_NALU_SVC_SUBSEQ_PARAM:
+				{
+					u32 sps_id;
+					gf_avc_get_sps_info((char *)ptr, nalu_size, &sps_id, NULL, NULL, NULL, NULL);
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[SVC Decoder] ES%d: SPS id=\"%d\" code=\"%d\" size=\"%d\"\n", ES_ID, sps_id, ptr[0] & 0x1F, nalu_size));
+				}
+				break;
+			case GF_AVC_NALU_PIC_PARAM:
+				{
+					u32 sps_id, pps_id;
+					gf_avc_get_pps_info((char *)ptr, nalu_size, &pps_id, &sps_id);
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[SVC Decoder] ES%d: PPS id=\"%d\" code=\"%d\" size=\"%d\" sps_id=\"%d\"\n", ES_ID, pps_id, ptr[0] & 0x1F, nalu_size, sps_id));
+				}
+				break;
+			default:
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[SVC Decoder] ES%d: NALU code=\"%d\" size=\"%d\"\n", ES_ID, ptr[0] & 0x1F, nalu_size));
+		}
+#endif
+		if (!ctx->state_found) {
+			u8 nal_type = (ptr[0] & 0x1F) ;
+			switch (nal_type) {
+			case GF_AVC_NALU_SEQ_PARAM:
+			case GF_AVC_NALU_PIC_PARAM:
+				if (ctx->baseES_ID == ES_ID)
+					ctx->state_found = 1;
+				break;
+			}
+		}
 
+		if (ctx->state_found) {
 			if (!got_pic) 
 				got_pic = decodeNAL(ctx->codec, ptr, nalu_size, &pic, Layer);
 			else
 				decodeNAL(ctx->codec, ptr, nalu_size, &pic, Layer);
+		}
 
-			ptr += nalu_size;
+		ptr += nalu_size;
+		if (ctx->nalu_size_length) {
 			if (inBufferLength < nalu_size + ctx->nalu_size_length) break;
-
 			inBufferLength -= nalu_size + ctx->nalu_size_length;
+		} else {
+			if (!sc_size || (inBufferLength < nalu_size + sc_size)) break;
+			inBufferLength -= nalu_size + sc_size;
+			ptr += sc_size;
 		}
-	} else {
 	}
-	if (got_pic!=1) return GF_OK;
+
+	if (got_pic!=1) {
+		*outBufferLength = 0;
+		return GF_OK;
+	}
 
 	if ((curMaxDqId != ctx->MaxDqId) || (pic.Width != ctx->width) || (pic.Height!=ctx->height)) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[SVC Decoder] Resizing from %dx%d to %dx%d\n", ctx->width, ctx->height, pic.Width, pic.Height ));
 		ctx->width = pic.Width;
 		ctx->stride = pic.Width + 32;
 		ctx->height = pic.Height;
 		ctx->out_size = ctx->stride * ctx->height * 3 / 2;
-
 		/*always force layer resize*/
 		*outBufferLength = ctx->out_size;
 		return GF_BUFFER_TOO_SMALL;
@@ -299,6 +358,7 @@
 
 	switch (esd->decoderConfig->objectTypeIndication) {
 	case GPAC_OTI_VIDEO_AVC:
+	case GPAC_OTI_VIDEO_SVC:
 		if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
 			Bool is_svc = 0;
 			u32 i, count;
@@ -322,7 +382,7 @@
 			gf_odf_avc_cfg_del(cfg);
 			return is_svc ? GF_CODEC_SUPPORTED : GF_CODEC_MAYBE_SUPPORTED;
 		}
-		return GF_CODEC_MAYBE_SUPPORTED;
+		return esd->has_ref_base ? GF_CODEC_SUPPORTED : GF_CODEC_MAYBE_SUPPORTED;
 	}
 	return GF_CODEC_NOT_SUPPORTED;
 }
@@ -361,7 +421,7 @@
 	gf_free(ifcg);
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 const u32 *QueryInterfaces() 
 {
 	static u32 si [] = {
@@ -373,7 +433,7 @@
 	return si; 
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface(u32 InterfaceType) 
 {
 #ifndef GPAC_DISABLE_AV_PARSERS
@@ -382,7 +442,7 @@
 	return NULL;
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 void ShutdownInterface(GF_BaseInterface *ifce)
 {
 	switch (ifce->InterfaceType) {
@@ -393,3 +453,6 @@
 #endif
 	}
 }
+
+GPAC_MODULE_STATIC_DELARATION( opensvc )
+

gpac-0.5.0.svn4296.tar.bz2/modules/osd/osd.c -> gpac-0.5.0.svn4668.tar.bz2/modules/osd/osd.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/oss_audio/oss.c -> gpac-0.5.0.svn4668.tar.bz2/modules/oss_audio/oss.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/platinum/GPACFileMediaServer.cpp -> gpac-0.5.0.svn4668.tar.bz2/modules/platinum/GPACFileMediaServer.cpp Changed

@@ -53,7 +53,7 @@
 {
 	u8 buf[10];
 	if (!alias) {
-			sprintf((char*)buf, "%08X", gf_crc_32((char*) path, strlen(path)));
+			sprintf((char*)buf, "%08X", gf_crc_32((char*) path, (u32) strlen(path)));
 			alias = (const char *)buf;
 	}
 	m_Directories.Add(GPAC_MediaDirectory(alias, path, is_hidden));
@@ -407,13 +407,13 @@
 
 	/*url was absolute, add its root directory*/
 	if (!strcmp(abs_url, url)) {
-		Bool found = 0;
+		Bool found = GF_FALSE;
 		NPT_String newdir;
 		/*if the path is /my/example/path/test.ext, we want to share the parent directory
 			/my/example/, otherwise we will loose the ability to browse for resource in the parent dir
 		*/
 		u32 nb_sep=0;
-		u32 len = strlen(abs_url);
+		u32 len = (u32) strlen(abs_url);
 		u32 i=0;
 		while (i<=len) {
 			if ((abs_url[len-i]=='\\') || (abs_url[len-i]=='/') ) {
@@ -437,11 +437,11 @@
 			GPAC_MediaDirectory *dir;
 			m_Directories.Get(i, dir);
 			if (!strcmp(newdir, dir->m_Path)) {
-				found = 1;
+				found = GF_TRUE;
 			}
 		}
 		if (!found)
-			AddSharedDirectory(newdir, NULL, 1);
+			AddSharedDirectory(newdir, NULL, GF_TRUE);
 	}
 
 	path = abs_url;

gpac-0.5.0.svn4296.tar.bz2/modules/platinum/GPACFileMediaServer.h -> gpac-0.5.0.svn4668.tar.bz2/modules/platinum/GPACFileMediaServer.h Changed

@@ -47,7 +47,7 @@
 	if is_hidden is set, directory is not visible during BrowseDirectChildren
 	if alias is NULL, a CRC32 of the path name will be used
 	*/
-	GPAC_MediaDirectory(const char *alias, const char *path, Bool is_hidden = 0)  
+	GPAC_MediaDirectory(const char *alias, const char *path, Bool is_hidden = GF_FALSE)
 	{
 		m_Path = path;
 		m_Path.Replace('/', NPT_FilePath::Separator);
@@ -66,7 +66,7 @@
 class GPAC_VirtualFile
 {
 public:
-	GPAC_VirtualFile(const char *uri="", const char *val="", const char *mime="", Bool temporary=0) 
+	GPAC_VirtualFile(const char *uri="", const char *val="", const char *mime="", Bool temporary= GF_FALSE)
 	{
 		m_URI = uri;
 		m_Content = val;
@@ -92,10 +92,10 @@
 						NPT_UInt16   port = 0);
 
 
-	void AddSharedDirectory(const char *path, const char *alias, Bool is_hidden = 0);
+	void AddSharedDirectory(const char *path, const char *alias, Bool is_hidden = GF_FALSE);
 
     NPT_String GetResourceURI(const char *file_path, const char *for_host);
-    void ShareVirtualResource(const char *res_uri, const char *res_val, const char *res_mime, Bool temporary = 0);
+    void ShareVirtualResource(const char *res_uri, const char *res_val, const char *res_mime, Bool temporary = GF_FALSE);
 
 protected:
     virtual NPT_Result OnBrowseDirectChildren(PLT_ActionReference&          action,

gpac-0.5.0.svn4296.tar.bz2/modules/platinum/GPACMediaRenderer.cpp -> gpac-0.5.0.svn4668.tar.bz2/modules/platinum/GPACMediaRenderer.cpp Changed

@@ -54,7 +54,7 @@
 {
 	m_mediaHistoryList = gf_list_new();
 	m_pUPnP = upnp;
-	m_connected = 0;
+	m_connected = GF_FALSE;
 	m_Duration = m_Time = 0;
 }
 
@@ -444,7 +444,7 @@
 	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[UPnP] Request: change media\n"));
 
 	if (m_connected) {
-		m_connected = 0;
+		m_connected = GF_FALSE;
 		m_pUPnP->OnStop(m_ip_src);
 	}
 	const char *ext = strrchr(MediaUri, '.');
@@ -460,7 +460,7 @@
 	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[UPnP] Opening URL %s\n", the_url));
 	m_track_pos = gf_list_count(m_mediaHistoryList);
 
-	m_connected = 1;
+	m_connected = GF_TRUE;
 	m_pUPnP->OnConnect(the_url, m_ip_src);
 	/* Set UPnP datas */
     m_pAVService->SetStateVariable("TransportState", "PLAYING");
@@ -477,7 +477,7 @@
 {
 	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[UPnP] Request: change state : PAUSE\n"));
     m_pAVService->SetStateVariable("TransportState", "PAUSED_PLAYBACK");
-	m_pUPnP->OnPause(0, m_ip_src);
+	m_pUPnP->OnPause(GF_FALSE, m_ip_src);
     return NPT_SUCCESS;
 }
 
@@ -488,14 +488,14 @@
 	/* if nothing playing, connect to first media of mediaHistoryList */
 	if (m_connected) {
 	    m_pAVService->SetStateVariable("TransportState", "PLAYING");
-		m_pUPnP->OnPause(1, m_ip_src);
+		m_pUPnP->OnPause(GF_TRUE, m_ip_src);
 	} else if (gf_list_count(m_mediaHistoryList) >= 1) {
 		char *track = (char *) gf_list_get(m_mediaHistoryList, 0);
 		m_track_pos = 1;
 
 		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[UPnP] Reading first media : %s\n", track));
 	    m_pAVService->SetStateVariable("TransportState", "PLAYING");
-		m_connected = 1;
+		m_connected = GF_TRUE;
 		m_pUPnP->OnConnect(track, m_ip_src);
 		//MRSetTrack(track, upnph->TrackPosition);
 	}
@@ -583,5 +583,5 @@
     m_pAVService->SetStateVariable("AVTransportURI", url);
     m_pAVService->SetStateVariable("CurrentTrackURI", url);
     m_pAVService->SetStateVariable("TransportState", "PLAYING");
-	m_connected = url ? 1 : 0;
+	m_connected = url ? GF_TRUE : GF_FALSE;
 }

gpac-0.5.0.svn4296.tar.bz2/modules/platinum/GPACPlatinum.cpp -> gpac-0.5.0.svn4668.tar.bz2/modules/platinum/GPACPlatinum.cpp Changed

@@ -34,7 +34,13 @@
 #ifdef GPAC_HAS_SPIDERMONKEY
 
 #if !defined(__GNUC__)
+# if defined(_WIN32_WCE)
 #  pragma comment(lib, "js32")
+# elif defined (_WIN64)
+#  pragma comment(lib, "js")
+# elif defined (WIN32)
+#  pragma comment(lib, "js")
+# endif
 #endif
 
 #endif
@@ -46,7 +52,7 @@
 	m_pMediaRenderer = NULL;
 	m_pMediaServer = NULL;
 	m_pAVCtrlPoint = NULL;
-	m_renderer_bound = 0;
+	m_renderer_bound = GF_FALSE;
 	m_pGenericController = NULL;	
 
 #ifdef GPAC_HAS_SPIDERMONKEY
@@ -77,14 +83,14 @@
 #ifdef GPAC_HAS_SPIDERMONKEY
 		jsval funval, rval;
 		if (!m_pJSCtx) return;
-		LockJavascript(1);
+		LockJavascript(GF_TRUE);
 		JS_LookupProperty(m_pJSCtx, m_pObj, "onMediaStop", &funval);
 		if (JSVAL_IS_OBJECT(funval)) {
 			jsval argv[1];
 			argv[0] = GetUPnPDevice(src_url);
 			JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 1, argv, &rval);
 		}
-		LockJavascript(0);
+		LockJavascript(GF_FALSE);
 #endif
 	} else {
 //		gf_term_disconnect(m_pTerm);
@@ -99,7 +105,7 @@
 #ifdef GPAC_HAS_SPIDERMONKEY
 		jsval funval, rval;
 		if (!m_pJSCtx) return res;
-		LockJavascript(1);
+		LockJavascript(GF_TRUE);
 		JS_LookupProperty(m_pJSCtx, m_pObj, "onMigrate", &funval);
 		if (JSVAL_IS_OBJECT(funval)) {
 			JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 0, NULL, &rval);
@@ -109,7 +115,7 @@
 				SMJS_FREE(m_pJSCtx, _res);
 			}
 		}
-		LockJavascript(0);
+		LockJavascript(GF_FALSE);
 #endif
 	} else {
 		GF_NetworkCommand com;
@@ -140,7 +146,7 @@
 		jsval funval, rval;
 		if (!m_pJSCtx) return;
 
-		LockJavascript(1);
+		LockJavascript(GF_TRUE);
 		JS_LookupProperty(m_pJSCtx, m_pObj, "onMediaConnect", &funval);
 		if (JSVAL_IS_OBJECT(funval)) {
 			jsval argv[2];
@@ -148,7 +154,7 @@
 			argv[1] = GetUPnPDevice(src_url);
 			JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 2, argv, &rval);
 		}
-		LockJavascript(0);
+		LockJavascript(GF_FALSE);
 #endif
 	} else {
 		gf_term_navigate_to(m_pTerm, url);
@@ -160,14 +166,14 @@
 #ifdef GPAC_HAS_SPIDERMONKEY
 		jsval funval, rval;
 		if (!m_pJSCtx) return;
-		LockJavascript(1);
+		LockJavascript(GF_TRUE);
 		JS_LookupProperty(m_pJSCtx, m_pObj, do_resume ? "onMediaPlay" : "onMediaPause", &funval);
 		if (JSVAL_IS_OBJECT(funval)) {
 			jsval argv[1];
 			argv[0] = GetUPnPDevice(src_url);
 			JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 1, argv, &rval);
 		}
-		LockJavascript(0);
+		LockJavascript(GF_FALSE);
 #endif
 	} else {
 		gf_term_set_option(m_pTerm, GF_OPT_PLAY_STATE, do_resume ? GF_STATE_PLAYING : GF_STATE_PAUSED);
@@ -180,14 +186,14 @@
 #ifdef GPAC_HAS_SPIDERMONKEY
 		jsval funval, rval;
 		if (!m_pJSCtx) return;
-		LockJavascript(1);
+		LockJavascript(GF_TRUE);
 		JS_LookupProperty(m_pJSCtx, m_pObj, "onMediaSeek", &funval);
 		if (JSVAL_IS_OBJECT(funval)) {
 			jsval argv[1];
 			argv[0] = DOUBLE_TO_JSVAL( JS_NewDouble(m_pJSCtx, time) );
 			JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 2, argv, &rval);
 		}
-		LockJavascript(0);
+		LockJavascript(GF_FALSE);
 #endif
 	} else {
 		/* CanSeek and Duration set for each media by event_proc */
@@ -211,7 +217,7 @@
 #ifdef GPAC_HAS_SPIDERMONKEY
 		jsval funval, rval;
 		if (!m_pJSCtx) return;
-		LockJavascript(1);
+		LockJavascript(GF_TRUE);
 		JS_LookupProperty(m_pJSCtx, m_pObj, "onMediaTimeChanged", &funval);
 		if (JSVAL_IS_OBJECT(funval)) {
 			jsval argv[2];
@@ -219,7 +225,7 @@
 			argv[1] = DOUBLE_TO_JSVAL( JS_NewDouble(m_pJSCtx, time) );
 			JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 2, argv, &rval);
 		}
-		LockJavascript(0);
+		LockJavascript(GF_FALSE);
 #endif
 	}
 }
@@ -230,7 +236,7 @@
 #ifdef GPAC_HAS_SPIDERMONKEY
 		jsval funval, rval;
 		if (!m_pJSCtx) return;
-		LockJavascript(1);
+		LockJavascript(GF_TRUE);
 		JS_LookupProperty(m_pJSCtx, m_pObj, "onMediaDurationChanged", &funval);
 		if (JSVAL_IS_OBJECT(funval)) {
 			jsval argv[2];
@@ -238,7 +244,7 @@
 			argv[1] = DOUBLE_TO_JSVAL( JS_NewDouble(m_pJSCtx, dur) );
 			JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 2, argv, &rval);
 		}
-		LockJavascript(0);
+		LockJavascript(GF_FALSE);
 #endif
 	}
 }
@@ -246,7 +252,7 @@
 
 Bool GF_UPnP::ProcessEvent(GF_Event *evt)
 {
-	if (!m_pMediaRenderer) return 0;
+	if (!m_pMediaRenderer) return GF_FALSE;
 	switch (evt->type) {
 	case GF_EVENT_CONNECT:
 		if (evt->connect.is_connected) {
@@ -281,21 +287,21 @@
 		}
 		break;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 Bool upnp_on_term_event(void *udta, GF_Event *evt, Bool consumed)
 {
 	GF_UPnP *upnp = (GF_UPnP *) udta;
 	if (!consumed && upnp) return upnp->ProcessEvent(evt);
-	return 0;
+	return GF_FALSE;
 }
 
 void GF_UPnP::Load(GF_Terminal *term)
 {
 	u16 port = 0;
-	Bool save_uuids=0;
-	Bool ignore_local_devices=0;
+	Bool save_uuids=GF_FALSE;
+	Bool ignore_local_devices=GF_FALSE;
 	const char *uuid, *opt, *name;
 	char hostname[100], friendly_name[1024];
 	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[UPnP] Starting UPnP\n"));
@@ -317,7 +323,7 @@
 
 	opt = gf_cfg_get_key(m_pTerm->user->config, "UPnP", "IgnoreCreatedDevices");
 	if (!opt || !strcmp(opt, "yes")) {
-		ignore_local_devices = 1;
+		ignore_local_devices = GF_TRUE;
 		if (!opt) gf_cfg_set_key(m_pTerm->user->config, "UPnP", "IgnoreCreatedDevices", "yes");
 	}
 
@@ -325,13 +331,13 @@
 
 	opt = gf_cfg_get_key(m_pTerm->user->config, "UPnP", "IgnoreCreatedDevices");
 	if (!opt || !strcmp(opt, "yes")) {
-		ignore_local_devices = 1;
+		ignore_local_devices = GF_TRUE;
 		if (!opt) gf_cfg_set_key(m_pTerm->user->config, "UPnP", "IgnoreCreatedDevices", "yes");
 	}
 
 
 	opt = gf_cfg_get_key(m_pTerm->user->config, "UPnP", "SaveUUIDs");
-	if (opt && !strcmp(opt, "yes")) save_uuids = 1;	
+	if (opt && !strcmp(opt, "yes")) save_uuids = GF_TRUE;
 	
 	opt = gf_cfg_get_key(m_pTerm->user->config, "UPnP", "MediaRendererEnabled");
 	if (!opt || !strcmp(opt, "yes")) {
@@ -399,14 +405,14 @@
 			m_pMediaServer->AddSharedDirectory("/", "all");
 		} else {
 			while (media_root) {
-				Bool is_hidden = 0;
+				Bool is_hidden = GF_FALSE;
 				char *sep1 = (char *)strchr(media_root, ':');
 				if (!sep1) break;
 				char *sep2 = (char *)strchr(sep1, ';');
 
 				if (!strncmp(media_root, "(h)", 3)) {
 					media_root+=3;
-					is_hidden = 1;
+					is_hidden = GF_TRUE;
 				}
 				sep1[0] = 0;
 				if (sep2) sep2[0] = 0;
@@ -490,7 +496,7 @@
 
 	if (m_IPFilter.GetLength() && (strstr((const char*)m_IPFilter, (const char*)device->GetURLBase().GetHost()) == NULL) ) return;
 
-	LockJavascript(1);
+	LockJavascript(GF_TRUE);
 
 	JS_LookupProperty(m_pJSCtx, m_pObj, "onMediaRendererAdd", &funval);
 	if (JSVAL_IS_OBJECT(funval)) {
@@ -501,7 +507,7 @@
 		
 		JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 3, argv, &rval);
 	}
-	LockJavascript(0);
+	LockJavascript(GF_FALSE);
 }
 
 
@@ -512,7 +518,7 @@
 
 	if (m_IPFilter.GetLength() && (strstr((const char*)m_IPFilter, (const char*)device->GetURLBase().GetHost()) == NULL) ) return;
 
-	LockJavascript(1);
+	LockJavascript(GF_TRUE);
 	JS_LookupProperty(m_pJSCtx, m_pObj, "onMediaServerAdd", &funval);
 	if (JSVAL_IS_OBJECT(funval)) {
 		jsval argv[3];
@@ -522,7 +528,7 @@
 		
 		JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 3, argv, &rval);
 	}
-	LockJavascript(0);
+	LockJavascript(GF_FALSE);
 }
 
 static SMJS_DECL_FUNC_PROP_GET(  upnpdevice_getProperty)
@@ -626,7 +632,7 @@
 
 	if (m_IPFilter.GetLength() && (strstr((const char*)m_IPFilter, (const char*)item->m_device->GetURLBase().GetHost()) == NULL) ) return;
 
-	LockJavascript(1);
+	LockJavascript(GF_TRUE);
 
 	if (added) {
 		item->js_ctx = m_pJSCtx;
@@ -643,7 +649,7 @@
 		argv[1] = BOOLEAN_TO_JSVAL( added ? JS_TRUE : JS_FALSE);
 		JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 3, argv, &rval);
 	}
-	LockJavascript(0);
+	LockJavascript(GF_FALSE);
 }
 
 static SMJS_DECL_FUNC_PROP_GET(  upnp_getProperty)
@@ -702,7 +708,7 @@
 		if (!strcmp(prop_name, "MovieDuration") && JSVAL_IS_DOUBLE( VPGET() )) {
 			jsdouble d;
 			JS_ValueToNumber(c, VPGET(), &d);
-			upnp->m_pMediaRenderer->SetDuration(d, 1);
+			upnp->m_pMediaRenderer->SetDuration(d, GF_TRUE);
 		}
 		else if (!strcmp(prop_name, "MovieTime") && JSVAL_IS_DOUBLE( VPGET() )) {
 			jsdouble d;
@@ -1185,7 +1191,7 @@
 	SMJS_OBJ
 	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
 	if (!upnp) return JS_TRUE;
-	upnp->m_renderer_bound = 1;
+	upnp->m_renderer_bound = GF_TRUE;
 
 	/*remove ourselves from the event filters since we will only be called through JS*/
 	gf_term_remove_event_filter(upnp->m_pTerm, &upnp->evt_filter);
@@ -1219,7 +1225,7 @@
 
 static JSBool SMJS_FUNCTION(upnp_share_virtual_resource)
 {
-	Bool temp = 0;
+	Bool temp = GF_FALSE;
 	char *res_url, *res_val, *mime;
 	SMJS_OBJ
 	SMJS_ARGS
@@ -1234,7 +1240,7 @@
 	}
 	mime = NULL;
 	if (argc==3) mime = SMJS_CHARS(c, argv[2]);
-	if ((argc==4) && JSVAL_IS_BOOLEAN(argv[3]) && (JSVAL_TO_BOOLEAN(argv[3])==JS_TRUE) ) temp = 1;;
+	if ((argc==4) && JSVAL_IS_BOOLEAN(argv[3]) && (JSVAL_TO_BOOLEAN(argv[3])==JS_TRUE) ) temp = GF_TRUE;;
 
 	upnp->m_pMediaServer->ShareVirtualResource(res_url, res_val, mime ? mime : "application/octet-stream", temp);
 	SMJS_FREE(c, res_url);
@@ -1496,18 +1502,18 @@
 				m_pJSCtx = NULL;
 			}
 		}
-		return 0;
+		return GF_FALSE;
 	}
 	if (m_nbJSInstances) {
 		/*FIXME - this was possible in previous version of SpiderMonkey, don't know how to fix that for new ones*/
 #if (JS_VERSION>=185)
 		m_nbJSInstances++;
-		return 0;
+		return GF_FALSE;
 #else
 		JS_DefineProperty((JSContext*)param->ctx, (JSObject*)param->global, "UPnP", OBJECT_TO_JSVAL(m_pObj), 0, 0, 0);
 		m_nbJSInstances++;
 #endif
-		return 0;
+		return GF_FALSE;
 	}
 
 	m_pJSCtx = (JSContext*)param->ctx;
@@ -1570,7 +1576,7 @@
 		u32 size = (u32) gf_f64_tell(f);
 		gf_f64_seek(f, 0, SEEK_SET);
 		char *buf = (char*)gf_malloc(sizeof(char)*(size+1));
-		size = fread(buf, 1, size, f);
+		size = (u32) fread(buf, 1, size, f);
 		buf[size]=0;
 		/*evaluate the script on the object only*/
 		if (JS_EvaluateScript(m_pJSCtx, device->obj, buf, size, 0, 0, &aval) != JS_TRUE) {
@@ -1582,7 +1588,7 @@
 		fclose(f);
 		gf_free(buf);
 	}
-	return 1;
+	return GF_TRUE;
 }
 
 #endif
@@ -1606,9 +1612,9 @@
 		}
 		if (!strcmp(opt, "yes")) {
 			upnp->Load((GF_Terminal *)param);
-			return 1;
+			return GF_TRUE;
 		}
-		return 0;
+		return GF_FALSE;
 
 	case GF_TERM_EXT_STOP:
 		upnp->Unload();
@@ -1622,7 +1628,7 @@
 			if (now - upnp->last_time > 200) {
 				u32 i, count, arg_set; 
 				jsval argv[1], rval;
-				upnp->LockJavascript(1);
+				upnp->LockJavascript(GF_TRUE);
 				arg_set = 0;
 				count = gf_list_count(upnp->m_Devices);
 				for (i=0; i<count; i++) {
@@ -1635,7 +1641,7 @@
 						JS_CallFunctionValue(upnp->m_pJSCtx, device->obj, device->run_proc, 1, argv, &rval);
 					}
 				}
-				upnp->LockJavascript(0);
+				upnp->LockJavascript(GF_FALSE);
 				upnp->last_time = now;
 			}
 		}
@@ -1647,7 +1653,7 @@
 		return upnp->LoadJS((GF_TermExtJS*)param);
 #endif
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 
@@ -1688,7 +1694,7 @@
 extern "C" {
 #endif
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 const u32 *QueryInterfaces() 
 {
 	static u32 si [] = {
@@ -1698,14 +1704,14 @@
 	return si; 
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface(u32 InterfaceType) 
 {
 	if (InterfaceType == GF_TERM_EXT_INTERFACE) return (GF_BaseInterface *)upnp_new();
 	return NULL;
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 void ShutdownInterface(GF_BaseInterface *ifce)
 {
 	switch (ifce->InterfaceType) {
@@ -1715,6 +1721,8 @@
 	}
 }
 
+GPAC_MODULE_STATIC_DELARATION( platinum )
+
 #ifdef __cplusplus
 }
 #endif

gpac-0.5.0.svn4296.tar.bz2/modules/platinum/GenericDevice.cpp -> gpac-0.5.0.svn4668.tar.bz2/modules/platinum/GenericDevice.cpp Changed

@@ -42,7 +42,7 @@
 	on_event = JSVAL_NULL;
 	m_StateListeners = gf_list_new();
 	m_ArgListeners = gf_list_new();
-	subscribed = 0;
+	subscribed = GF_FALSE;
 	vars=NULL;
 #endif
 }
@@ -137,7 +137,7 @@
 			gf_js_add_root(c, &service->on_event, GF_JSGC_VAL);
 			if (!service->subscribed) {
 				service->m_device->m_pUPnP->m_pGenericController->m_CtrlPoint->Subscribe(service->m_service);
-				service->subscribed = 1;
+				service->subscribed = GF_TRUE;
 			}
 		}
 		return JS_TRUE;
@@ -167,7 +167,7 @@
 	gf_js_add_root(c, &svl->on_event, GF_JSGC_VAL);
 	if (!service->subscribed) {
 		service->m_device->m_pUPnP->m_pGenericController->m_CtrlPoint->Subscribe(service->m_service);
-		service->subscribed = 1;
+		service->subscribed = GF_TRUE;
 	}
 	SMJS_FREE(c, name);
 	return JS_TRUE;
@@ -179,7 +179,7 @@
 	PLT_ArgumentDesc *desc;
 	GPAC_ActionArgListener *argl  = NULL;
 	char *name;
-	Bool script_callback = 0;
+	Bool script_callback = GF_FALSE;
 	u32 i;
 	SMJS_OBJ
 	SMJS_ARGS
@@ -197,7 +197,7 @@
 	desc = NULL;
 	if (argc==3) {
 		if (JSVAL_IS_BOOLEAN(argv[2])) {
-			script_callback = 1;
+			script_callback = GF_TRUE;
 		} else {
 			if (!JSVAL_IS_STRING(argv[2]) ) return JS_FALSE;
 			name = SMJS_CHARS(c, argv[2]);
@@ -625,10 +625,10 @@
 			jsval argv[1], rval;
 
 			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[UPnP] Calling handler for response %s argument %s\n", (char *) action->GetActionDesc().GetName(), (char *) argl->arg->GetName() ));
-			m_pUPnP->LockJavascript(1);
+			m_pUPnP->LockJavascript(GF_TRUE);
 			argv[0] = STRING_TO_JSVAL( JS_NewStringCopyZ(serv->js_ctx, value) );
 			JS_CallFunctionValue(serv->js_ctx, serv->obj, argl->on_event, 1, argv, &rval);
-			m_pUPnP->LockJavascript(0);
+			m_pUPnP->LockJavascript(GF_FALSE);
 		} else {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[UPnP] %s Response: couldn't get argument %s value\n", (char *) action->GetActionDesc().GetName(), (char *) argl->arg->GetName() ));
 		}
@@ -636,7 +636,7 @@
 
 	if (act_l) {
 		jsval rval;
-		m_pUPnP->LockJavascript(1);
+		m_pUPnP->LockJavascript(GF_TRUE);
 		if (act_l->is_script) {
 			JSObject *act_obj;
 			jsval argv[2];
@@ -667,7 +667,7 @@
 		else {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[UPnP] response %s has error %d\n", (char *) action->GetActionDesc().GetName(), res ));
 		}
-		m_pUPnP->LockJavascript(0);
+		m_pUPnP->LockJavascript(GF_FALSE);
 	}
 	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[UPnP] Done processing response %s\n", (char *) action->GetActionDesc().GetName()));
 
@@ -715,10 +715,10 @@
 
 	if (!JSVAL_IS_NULL(serv->on_event)) {
 		jsval rval;
-		m_pUPnP->LockJavascript(1);
+		m_pUPnP->LockJavascript(GF_TRUE);
 		serv->vars = vars;
 		JS_CallFunctionValue(serv->js_ctx, serv->obj, serv->on_event, 0, 0, &rval);
-		m_pUPnP->LockJavascript(0);
+		m_pUPnP->LockJavascript(GF_FALSE);
 		serv->vars = NULL;
 	}
 
@@ -727,10 +727,10 @@
 		/*check if we can find our var in this list*/
 		if (vars->Contains(svl->var)) {
 			jsval argv[1], rval;
-			m_pUPnP->LockJavascript(1);
+			m_pUPnP->LockJavascript(GF_TRUE);
 			argv[0] = STRING_TO_JSVAL( JS_NewStringCopyZ(serv->js_ctx, svl->var->GetValue() ) );
 			JS_CallFunctionValue(serv->js_ctx, serv->obj, svl->on_event, 1, argv, &rval);
-			m_pUPnP->LockJavascript(0);
+			m_pUPnP->LockJavascript(GF_FALSE);
 		}
 
 	}
@@ -964,7 +964,7 @@
 
 	jsval argv[2];
 
-	m_pUPnP->LockJavascript(1);
+	m_pUPnP->LockJavascript(GF_TRUE);
 
 	JSObject *js_action = JS_NewObject(m_pUPnP->m_pJSCtx, &m_pUPnP->upnpDeviceClass._class, 0, 0);
 	argv[0] = OBJECT_TO_JSVAL(js_action);
@@ -984,7 +984,7 @@
 	jsval rval;
 	JS_CallFunctionValue(m_pUPnP->m_pJSCtx, obj, act_proc, 1, argv, &rval);
 	SMJS_SET_PRIVATE(m_pUPnP->m_pJSCtx, js_action, NULL);
-	m_pUPnP->LockJavascript(0);
+	m_pUPnP->LockJavascript(GF_FALSE);
 
 	if (JSVAL_IS_INT(rval) && (JSVAL_TO_INT(rval) != 0)) {
 	    action->SetError(JSVAL_TO_INT(rval), "Action Failed");

gpac-0.5.0.svn4296.tar.bz2/modules/pulseaudio/pulseaudio.c -> gpac-0.5.0.svn4668.tar.bz2/modules/pulseaudio/pulseaudio.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/raw_out/raw_video.c -> gpac-0.5.0.svn4668.tar.bz2/modules/raw_out/raw_video.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/redirect_av/ffmpeg_ts_muxer.c -> gpac-0.5.0.svn4668.tar.bz2/modules/redirect_av/ffmpeg_ts_muxer.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/redirect_av/gpac_ts_muxer.c -> gpac-0.5.0.svn4668.tar.bz2/modules/redirect_av/gpac_ts_muxer.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/redirect_av/redirect_av.c -> gpac-0.5.0.svn4668.tar.bz2/modules/redirect_av/redirect_av.c Changed

@@ -120,7 +120,7 @@
  * This thread sends the frame to TS mux
  * \param Parameter The GF_AVRedirect pointer
  */
-static Bool audio_encoding_thread_run(void *param)
+static u32 audio_encoding_thread_run(void *param)
 {
     u8 * inBuff;
     u8 * outBuff;
@@ -229,7 +229,7 @@
  * This thread sends the frame to TS mux
  * \param Parameter The GF_AVRedirect pointer
  */
-static Bool video_encoding_thread_run(void *param)
+static u32 video_encoding_thread_run(void *param)
 {
     GF_AVRedirect * avr = (GF_AVRedirect*) param;
     u64 currentFrameTimeProcessed = 0, lastEncodedFrameTime = 0;
@@ -496,7 +496,7 @@
     GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ( "[AVRedirect] Writing video frame\n" ) );
 }
 
-static void avr_on_video_reconfig ( void *udta, u32 width, u32 height )
+static void avr_on_video_reconfig ( void *udta, u32 width, u32 height, u8 bpp )
 {
 
     GF_AVRedirect *avr = ( GF_AVRedirect * ) udta;
@@ -809,7 +809,7 @@
     gf_free ( dr );
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 const u32 *QueryInterfaces()
 {
     static u32 si [] =
@@ -820,14 +820,14 @@
     return si;
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface ( u32 InterfaceType )
 {
     if ( InterfaceType == GF_TERM_EXT_INTERFACE ) return ( GF_BaseInterface * ) avr_new();
     return NULL;
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 void ShutdownInterface ( GF_BaseInterface *ifce )
 {
     switch ( ifce->InterfaceType )
@@ -837,3 +837,6 @@
         break;
     }
 }
+
+
+GPAC_MODULE_STATIC_DELARATION( redirect_av )

gpac-0.5.0.svn4296.tar.bz2/modules/rtp_in/rtp_in.c -> gpac-0.5.0.svn4668.tar.bz2/modules/rtp_in/rtp_in.c Changed

@@ -366,8 +366,8 @@
 
 static GF_Err RP_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
 {
-	u32 ESID;
-	RTPStream *ch;
+	u32 ESID, i;
+	RTPStream *ch, *next_ch;
 	RTSPSession *sess;
 	char *es_url;
 	RTPClient *priv = (RTPClient *)plug->priv;
@@ -388,6 +388,17 @@
 		/*this should not happen, the sdp must describe all streams in the service*/
 		if (!ch) return GF_STREAM_NOT_FOUND;
 
+		/*search for next stream*/
+		ch->next_stream = 0;
+		for (i = 0; i < gf_list_count(priv->channels); i++) {
+			next_ch = (RTPStream *)gf_list_get(priv->channels, i);
+			if (next_ch->prev_stream == ch->mid)
+			{
+				ch->next_stream = next_ch->mid;
+				break;
+			}
+		}
+
 		/*assign app channel*/
 		ch->channel = channel;
 		sess = ch->rtsp;
@@ -450,6 +461,81 @@
 	return GF_OK;
 }
 
+static void gf_rtp_switch_quality(RTPClient *rtp, Bool switch_up)
+{
+	u32 i,count;
+	RTPStream *ch, *cur_ch;
+	GF_NetworkCommand com;
+	
+	count = gf_list_count(rtp->channels);
+	/*find the current stream*/
+	ch = cur_ch = NULL;
+	for (i = 0; i < count; i++) {
+		cur_ch = (RTPStream *) gf_list_get(rtp->channels, i);
+		if (cur_ch->mid != rtp->cur_mid) {
+			cur_ch=NULL;
+			continue;
+		}
+		break;
+	}
+	if (!cur_ch) return;
+
+	if (switch_up)
+	{
+		/*this is the highest stream*/
+		if (!cur_ch->next_stream)
+		{
+			cur_ch->status = RTP_Running;
+			return;
+		}
+		else
+		{
+			for (i = 0; i < count; i++) {
+				ch = (RTPStream *) gf_list_get(rtp->channels, i);
+				if (ch->mid == cur_ch->next_stream)
+				{
+					/*resume streaming next channel*/
+					gf_mx_p(rtp->mx);
+					RP_InitStream(ch, 0);
+					gf_mx_v(rtp->mx);
+					ch->status = RTP_Running;
+					rtp->cur_mid = ch->mid;
+					break;
+				}
+			
+			}
+		}	
+	}
+	else
+	{
+		/*this is the lowest stream i.e base layer*/
+		if (!cur_ch->prev_stream)
+		{
+			cur_ch->status = RTP_Running;
+			return;
+		}
+		else
+		{
+			for (i = 0; i < count; i++) {
+				ch = (RTPStream *) gf_list_get(rtp->channels, i);
+				if (ch->mid == cur_ch->prev_stream)
+				{
+					/*stop streaming current channel*/
+					gf_rtp_stop(cur_ch->rtp_ch);
+					cur_ch->status = RTP_Connected;
+					com.command_type = GF_NET_CHAN_RESET;
+					com.base.on_channel = cur_ch;
+					gf_term_on_command(rtp->service, &com, GF_OK);
+					rtp->cur_mid = ch->mid;
+					break;
+				}		
+			}
+		}	
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("Switch from ES%d to ES %d\n", cur_ch->mid, ch->mid));
+	return;
+}
+
 static GF_Err RP_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
 {
 	RTPStream *ch;
@@ -470,12 +556,18 @@
 		priv->session_migration=1;
 		if (priv->session_state_data) {
 			com->migrate.data = priv->session_state_data;
-			com->migrate.data_len = strlen(priv->session_state_data);
+			com->migrate.data_len = (u32) strlen(priv->session_state_data);
 			return GF_OK;
 		}
 		return GF_NOT_SUPPORTED;
 	}
 
+	if (com->command_type == GF_NET_SERVICE_QUALITY_SWITCH)
+	{
+		gf_rtp_switch_quality(priv, com->switch_quality.up);
+		return GF_OK;
+	}
+
 	/*ignore commands other than channels one*/
 	if (!com->base.on_channel) {
 		if (com->command_type==GF_NET_IS_CACHABLE) return GF_OK;
@@ -544,10 +636,13 @@
 			RP_UserCommand(ch->rtsp, ch, com);
 		} else {
 			ch->status = RTP_Running;
+			if (!ch->next_stream)
+				priv->cur_mid = ch->mid;
+
 			if (ch->rtp_ch) {
 				/*technically we shouldn't attempt to synchronize streams based on RTP, we should use RTCP/ However it
 				may happen that the RTCP traffic is absent ...*/
-				ch->check_rtp_time = RTP_SET_TIME_RTP;
+				//ch->check_rtp_time = RTP_SET_TIME_RTP;
 				ch->rtcp_init = 0;
 				gf_mx_p(priv->mx);
 				RP_InitStream(ch, (ch->flags & RTP_CONNECTED) ? 1 : 0);
@@ -647,7 +742,7 @@
 		/*decode data*/
 		data = strstr(data, ",");
 		data += 1;
-		*out_data_size = gf_base64_decode(data, strlen(data), ch->buffer, RTP_BUFFER_SIZE);
+		*out_data_size = gf_base64_decode(data, (u32) strlen(data), ch->buffer, RTP_BUFFER_SIZE);
 		/*FIXME - currently only support for empty SL header*/
 		*out_data_ptr = ch->buffer;
 		ch->flags &= ~GF_RTP_NEW_AU;
@@ -775,7 +870,7 @@
 #endif
 
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
@@ -787,7 +882,7 @@
 	return si;
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 #ifndef GPAC_DISABLE_STREAMING
@@ -796,7 +891,7 @@
 	return NULL;
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 void ShutdownInterface(GF_BaseInterface *ifce)
 {
 	switch (ifce->InterfaceType) {
@@ -807,3 +902,5 @@
 #endif
 	}
 }
+
+GPAC_MODULE_STATIC_DELARATION( rtp_in )

gpac-0.5.0.svn4296.tar.bz2/modules/rtp_in/rtp_in.h -> gpac-0.5.0.svn4668.tar.bz2/modules/rtp_in/rtp_in.h Changed

gpac-0.5.0.svn4296.tar.bz2/modules/rtp_in/rtp_stream.c -> gpac-0.5.0.svn4668.tar.bz2/modules/rtp_in/rtp_stream.c Changed

@@ -41,7 +41,7 @@
 
 	/*success, overwrite SL config*/
 	memset(&com, 0, sizeof(GF_NetworkCommand));
-	com.command_type = GF_NET_CHAN_RECONFIG;
+	com.command_type =	GF_NET_CHAN_RECONFIG;
 	com.base.on_channel = ch->channel;
 
 	gf_rtp_depacketizer_get_slconfig(ch->depacketizer, &com.cfg.sl_config);
@@ -114,8 +114,15 @@
 
 static void rtp_sl_packet_cbk(void *udta, char *payload, u32 size, GF_SLHeader *hdr, GF_Err e)
 {
+	u64 cts, dts;
 	RTPStream *ch = (RTPStream *)udta;
 
+	if (!ch->rtcp_init) return;
+	cts = hdr->compositionTimeStamp;
+	dts = hdr->decodingTimeStamp;
+	hdr->compositionTimeStamp += ch->ts_offset;
+	hdr->decodingTimeStamp += ch->ts_offset;
+
 	if (ch->rtp_ch->packet_loss) e = GF_REMOTE_SERVICE_ERROR;
 
 	if (ch->owner->first_packet_drop && (hdr->packetSequenceNumber >= ch->owner->first_packet_drop) ) {
@@ -124,6 +131,8 @@
 	} else {
 		gf_term_on_sl_packet(ch->owner->service, ch->channel, payload, size, hdr, e);
 	}
+	hdr->compositionTimeStamp = cts;
+	hdr->decodingTimeStamp = dts;
 }
 
 
@@ -144,6 +153,7 @@
 	char *ctrl;
 	GF_SDPConnection *conn;
 	GF_RTSPTransport trans;
+	u32 mid, prev_stream, base_stream;
 
 	//extract all relevant info from the GF_SDPMedia
 	Start = 0.0;
@@ -155,6 +165,7 @@
 	range = NULL;
 	s_port_first = s_port_last = 0;
 	ssrc = rtp_seq = rtp_time = 0;
+	mid = prev_stream = base_stream = 0;
 	i=0;
 	while ((att = (GF_X_Attribute*)gf_list_enum(media->Attributes, &i))) {
 		if (!stricmp(att->Name, "control")) ctrl = att->Value;
@@ -173,6 +184,15 @@
 			rvc_predef = atoi(att->Value);
 		} else if (!stricmp(att->Name, "rvc-config")) { 
 			rvc_config_att = att->Value;
+		} else if (!stricmp(att->Name, "mid")) {
+			sscanf(att->Value, "L%d", &mid);
+		} else if (!stricmp(att->Name, "depend")) {
+			char buf[3000];
+			memset(buf, 0, 3000);
+			sscanf(att->Value, "%*d lay L%d %*s %s", &base_stream, buf);
+			if (!strlen(buf))
+				sscanf(att->Value, "%*d lay %s", buf);
+			sscanf(buf, "L%d", &prev_stream);
 		}
 	}
 
@@ -226,6 +246,9 @@
 	if (ctrl) tmp->control = gf_strdup(ctrl);
 	tmp->ES_ID = ESID;
 	tmp->OD_ID = ODID;
+	tmp->mid = mid;
+	tmp->prev_stream = prev_stream;
+	tmp->base_stream = base_stream;
 
 	memset(&trans, 0, sizeof(GF_RTSPTransport));
 	trans.Profile = media->Profile;
@@ -286,9 +309,9 @@
 		if (!strncmp(rvc_config_att, "data:application/rvc-config+xml", 32) && strstr(rvc_config_att, "base64") ) {
 			char *data = strchr(rvc_config_att, ',');
 			if (data) {
-				rvc_size = strlen(data) * 3 / 4 + 1;
+				rvc_size = (u32) strlen(data) * 3 / 4 + 1;
 				rvc_data = gf_malloc(sizeof(char) * rvc_size);
-				rvc_size = gf_base64_decode(data, strlen(data), rvc_data, rvc_size);
+				rvc_size = gf_base64_decode(data, (u32) strlen(data), rvc_data, rvc_size);
 				rvc_data[rvc_size] = 0;
 			}
 			if (!strncmp(rvc_config_att, "data:application/rvc-config+xml+gz", 35)) is_gz = 1;
@@ -420,31 +443,53 @@
 
 	/*update sync if on pure RTP*/
 	if (!ch->rtcp_init && has_sr) {
+		Double ntp_clock;
+
+		ntp_clock = ch->rtp_ch->last_SR_NTP_sec;
+		ntp_clock += ((Double)ch->rtp_ch->last_SR_NTP_frac)/0xFFFFFFFF;
+			
+		if (!ch->owner->last_ntp) {
+			//add safety in case this RTCP report is received before another report 
+			//that was supposed to come in earlier (with earlier NTP)
+			Double safety_offset, time = ch->rtp_ch->last_SR_rtp_time;
+			time /= ch->rtp_ch->TimeScale;
+			safety_offset = time/2;			
+			ch->owner->last_ntp = ntp_clock - safety_offset;	
+		}
+
+		if (ntp_clock >= ch->owner->last_ntp) {
+			ntp_clock -= ch->owner->last_ntp;
+		} else {
+			ntp_clock = 0;
+		}
+
+		assert(ch->rtp_ch->last_SR_rtp_time >= (u64) (ntp_clock * ch->rtp_ch->TimeScale));
+		ch->ts_offset = ch->rtp_ch->last_SR_rtp_time;
+		ch->ts_offset -= (s64) (ntp_clock * ch->rtp_ch->TimeScale);
+
+#if 0
 		GF_NetworkCommand com;
 		memset(&com, 0, sizeof(com));
 		com.command_type = GF_NET_CHAN_MAP_TIME;
 		com.base.on_channel = ch->channel;
-		com.map_time.media_time = ch->rtp_ch->last_SR_NTP_sec;
-		com.map_time.media_time += ((Double)ch->rtp_ch->last_SR_NTP_frac)/0xFFFFFFFF;
-
-		if (!ch->owner->last_ntp) {
-			ch->owner->last_ntp = com.map_time.media_time;
-		}
+		com.map_time.media_time = ntp;
+		
 		if (com.map_time.media_time >= ch->owner->last_ntp) {
 			com.map_time.media_time -= ch->owner->last_ntp;
 		} else {
 			com.map_time.media_time = 0;
 		}
 		com.map_time.timestamp = ch->rtp_ch->last_SR_rtp_time;
-		com.map_time.reset_buffers = 0;
-		ch->rtcp_init = 1;
-		ch->check_rtp_time = RTP_SET_TIME_NONE;
+		com.map_time.reset_buffers = 1;
 		gf_term_on_command(ch->owner->service, &com, GF_OK);
+#endif
 
-		GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTCP] Using Sender Report to map RTP Time TS %d Media Time %g\n",
-			com.map_time.timestamp, com.map_time.media_time
-			));
+		GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTCP] At %d Using Sender Report to map RTP TS %d to NTP clock %g - new TS offset "LLD" \n",
+			gf_sys_clock(), ch->rtp_ch->last_SR_rtp_time, ntp_clock, ch->ts_offset
+		));
 
+		ch->rtcp_init = 1;
+		ch->check_rtp_time = RTP_SET_TIME_NONE;
 	}
 
 	if (e == GF_EOS) {
@@ -485,22 +530,21 @@
 	packet reading per RTP reading loop
 	NOTE2: a better implementation would be to use select() to get woken up...
 	*/
-
 	tot_size = 0;
+
 	while (1) {
-		size = gf_rtp_read_rtp(ch->rtp_ch, ch->buffer, RTP_BUFFER_SIZE);
+		size = gf_rtp_read_rtcp(ch->rtp_ch, ch->buffer, RTP_BUFFER_SIZE);
 		if (!size) break;
 		tot_size += size;
-		RP_ProcessRTP(ch, ch->buffer, size);
+		RP_ProcessRTCP(ch, ch->buffer, size);
 	}
 
 	while (1) {
-		size = gf_rtp_read_rtcp(ch->rtp_ch, ch->buffer, RTP_BUFFER_SIZE);
+		size = gf_rtp_read_rtp(ch->rtp_ch, ch->buffer, RTP_BUFFER_SIZE);
 		if (!size) break;
 		tot_size += size;
-		RP_ProcessRTCP(ch, ch->buffer, size);
+		RP_ProcessRTP(ch, ch->buffer, size);
 	}
-
 	/*and send the report*/
 	if (ch->flags & RTP_ENABLE_RTCP) gf_rtp_send_rtcp_report(ch->rtp_ch, SendTCPData, ch);

gpac-0.5.0.svn4296.tar.bz2/modules/rtp_in/sdp_fetch.c -> gpac-0.5.0.svn4668.tar.bz2/modules/rtp_in/sdp_fetch.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/rtp_in/sdp_load.c -> gpac-0.5.0.svn4668.tar.bz2/modules/rtp_in/sdp_load.c Changed

@@ -56,6 +56,8 @@
 		/*session migration*/
 		else if (!strcmp(att->Name, "x-session-name")) url = att->Value;
 		else if (!strcmp(att->Name, "x-session-id")) session_id = att->Value;
+		/*we have the H264-SVC streams*/
+		else if (!strcmp(att->Name, "group") && !strncmp(att->Value, "DDP", 3)) rtp->is_svc = 1;
 	}
 	if (range) {
 		Start = range->start;
@@ -131,7 +133,7 @@
 		buf64 = strstr(iod_str, ",");
 		if (!buf64) return GF_URL_ERROR;
 		buf64 += 1;
-		size64 = strlen(buf64) - 1;
+		size64 = (u32) strlen(buf64) - 1;
 
 		size = gf_base64_decode(buf64, size64, buf, 2000);
 		if (!size) return GF_SERVICE_ERROR;
@@ -142,7 +144,7 @@
 		buf16 = strstr(iod_str, ",");
 		if (!buf16) return GF_URL_ERROR;
 		buf16 += 1;
-		size16 = strlen(buf16) - 1;
+		size16 = (u32) strlen(buf16) - 1;
 
 		size = gf_base16_decode(buf16, size16, buf, 2000);
 		if (!size) return GF_SERVICE_ERROR;
@@ -165,20 +167,21 @@
 	}
 }
 
-static GF_ObjectDescriptor *RP_GetChannelOD(RTPStream *ch, u32 ch_idx)
+static GF_ESD *RP_GetChannelESD(RTPStream *ch, u32 ch_idx)
 {
 	GF_ESD *esd;
-	GF_ObjectDescriptor *od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
 
 	if (!ch->ES_ID) ch->ES_ID = ch_idx + 1;
-	od->objectDescriptorID = ch->OD_ID ? ch->OD_ID : ch->ES_ID;
 
 	esd = gf_odf_desc_esd_new(0);
 	esd->slConfig->timestampResolution = gf_rtp_get_clockrate(ch->rtp_ch);
 	esd->slConfig->useRandomAccessPointFlag = 1;
 	esd->slConfig->useTimestampsFlag = 1;
+	esd->slConfig->no_dts_signaling = ch->depacketizer->sl_map.DTSDeltaLength ? 0 : 1;
 	esd->ESID = ch->ES_ID;
 	esd->OCRESID = 0;
+	if (ch->mid)
+		esd->has_ref_base = 1;
 
 	esd->decoderConfig->streamType = ch->depacketizer->sl_map.StreamType;
 	esd->decoderConfig->objectTypeIndication = ch->depacketizer->sl_map.ObjectTypeIndication;
@@ -196,7 +199,42 @@
 		ch->depacketizer->sl_map.rvc_config = NULL;
 		ch->depacketizer->sl_map.rvc_config_size = 0;
 	}
+
+	return esd;
+}
+
+static GF_ObjectDescriptor *RP_GetChannelOD(RTPStream *ch, u32 ch_idx)
+{
+	GF_ESD *esd;
+	GF_ObjectDescriptor *od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
+
+	esd = RP_GetChannelESD(ch, ch_idx);
+
+	od->objectDescriptorID = ch->OD_ID ? ch->OD_ID : ch->ES_ID;
+
 	gf_list_add(od->ESDescriptors, esd);
+
+	// for each channel depending on this channel, get esd, set esd->dependsOnESID and add to od
+	if (ch->owner->is_svc)
+	{
+		u32 i, count;
+
+		count = gf_list_count(ch->owner->channels);
+		for (i = 0; i < count; i++)
+		{
+			RTPStream *the_channel;
+			GF_ESD *the_esd;
+
+			the_channel = (RTPStream *)gf_list_get(ch->owner->channels, i);
+			if (the_channel->base_stream == ch->mid) 
+			{
+				the_esd = RP_GetChannelESD(the_channel, i);
+				the_esd->dependsOnESID = the_channel->prev_stream;
+				gf_list_add(od->ESDescriptors, the_esd);
+			}
+		}
+	}
+	
 	return od;
 }
 
@@ -243,6 +281,7 @@
 	i=0;
 	while ((ch = (RTPStream *)gf_list_enum(rtp->channels, &i))) {
 		if (ch->control && !strnicmp(ch->control, "data:", 5)) continue;
+		if (ch->prev_stream) continue;
 
 		if (!rtp->media_type) {
 			od = RP_GetChannelOD(ch, i);
@@ -368,7 +407,7 @@
 
 	case GF_NETIO_GET_CONTENT:
 		param->data = rtp->session_state_data + strlen("data:application/sdp,");
-		param->size = strlen(param->data);
+		param->size = (u32) strlen(param->data);
 		return;
 	}
 }
@@ -388,7 +427,7 @@
 
 	sdp_buf = rtp->session_state_data + strlen("data:application/sdp,");
 	sdp = gf_sdp_info_new();
-	e = gf_sdp_info_parse(sdp, sdp_buf, strlen(sdp_buf) );
+	e = gf_sdp_info_parse(sdp, sdp_buf, (u32) strlen(sdp_buf) );
 
 	for (i=0; i<gf_list_count(rtp->channels); i++) {
 		GF_SDPMedia *media = NULL;

gpac-0.5.0.svn4296.tar.bz2/modules/rvc_dec/rvc_dec.c -> gpac-0.5.0.svn4668.tar.bz2/modules/rvc_dec/rvc_dec.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/saf_in/saf_in.c -> gpac-0.5.0.svn4668.tar.bz2/modules/saf_in/saf_in.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/sdl_out/audio.c -> gpac-0.5.0.svn4668.tar.bz2/modules/sdl_out/audio.c Changed

@@ -23,12 +23,8 @@
  *		
  */
 
-#ifdef GPAC_IPHONE
-#include "libgpac_symbols.h"
-#endif
-
 #include "sdl_out.h"
-
+	
 #define SDLAUD()	SDLAudCtx *ctx = (SDLAudCtx *)dr->opaque
 
 static void sdl_close_audio(){
@@ -41,11 +37,17 @@
 	GF_AudioOutput *dr = (GF_AudioOutput *)udata;
 	SDLAUD();
 	if (ctx->volume != SDL_MIX_MAXVOLUME){
-		ctx->audioBuff = gf_realloc( ctx->audioBuff, sizeof(Uint8) * len);
-		dr->FillBuffer(dr->audio_renderer, ctx->audioBuff, len);	
-		SDL_MixAudio(stream, ctx->audioBuff, len, ctx->volume);
+		u32 written;
+		if (ctx->alloc_size < (u32) len) {
+			ctx->audioBuff = gf_realloc( ctx->audioBuff, sizeof(Uint8) * len);
+			ctx->alloc_size = len;
+		}
+		memset(stream, 0, len);
+		written = dr->FillBuffer(dr->audio_renderer, (char *) ctx->audioBuff, (u32) len);	
+		if (written)
+			SDL_MixAudio(stream, ctx->audioBuff, len, ctx->volume);
 	} else {
-		dr->FillBuffer(dr->audio_renderer, stream, len);	
+		dr->FillBuffer(dr->audio_renderer, (char *) stream, (u32) len);	
 	}
 }
 
@@ -62,6 +64,7 @@
 	flags = SDL_WasInit(SDL_INIT_AUDIO);
 	if (!(flags & SDL_INIT_AUDIO)) {
 		if (SDL_InitSubSystem(SDL_INIT_AUDIO)<0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Audio output initialization error\n")); 
 			SDLOUT_CloseSDL();
 			return GF_IO_ERR;
 		}
@@ -78,12 +81,14 @@
 		sdl_close_audio();
 		SDL_QuitSubSystem(SDL_INIT_AUDIO);
 		SDLOUT_CloseSDL();
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Audio output format not supported\n")); 
 		return GF_IO_ERR;
 	}
 	sdl_close_audio();
-	ctx->is_init = 1;
+	ctx->is_init = GF_TRUE;
 	ctx->num_buffers = num_buffers;
 	ctx->total_duration = total_duration;
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL] Audio output setup\n")); 
 	return GF_OK;
 }
 
@@ -94,7 +99,7 @@
 	if (ctx->is_init) {
 		SDL_QuitSubSystem(SDL_INIT_AUDIO);
 		SDLOUT_CloseSDL();
-		ctx->is_init = 0;
+		ctx->is_init = GF_FALSE;
 	}
 }
 
@@ -122,7 +127,7 @@
 	SDLAUD();
 
 	sdl_close_audio();
-	ctx->is_running = 0;
+	ctx->is_running = GF_FALSE;
 
 	memset(&want_format, 0, sizeof(SDL_AudioSpec));
 	want_format.freq = *SampleRate;
@@ -144,7 +149,7 @@
 	while (want_format.samples*2<nb_samples) want_format.samples *= 2;
 
 	if ( SDL_OpenAudio(&want_format, &got_format) < 0 ) return GF_IO_ERR;
-	ctx->is_running = 1;
+	ctx->is_running = GF_TRUE;
 	ctx->delay_ms = (got_format.samples * 1000) / got_format.freq;
 	ctx->total_size = got_format.samples;
 	*SampleRate = got_format.freq;
@@ -161,6 +166,7 @@
 	}
 	/*and play*/
 	SDL_PauseAudio(0);
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL] Audio output setup - SampleRate %d Nb Channels %d - %d ms delay\n", got_format.freq, got_format.channels, ctx->delay_ms)); 
 	return GF_OK;
 }
 
@@ -179,10 +185,14 @@
 static void SDLAud_SetVolume(GF_AudioOutput *dr, u32 Volume)
 {
 	SDLAUD();
+#if 0
 	if (Volume > 98)
 		ctx->volume = SDL_MIX_MAXVOLUME;
 	else
 		ctx->volume = Volume * SDL_MIX_MAXVOLUME / 100;
+#else
+	ctx->volume = SDL_MIX_MAXVOLUME;
+#endif
 }
 
 static void SDLAud_SetPan(GF_AudioOutput *dr, u32 pan)

gpac-0.5.0.svn4296.tar.bz2/modules/sdl_out/cursors.c -> gpac-0.5.0.svn4668.tar.bz2/modules/sdl_out/cursors.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/sdl_out/sdl_out.c -> gpac-0.5.0.svn4668.tar.bz2/modules/sdl_out/sdl_out.c Changed

@@ -25,19 +25,27 @@
 
 #include "sdl_out.h"
 
-static Bool is_init = 0;
+static Bool is_init = GF_FALSE;
 static u32 num_users = 0;
 
+#if (defined(WIN32) || defined(_WIN32_WCE)) && !defined(__GNUC__)
+#if SDL_VERSION_ATLEAST(2,0,0)
+#pragma comment(lib, "SDL2")
+#else
+#pragma comment(lib, "SDL")
+#endif
+#endif
+
 Bool SDLOUT_InitSDL()
 {
 	if (is_init) {
 		num_users++;
-		return 1;
+		return GF_TRUE;
 	}
-	if (SDL_Init(0) < 0) return 0;
-	is_init = 1;
+	if (SDL_Init(0) < 0) return GF_FALSE;
+	is_init = GF_TRUE;
 	num_users++;
-	return 1;
+	return GF_TRUE;
 }
 
 void SDLOUT_CloseSDL()
@@ -51,7 +59,7 @@
 
 
 /*interface query*/
-GF_EXPORT
+GPAC_MODULE_EXPORT
 const u32 *QueryInterfaces() 
 {
 	static u32 si [] = {
@@ -63,7 +71,7 @@
 }
 
 /*interface create*/
-GF_EXPORT
+GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 	if (InterfaceType == GF_VIDEO_OUTPUT_INTERFACE) return SDL_NewVideo();
@@ -72,7 +80,7 @@
 }
 
 /*interface destroy*/
-GF_EXPORT
+GPAC_MODULE_EXPORT
 void ShutdownInterface(GF_BaseInterface *ifce)
 {
 	switch (ifce->InterfaceType) {
@@ -84,3 +92,5 @@
 		break;
 	}
 }
+
+GPAC_MODULE_STATIC_DELARATION( sdl_out )

gpac-0.5.0.svn4296.tar.bz2/modules/sdl_out/sdl_out.h -> gpac-0.5.0.svn4668.tar.bz2/modules/sdl_out/sdl_out.h Changed

@@ -26,21 +26,21 @@
 #ifndef _GF_SDL_OUT_H_
 #define _GF_SDL_OUT_H_
 
-/*SDL*/
-#include <SDL.h>
-
 /*driver interfaces*/
 #include <gpac/modules/audio_out.h>
 #include <gpac/modules/video_out.h>
 #include <gpac/thread.h>
 
+/*SDL*/
+#include <SDL.h>
+
 /*SDL init routines*/
 Bool SDLOUT_InitSDL();
 void SDLOUT_CloseSDL();
 
 /*when not threaded on win32, locks happen randomly when setting the window's caption*/
 #ifdef WIN32
-#define SDL_WINDOW_THREAD
+//#define SDL_WINDOW_THREAD
 #endif
 
 typedef enum {
@@ -66,11 +66,23 @@
 	SDL_Cursor *curs_def, *curs_hand, *curs_collide;
 	Bool use_systems_memory;
 
+	
+#if SDL_VERSION_ATLEAST(2,0,0)
+	SDL_GLContext gl_context;
+	SDL_Renderer *renderer;
+	SDL_Window *screen;
+	SDL_Surface *back_buffer;
+
+	SDL_Surface *pool_rgb, *pool_rgba;
+	SDL_Texture *yuv_texture;
+	char szCaption[100];
+#else
 	SDL_Surface *screen;
 	SDL_Surface *back_buffer;
 
 	SDL_Surface *pool_rgb, *pool_rgba;
 	SDL_Overlay *yuv_overlay;
+#endif
 
 	u32 width, height;
 
@@ -94,7 +106,7 @@
 */
 typedef struct
 {
-	u32 num_buffers, total_duration, delay_ms, total_size, volume;
+	u32 num_buffers, total_duration, delay_ms, total_size, volume, alloc_size;
 	Bool is_init, is_running;
 	Uint8 * audioBuff;
 } SDLAudCtx;

gpac-0.5.0.svn4296.tar.bz2/modules/sdl_out/video.c -> gpac-0.5.0.svn4668.tar.bz2/modules/sdl_out/video.c Changed

@@ -1,4 +1,4 @@
-/*
+ /*
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre - Romain Bouqueau
@@ -23,18 +23,19 @@
  *		
  */
 
-#ifdef GPAC_IPHONE
-#include "libgpac_symbols.h"
-#else
 #include "sdl_out.h"
 #include <gpac/user.h>
-#endif
 
+//#include "unicode.h"
 
 #ifdef WIN32
 #include <windows.h>
 #endif
 
+#ifdef GPAC_IPHONE
+#include <OpenGLES/ES1/gl.h>
+#include <OpenGLES/ES1/glext.h>
+#endif
 
 /*cursors data*/
 static char hand_data[] = 
@@ -115,6 +116,37 @@
 
 #define SDLVID()	SDLVidCtx *ctx = (SDLVidCtx *)dr->opaque
 
+
+	
+#if SDL_VERSION_ATLEAST(2,0,0)
+void SDLVid_SetCaption(SDL_Window* window)
+{
+	if (SDL_GetCurrentVideoDriver()) {
+		char szCap[1024];
+		sprintf(szCap, "SDL Video Output (%s)", SDL_GetCurrentVideoDriver());
+		SDL_SetWindowTitle(window, szCap);
+	} else {
+		SDL_SetWindowTitle(window, "SDL Video Output");
+	}
+}
+#else
+
+#define SDLK_KP_0	SDLK_KP0
+#define SDLK_KP_1	SDLK_KP1
+#define SDLK_KP_2	SDLK_KP2
+#define SDLK_KP_3	SDLK_KP3
+#define SDLK_KP_4	SDLK_KP4
+#define SDLK_KP_5	SDLK_KP5
+#define SDLK_KP_6	SDLK_KP6
+#define SDLK_KP_7	SDLK_KP7
+#define SDLK_KP_8	SDLK_KP8
+#define SDLK_KP_9	SDLK_KP9
+#define SDLK_NUMLOCKCLEAR SDLK_NUMLOCK
+#define SDLK_SCROLLLOCK SDLK_SCROLLOCK
+#define SDLK_APPLICATION SDLK_COMPOSE
+#define SDLK_PRINTSCREEN SDLK_PRINT
+#define SDL_WINDOW_RESIZABLE SDL_RESIZABLE
+
 static u32 video_modes[] = 
 {
 	320, 200,
@@ -139,6 +171,9 @@
 		SDL_WM_SetCaption("SDL Video Output", NULL);
 	}
 }
+#endif
+	
+
 
 SDL_Cursor *SDLVid_LoadCursor(char *maskdata)
 {
@@ -205,43 +240,43 @@
 		evt->key_code = GF_KEY_SLASH; 
 		break;
 
-	case SDLK_KP0: evt->flags = GF_KEY_EXT_NUMPAD;
+	case SDLK_KP_0: evt->flags = GF_KEY_EXT_NUMPAD;
 	case SDLK_0: 
 		evt->key_code = GF_KEY_0; 
 		break;
-	case SDLK_KP1: evt->flags = GF_KEY_EXT_NUMPAD;
+	case SDLK_KP_1: evt->flags = GF_KEY_EXT_NUMPAD;
 	case SDLK_1: 
 		evt->key_code = GF_KEY_1; 
 		break;
-	case SDLK_KP2: evt->flags = GF_KEY_EXT_NUMPAD;
+	case SDLK_KP_2: evt->flags = GF_KEY_EXT_NUMPAD;
 	case SDLK_2: 
 		evt->key_code = GF_KEY_2; 
 		break;
-	case SDLK_KP3: evt->flags = GF_KEY_EXT_NUMPAD;
+	case SDLK_KP_3: evt->flags = GF_KEY_EXT_NUMPAD;
 	case SDLK_3: 
 		evt->key_code = GF_KEY_3; 
 		break;
-	case SDLK_KP4: evt->flags = GF_KEY_EXT_NUMPAD;
+	case SDLK_KP_4: evt->flags = GF_KEY_EXT_NUMPAD;
 	case SDLK_4: 
 		evt->key_code = GF_KEY_4; 
 		break;
-	case SDLK_KP5: evt->flags = GF_KEY_EXT_NUMPAD;
+	case SDLK_KP_5: evt->flags = GF_KEY_EXT_NUMPAD;
 	case SDLK_5: 
 		evt->key_code = GF_KEY_5; 
 		break;
-	case SDLK_KP6: evt->flags = GF_KEY_EXT_NUMPAD;
+	case SDLK_KP_6: evt->flags = GF_KEY_EXT_NUMPAD;
 	case SDLK_6: 
 		evt->key_code = GF_KEY_6; 
 		break;
-	case SDLK_KP7: evt->flags = GF_KEY_EXT_NUMPAD;
+	case SDLK_KP_7: evt->flags = GF_KEY_EXT_NUMPAD;
 	case SDLK_7: 
 		evt->key_code = GF_KEY_7; 
 		break;
-	case SDLK_KP8: evt->flags = GF_KEY_EXT_NUMPAD;
+	case SDLK_KP_8: evt->flags = GF_KEY_EXT_NUMPAD;
 	case SDLK_8: 
 		evt->key_code = GF_KEY_8; 
 		break;
-	case SDLK_KP9: evt->flags = GF_KEY_EXT_NUMPAD;
+	case SDLK_KP_9: evt->flags = GF_KEY_EXT_NUMPAD;
 	case SDLK_9: 
 		evt->key_code = GF_KEY_9; 
 		break;
@@ -301,9 +336,9 @@
 	case SDLK_F13: evt->key_code = GF_KEY_F13; break;
 	case SDLK_F14: evt->key_code = GF_KEY_F14; break;
 	case SDLK_F15: evt->key_code = GF_KEY_F15; break;
-	case SDLK_NUMLOCK: evt->key_code = GF_KEY_NUMLOCK; break;
+	case SDLK_NUMLOCKCLEAR: evt->key_code = GF_KEY_NUMLOCK; break;
 	case SDLK_CAPSLOCK: evt->key_code = GF_KEY_CAPSLOCK; break;
-	case SDLK_SCROLLOCK: evt->key_code = GF_KEY_SCROLL; break;
+	case SDLK_SCROLLLOCK: evt->key_code = GF_KEY_SCROLL; break;
 
 	case SDLK_RSHIFT: 
 		evt->key_code = GF_KEY_SHIFT;
@@ -338,9 +373,9 @@
 		evt->flags = GF_KEY_EXT_RIGHT;
 		break;*/
 	case SDLK_MODE: evt->key_code = GF_KEY_MODECHANGE; break;
-	case SDLK_COMPOSE: evt->key_code = GF_KEY_COMPOSE; break;
+	case SDLK_APPLICATION: evt->key_code = GF_KEY_COMPOSE; break;
 	case SDLK_HELP: evt->key_code = GF_KEY_HELP; break;
-	case SDLK_PRINT: evt->key_code = GF_KEY_PRINTSCREEN; break;
+	case SDLK_PRINTSCREEN: evt->key_code = GF_KEY_PRINTSCREEN; break;
 
 #if (SDL_MAJOR_VERSION>=1) && (SDL_MINOR_VERSION>=3)
 /*
@@ -415,6 +450,16 @@
 
 static void SDLVid_DestroyObjects(SDLVidCtx *ctx)
 {
+#if SDL_VERSION_ATLEAST(2,0,0)
+	if (ctx->back_buffer) SDL_FreeSurface(ctx->back_buffer);
+	ctx->back_buffer = NULL;
+	if (ctx->pool_rgb) SDL_FreeSurface(ctx->pool_rgb);
+	ctx->pool_rgb = NULL;
+	if (ctx->pool_rgba) SDL_FreeSurface(ctx->pool_rgba);
+	ctx->pool_rgba = NULL;
+	SDL_DestroyTexture(ctx->yuv_texture);
+	ctx->yuv_texture = NULL;
+#else
 	if (ctx->back_buffer) SDL_FreeSurface(ctx->back_buffer);
 	ctx->back_buffer = NULL;
 	if (ctx->pool_rgb) SDL_FreeSurface(ctx->pool_rgb);
@@ -423,9 +468,22 @@
 	ctx->pool_rgba = NULL;
 	SDL_FreeYUVOverlay(ctx->yuv_overlay);
 	ctx->yuv_overlay=NULL;
+#endif
 }
 
-
+#if SDL_VERSION_ATLEAST(2,0,0)
+#ifdef GPAC_IPHONE
+#define SDL_WINDOW_FLAGS			SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN | SDL_WINDOW_BORDERLESS | SDL_WINDOW_RESIZABLE
+#define SDL_FULLSCREEN_FLAGS		SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN | SDL_WINDOW_BORDERLESS | SDL_WINDOW_RESIZABLE
+#define SDL_GL_WINDOW_FLAGS			SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN | SDL_WINDOW_BORDERLESS | SDL_WINDOW_RESIZABLE
+#define SDL_GL_FULLSCREEN_FLAGS		SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN | SDL_WINDOW_BORDERLESS | SDL_WINDOW_RESIZABLE
+#else
+#define SDL_WINDOW_FLAGS			SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE
+#define SDL_FULLSCREEN_FLAGS		SDL_WINDOW_OPENGL | SDL_WINDOW_FULLSCREEN
+#define SDL_GL_WINDOW_FLAGS			SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE
+#define SDL_GL_FULLSCREEN_FLAGS		SDL_WINDOW_OPENGL | SDL_WINDOW_FULLSCREEN
+#endif
+#else
 #ifdef GPAC_IPHONE
 #define SDL_WINDOW_FLAGS			SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_RESIZABLE | SDL_NOFRAME
 #define SDL_FULLSCREEN_FLAGS		SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_FULLSCREEN | SDL_NOFRAME
@@ -437,27 +495,38 @@
 #define SDL_GL_WINDOW_FLAGS			SDL_HWSURFACE | SDL_OPENGL | SDL_HWACCEL | SDL_RESIZABLE
 #define SDL_GL_FULLSCREEN_FLAGS		SDL_HWSURFACE | SDL_OPENGL | SDL_HWACCEL | SDL_FULLSCREEN
 #endif
+#endif
 
 
-GF_Err SDLVid_ResizeWindow(GF_VideoOutput *dr, u32 width, u32 height) 
+GF_Err SDLVid_ResizeWindow(GF_VideoOutput *dr, u32 width, u32 height)
 {
 	SDLVID();
 	GF_Event evt;
-
+	
 	/*lock X mutex to make sure the event queue is not being processed*/
 	gf_mx_p(ctx->evt_mx);
-
-	if (ctx->output_3d_type==1) {
+    
+    GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL] Resizing window %dx%d\n", width, height));
+		
+	if (ctx->output_3d_type) {
 		u32 flags, nb_bits;
 		const char *opt;
+
 		if ((ctx->width==width) && (ctx->height==height) ) {
 			gf_mx_v(ctx->evt_mx);
 			return GF_OK;
 		}
+		
+#if SDL_VERSION_ATLEAST(2,0,0)
+		flags = SDL_GL_WINDOW_FLAGS;
+		if (ctx->os_handle) flags &= ~SDL_WINDOW_RESIZABLE;
+		if (ctx->fullscreen) flags |= SDL_FULLSCREEN_FLAGS;
+#else
 		flags = SDL_GL_WINDOW_FLAGS;
 		if (ctx->os_handle) flags &= ~SDL_RESIZABLE;
 		if (ctx->fullscreen) flags |= SDL_FULLSCREEN_FLAGS;
 		if (!ctx->screen) ctx->screen = SDL_SetVideoMode(width, height, 0, flags);
+#endif
 		SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
 
 		opt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "GLNbBitsDepth");
@@ -465,22 +534,48 @@
 		SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, nb_bits);
 		SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 0);
 		opt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "GLNbBitsPerComponent");
-		nb_bits = opt ? atoi(opt) : 5;
+		nb_bits = opt ? atoi(opt) : 8;
 		SDL_GL_SetAttribute(SDL_GL_RED_SIZE, nb_bits);
 		SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, nb_bits);
 		SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, nb_bits);
 
 		assert(width);
 		assert(height);
+#if SDL_VERSION_ATLEAST(2,0,0)				
+		if (!ctx->screen) {
+			if (!(ctx->screen = SDL_CreateWindow("", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, width, height, flags))) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Cannot create window: %s\n", SDL_GetError()));
+				gf_mx_v(ctx->evt_mx);
+				return GF_IO_ERR;
+			}
+		}
+		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()));
+				gf_mx_v(ctx->evt_mx);
+				return GF_IO_ERR;
+			}
+			if (SDL_GL_MakeCurrent(ctx->screen, ctx->gl_context)) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Cannot make context current: %s\n", SDL_GetError()));
+				gf_mx_v(ctx->evt_mx);
+				return GF_IO_ERR;
+			}
+		}
+        SDL_SetWindowSize(ctx->screen, width, height);
+				
+#else
 		ctx->screen = SDL_SetVideoMode(width, height, 0, flags);
+#endif
 		assert(ctx->screen);
 		ctx->width = width;
 		ctx->height = height;
 		memset(&evt, 0, sizeof(GF_Event));
 		evt.type = GF_EVENT_VIDEO_SETUP;
-		dr->on_event(dr->evt_cbk_hdl, &evt);		
+		dr->on_event(dr->evt_cbk_hdl, &evt);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[SDL] 3D Setup done\n"));
 	} else {
 		u32 flags;
+
 #ifdef GPAC_IPHONE
 		flags = SDL_FULLSCREEN_FLAGS;
 		//SDL readme says it would make us faster
@@ -489,8 +584,28 @@
 #else
 		flags = SDL_WINDOW_FLAGS;
 #endif
-		if (ctx->os_handle) flags &= ~SDL_RESIZABLE;
+		if (ctx->os_handle) flags &= ~SDL_WINDOW_RESIZABLE;
+
+#if SDL_VERSION_ATLEAST(2,0,0)
+		if (!ctx->screen) {
+			if (!(ctx->screen = SDL_CreateWindow("", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, width, height, flags))) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Cannot create window: %s\n", SDL_GetError()));
+				gf_mx_v(ctx->evt_mx);
+				return GF_IO_ERR;
+			}
+		}
+		if ( !ctx->renderer ) {
+            if (!(ctx->renderer = SDL_CreateRenderer(ctx->screen, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC))) {
+                GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Cannot create renderer: %s\n", SDL_GetError()));
+				gf_mx_v(ctx->evt_mx);
+				return GF_IO_ERR;
+			}
+        }
+        SDL_SetWindowSize(ctx->screen, width, height);
+#else
 		ctx->screen = SDL_SetVideoMode(width, height, 0, flags);
+#endif
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[SDL] 2D Setup done\n"));
 	}
 	gf_mx_v(ctx->evt_mx);
 	return ctx->screen ? GF_OK : GF_IO_ERR;
@@ -500,12 +615,16 @@
 static Bool SDLVid_InitializeWindow(SDLVidCtx *ctx, GF_VideoOutput *dr)
 {
 	u32 flags;
+#if SDL_VERSION_ATLEAST(2,0,0)
+	SDL_DisplayMode vinf;
+#else
 	const SDL_VideoInfo *vinf;
+#endif
 
 	putenv("directx");
 	flags = SDL_WasInit(SDL_INIT_VIDEO);
 	if (!(flags & SDL_INIT_VIDEO)) {
-		if (SDL_InitSubSystem(SDL_INIT_VIDEO)<0) {
+		if (SDL_InitSubSystem(SDL_INIT_VIDEO)) {
 			return 0;
 		}
 	}
@@ -513,14 +632,23 @@
 	ctx->curs_def = SDL_GetCursor();
 	ctx->curs_hand = SDLVid_LoadCursor(hand_data);
 	ctx->curs_collide = SDLVid_LoadCursor(collide_data);
+#if SDL_VERSION_ATLEAST(2,0,0)
+
+#else
 	SDL_EnableUNICODE(1);
 	SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
+#endif
 
 	ctx->last_mouse_move = SDL_GetTicks();
 	ctx->cursor_on = 1;
 
 	/*save display resolution - SDL seems to get the screen resolution if asked for video info before
 	changing the video mode - to check on other platforms*/
+#if SDL_VERSION_ATLEAST(2,0,0)
+	SDL_GetDesktopDisplayMode(0,&vinf);
+	dr->max_screen_width = vinf.w;
+	dr->max_screen_height = vinf.h;
+#else
 	vinf = SDL_GetVideoInfo();
 #if SDL_VERSION_ATLEAST(1, 2, 10)
 	dr->max_screen_width = vinf->current_w;
@@ -547,21 +675,51 @@
 		}
 	}
 #endif /* versions prior to 1.2.10 do not have the size of screen */
+#endif
 
-	if (!ctx->os_handle) SDLVid_SetCaption();
+	if (!ctx->os_handle) 
+#if SDL_VERSION_ATLEAST(2,0,0)
+		SDLVid_SetCaption(ctx->screen);
+#else
+		SDLVid_SetCaption();
+#endif
 	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL] Video output initialized - screen resolution %d %d\n", dr->max_screen_width, dr->max_screen_height)); 
 	return 1;
 }
 
+static void SDLVid_ResetWindow(SDLVidCtx *ctx)
+{
+	SDLVid_DestroyObjects(ctx);
+#if SDL_VERSION_ATLEAST(2,0,0)
+	if ( ctx->gl_context )
+		SDL_GL_DeleteContext(ctx->gl_context);
+	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*/
+#ifdef GPAC_IPHONE
+	if ( ctx->screen ) {
+		SDL_DestroyWindow(ctx->screen);
+		ctx->screen=NULL;
+	}
+	SDL_QuitSubSystem(SDL_INIT_VIDEO);
+	SDL_InitSubSystem(SDL_INIT_VIDEO);
+#endif
+	
+#endif
+}
+
 static void SDLVid_ShutdownWindow(SDLVidCtx *ctx)
 {
 	SDLVid_DestroyObjects(ctx);
-	SDL_FreeCursor(ctx->curs_hand);
-	SDL_FreeCursor(ctx->curs_collide);
+	SDLVid_ResetWindow(ctx);
 	SDL_QuitSubSystem(SDL_INIT_VIDEO);
 }
 
-#if defined SDL_TEXTINPUTEVENT_TEXT_SIZE && !defined GPAC_IPHONE
+#if defined SDL_TEXTINPUTEVENT_TEXT_SIZE /*&& !defined GPAC_IPHONE*/
 #include <gpac/unicode.h>
 #endif
 
@@ -573,29 +731,49 @@
 
 	while (SDL_PollEvent(&sdl_evt)) {
 		switch (sdl_evt.type) {
+#if SDL_VERSION_ATLEAST(2,0,0)
+		case SDL_WINDOWEVENT:
+			switch (sdl_evt.window.event) {
+			case SDL_WINDOWEVENT_SIZE_CHANGED:
+                gpac_evt.type = GF_EVENT_SIZE;
+				gpac_evt.size.width = sdl_evt.window.data1;
+				gpac_evt.size.height = sdl_evt.window.data2;
+				dr->on_event(dr->evt_cbk_hdl, &gpac_evt);
+				break;
+			case SDL_WINDOWEVENT_EXPOSED:
+			case SDL_WINDOWEVENT_SHOWN:
+			case SDL_WINDOWEVENT_MOVED:
+				gpac_evt.type = GF_EVENT_REFRESH;
+				dr->on_event(dr->evt_cbk_hdl, &gpac_evt);
+				break;
+			}
+			break;
+#else
 		case SDL_VIDEORESIZE:
 		  	gpac_evt.type = GF_EVENT_SIZE;
 			gpac_evt.size.width = sdl_evt.resize.w;
 			gpac_evt.size.height = sdl_evt.resize.h;
 			dr->on_event(dr->evt_cbk_hdl, &gpac_evt);
 			break;
-		case SDL_QUIT:
-			gpac_evt.type = GF_EVENT_QUIT;
-			dr->on_event(dr->evt_cbk_hdl, &gpac_evt);
-			return 0;
-
 		case SDL_VIDEOEXPOSE:
 			gpac_evt.type = GF_EVENT_REFRESH;
 			dr->on_event(dr->evt_cbk_hdl, &gpac_evt);
 			break;
+#endif
+				
+		case SDL_QUIT:
+			gpac_evt.type = GF_EVENT_QUIT;
+			dr->on_event(dr->evt_cbk_hdl, &gpac_evt);
+			return 0;
+			
 #ifdef SDL_TEXTINPUTEVENT_TEXT_SIZE
 		/*keyboard*/
 		case SDL_TEXTINPUT: /* Since SDL 1.3, text-input is handled in a specific event */
 		{
-			u32 len = strlen( sdl_evt.text.text);
+			u32 len = (u32) strlen( sdl_evt.text.text);
 			u32 ucs4_len;
 			assert( len < 5 );
-			ucs4_len = utf8_to_ucs4 (&(gpac_evt.character.unicode_char), len, sdl_evt.text.text);
+			ucs4_len = utf8_to_ucs4 (&(gpac_evt.character.unicode_char), len, (unsigned char*)(sdl_evt.text.text));
 			gpac_evt.type = GF_EVENT_TEXTINPUT;
 			dr->on_event(dr->evt_cbk_hdl, &gpac_evt);	
 			break;
@@ -606,17 +784,17 @@
 			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);
+#ifndef SDL_TEXTINPUTEVENT_TEXT_SIZE
 			if ((sdl_evt.key.type==SDL_KEYDOWN)
 				&& sdl_evt.key.keysym.unicode
-#ifdef SDL_TEXTINPUTEVENT_TEXT_SIZE
 				&& ((sdl_evt.key.keysym.unicode=='\r') || (sdl_evt.key.keysym.unicode=='\n')  || (sdl_evt.key.keysym.unicode=='\b') || (sdl_evt.key.keysym.unicode=='\t') )
-#endif
 			) {
 				gpac_evt.character.unicode_char = sdl_evt.key.keysym.unicode;
 				gpac_evt.type = GF_EVENT_TEXTINPUT;
 				dr->on_event(dr->evt_cbk_hdl, &gpac_evt);
 			}
-			break;
+#endif
+                break;
 
 		/*mouse*/
 		case SDL_MOUSEMOTION:
@@ -657,9 +835,19 @@
 #endif
 			}
 			break;
+#if SDL_VERSION_ATLEAST(2,0,0)
+		case SDL_MOUSEWHEEL:
+			/*SDL handling is not perfect there, it just says up/down but no info on how much
+			the wheel was rotated...*/
+			gpac_evt.mouse.wheel_pos = INT2FIX(sdl_evt.wheel.x);
+			gpac_evt.type = GF_EVENT_MOUSEWHEEL;
+			dr->on_event(dr->evt_cbk_hdl, &gpac_evt);
+			break;
+#endif
+
 		}
 	}
-	return 1;
+	return GF_TRUE;
 }
 
 #ifdef	SDL_WINDOW_THREAD
@@ -735,7 +923,8 @@
 	ctx->output_3d_type = 0;
 	ctx->force_alpha = (init_flags & GF_TERM_WINDOW_TRANSPARENT) ? 1 : 0;
 
-	if (!SDLOUT_InitSDL()) return GF_IO_ERR;
+	if (!SDLOUT_InitSDL())
+        return GF_IO_ERR;
 
 #ifdef	SDL_WINDOW_THREAD
 	ctx->sdl_th_state = SDL_STATE_STOPPED;
@@ -745,12 +934,14 @@
 		gf_sleep(10);
 
 	if (ctx->sdl_th_state==SDL_STATE_STOP_REQ) {
+
 		SDLOUT_CloseSDL();
 		ctx->sdl_th_state = SDL_STATE_STOPPED;
 		return GF_IO_ERR;
 	}
 #else
 	if (!SDLVid_InitializeWindow(ctx, dr)) {
+        SDL_QuitSubSystem(SDL_INIT_VIDEO);
 		SDLOUT_CloseSDL();
 		return GF_IO_ERR;
 	}
@@ -786,22 +977,34 @@
 }
 
 
-GF_Err SDLVid_SetFullScreen(GF_VideoOutput *dr, u32 bFullScreenOn, u32 *screen_width, u32 *screen_height)
+GF_Err SDLVid_SetFullScreen(GF_VideoOutput *dr, Bool bFullScreenOn, u32 *screen_width, u32 *screen_height)
 {
-	u32 bpp, pref_bpp;
+	int bpp;
+	u32 pref_bpp;
 	SDLVID();
+#if SDL_VERSION_ATLEAST(2,0,0)
+	SDL_DisplayMode goodMode;
+	u32 numDisplayModes;
+	u32 mask;
+#endif
 
 	if (ctx->fullscreen==bFullScreenOn) return GF_OK;
-
+	
 	/*lock to get sure the event queue is not processed under X*/
 	gf_mx_p(ctx->evt_mx);
 	ctx->fullscreen = bFullScreenOn;
 
+#if SDL_VERSION_ATLEAST(2,0,0)
+	SDL_GetCurrentDisplayMode(0, &goodMode);
+	SDL_PixelFormatEnumToMasks(goodMode.format, &bpp, &mask, &mask, &mask, &mask);
+	pref_bpp = bpp;
+#else
 	pref_bpp = bpp = ctx->screen->format->BitsPerPixel;
+#endif
 
 	if (ctx->fullscreen) {
 		u32 flags;
-		Bool switch_res = 0;
+		Bool switch_res = GF_FALSE;
 		const char *sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "SwitchResolution");
 		if (sOpt && !stricmp(sOpt, "yes")) switch_res = 1;
 		if (!dr->max_screen_width || !dr->max_screen_height) switch_res = 1;
@@ -813,6 +1016,21 @@
 			u32 i;
 			ctx->fs_width = *screen_width;
 			ctx->fs_height = *screen_height;
+
+#if SDL_VERSION_ATLEAST(2,0,0)
+			numDisplayModes = SDL_GetNumDisplayModes(0);
+			for(i=0; i<numDisplayModes; i++) {
+				SDL_GetDisplayMode(0, i, &goodMode);
+				if ((ctx->fs_width <= (u32) goodMode.w) && (ctx->fs_height <= (u32) goodMode.h)) {
+					s32 bppDisp;
+					ctx->fs_width = goodMode.w;
+					ctx->fs_height = goodMode.h;
+					SDL_PixelFormatEnumToMasks(goodMode.format, &bppDisp, &mask, &mask, &mask, &mask);
+					pref_bpp = bppDisp;
+					break;
+				}
+			}
+#else
 			for(i=0; i<nb_video_modes; i++) {
 				if (ctx->fs_width<=video_modes[2*i] && ctx->fs_height<=video_modes[2*i + 1]) {
 					if ((pref_bpp = SDL_VideoModeOK(video_modes[2*i], video_modes[2*i+1], bpp, flags))) {
@@ -822,11 +1040,20 @@
 					}
 				}
 			}
+#endif
 		} else {
+#if SDL_VERSION_ATLEAST(2,0,0)
+			SDL_GetCurrentDisplayMode(0, &goodMode);
+#endif
 			ctx->fs_width = dr->max_screen_width;
 			ctx->fs_height = dr->max_screen_height;
 		}
+#if SDL_VERSION_ATLEAST(2,0,0)
+		SDL_SetWindowDisplayMode(ctx->screen, &goodMode);
+		SDL_SetWindowFullscreen(ctx->screen, SDL_TRUE);
+#else
 		ctx->screen = SDL_SetVideoMode(ctx->fs_width, ctx->fs_height, pref_bpp, flags);
+#endif
 		/*we switched bpp, clean all objects*/
 		if (bpp != pref_bpp) SDLVid_DestroyObjects(ctx);
 		*screen_width = ctx->fs_width;
@@ -839,6 +1066,9 @@
 			dr->on_event(dr->evt_cbk_hdl, &evt);
 		}
 	} else {
+#if SDL_VERSION_ATLEAST(2,0,0)
+		SDL_SetWindowFullscreen(ctx->screen, SDL_FALSE);
+#endif
 		SDLVid_ResizeWindow(dr, ctx->store_width, ctx->store_height);
 		*screen_width = ctx->store_width;
 		*screen_height = ctx->store_height;
@@ -850,9 +1080,15 @@
 
 GF_Err SDLVid_SetBackbufferSize(GF_VideoOutput *dr, u32 newWidth, u32 newHeight, Bool system_mem)
 {
-	u32 col;
 	const char *opt;
 	SDLVID();
+#if SDL_VERSION_ATLEAST(2,0,0)
+	SDL_DisplayMode disp;
+	s32 bpp;
+	u32 Rmask, Gmask, Bmask, Amask;
+#else
+	u32 col;
+#endif
 	
 	if (ctx->output_3d_type==1) return GF_BAD_PARAM;
 
@@ -866,15 +1102,27 @@
 
 
 	/*clear screen*/
+#if SDL_VERSION_ATLEAST(2,0,0)
+	SDL_SetRenderDrawColor(ctx->renderer, 0, 0, 0, 255);
+	SDL_RenderClear(ctx->renderer);
+	SDL_RenderPresent(ctx->renderer);
+#else
 	col = SDL_MapRGB(ctx->screen->format, 0, 0, 0);
 	SDL_FillRect(ctx->screen, NULL, col);
 	SDL_Flip(ctx->screen);
+#endif
 
 	if (ctx->back_buffer && ((u32) ctx->back_buffer->w==newWidth) && ((u32) ctx->back_buffer->h==newHeight)) {
 		return GF_OK;
 	}
 	if (ctx->back_buffer) SDL_FreeSurface(ctx->back_buffer);
+#if SDL_VERSION_ATLEAST(2,0,0)
+	SDL_GetWindowDisplayMode(ctx->screen, &disp);
+	SDL_PixelFormatEnumToMasks(disp.format, &bpp, &Rmask, &Gmask, &Bmask, &Amask);
+	ctx->back_buffer = SDL_CreateRGBSurface(0, newWidth, newHeight, bpp, Rmask, Gmask, Bmask, 0);
+#else
 	ctx->back_buffer = SDL_CreateRGBSurface(ctx->use_systems_memory ? SDL_SWSURFACE : SDL_HWSURFACE, newWidth, newHeight, ctx->screen->format->BitsPerPixel, ctx->screen->format->Rmask, ctx->screen->format->Gmask, ctx->screen->format->Bmask, 0);
+#endif
 	ctx->width = newWidth;
 	ctx->height = newHeight;
 	if (!ctx->back_buffer) return GF_IO_ERR;
@@ -904,7 +1152,7 @@
 	}
 }
 
-static GF_Err SDLVid_LockBackBuffer(GF_VideoOutput *dr, GF_VideoSurface *video_info, u32 do_lock)
+static GF_Err SDLVid_LockBackBuffer(GF_VideoOutput *dr, GF_VideoSurface *video_info, Bool do_lock)
 {
 	SDLVID();
 	if (!ctx->back_buffer) return GF_BAD_PARAM;
@@ -915,7 +1163,7 @@
 		video_info->height = ctx->back_buffer->h;
 		video_info->pitch_x = 0;
 		video_info->pitch_y = ctx->back_buffer->pitch;
-		video_info->video_buffer = ctx->back_buffer->pixels;
+		video_info->video_buffer = (char*)ctx->back_buffer->pixels;
 		video_info->pixel_format = SDLVid_MapPixelFormat(ctx->back_buffer->format, ctx->force_alpha);
 		video_info->is_hardware_memory = !ctx->use_systems_memory;
 	} else {
@@ -931,41 +1179,81 @@
 	/*if resizing don't process otherwise we may deadlock*/
 	if (!ctx->screen) return GF_OK;
 
-	if (ctx->output_3d_type==1) {
+    //GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Flush\n"));
+	
+    if (ctx->output_3d_type==1) {
+#if SDL_VERSION_ATLEAST(2,0,0)
+		SDL_GL_SwapWindow(ctx->screen);
+#else
 		SDL_GL_SwapBuffers();
+#endif
 		return GF_OK;
 	}
 	if (!ctx->back_buffer) return GF_BAD_PARAM;
 
 	if ((dest->w != (u32) ctx->back_buffer->w) || (dest->h != (u32) ctx->back_buffer->h)) {
 		GF_VideoSurface src, dst;
+#if SDL_VERSION_ATLEAST(2,0,0)
+		SDL_Surface* wndSurface;
+#endif
 
 		SDL_LockSurface(ctx->back_buffer);
-		SDL_LockSurface(ctx->screen);
-
 		src.height = ctx->back_buffer->h;
 		src.width = ctx->back_buffer->w;
 		src.pitch_x = 0;
 		src.pitch_y = ctx->back_buffer->pitch;
 		src.pixel_format = SDLVid_MapPixelFormat(ctx->back_buffer->format, ctx->force_alpha);
-		src.video_buffer = ctx->back_buffer->pixels;
+		src.video_buffer = (char*)ctx->back_buffer->pixels;
 
+#if SDL_VERSION_ATLEAST(2,0,0)
+		wndSurface  = SDL_GetWindowSurface(ctx->screen);
+		SDL_LockSurface(wndSurface);
+		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.video_buffer = (char*)wndSurface->pixels;
+#else
+		SDL_LockSurface(ctx->screen);
 		dst.height = ctx->screen->h;
 		dst.width = ctx->screen->w;
 		dst.pitch_x = 0;
 		dst.pitch_y = ctx->screen->pitch;
 		dst.pixel_format = SDLVid_MapPixelFormat(ctx->screen->format, 0);
 		dst.video_buffer = ctx->screen->pixels;
+#endif
 
 		gf_stretch_bits(&dst, &src, dest, NULL, 0xFF, 0, NULL, NULL);
-
-		SDL_UnlockSurface(ctx->back_buffer);
+#if SDL_VERSION_ATLEAST(2,0,0)
+		SDL_UnlockSurface(wndSurface);
+#else
 		SDL_UnlockSurface(ctx->screen);
+#endif
+		SDL_UnlockSurface(ctx->back_buffer);
+		
 	} else {
+#if SDL_VERSION_ATLEAST(2,0,0)
+		SDL_Texture* tx;
+#endif
 		rc.x = dest->x; rc.y = dest->y; rc.w = dest->w; rc.h = dest->h;
+#if SDL_VERSION_ATLEAST(2,0,0)
+        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);
+#else
 		SDL_BlitSurface(ctx->back_buffer, NULL, ctx->screen, &rc);
+#endif
 	}
+#if SDL_VERSION_ATLEAST(2,0,0)
+	SDL_RenderPresent(ctx->renderer);
+#else
 	SDL_Flip(ctx->screen);
+#endif
 	return GF_OK;
 }
 
@@ -991,7 +1279,7 @@
 
 
 #ifdef WIN32
-u32 get_sys_col(int idx)
+static u32 get_sys_col(int idx)
 {
 	u32 res;
 	DWORD val = GetSysColor(idx);
@@ -1009,6 +1297,16 @@
 		SDLVID();
 		SDLVid_ProcessMessageQueue(ctx, dr);
 #endif		
+#if SDL_VERSION_ATLEAST(2,0,0)
+		{
+			SDLVID();
+			if (ctx->szCaption[0]) {
+				SDL_SetWindowTitle(ctx->screen, ctx->szCaption);
+				ctx->szCaption[0]=0;
+			}
+		}
+#endif
+
 		return GF_OK;
 	}
 	switch (evt->type) {
@@ -1023,7 +1321,15 @@
 			break;
 	}
 #endif
+#if SDL_VERSION_ATLEAST(2,0,0)
+	{
+		SDLVID();
+		strncpy(ctx->szCaption, evt->caption.caption, 99);
+		ctx->szCaption[99]=0;
+	}
+#else
 		SDL_WM_SetCaption(evt->caption.caption, NULL);
+#endif
 		break;
 	case GF_EVENT_SHOWHIDE:
 		/*the only way to have proper show/hide with SDL is to shutdown the video system and reset it up
@@ -1036,7 +1342,12 @@
 			ctx->store_width = evt->size.width;
 			ctx->store_height = evt->size.height;
 		} else {
+#ifdef GPAC_IPHONE
+//            SDLVid_ResizeWindow(dr, dr->max_screen_width, dr->max_screen_height);
 			SDLVid_ResizeWindow(dr, evt->size.width, evt->size.height);
+#else
+			SDLVid_ResizeWindow(dr, evt->size.width, evt->size.height);
+#endif
 		}
 	}
 		break;
@@ -1050,6 +1361,13 @@
 			/*force a resetup of the window*/
 			if (ctx->output_3d_type) {
 				ctx->width = ctx->height = 0;
+				ctx->output_3d_type = 0;
+				SDLVid_ResetWindow(ctx);
+		        SDLVid_ResizeWindow(dr, evt->setup.width, evt->setup.height);
+			} else {
+#if SDL_VERSION_ATLEAST(2,0,0)
+				SDLVid_ResizeWindow(dr, evt->setup.width, evt->setup.height);
+#endif
 			}
 			ctx->output_3d_type = 0;
 			return SDLVid_SetBackbufferSize(dr, evt->setup.width, evt->setup.height, evt->setup.system_memory);
@@ -1057,9 +1375,16 @@
 			/*force a resetup of the window*/
 			if (!ctx->output_3d_type) {
 				ctx->width = ctx->height = 0;
+				SDLVid_ResetWindow(ctx);
 			}
 			ctx->output_3d_type = 1;
+            GF_LOG(GF_LOG_ERROR, 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);
+#else
+			return SDLVid_ResizeWindow(dr, evt->setup.width, evt->setup.height);
+#endif
 		case 2:
 			/*find a way to do that in SDL*/
 			ctx->output_3d_type = 2;
@@ -1197,12 +1522,68 @@
 {
 	SDLVID();
 	u32 amask = 0;
-	u32 bpp, i;
+	u32 bpp;
+#if SDL_VERSION_ATLEAST(2,0,0)
+#else
+	u32 i;
 	u8 *dst, *src;
-	SDL_Rect srcrc, dstrc;
+#endif
+	SDL_Rect dstrc;
 	SDL_Surface **pool;
 
+    GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[SDL] Bliting surface (overlay type %d)\n", overlay_type));
+
 	if (overlay_type) {
+#if SDL_VERSION_ATLEAST(2,0,0)
+		u8* pixels;
+		int pitch;
+		u32 format;
+		s32 acc, w, h;
+		u8 *pY, *pU, *pV;
+		if (!video_src) {
+			if (ctx->yuv_texture) {
+				SDL_DestroyTexture(ctx->yuv_texture);
+				ctx->yuv_texture=NULL;
+			}
+			return GF_OK;
+		}
+		if (ctx->yuv_texture ) {
+			SDL_QueryTexture(ctx->yuv_texture, &format, &acc, &w, &h);
+			if ((w != src_wnd->w) || (h != src_wnd->h) ) {
+				SDL_DestroyTexture(ctx->yuv_texture);
+				ctx->yuv_texture = NULL;
+			}
+		}
+		if (! ctx->yuv_texture ) {
+			ctx->yuv_texture = SDL_CreateTexture(ctx->renderer, SDL_PIXELFORMAT_YV12, SDL_TEXTUREACCESS_STREAMING, src_wnd->w, src_wnd->h);
+			if (!ctx->yuv_texture) return GF_NOT_SUPPORTED;
+		}
+
+		SDL_QueryTexture(ctx->yuv_texture, &format, &acc, &w, &h);
+
+		/*copy pixels*/
+		if (SDL_LockTexture(ctx->yuv_texture, NULL, (void**)&pixels, &pitch) < 0) {
+			return GF_NOT_SUPPORTED;
+		}
+
+		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);
+
+		SDL_UnlockTexture(ctx->yuv_texture);
+
+		dstrc.w = dst_wnd->w;
+		dstrc.h = dst_wnd->h;
+		dstrc.x = dst_wnd->x;
+		dstrc.y = dst_wnd->y;
+
+        SDL_ClearError();
+		SDL_RenderCopy(ctx->renderer, ctx->yuv_texture, NULL, &dstrc);
+		SDL_RenderPresent(ctx->renderer);
+		return GF_OK;
+
+#else
 		if (!video_src) {
 			if (ctx->yuv_overlay) {
 				SDL_FreeYUVOverlay(ctx->yuv_overlay);
@@ -1231,10 +1612,12 @@
 		dstrc.y = dst_wnd->y;
 		SDL_DisplayYUVOverlay(ctx->yuv_overlay, &dstrc);
 		return GF_OK;
+#endif
 	}
 
 	/*SDL doesn't support stretching ...*/
-	if ((src_wnd->w != dst_wnd->w) || (src_wnd->h!=dst_wnd->h)) return GF_NOT_SUPPORTED;
+	if ((src_wnd->w != dst_wnd->w) || (src_wnd->h!=dst_wnd->h)) 
+		return GF_NOT_SUPPORTED;
 
 	switch (video_src->pixel_format) {
 	case GF_PIXEL_RGB_24:
@@ -1243,25 +1626,52 @@
 		break;
 	case GF_PIXEL_RGBA:
 		pool = &ctx->pool_rgba;
-		amask = 0xFF000000;
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+		amask = 0x000000FF;
+#else
+        amask = 0xFF000000;
+#endif
 		bpp = 4;
 		break;
 	default:
 		return GF_NOT_SUPPORTED;
 	}
+#if SDL_VERSION_ATLEAST(2,0,0)
+    if ((*pool)) SDL_FreeSurface((*pool));
+    (*pool) = SDL_CreateRGBSurfaceFrom(video_src->video_buffer + video_src->pitch_y*src_wnd->y + src_wnd->x*bpp,
+        src_wnd->w, src_wnd->h, 8*bpp, video_src->pitch_y,
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+        0xFF000000, 0x00FF0000, 0x0000FF00, amask);
+#else
+        0x000000FF, 0x0000FF00, 0x00FF0000, amask);
+#endif
+    dstrc.w = dst_wnd->w;
+	dstrc.h = dst_wnd->h;
+	dstrc.x = dst_wnd->x;
+	dstrc.y = dst_wnd->y;
+    
+	if (SDL_BlitSurface(*pool, NULL, ctx->back_buffer, &dstrc))
+        GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Blit error: %s\n", SDL_GetError()));
+
+	
+	SDL_FreeSurface((*pool));
+    *pool = NULL;
 
+#else
 	if (! *pool || ((*pool)->w < (int) src_wnd->w) || ((*pool)->h < (int) src_wnd->h) ) {
 		if ((*pool)) SDL_FreeSurface((*pool));
+
 		(*pool) = SDL_CreateRGBSurface(ctx->use_systems_memory ? SDL_SWSURFACE : SDL_HWSURFACE, 
 						src_wnd->w, src_wnd->h, 8*bpp, 
 						0x000000FF, 0x0000FF00, 0x00FF0000, amask);
+
 		if (! (*pool) ) return GF_IO_ERR;
 	}
 
 	SDL_LockSurface(*pool);
 
 	dst = (u8 *) ( (*pool)->pixels);
-	src = video_src->video_buffer + video_src->pitch_y*src_wnd->y + src_wnd->x*bpp;
+	src = (u8*)video_src->video_buffer + video_src->pitch_y*src_wnd->y + src_wnd->x*bpp;
 	for (i=0; i<src_wnd->h; i++) {
 		memcpy(dst, src, bpp * src_wnd->w);
 		src += video_src->pitch_y;
@@ -1269,17 +1679,16 @@
 	}
 	SDL_UnlockSurface(*pool);
 
-	srcrc.w = src_wnd->w;
-	srcrc.h = src_wnd->h;
-	srcrc.x = 0;
-	srcrc.y = 0;
-
 	dstrc.w = dst_wnd->w;
 	dstrc.h = dst_wnd->h;
 	dstrc.x = dst_wnd->x;
 	dstrc.y = dst_wnd->y;
 
-	SDL_BlitSurface(*pool, &srcrc, ctx->back_buffer, &dstrc);
+	if (SDL_BlitSurface(*pool, NULL, ctx->back_buffer, &dstrc))
+        GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Blit error: %s\n", SDL_GetError()));
+#endif
+    
+    
 	return GF_OK;
 }
 
@@ -1290,11 +1699,11 @@
 	SDLVidCtx *ctx;
 	GF_VideoOutput *driv;
 	
-	driv = gf_malloc(sizeof(GF_VideoOutput));
+	driv = (GF_VideoOutput*)gf_malloc(sizeof(GF_VideoOutput));
 	memset(driv, 0, sizeof(GF_VideoOutput));
 	GF_REGISTER_MODULE_INTERFACE(driv, GF_VIDEO_OUTPUT_INTERFACE, "SDL Video Output", "gpac distribution");
 
-	ctx = gf_malloc(sizeof(SDLVidCtx));
+	ctx = (SDLVidCtx*)gf_malloc(sizeof(SDLVidCtx));
 	memset(ctx, 0, sizeof(SDLVidCtx));
 #ifdef	SDL_WINDOW_THREAD
 	ctx->sdl_th = gf_th_new("SDLVideo");
@@ -1311,11 +1720,12 @@
 	driv->hw_caps |= GF_VIDEO_HW_OPENGL;
 
 	/*no YUV hardware blitting in SDL (only overlays)*/
-	driv->hw_caps |= GF_VIDEO_HW_HAS_YUV_OVERLAY | GF_VIDEO_HW_HAS_RGB | GF_VIDEO_HW_HAS_RGBA;
+	driv->hw_caps |= GF_VIDEO_HW_HAS_YUV_OVERLAY | GF_VIDEO_HW_HAS_RGB | GF_VIDEO_HW_HAS_RGBA;;
 	driv->Blit = SDL_Blit;
 	driv->LockBackBuffer = SDLVid_LockBackBuffer;
 	driv->LockOSContext = NULL;
 
+
 	/*color keying with overlays are not supported in SDL ...*/
 #if 0
 	/*get YUV overlay key*/

gpac-0.5.0.svn4296.tar.bz2/modules/soft_raster/raster_565.c -> gpac-0.5.0.svn4668.tar.bz2/modules/soft_raster/raster_565.c Changed

@@ -92,7 +92,7 @@
 	u16 col565 = surf->fill_565;
 	u32 col = surf->fill_col;
 	register u32 a, fin, col_no_a;
-	u8 *dst = surf->pixels + y * surf->pitch_y;
+	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
 	register s32 i;
 	u32 len;
 	s32 x;
@@ -117,7 +117,7 @@
 
 void evg_565_fill_const_a(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
 {
-	u8 *dst = surf->pixels + y * surf->pitch_y;
+	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
 	u32 col = surf->fill_col;
 	register u32 a, fin, col_no_a;
 	register s32 i;
@@ -134,7 +134,7 @@
 
 void evg_565_fill_var(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
 {
-	u8 *dst = surf->pixels + y * surf->pitch_y;
+	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
 	register u8 spanalpha, col_a;
 	register s32 i, x;
 	register u32 len;
@@ -178,7 +178,7 @@
 	val = GF_COL_TO_565(col);
 
 	for (y=0; y<h; y++) {
-		u8 *data = _this->pixels + (sy+y) * st + _this->pitch_x*sx;
+		u8 *data = (u8 *) _this->pixels + (sy+y) * st + _this->pitch_x*sx;
 		for (x=0; x<w; x++)  {
 			*(u16*) data = val;
 			data += _this->pitch_x;

gpac-0.5.0.svn4296.tar.bz2/modules/soft_raster/raster_argb.c -> gpac-0.5.0.svn4668.tar.bz2/modules/soft_raster/raster_argb.c Changed

@@ -96,7 +96,7 @@
 {
 	u32 col = surf->fill_col;
 	u32 a, fin, col_no_a;
-	u8 *dst = surf->pixels + y * surf->pitch_y;
+	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
 	s32 i, x;
 	u32 len;
 	u8 col_a, col_r, col_g, col_b;
@@ -128,7 +128,7 @@
 
 void evg_bgra_fill_const_a(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
 {
-	u8 *dst = surf->pixels + y * surf->pitch_y;
+	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
 	u32 col = surf->fill_col;
 	u32 a, fin, col_no_a;
 	s32 i;
@@ -145,7 +145,7 @@
 
 void evg_bgra_fill_var(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
 {
-	u8 *dst = surf->pixels + y * surf->pitch_y;
+	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
 	u8 spanalpha, col_a;
 	s32 i, x;
 	u32 len;
@@ -203,7 +203,7 @@
 
 	if (!use_memset) {
 		for (y = 0; y < h; y++) {
-			data = _this ->pixels + (sy+y)* st + _this->pitch_x*sx;
+			data = (u8 *) _this ->pixels + (sy+y)* st + _this->pitch_x*sx;
 			for (x = 0; x < w; x++) {
 				data[0] = col_b;
 				data[1] = col_g;
@@ -267,7 +267,7 @@
 	u32 col = surf->fill_col;
 	u32 fin, col_no_a, spana;
 	u8 col_r, col_g, col_b;
-	u8 *dst = surf->pixels + y * surf->pitch_y;
+	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
 	s32 i, x;
 	u32 len;
 
@@ -297,7 +297,7 @@
 
 void evg_bgrx_fill_const_a(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
 {
-	u8 *dst = surf->pixels + y * surf->pitch_y;
+	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
 	u32 col = surf->fill_col;
 	u32 a, fin, col_no_a;
 	s32 i;
@@ -314,7 +314,7 @@
 
 void evg_bgrx_fill_var(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
 {
-	u8 *dst = surf->pixels + y * surf->pitch_y;
+	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
 	u8 spanalpha, col_a;
 	s32 i, x;
 	u32 len;
@@ -388,7 +388,7 @@
 {
 	u32 col = surf->fill_col;
 	u32 fin, col_no_a, spana;
-	u8 *dst = surf->pixels + y * surf->pitch_y;
+	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
 	u8 r, g, b;
 	s32 i, x;
 	u32 len;
@@ -420,7 +420,7 @@
 
 void evg_rgbx_fill_const_a(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
 {
-	u8 *dst = surf->pixels + y * surf->pitch_y;
+	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
 	u32 col = surf->fill_col;
 	u32 a, fin, col_no_a;
 	s32 i;
@@ -437,7 +437,7 @@
 
 void evg_rgbx_fill_var(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
 {
-	u8 *dst = surf->pixels + y * surf->pitch_y;
+	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
 	u8 spanalpha, col_a;
 	s32 i, x;
 	u32 len;
@@ -486,7 +486,7 @@
 	b = GF_COL_B(col);
 	col = GF_COL_ARGB(0xFF, b, g, r);
 	for (y = 0; y < h; y++) {
-		u8 *data = _this ->pixels + (y + sy) * _this->pitch_y + st*sx;
+		u8 *data = (u8 *) _this ->pixels + (y + sy) * _this->pitch_y + st*sx;
 		for (x = 0; x < w; x++) {
 			data[0] = r;
 			data[1] = g;
@@ -564,8 +564,8 @@
 	u32 col = surf->fill_col;
 	u32 new_a, fin, col_no_a;
 	u8 a, r, g, b;
-	char *dst = surf->pixels + y * surf->pitch_y;
-	char *p;
+	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
+	u8 *p;
 	s32 i;
 	u32 len;
 
@@ -597,7 +597,7 @@
 
 void evg_rgba_fill_const_a(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
 {
-	u8 *dst = surf->pixels + y * surf->pitch_y;
+	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
 	u32 a, fin, col_no_a;
 	s32 i;
 
@@ -614,7 +614,7 @@
 
 void evg_rgba_fill_var(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
 {
-	u8 *dst = surf->pixels + y * surf->pitch_y;
+	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
 	u8 *p;
 	u8 spanalpha, col_a;
 	s32 i;
@@ -673,7 +673,7 @@
 
 	if (!use_memset) {
 		for (y = 0; y < h; y++) {
-			data = _this ->pixels + (sy+y)* st + _this->pitch_x * rc.x;
+			data = (u8 *) _this ->pixels + (sy+y)* st + _this->pitch_x * rc.x;
 			for (x = 0; x < w; x++) {
 				*(data) = r;
 				*(data+1) = g;

gpac-0.5.0.svn4296.tar.bz2/modules/soft_raster/raster_load.c -> gpac-0.5.0.svn4668.tar.bz2/modules/soft_raster/raster_load.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/soft_raster/stencil.c -> gpac-0.5.0.svn4668.tar.bz2/modules/soft_raster/stencil.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/svg_in/svg_in.c -> gpac-0.5.0.svn4668.tar.bz2/modules/svg_in/svg_in.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/timedtext/timedtext_dec.c -> gpac-0.5.0.svn4668.tar.bz2/modules/timedtext/timedtext_dec.c Changed

@@ -631,7 +631,7 @@
 				memcpy(wsChunk, &utf16_txt[start_char], sizeof(s16)*(i-start_char));
 				wsChunk[i-start_char] = 0;
 				sp = &wsChunk[0];
-				len = gf_utf8_wcstombs(szLine, 5000, (const unsigned short **) &sp);
+				len = (u32) gf_utf8_wcstombs(szLine, 5000, (const unsigned short **) &sp);
 				szLine[len] = 0;
 
 				gf_sg_vrml_mf_append(&text->string, GF_SG_VRML_MFSTRING, (void **) &st);
@@ -889,7 +889,7 @@
 		char_count = txt->len / 2;
 	} else {
 		char *p = txt->text;
-		char_count = gf_utf8_mbstowcs(utf16_text, 2500, (const char **) &p);
+		char_count = (u32) gf_utf8_mbstowcs(utf16_text, 2500, (const char **) &p);
 	}
 
 	chunks = gf_list_new();
@@ -1144,7 +1144,7 @@
 void *NewTTReader();
 #endif
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 	switch (InterfaceType) {
@@ -1156,7 +1156,7 @@
 	}
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 void ShutdownInterface(GF_BaseInterface *ifce)
 {
 	switch (ifce->InterfaceType) {
@@ -1173,15 +1173,15 @@
 
 #else
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface(u32 InterfaceType) { return NULL; }
-GF_EXPORT
+GPAC_MODULE_EXPORT
 void ShutdownInterface(GF_BaseInterface *ifce) {}
 
 
 #endif /*!defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_ISOM)*/
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
@@ -1193,3 +1193,5 @@
 	};
 	return si;
 }
+
+GPAC_MODULE_STATIC_DELARATION( timedtext )

gpac-0.5.0.svn4296.tar.bz2/modules/ui_rec/ui_rec.c -> gpac-0.5.0.svn4668.tar.bz2/modules/ui_rec/ui_rec.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/validator/validator.c -> gpac-0.5.0.svn4668.tar.bz2/modules/validator/validator.c Changed

@@ -211,12 +211,13 @@
     }
 }
 
-static void validator_on_video_reconfig(void *udta, u32 width, u32 height)
+static void validator_on_video_reconfig(void *udta, u32 width, u32 height, u8 bpp)
 {
 }
 
-Bool validator_on_event_play(GF_Validator *validator, GF_Event *event, Bool consumed_by_compositor)
+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) {
@@ -385,9 +386,10 @@
     gf_list_add(validator->xvs_node->content, evt_node);
 } 
 
-Bool validator_on_event_record(GF_Validator *validator, GF_Event *event, Bool consumed_by_compositor)
+Bool validator_on_event_record(void *udta, GF_Event *event, Bool consumed_by_compositor)
 {
-    Bool rec_event = 1;
+	GF_Validator *validator = (GF_Validator *)udta;
+	Bool rec_event = 1;
 	switch (event->type) {
 	case GF_EVENT_CONNECT:
 		if (event->connect.is_connected) {
@@ -841,21 +843,21 @@
 		}
 
 		/* since we changed parameters of the compositor, we need to trigger a reconfiguration */
-        gf_modules_set_option((GF_BaseInterface*)termext, "Compositor", "FrameRate", "5.0");
-        gf_modules_set_option((GF_BaseInterface*)termext, "Compositor", "AntiAlias", "None");
-        gf_term_set_option(validator->term, GF_OPT_RELOAD_CONFIG, 1);
+        	gf_modules_set_option((GF_BaseInterface*)termext, "Compositor", "FrameRate", "5.0");
+        	gf_modules_set_option((GF_BaseInterface*)termext, "Compositor", "AntiAlias", "None");
+        	gf_term_set_option(validator->term, GF_OPT_RELOAD_CONFIG, 1);
 
 		validator->evt_filter.udta = validator;
 		if (!validator->is_recording) {
 			validator->evt_filter.on_event = validator_on_event_play;
-            termext->caps |= GF_TERM_EXTENSION_NOT_THREADED;
+        	termext->caps |= GF_TERM_EXTENSION_NOT_THREADED;
         } else {
-			validator->evt_filter.on_event = validator_on_event_record;
+		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;
+	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 */
@@ -925,7 +927,7 @@
         /* 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;
+            //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;
@@ -985,7 +987,7 @@
 	gf_free(dr);
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 const u32 *QueryInterfaces() 
 {
 	static u32 si [] = {
@@ -995,14 +997,14 @@
 	return si; 
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface(u32 InterfaceType) 
 {
 	if (InterfaceType == GF_TERM_EXT_INTERFACE) return (GF_BaseInterface *)validator_new();
 	return NULL;
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 void ShutdownInterface(GF_BaseInterface *ifce)
 {
 	switch (ifce->InterfaceType) {
@@ -1011,3 +1013,5 @@
 		break;
 	}
 }
+
+GPAC_MODULE_STATIC_DELARATION( validator )

gpac-0.5.0.svn4296.tar.bz2/modules/wav_out/wav_out.c -> gpac-0.5.0.svn4668.tar.bz2/modules/wav_out/wav_out.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/widgetman/unzip.c -> gpac-0.5.0.svn4668.tar.bz2/modules/widgetman/unzip.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/widgetman/widget.c -> gpac-0.5.0.svn4668.tar.bz2/modules/widgetman/widget.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/widgetman/widgetman.c -> gpac-0.5.0.svn4668.tar.bz2/modules/widgetman/widgetman.c Changed

@@ -43,7 +43,13 @@
 #ifdef GPAC_HAS_SPIDERMONKEY
 
 #if !defined(__GNUC__)
+# if defined(_WIN32_WCE)
 #  pragma comment(lib, "js32")
+# elif defined (_WIN64)
+#  pragma comment(lib, "js")
+# elif defined (WIN32)
+#  pragma comment(lib, "js")
+# endif
 #endif
 
 
@@ -262,7 +268,7 @@
 	/* create the extracted path for the package root using:
 	   the cache dir + a CRC of the file path and the instance*/
 	sprintf(wzip->root_extracted_path, "%s%08X", path, (unsigned int)((unsigned long) wzip));
-	i = gf_crc_32((char *)wzip->root_extracted_path, strlen(wzip->root_extracted_path));
+	i = gf_crc_32((char *)wzip->root_extracted_path, (u32) strlen(wzip->root_extracted_path));
 	sprintf(wzip->archive_id, "GWM_%08X_", i);
 	sprintf(wzip->root_extracted_path, "%s/%s", dir, wzip->archive_id);
 
@@ -299,7 +305,7 @@
 		if (!sep) sep = strrchr(item_name, '\\');
 		if (sep) {
 			sep[0] = 0;
-			sprintf(szPath, "%s_%08X_%s", wzip->root_extracted_path, gf_crc_32((char*)item_name, strlen(item_name)), sep+1);
+			sprintf(szPath, "%s_%08X_%s", wzip->root_extracted_path, gf_crc_32((char*)item_name, (u32) strlen(item_name)), sep+1);
 			sep[0] = '/';
 		} else {
 			strcpy(szPath, wzip->root_extracted_path);
@@ -342,7 +348,7 @@
 	/* create the extracted path for the package root using:
 	   the cache dir + a CRC of the file path and the instance*/
 	sprintf(wzip->root_extracted_path, "%s%08X", path, (unsigned int)((unsigned long) wzip));
-	i = gf_crc_32((char *)wzip->root_extracted_path, strlen(wzip->root_extracted_path));
+	i = gf_crc_32((char *)wzip->root_extracted_path, (u32) strlen(wzip->root_extracted_path));
 	sprintf(wzip->archive_id, "GWM_%08X_", i);
 	sprintf(wzip->root_extracted_path, "%s/%s", dir, wzip->archive_id);
 
@@ -359,7 +365,7 @@
 		if (!sep) sep = strrchr(filename_inzip, '\\');
 		if (sep) {
 			sep[0] = 0;
-			sprintf(szPath, "%s_%08X_%s", wzip->root_extracted_path, gf_crc_32(filename_inzip, strlen(filename_inzip)), sep+1);
+			sprintf(szPath, "%s_%08X_%s", wzip->root_extracted_path, gf_crc_32(filename_inzip, (u32) strlen(filename_inzip)), sep+1);
 			sep[0] = '/';
 		} else {
 			strcpy(szPath, wzip->root_extracted_path);
@@ -624,8 +630,8 @@
 	if (!widg->widget->nb_instances) wm_delete_widget(wm, widg->widget);
 
 	if (!widg->permanent) {
-		gf_cfg_del_section(wm->term->user->config, widg->secname);
-		gf_cfg_set_key(wm->term->user->config, "Widgets", widg->secname, NULL);
+		gf_cfg_del_section(wm->term->user->config, (const char *)widg->secname);
+		gf_cfg_set_key(wm->term->user->config, "Widgets", (const char *)widg->secname, NULL);
 	}
 	if (widg->mpegu_context) gf_xml_dom_del(widg->mpegu_context);
 
@@ -1050,7 +1056,7 @@
 		att = gf_node_dump_attribute(evt->target, evt->attr);
 		if (!att) return;
 	}
-	gf_cfg_set_key(wid->widget->wm->term->user->config, wid->secname, pref->name, att);
+	gf_cfg_set_key(wid->widget->wm->term->user->config, (const char *)wid->secname, pref->name, att);
 	gf_free(att);
 }
 
@@ -1100,7 +1106,7 @@
 
 
 		/*get stored value for this preference*/
-		value = gf_cfg_get_key(wid->widget->wm->term->user->config, wid->secname, pref->name);
+		value = gf_cfg_get_key(wid->widget->wm->term->user->config, (const char *)wid->secname, pref->name);
 		/*if none found, use preference*/
 		if (!value) value = pref->value;
 
@@ -1572,7 +1578,7 @@
 
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	str = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<contextInformation xmlns=\"urn:mpeg:mpegu:schema:widgets:contextinfo:2010\">\n";
-	gf_bs_write_data(bs, (u8 *) str, strlen(str) );
+	gf_bs_write_data(bs, (const char *) str, (u32) strlen(str) );
 
 	count = gf_list_count(wid->widget->main->preferences);
 	for (i=0; i<count; i++) {
@@ -1584,12 +1590,12 @@
 		if (!(pref->flags & GF_WM_PREF_MIGRATE)) continue;
 
 		str = " <preference name=\"";
-		gf_bs_write_data(bs, (u8 *) str, strlen(str) );
+		gf_bs_write_data(bs, (const char *) str, (u32) strlen(str) );
 
-		gf_bs_write_data(bs, (u8 *) pref->name, strlen(pref->name) );
+		gf_bs_write_data(bs, (const char *) pref->name, (u32) strlen(pref->name) );
 
 		str = "\" value=\"";
-		gf_bs_write_data(bs, (u8 *) str, strlen(str) );
+		gf_bs_write_data(bs, (const char *) str, (u32) strlen(str) );
 
 		/*read from node*/
 		if (pref->connectTo && pref->connectTo->attribute) {
@@ -1600,13 +1606,13 @@
 #ifndef GPAC_DISABLE_SVG
 				if ((n->sgprivate->tag >= GF_NODE_FIRST_DOM_NODE_TAG) && !strcmp(pref->connectTo->attribute, "textContent")) {
 					char *txt = gf_dom_flatten_textContent(n);
-					gf_bs_write_data(bs, (u8 *) txt, strlen(txt) );
+					gf_bs_write_data(bs, (const char *) txt, (u32) strlen(txt) );
 				} else
 #endif
 				if (gf_node_get_field_by_name(n, pref->connectTo->attribute, &info)==GF_OK) {
 					att = gf_node_dump_attribute(n, &info);
 					if (att) {
-						gf_bs_write_data(bs, (u8 *) att, strlen(att) );
+						gf_bs_write_data(bs, (const char *)  att, (u32) strlen(att) );
 						gf_free(att);
 					}
 				}
@@ -1614,17 +1620,17 @@
 		}
 		/*read from config*/
 		else {
-			att = (char *)gf_cfg_get_key(wid->widget->wm->term->user->config, wid->secname, pref->name);
+			att = (char *)gf_cfg_get_key(wid->widget->wm->term->user->config, (const char *) wid->secname, pref->name);
 			if (!att) att = pref->value;
 
-			if (att) gf_bs_write_data(bs, (u8 *) att, strlen(att) );
+			if (att) gf_bs_write_data(bs, (const char *) att, (u32) strlen(att) );
 		}
 
 		str = "\"/>\n";
-		gf_bs_write_data(bs, (u8 *) str, strlen(str) );
+		gf_bs_write_data(bs, (const char *)  str, (u32) strlen(str) );
 	}
 	str = "</contextInformation>\n";
-	gf_bs_write_data(bs, (u8 *) str, strlen(str) );
+	gf_bs_write_data(bs, (const char *)  str, (u32) strlen(str) );
 
 	gf_bs_write_u8(bs, 0);
 	att = NULL;
@@ -1850,7 +1856,7 @@
 		*vp = BOOLEAN_TO_JSVAL( wid->activated ? JS_TRUE : JS_FALSE);
 	}
 	else if (!strcmp(prop_name, "section")) {
-		s = JS_NewStringCopyZ(c, wid->secname);
+		s = JS_NewStringCopyZ(c, (const char *) wid->secname);
 		*vp = STRING_TO_JSVAL(s);
 	}
 	else if (!strcmp(prop_name, "num_instances")) {
@@ -1877,7 +1883,7 @@
 	else {
 		char szName[1024];
 		sprintf(szName, "WM:%s", prop_name);
-		opt = gf_cfg_get_key(wid->widget->wm->term->user->config, wid->secname, szName);
+		opt = gf_cfg_get_key(wid->widget->wm->term->user->config, (const char *) wid->secname, szName);
 		if (opt) {
 			Double val=0;
 			if (!strcmp(opt, "true")) *vp = BOOLEAN_TO_JSVAL(JS_TRUE);
@@ -1932,7 +1938,7 @@
 		}
 
 		sprintf(szName, "WM:%s", prop_name);
-		gf_cfg_set_key(wid->widget->wm->term->user->config, wid->secname, szName, value);
+		gf_cfg_set_key(wid->widget->wm->term->user->config, (const char *) wid->secname, szName, value);
 		SMJS_FREE(c, _val);
 	}
 
@@ -2296,8 +2302,8 @@
 	/*unless explecetely requested, remove the section*/
 	if ((argc!=2) || !JSVAL_IS_BOOLEAN(argv[1]) || (JSVAL_TO_BOOLEAN(argv[1])==JS_TRUE) ) {
 		/*create section*/
-		gf_cfg_del_section(wm->term->user->config, wid->secname);
-		gf_cfg_set_key(wm->term->user->config, "Widgets", wid->secname, NULL);
+		gf_cfg_del_section(wm->term->user->config, (const char *) wid->secname);
+		gf_cfg_set_key(wm->term->user->config, "Widgets", (const char *) wid->secname, NULL);
 	}
 	wm_delete_widget_instance(wm, wid);
 	return JS_TRUE;
@@ -2713,7 +2719,7 @@
 
 	if (!input) return gf_strdup("");
 
-	len = strlen(input);
+	len = (u32) strlen(input);
 	output = gf_malloc(len+1);
 
 	first_space_copied = 1;
@@ -2774,7 +2780,7 @@
 			for (i=0; i<count; i++) {
 				GF_XMLNode *child = (GF_XMLNode *)gf_list_get(node->content, i);
 				char *child_content = wm_get_text_content(child, xml_lang, user_locale);
-				u32 child_content_len = strlen(child_content);
+				u32 child_content_len = (u32) strlen(child_content);
 				text_content = gf_realloc(text_content, text_content_len+child_content_len+1);
 				memcpy(text_content+text_content_len, child_content, child_content_len);
 				text_content[text_content_len+child_content_len] = 0;
@@ -3374,13 +3380,13 @@
 		wi->instance_id ++;
 
 		sprintf(szName, "%s#%s#Instance%d", path, wi->widget->name, wi->instance_id);
-		sprintf(wi->secname, "Widget#%08X", gf_crc_32(szName, strlen(szName)));
+		sprintf(wi->secname, "Widget#%08X", gf_crc_32(szName, (u32) strlen(szName)));
 
 		/*create section*/
-		gf_cfg_set_key(wm->term->user->config, "Widgets", wi->secname, " ");
-		gf_cfg_set_key(wm->term->user->config, wi->secname, "WM:Manifest", wi->widget->url);
+		gf_cfg_set_key(wm->term->user->config, "Widgets", (const char *) wi->secname, " ");
+		gf_cfg_set_key(wm->term->user->config, (const char *) wi->secname, "WM:Manifest", wi->widget->url);
 		sprintf(szInst, "%d", wi->instance_id);
-		gf_cfg_set_key(wm->term->user->config, wi->secname, "WM:InstanceID", szInst);
+		gf_cfg_set_key(wm->term->user->config, (const char *) wi->secname, "WM:InstanceID", szInst);
 	}
 	gf_list_add(wm->widget_instances, wi);
 
@@ -3447,8 +3453,8 @@
 	if (wid) {
 		wm_widget_jsbind(wm, wid);
 		/*remove section info*/
-		gf_cfg_del_section(wm->term->user->config, wid->secname);
-		gf_cfg_set_key(wm->term->user->config, "Widgets", wid->secname, NULL);
+		gf_cfg_del_section(wm->term->user->config, (const char *) wid->secname);
+		gf_cfg_set_key(wm->term->user->config, "Widgets", (const char *) wid->secname, NULL);
 	}
 	return 0;
 }
@@ -3478,7 +3484,7 @@
 				u32 instID = ID ? atoi(ID) : 0;
 				GF_WidgetInstance *wi = wm_load_widget(wm, manifest, instID, 0);
 				if (wi) {
-					strcpy(wi->secname, name);
+					strcpy(wi->secname, (const char *) name);
 					wm_widget_jsbind(wm, wi);
 				}
 			}
@@ -3622,7 +3628,7 @@
 #endif
 
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
@@ -3635,7 +3641,7 @@
 	return si;
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 #ifdef GPAC_HAS_SPIDERMONKEY
@@ -3645,7 +3651,7 @@
 	return NULL;
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 void ShutdownInterface(GF_BaseInterface *ifce)
 {
 	switch (ifce->InterfaceType) {
@@ -3660,3 +3666,5 @@
 	}
 }
 
+
+GPAC_MODULE_STATIC_DELARATION( widgetman )

gpac-0.5.0.svn4296.tar.bz2/modules/wiiis/wiiis.c -> gpac-0.5.0.svn4668.tar.bz2/modules/wiiis/wiiis.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/x11_out/x11_out.c -> gpac-0.5.0.svn4668.tar.bz2/modules/x11_out/x11_out.c Changed

gpac-0.5.0.svn4296.tar.bz2/modules/xvid_dec/xvid_dec.c -> gpac-0.5.0.svn4668.tar.bz2/modules/xvid_dec/xvid_dec.c Changed

@@ -31,7 +31,14 @@
 /*if we don't have M4V (A)SP parser, we con't get width and height and xvid is then unusable ...*/
 #ifndef GPAC_DISABLE_AV_PARSERS
 
-#include "xvid.h"
+#if !defined(__GNUC__)
+# if defined(_WIN32_WCE) || defined (WIN32)
+#  pragma comment(lib, "libxvidcore")
+# endif
+#endif
+
+
+#include <xvid.h>
 
 #ifndef XVID_DEC_FRAME
 #define XVID_DEC_FRAME xvid_dec_frame_t
@@ -42,7 +49,7 @@
 
 #undef XVID_USE_OLD_API
 
-static Bool xvid_is_init = 0;
+static Bool xvid_is_init = GF_FALSE;
 
 typedef struct
 {
@@ -467,7 +474,7 @@
 #endif /*GPAC_DISABLE_AV_PARSERS*/
 
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 const u32 *QueryInterfaces() 
 {
 	static u32 si [] = {
@@ -479,7 +486,7 @@
 	return si; 
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface(u32 InterfaceType) 
 {
 #ifndef GPAC_DISABLE_AV_PARSERS
@@ -488,7 +495,7 @@
 	return NULL;
 }
 
-GF_EXPORT
+GPAC_MODULE_EXPORT
 void ShutdownInterface(GF_BaseInterface *ifce)
 {
 	switch (ifce->InterfaceType) {
@@ -499,3 +506,5 @@
 #endif
 	}
 }
+
+GPAC_MODULE_STATIC_DELARATION( xvid )

gpac-0.5.0.svn4296.tar.bz2/modules/xvid_dec/xvid_dec_wce.cpp -> gpac-0.5.0.svn4668.tar.bz2/modules/xvid_dec/xvid_dec_wce.cpp Changed

gpac-0.5.0.svn4668.tar.bz2/packagers Added

gpac-0.5.0.svn4668.tar.bz2/packagers/win32_64 Added

gpac-0.5.0.svn4668.tar.bz2/packagers/win32_64/nsis Added

gpac-0.5.0.svn4668.tar.bz2/packagers/win32_64/nsis/default.out Added

gpac-0.5.0.svn4668.tar.bz2/packagers/win32_64/nsis/gpac_installer.nsi Added

@@ -0,0 +1,941 @@
+;--------------------------------
+;General
+!define GPAC_VERSION	0.5.1-DEV
+!include default.out
+
+!define GPAC_ROOT ..\..\..
+!ifdef IS_WIN64
+!define GPAC_BIN ${GPAC_ROOT}\bin\x64\release
+!define GPAC_EXTRA_LIB ${GPAC_ROOT}\extra_lib\lib\x64\release
+InstallDir "$PROGRAMFILES64\GPAC"
+!else
+!define GPAC_BIN ${GPAC_ROOT}\bin\win32\release
+!define GPAC_EXTRA_LIB ${GPAC_ROOT}\extra_lib\lib\win32\release
+InstallDir "$PROGRAMFILES32\GPAC"
+!endif
+
+InstallDirRegKey HKCU "SOFTWARE\GPAC" "InstallDir"
+
+RequestExecutionLevel highest
+!include LogicLib.nsh
+
+Function .onInit
+!ifdef IS_WIN64
+!include "x64.nsh"
+${If} ${RunningX64}
+${Else}
+	MessageBox MB_OK|MB_ICONSTOP "This installer is for 64bits operating systems only.$\n Please go to our website and get the 32 BITS installer."
+	Quit
+${Endif}
+!endif
+
+UserInfo::GetAccountType
+pop $0
+FunctionEnd
+
+;--------------------------------
+;Include Modern UI
+
+  !include "MUI2.nsh"
+
+WindowIcon on
+Icon "${GPAC_ROOT}\doc\osmo4.ico"
+UninstallIcon "${GPAC_ROOT}\doc\osmo4.ico"
+
+;--------------------------------
+;Interface Settings
+
+  !define MUI_ABORTWARNING
+
+Var DIALOG
+Var Label
+Var Confirm
+
+LangString PAGE_TITLE ${LANG_ENGLISH} "Title"
+LangString PAGE_SUBTITLE ${LANG_ENGLISH} "Subtitle"
+
+Function EnableNext
+  Pop $R1
+  ${NSD_GetState} $Confirm $R1
+	GetDlgItem $0 $HWNDPARENT 1
+	${If} $R1 == ${BST_CHECKED}
+   EnableWindow $0 1
+  ${Else} 
+   EnableWindow $0 0
+  ${Endif} 
+FunctionEnd
+
+Function customPage
+	!insertmacro MUI_HEADER_TEXT "Patents and Royalties" "Please read carefully the following clause."
+	GetDlgItem $0 $HWNDPARENT 1
+	EnableWindow $0 0
+	nsDialogs::Create 1018
+	Pop $DIALOG
+
+  ${NSD_CreateLabel} 0 0 100% 120u "Multimedia technologies are often covered by various patents which are most of the time hard to identify. These patents may or may not apply in your local jurisdiction. By installing this software, you acknowledge that you may have to pay royaltee fees in order to legally use this software. Do not proceed with this setup if you do not understand or do not agree with these terms. In any case, the authors and/or distributors bears no liability for any infringing usage of this software, which is provided for educational or research purposes."
+	Pop $Label
+
+  ${NSD_CreateCheckBox} 0 -30 100% 12u "I understand and accept the conditions"
+  Pop $Confirm
+	GetFunctionAddress $0 EnableNext
+	nsDialogs::OnClick $Confirm $0
+  
+  
+  nsDialogs::Show
+FunctionEnd
+
+;--------------------------------
+;Pages
+
+  !insertmacro MUI_PAGE_WELCOME
+  !insertmacro MUI_PAGE_LICENSE "${GPAC_ROOT}\COPYING" 
+  Page custom customPage
+  !insertmacro MUI_PAGE_COMPONENTS
+  !insertmacro MUI_PAGE_DIRECTORY
+    
+  !insertmacro MUI_PAGE_INSTFILES
+  !insertmacro MUI_PAGE_FINISH
+  
+  !insertmacro MUI_UNPAGE_CONFIRM
+  !insertmacro MUI_UNPAGE_INSTFILES
+
+  !insertmacro MUI_LANGUAGE "English"
+
+ComponentText "This will install the GPAC Framework on your computer. Select which optional things you want installed."
+DirText "This will install the GPAC Framework on your computer. Choose a directory"
+
+
+Function FctWriteRegStrAuth
+   ;local var
+   Push $0
+   Push $R0
+   Push $R1
+   Push $R2
+   Push $R3
+   ;pop function arguments
+   Exch 5
+   Pop $R3
+   Exch 5
+   Pop $R2
+   Exch 5
+   Pop $R1
+   Exch 5
+   Pop $R0
+
+   ;test if calling HKCR
+   StrCmp $R0 "HKCR" +1 +3
+   WriteRegStr HKCR $R1 $R2 $R3
+   goto lbl_end
+   
+   #has current user admin privileges?
+   userInfo::getAccountType
+   Pop $0
+   StrCmp $0 "Admin" lbl_admin lbl_not_admin
+
+   lbl_admin:
+      WriteRegStr HKLM $R1 $R2 $R3
+      goto lbl_end
+
+   lbl_not_admin:
+      WriteRegStr HKCU $R1 $R2 $R3
+
+   lbl_end:
+      Pop $R3
+      Pop $R2
+      Pop $R1
+      Pop $R0
+      Pop $0
+FunctionEnd
+
+!macro WriteRegStrAuth HKREG SUBREG ENTRY VALUESTR
+    Push "${HKREG}"
+    Push "${SUBREG}"
+    Push "${ENTRY}"
+    Push "${VALUESTR}"
+    Call FctWriteRegStrAuth
+!macroend
+ 
+!define WriteRegStrAuth "!insertmacro WriteRegStrAuth"
+
+
+Function un.FctDeleteRegKeyAuth
+   ;local var
+   Push $0
+   Push $R0
+   Push $R1
+   ;pop function arguments
+   Exch 3
+   Pop $R1
+   Exch 3
+   Pop $R0
+
+   ;test if calling HKCR
+   StrCmp $R0 "HKCR" +1 +3
+   DeleteRegKey HKCR $R1
+   goto lbl_end
+   
+   #has current user admin privileges?
+   userInfo::getAccountType
+   Pop $0
+   StrCmp $0 "Admin" lbl_admin lbl_not_admin
+   
+   lbl_admin:
+      DeleteRegKey HKLM $R1
+      goto lbl_end
+   
+   lbl_not_admin:
+      DeleteRegKey HKCU $R1
+
+   lbl_end:
+      Pop $0
+      Pop $R1
+      Pop $R0
+FunctionEnd
+
+!macro DeleteRegKeyAuth HKREG SUBREG
+    Push "${HKREG}"
+    Push "${SUBREG}"
+    Call un.FctDeleteRegKeyAuth
+!macroend
+ 
+!define DeleteRegKeyAuth "!insertmacro DeleteRegKeyAuth"
+
+Function InsertGDIPLUS
+   Push $R0
+   Push $R1
+   ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
+   StrCmp $R0 "" 0 lbl_winnt
+
+   ;NOT NT
+   ReadRegStr $R0 HKLM SOFTWARE\Microsoft\Windows\CurrentVersion VersionNumber
+
+   StrCpy $R1 $R0 1
+   ; win95, NOT SUPPORTED
+   StrCmp $R1 '4' 0 lbl_err_95
+   StrCpy $R1 $R0 3
+   StrCmp $R1 '4.0' lbl_err_95
+   ;winME or 98 otherwise
+   StrCmp $R1 '4.9' lbl_add lbl_add
+
+lbl_err_nt:
+   MessageBox MB_OK "Microsoft GDI+ cannot be installed on NT 3 Systems"
+   Goto lbl_done
+
+lbl_err_95:
+   MessageBox MB_OK "Microsoft GDI+ cannot be installed on Windows 95 and older Systems"
+   Goto lbl_done
+
+lbl_winnt:
+   StrCpy $R1 $R0 1
+   StrCmp $R1 '3' lbl_err_nt
+   StrCmp $R1 '4' lbl_add
+   StrCpy $R1 $R0 3
+   StrCmp $R1 '5.0' lbl_add	;2000
+   StrCmp $R1 '5.1' lbl_xp	;XP
+   StrCmp $R1 '5.2' lbl_done	;.NET server
+
+lbl_add:
+ !ifndef IS_WIN64
+   File "${GPAC_BIN}\Gdiplus.dll"
+  !endif
+
+lbl_xp:
+   File "${GPAC_BIN}\gm_gdip_raster.dll"
+
+lbl_done:
+FunctionEnd
+
+;osmo4 install
+Section "Osmo4/GPAC Player" SecOsmo4
+  SectionIn RO
+  SetOutPath $INSTDIR
+
+  File /oname=ReadMe.txt "${GPAC_ROOT}\README"
+  File /oname=License.txt "${GPAC_ROOT}\COPYING"
+  File /oname=Changelog.txt "${GPAC_ROOT}\Changelog"
+  File "${GPAC_ROOT}\doc\configuration.html"
+  File "${GPAC_ROOT}\doc\gpac.mp4"
+
+  !ifndef IS_WIN64
+  File "${GPAC_BIN}\Osmo4.exe"
+  !endif
+  File "${GPAC_ROOT}\doc\osmo4.ico"
+  File "${GPAC_BIN}\libgpac.dll"
+  File "${GPAC_BIN}\gm_dummy_in.dll"
+  File "${GPAC_BIN}\gm_dx_hw.dll"
+  File "${GPAC_BIN}\js.dll"
+  File "${GPAC_BIN}\gm_gpac_js.dll"
+  File "${GPAC_BIN}\libeay32.dll"
+  File "${GPAC_BIN}\ssleay32.dll"
+  File "${GPAC_BIN}\gm_ismacryp.dll"
+
+  ;create default cache
+  SetOutPath $INSTDIR\cache
+
+
+  ;copy GUI
+  SetOutPath $INSTDIR\gui
+  File "${GPAC_ROOT}\gui\gui.bt"
+  File "${GPAC_ROOT}\gui\gui.js"
+  File "${GPAC_ROOT}\gui\gwlib.js"
+  File "${GPAC_ROOT}\gui\mpegu-core.js"
+  SetOutPath $INSTDIR\gui\icons
+  File /r /x .svn ${GPAC_ROOT}\gui\icons\*
+  SetOutPath $INSTDIR\gui\extensions
+  File /r /x .svn ${GPAC_ROOT}\gui\extensions\*
+
+  SetOutPath $INSTDIR
+  
+  ${WriteRegStrAuth} HKCU "SOFTWARE\GPAC" "InstallDir" "$INSTDIR"
+  ${WriteRegStrAuth} HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Osmo4" "DisplayName" "Osmo4/GPAC (remove only)"
+  ${WriteRegStrAuth} HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Osmo4" "UninstallString" "$INSTDIR\uninstall.exe"
+  WriteUninstaller "uninstall.exe"
+
+SectionEnd
+
+SubSection "GPAC Plugins" SecPlugins
+
+
+;
+;	2 install modes, normal one and full one
+
+Section "MPEG-4 BIFS Decoder" SecBIFS
+  SectionIn 1
+  File "${GPAC_BIN}\gm_bifs_dec.dll"
+SectionEnd
+
+Section "MPEG-4 ODF Decoder" SecODF
+  SectionIn 1
+  File "${GPAC_BIN}\gm_odf_dec.dll"
+SectionEnd
+
+Section "MPEG-4 LASeR Decoder" SecLASeR
+  SectionIn 1
+  File "${GPAC_BIN}\gm_laser_dec.dll"
+SectionEnd
+
+Section "MPEG-4 SAF Demultiplexer" SecSAF
+  SectionIn 1
+  File "${GPAC_BIN}\gm_saf_in.dll"
+SectionEnd
+
+Section "Textual MPEG-4 Loader" SecTextLoad
+  SectionIn 1
+  File "${GPAC_BIN}\gm_ctx_load.dll"
+SectionEnd
+
+Section "Image Package (PNG, JPEG, BMP)" SecIMG
+  SectionIn 1
+  File "${GPAC_BIN}\gm_img_in.dll"
+SectionEnd
+
+Section "AAC Audio" SecAAC
+  SectionIn 1
+  File "${GPAC_BIN}\gm_aac_in.dll"
+SectionEnd
+
+Section "MP3 Audio" SecMP3
+  SectionIn 1
+  File "${GPAC_BIN}\gm_mp3_in.dll"
+SectionEnd
+
+Section "AC3 Audio" SecAC3
+  SectionIn 1
+  File "${GPAC_BIN}\gm_ac3_in.dll"
+SectionEnd
+
+Section "FFMPEG" SecFFMPEG
+  SectionIn 1
+  File "${GPAC_BIN}\gm_ffmpeg_in.dll"
+  File "${GPAC_BIN}\avcodec-*.dll"
+  File "${GPAC_BIN}\avformat-*.dll"
+  File "${GPAC_BIN}\avutil-*.dll"
+  File "${GPAC_BIN}\swscale-*.dll"
+SectionEnd
+
+Section "XviD Video Decoder" SecXVID
+  SectionIn 1
+  File "${GPAC_BIN}\gm_xvid_dec.dll"
+SectionEnd
+
+;Section "AMR NB & WB" SecAMRFT
+;  SectionIn 1
+;  File "..\gm_amr_float_dec.dll"
+;SectionEnd
+
+Section "Subtitles" SecSUBS
+  SectionIn 1
+  File "${GPAC_BIN}\gm_timedtext.dll"
+SectionEnd
+
+Section "ISO File Format" SecISOFF
+  SectionIn 1
+  File "${GPAC_BIN}\gm_isom_in.dll"
+SectionEnd
+
+Section "MPEG-2 TS" SecM2TS
+  SectionIn 1
+  File "${GPAC_BIN}\gm_mpegts_in.dll"
+SectionEnd
+
+Section "RTP/RTSP" SecRTP
+  SectionIn 1
+  File "${GPAC_BIN}\gm_rtp_in.dll"
+SectionEnd
+
+Section "SVG" SecSVG
+  SectionIn 1
+  File "${GPAC_BIN}\gm_svg_in.dll"
+SectionEnd
+
+Section "GDI+" SecGDIP
+  SectionIn 1
+  call InsertGDIPLUS
+SectionEnd
+
+Section "GPAC 2D Raster" SecG2DS
+  SectionIn 1
+  File "${GPAC_BIN}\gm_soft_raster.dll"
+SectionEnd
+
+Section "FreeType" SecFT
+  SectionIn 1
+  File "${GPAC_BIN}\gm_ft_font.dll"
+SectionEnd
+
+Section "Windows MME Audio" SecWAVE
+  SectionIn 1
+  File "${GPAC_BIN}\gm_wav_out.dll"
+SectionEnd
+
+Section "Xiph" SecXIPH
+  SectionIn 1
+  File "${GPAC_BIN}\gm_ogg.dll"
+SectionEnd
+
+Section "OpenSVC Decoder" SecOSVC
+  SectionIn 1
+  File "${GPAC_BIN}\OpenSVCDecoder.dll"
+  File "${GPAC_BIN}\gm_opensvc_dec.dll"
+SectionEnd
+
+Section "OpenHEVC Decoder" SecOHEVC
+  SectionIn 1
+  File "${GPAC_BIN}\libLibOpenHevcWrapper.dll"
+  File "${GPAC_BIN}\gm_openhevc_dec.dll"
+SectionEnd
+
+Section "MPEG DASH Suppport" SecDASH
+  SectionIn 1
+  File "${GPAC_BIN}\gm_mpd_in.dll"
+SectionEnd
+
+Section "HTML 5 Media Source Extensions Suppport" SecMSE
+  SectionIn 1
+  File "${GPAC_BIN}\gm_mse_in.dll"
+SectionEnd
+
+Section "UPnP Support" SecUPnP
+  SectionIn 1
+  File "${GPAC_BIN}\gm_platinum.dll"
+SectionEnd
+
+Section "Widget Manager" SecMPEGU
+  SectionIn 1
+  File "${GPAC_BIN}\gm_widgetman.dll"
+SectionEnd
+
+;Section "MobileIP Framework" SecMobIP
+;  SectionIn 1
+;  File "..\gm_mobile_ip.dll"
+;  File "..\MobileSession.dll"
+;SectionEnd
+
+
+;Section "OFFIS Audio compressor" SecOffisComp
+;  SectionIn 1
+;  ;copy GUI
+;  File "..\gm_offis_compressor.dll"
+;  File "..\QtCore4.dll"
+;  File "..\QtGui4.dll"
+;  SetOutPath $INSTDIR\gui\extensions
+;  File /r /x .svn ..\..\..\..\gui\extensions\offis*
+;  SetOutPath $INSTDIR
+;SectionEnd
+
+SubSectionEnd
+
+
+Section "MP4Box" SecMP4B
+  SectionIn 1
+  SetOutPath $INSTDIR
+  File "${GPAC_BIN}\MP4Box.exe"
+  File "${GPAC_BIN}\MP42TS.exe"
+
+  Push $INSTDIR
+  Call AddToPath
+SectionEnd
+
+
+Section "GPAC SDK" SecSDK
+  SectionIn 1
+  SetOutPath $INSTDIR\sdk\include
+  File /r /x CVS ${GPAC_ROOT}\include\*.h
+  SetOutPath $INSTDIR\sdk\lib
+  File ${GPAC_BIN}\libgpac.lib
+  File ${GPAC_EXTRA_LIB}\js.lib
+SectionEnd
+
+
+!ifndef IS_WIN64
+!define HK_MOZ "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0"
+
+Section "Osmozilla" SecZILLA
+  SectionIn 1
+  SetOutPath $INSTDIR
+  File "${GPAC_BIN}\nposmozilla.dll"
+  File "${GPAC_BIN}\nposmozilla.xpt"
+
+  ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "Path" "$INSTDIR\nposmozilla.dll"
+  ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "XPTPath" "$INSTDIR\nposmozilla.xpt"
+  ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "Version" "${GPAC_VERSION}"
+  ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "Vendor" "GPAC"
+  ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "Description" "GPAC plugin"
+  ${WriteRegStrAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0" "ProductName" "Osmozilla"
+SectionEnd
+!endif
+
+Section "GPAX" SecGPAX
+  SectionIn 1
+  SetOutPath $INSTDIR
+  File "${GPAC_BIN}\GPAX.dll"
+  RegDLL "$INSTDIR\GPAX.dll"
+SectionEnd
+
+
+Section "MP4Client" SecMP4C
+  SectionIn 1
+  SetOutPath $INSTDIR
+  File "${GPAC_BIN}\MP4Client.exe"
+SectionEnd   
+                 
+                 
+                  
+Section "Windows Runtime Libraries" SecMSVCRT
+  SectionIn 1
+;  File "..\Microsoft.VC100.CRT.manifest"
+;  File "..\Microsoft.VC100.MFC.manifest"       
+  File "${GPAC_BIN}\msvcr100.dll"
+  File "${GPAC_BIN}\mfc100.dll"
+SectionEnd
+
+
+
+
+SubSection "Osmo4 Shortcuts"
+
+Section "Add Start Menu Shortcuts"
+  SectionIn 1
+  #has current user admin privileges?
+  userInfo::getAccountType
+  Pop $0
+  StrCmp $0 "Admin" +1 +2
+  SetShellVarContext all
+  CreateDirectory "$SMPROGRAMS\Osmo4"
+  CreateShortCut "$SMPROGRAMS\Osmo4\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
+  !ifndef IS_WIN64
+  CreateShortCut "$SMPROGRAMS\Osmo4\Osmo4 (Classic UI).lnk" "$INSTDIR\Osmo4.exe" ""
+  !endif
+  CreateShortCut "$SMPROGRAMS\Osmo4\Osmo4 (New UI).lnk" "$INSTDIR\MP4Client.exe" "-gui" 
+  CreateShortCut "$SMPROGRAMS\Osmo4\Osmo4 (New UI With Console).lnk" "$INSTDIR\MP4Client.exe" ""
+  CreateShortCut "$SMPROGRAMS\Osmo4\Readme.lnk" "$INSTDIR\ReadMe.txt"
+  CreateShortCut "$SMPROGRAMS\Osmo4\License.lnk" "$INSTDIR\License.txt"
+  CreateShortCut "$SMPROGRAMS\Osmo4\History.lnk" "$INSTDIR\changelog.txt"
+  CreateShortCut "$SMPROGRAMS\Osmo4\Configuration Info.lnk" "$INSTDIR\configuration.html"
+SectionEnd
+
+!ifndef IS_WIN64
+Section "Add shortcut to QuickLaunch"
+  SectionIn 1
+  CreateShortCut "$QUICKLAUNCH\Osmo4.lnk" "$INSTDIR\Osmo4.exe" "" "$INSTDIR\Osmo4.exe" 0
+SectionEnd
+
+Section "Add shortcut to Desktop"
+  SectionIn 1
+  CreateShortCut "$DESKTOP\Osmo4.lnk" "$INSTDIR\Osmo4.exe" "" "$INSTDIR\Osmo4.exe" 0
+SectionEnd
+
+!define SHCNE_ASSOCCHANGED 0x08000000
+!define SHCNF_IDLIST 0
+
+Section "Make Osmo4 the default MPEG-4 Player"
+  SectionIn 1
+  ;write file association
+  ${WriteRegStrAuth} HKCR GPAC\mp4\DefaultIcon "" "$INSTDIR\Osmo4.ico, 0"
+  ${WriteRegStrAuth} HKCR GPAC\mp4\Shell\open\command "" "$INSTDIR\Osmo4.exe %L"
+  ${WriteRegStrAuth} HKCR .mp4 "" "GPAC\mp4"
+  !system 'shell32.dll::SHChangeNotify(i, i, i, i) v (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)'
+
+SectionEnd
+
+Section "Associate 3GPP files (3GP) with Osmo4"
+  SectionIn 1
+  ;write file association
+  ${WriteRegStrAuth} HKCR GPAC\3gp\DefaultIcon "" "$INSTDIR\Osmo4.ico, 0"
+  ${WriteRegStrAuth} HKCR GPAC\3gp\Shell\open\command "" "$INSTDIR\Osmo4.exe %L"
+  ${WriteRegStrAuth} HKCR .3gp "" "GPAC\3gp"
+  !system 'shell32.dll::SHChangeNotify(i, i, i, i) v (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)'
+SectionEnd
+
+Section "Associate 3GPP2 files (3G2) with Osmo4"
+  SectionIn 1
+  ;write file association
+  ${WriteRegStrAuth} HKCR GPAC\3g2\DefaultIcon "" "$INSTDIR\Osmo4.ico, 0"
+  ${WriteRegStrAuth} HKCR GPAC\3g2\Shell\open\command "" "$INSTDIR\Osmo4.exe %L"
+  ${WriteRegStrAuth} HKCR .3g2 "" "GPAC\3g2"
+  !system 'shell32.dll::SHChangeNotify(i, i, i, i) v (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)'
+SectionEnd
+!endif
+  
+SubSectionEnd
+
+
+
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecOsmo4} "Osmo4 player"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecPlugins} "GPAC Plugins"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecBIFS} "MPEG-4 BIFS Scene Decoder"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecODF} "MPEG-4 Object Descriptor Decoder"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecLASeR} "MPEG-4 LASeR Scene Decoder"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecTextLoad} "Support for uncompressed MPEG-4 (BT and XMT), VRML and X3D textual formats"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSAF} "MPEG-4 SAF Demultiplexer"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecIMG} "Support for PNG, JPEG, BMP and JPEG2000 images"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecAAC} "Support for MPEG-4 Audio HE-AAC decoder and web radios"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecMP3} "Support for MPEG-1/2 Audio (inc. MP3) decoder and web radios"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecAC3} "Support for Dolby AC3 decoder and web radios"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecFFMPEG} "Support for FFMPEG libraries for various format decoding and demultiplexing"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecXVID} "Support for XVID library for MPEG-4 Video Part 2 decoding"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecAMRFT} "Support for AMR and AMR WideBand decoder and web radios"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSUBS} "Subtitle support include SRT, SUB, 3GPP and MPEG-4 Text formats"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecISOFF} "Support for ISO-based file formats (3GP, MP4, MJ2K)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecM2TS} "Support for MPEG-2 Transport Stream"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecRTP} "Support for RTP and RTSP IP streaming"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSVG} "Support for SVG including progressive loading"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecGDIP} "GDIPlus-based rasterizer"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecG2DS} "GPAC software rasterizer"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecFT} "FreeType font parsing"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecWAVE} "Windows MME Audio output support"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecXIPH} "Support for XIPP OGG, Vorbis and Theora media"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecOSVC} "Support for SVC decoding through OpenSVC Decoder"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecOHEVC} "Support for HEVC decoding through OpenHEVC Decoder"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecDASH} "HTTP Streaming using MPEG DASH"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecMSE}  "HTTP Streaming using HTML 5 Media Source Extensions"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecUPnP} "Support for UPnP based on Platinum"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecMPEGU} "Support for W3C and MPEG-U Widgets"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecMobIP} "UNIGE Mobile IP Framework"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecOffisComp} "OFFIS Audio Compressor"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecMP4B} "MP4Box command-line tool for various multimedia operations"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSDK} "GPAC SDK: headers and library files needed to develop modules for GPAC or appllication based on GPAC"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecZILLA} "GPAC playback support NPAPI-based browsers (FireFox/Gecko, Safari/WebKit)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecGPAX} "GPAC playback support using ActiveX component (Internet Explorer)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecMP4C} "GPAC command-line player and AVI dumper"
+  
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+
+Function .onInstSuccess
+;  MessageBox MB_YESNO "GPAC Framework installation complete. Do you want to launch the Osmo4 player?" IDNO NoLaunch
+;  Exec $INSTDIR\Osmo4.exe
+;  NoLaunch:
+FunctionEnd
+
+
+
+
+
+; uninstall stuff
+
+UninstallText "This will uninstall OSMO4/GPAC from your computer. Hit next to continue."
+
+; special uninstall section.
+Section "Uninstall"
+  ; remove registry keys
+  ${DeleteRegKeyAuth} HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Osmo4"
+  ${DeleteRegKeyAuth} HKCU "SOFTWARE\GPAC"
+  ${DeleteRegKeyAuth} HKCU "SOFTWARE\MozillaPlugins\@gpac/osmozilla,version=1.0"
+  ${DeleteRegKeyAuth} HKCR GPAC\mp4\DefaultIcon
+  ${DeleteRegKeyAuth} HKCR GPAC\mp4\shell\open\command
+  ${DeleteRegKeyAuth} HKCR GPAC\mp4
+  ${DeleteRegKeyAuth} HKCR .mp4
+  ${DeleteRegKeyAuth} HKCR GPAC\3gp\DefaultIcon
+  ${DeleteRegKeyAuth} HKCR GPAC\3gp\shell\open\command
+  ${DeleteRegKeyAuth} HKCR GPAC\3gp
+  ${DeleteRegKeyAuth} HKCR .3gp
+  ${DeleteRegKeyAuth} HKCR GPAC\3g2\DefaultIcon
+  ${DeleteRegKeyAuth} HKCR GPAC\3g2\shell\open\command
+  ${DeleteRegKeyAuth} HKCR GPAC\3g2
+  ${DeleteRegKeyAuth} HKCR .3g2
+  ${DeleteRegKeyAuth} HKCR GPAC
+
+  UnRegDLL "$INSTDIR\GPAX.dll"
+  RMDir /r $INSTDIR
+  Push $INSTDIR
+  Call un.RemoveFromPath
+  #has current user admin privileges?
+  userInfo::getAccountType
+  Pop $0
+  StrCmp $0 "Admin" +1 +2
+  SetShellVarContext all
+  Delete "$SMPROGRAMS\Osmo4\*.*"
+  RMDir "$SMPROGRAMS\Osmo4"
+  Delete "$QUICKLAUNCH\Osmo4.lnk"
+  Delete "$DESKTOP\Osmo4.lnk"
+
+SectionEnd
+
+;path modif functions
+!verbose 3
+!include "WinMessages.NSH"
+!verbose 4
+
+!ifndef WriteEnvStr_RegKey
+  !ifdef ALL_USERS
+    !define WriteEnvStr_RegKey \
+       'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
+  !else
+    !define WriteEnvStr_RegKey 'HKCU "Environment"'
+  !endif
+!endif
+
+; AddToPath - Adds the given dir to the search path.
+;        Input - head of the stack
+;        Note - Win9x systems requires reboot
+
+Function AddToPath
+  Exch $0
+  Push $1
+  Push $2
+  Push $3
+ 
+  # don't add if the path doesn't exist
+  IfFileExists "$0\*.*" "" AddToPath_done
+ 
+  ReadEnvStr $1 PATH
+  Push "$1;"
+  Push "$0;"
+  Call StrStr
+  Pop $2
+  StrCmp $2 "" "" AddToPath_done
+  Push "$1;"
+  Push "$0\;"
+  Call StrStr
+  Pop $2
+  StrCmp $2 "" "" AddToPath_done
+  GetFullPathName /SHORT $3 $0
+  Push "$1;"
+  Push "$3;"
+  Call StrStr
+  Pop $2
+  StrCmp $2 "" "" AddToPath_done
+  Push "$1;"
+  Push "$3\;"
+  Call StrStr
+  Pop $2
+  StrCmp $2 "" "" AddToPath_done
+ 
+  Call IsNT
+  Pop $1
+  StrCmp $1 1 AddToPath_NT
+    ; Not on NT
+    StrCpy $1 $WINDIR 2
+    FileOpen $1 "$1\autoexec.bat" a
+    FileSeek $1 -1 END
+    FileReadByte $1 $2
+    IntCmp $2 26 0 +2 +2 # DOS EOF
+      FileSeek $1 -1 END # write over EOF
+    FileWrite $1 "$\r$\nSET PATH=%PATH%;$3$\r$\n"
+    FileClose $1
+    SetRebootFlag true
+    Goto AddToPath_done
+ 
+  AddToPath_NT:
+    ReadRegStr $1 ${WriteEnvStr_RegKey} "PATH"
+    StrCpy $2 $1 1 -1 # copy last char
+    StrCmp $2 ";" 0 +2 # if last char == ;
+      StrCpy $1 $1 -1 # remove last char
+    StrCmp $1 "" AddToPath_NTdoIt
+      StrCpy $0 "$1;$0"
+    AddToPath_NTdoIt:
+      WriteRegExpandStr ${WriteEnvStr_RegKey} "PATH" $0
+      SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
+ 
+  AddToPath_done:
+    Pop $3
+    Pop $2
+    Pop $1
+    Pop $0
+FunctionEnd
+
+; RemoveFromPath - Remove a given dir from the path
+;     Input: head of the stack
+
+Function un.RemoveFromPath
+  Exch $0
+  Push $1
+  Push $2
+  Push $3
+  Push $4
+  Push $5
+  Push $6
+ 
+  IntFmt $6 "%c" 26 # DOS EOF
+ 
+  Call un.IsNT
+  Pop $1
+  StrCmp $1 1 unRemoveFromPath_NT
+    ; Not on NT
+    StrCpy $1 $WINDIR 2
+    FileOpen $1 "$1\autoexec.bat" r
+    GetTempFileName $4
+    FileOpen $2 $4 w
+    GetFullPathName /SHORT $0 $0
+    StrCpy $0 "SET PATH=%PATH%;$0"
+    Goto unRemoveFromPath_dosLoop
+ 
+    unRemoveFromPath_dosLoop:
+      FileRead $1 $3
+      StrCpy $5 $3 1 -1 # read last char
+      StrCmp $5 $6 0 +2 # if DOS EOF
+        StrCpy $3 $3 -1 # remove DOS EOF so we can compare
+      StrCmp $3 "$0$\r$\n" unRemoveFromPath_dosLoopRemoveLine
+      StrCmp $3 "$0$\n" unRemoveFromPath_dosLoopRemoveLine
+      StrCmp $3 "$0" unRemoveFromPath_dosLoopRemoveLine
+      StrCmp $3 "" unRemoveFromPath_dosLoopEnd
+      FileWrite $2 $3
+      Goto unRemoveFromPath_dosLoop
+      unRemoveFromPath_dosLoopRemoveLine:
+        SetRebootFlag true
+        Goto unRemoveFromPath_dosLoop
+ 
+    unRemoveFromPath_dosLoopEnd:
+      FileClose $2
+      FileClose $1
+      StrCpy $1 $WINDIR 2
+      Delete "$1\autoexec.bat"
+      CopyFiles /SILENT $4 "$1\autoexec.bat"
+      Delete $4
+      Goto unRemoveFromPath_done
+ 
+  unRemoveFromPath_NT:
+    ReadRegStr $1 ${WriteEnvStr_RegKey} "PATH"
+    StrCpy $5 $1 1 -1 # copy last char
+    StrCmp $5 ";" +2 # if last char != ;
+      StrCpy $1 "$1;" # append ;
+    Push $1
+    Push "$0;"
+    Call un.StrStr ; Find `$0;` in $1
+    Pop $2 ; pos of our dir
+    StrCmp $2 "" unRemoveFromPath_done
+      ; else, it is in path
+      # $0 - path to add
+      # $1 - path var
+      StrLen $3 "$0;"
+      StrLen $4 $2
+      StrCpy $5 $1 -$4 # $5 is now the part before the path to remove
+      StrCpy $6 $2 "" $3 # $6 is now the part after the path to remove
+      StrCpy $3 $5$6
+ 
+      StrCpy $5 $3 1 -1 # copy last char
+      StrCmp $5 ";" 0 +2 # if last char == ;
+        StrCpy $3 $3 -1 # remove last char
+ 
+      WriteRegExpandStr ${WriteEnvStr_RegKey} "PATH" $3
+      SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
+ 
+  unRemoveFromPath_done:
+    Pop $6
+    Pop $5
+    Pop $4
+    Pop $3
+    Pop $2
+    Pop $1
+    Pop $0
+FunctionEnd
+
+###########################################
+#            Utility Functions            #
+###########################################
+
+; IsNT
+; no input
+; output, top of the stack = 1 if NT or 0 if not
+;
+; Usage:
+;   Call IsNT
+;   Pop $R0
+;  ($R0 at this point is 1 or 0)
+
+!macro IsNT un
+Function ${un}IsNT
+  Push $0
+  ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
+  StrCmp $0 "" 0 IsNT_yes
+  ; we are not NT.
+  Pop $0
+  Push 0
+  Return
+ 
+  IsNT_yes:
+    ; NT!!!
+    Pop $0
+    Push 1
+FunctionEnd
+!macroend
+!insertmacro IsNT ""
+!insertmacro IsNT "un."
+
+; StrStr
+; input, top of stack = string to search for
+;        top of stack-1 = string to search in
+; output, top of stack (replaces with the portion of the string remaining)
+; modifies no other variables.
+;
+; Usage:
+;   Push "this is a long ass string"
+;   Push "ass"
+;   Call StrStr
+;   Pop $R0
+;  ($R0 at this point is "ass string")
+
+!macro StrStr un
+Function ${un}StrStr
+Exch $R1 ; st=haystack,old$R1, $R1=needle
+  Exch    ; st=old$R1,haystack
+  Exch $R2 ; st=old$R1,old$R2, $R2=haystack
+  Push $R3
+  Push $R4
+  Push $R5
+  StrLen $R3 $R1
+  StrCpy $R4 0
+  ; $R1=needle
+  ; $R2=haystack
+  ; $R3=len(needle)
+  ; $R4=cnt
+  ; $R5=tmp
+  loop:
+    StrCpy $R5 $R2 $R3 $R4
+    StrCmp $R5 $R1 done
+    StrCmp $R5 "" done
+    IntOp $R4 $R4 + 1
+    Goto loop
+done:
+  StrCpy $R1 $R2 "" $R4
+  Pop $R5
+  Pop $R4
+  Pop $R3
+  Pop $R2
+  Exch $R1
+FunctionEnd
+!macroend
+!insertmacro StrStr ""
+!insertmacro StrStr "un."

gpac-0.5.0.svn4668.tar.bz2/packagers/win32_64/nsis/readme.txt Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/auxiliary_files/logo.bt Added

@@ -0,0 +1,126 @@
+InitialObjectDescriptor {
+ objectDescriptorID 1
+ sceneProfileLevelIndication 254
+ graphicsProfileLevelIndication 254
+ ODProfileLevelIndication 254
+ esDescr [
+  ES_Descriptor {
+   ES_ID 1
+   decConfigDescr DecoderConfigDescriptor {
+    objectTypeIndication 1
+    streamType 3
+    bufferSizeDB 2038
+    decSpecificInfo BIFSConfig {
+     nodeIDbits 4
+     isCommandStream true
+     pixelMetric true
+    }
+   }
+   slConfigDescr SLConfigDescriptor {
+    useAccessUnitStartFlag true
+    useAccessUnitEndFlag true
+    useTimeStampsFlag true
+    timeStampResolution 1000
+    timeStampLength 32
+   }
+  }
+ ]
+}
+
+OrderedGroup {
+ children [
+#  Background2D { backColor 1 1 1 }
+  DEF N0 Viewport {
+   size 140 140
+   fit 1
+  }
+
+  Transform2D {
+   scale 0.5 0.5
+   children [
+    Transform2D {
+     translation 1 -2
+     children [
+      Shape {
+       appearance Appearance {
+        material Material2D {
+         lineProps XLineProperties {
+          lineColor 0.2 0.2 0.2
+          width 20
+         }
+        }
+       }
+       geometry Circle {
+        radius 100
+       }
+      }
+     ]
+    }
+    Transform2D {
+     translation 0 -30
+     children [
+      Shape {
+       appearance DEF N3 Appearance {
+        texture RadialGradient {
+         focalPoint 0.45 0.8
+         key [0 1]
+         keyValue [0.5 0.5 0.5 0 0 0]
+        }
+        material Material2D {
+         filled TRUE
+        }
+       }
+       geometry Circle {
+        radius 60
+       }
+      }
+     ]
+    }
+    Transform2D {
+     translation 0 90
+     children [
+      Shape {
+       appearance Appearance {
+        material Material2D {
+         filled true
+        }
+        texture RadialGradient {
+         focalPoint 0.45 0.2
+         key [0 1]
+         keyValue [0.2 0.2 0.2 0 0 0]
+        }
+       }
+       geometry IndexedFaceSet2D {
+        colorPerVertex false
+        coord Coordinate2D {
+         point [-40 5 40 5 0 -60]
+        }
+       }
+      }
+     ]
+    }
+    Shape {
+     appearance Appearance {
+      material DEF N4 Material2D {
+       lineProps DEF N5 XLineProperties {
+        lineColor 1 0 0
+        width 20
+        texture RadialGradient {
+         focalPoint 0.5 0.5
+         key [0 0.8 0.9 1]
+         keyValue [0 0 0 0.5 0 0 1 0 0 0.5 0 0]
+        }
+       }
+      }
+     }
+     geometry Circle {
+      radius 100
+     }
+    }
+   ]
+  }
+
+ ]
+}
+
+

gpac-0.5.0.svn4668.tar.bz2/regression_tests/html5_video Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/html5_video/basic_arraybuffer.js Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/html5_video/basic_audio.svg Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/html5_video/basic_mediasource.js Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/html5_video/basic_sourcebuffer.js Added

@@ -0,0 +1,53 @@
+/*****************************************************************************************
+ * Testing basic support for the MSE SourceBuffer JavaScript object
+ *****************************************************************************************/
+
+alert("Script loaded");
+
+function enumerate(e, s)
+{
+	for(var propertyName in e) {
+		alert((s==null?"":s)+" "+propertyName+": "+e[propertyName]);
+		if (typeof(e[propertyName]) == "object") {
+			enumerate(e[propertyName], " ");
+		}
+	}		
+}
+
+function onSourceOpen(event)
+{
+	alert("MediaSource opened");
+	/* GPAC Hack: since the event is not targeted to the MediaSource, we need to get the MediaSource back */
+	var ms = event.target.ms;
+	enumerate(ms);
+	
+	alert("Checking if type video/mp4 is supported: "+MediaSource.isTypeSupported("video/mp4"));
+	alert("Checking if type video/ogg is supported: "+MediaSource.isTypeSupported("video/ogg"));
+	alert("Checking if type text/plain is supported: "+MediaSource.isTypeSupported("text/plain"));
+	alert("Checking if type application/octet-stream is supported: "+MediaSource.isTypeSupported("application/octet-stream"));
+
+	alert("Adding Source Buffer of type video/mp4 to the MediaSource");
+	var sb = ms.addSourceBuffer("video/mp4");
+	alert("SourceBuffer "+sb);
+	enumerate(sb);
+	enumerate(sb.buffered);
+}
+
+function init()
+{	
+	var v = document.getElementById("v");
+	
+	alert("Creating new MediaSource");
+	var ms = new MediaSource();			
+
+	/* GPAC Hack: the event should be dispatched to the MediaSource object */
+	v.addEventListener("sourceopen", onSourceOpen);
+				
+	var url = URL.createObjectURL(ms);
+	alert("Attaching Media Source "+url+" to Video");
+	v.src = url;
+	
+	/* GPAC hack to retrieve the MediaSource from the video when the sourceopen event is dispatched */
+	v.ms = ms;
+	
+}
\ No newline at end of file

gpac-0.5.0.svn4668.tar.bz2/regression_tests/html5_video/basic_url.js Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/html5_video/basic_video.js Added

@@ -0,0 +1,81 @@
+/*****************************************************************************************
+ * Testing support for the basic HTML5 Video object
+ *****************************************************************************************/
+
+alert("Script loaded");
+
+function enumerate(e)
+{
+	for(var propertyName in e) {
+		alert(" "+propertyName+": "+e[propertyName]);
+	}
+}
+
+function print_ranges(r) {
+    alert(" time ranges length:" + r.length);
+    for (var i = 0; i < r.length; i++) {
+        alert(" (" + r.start(i) + "," + r.end(i) + ")");
+    }
+}
+
+function print_tracks(t) {
+}
+
+function print_media_info()
+{
+    var v = document.getElementById("v");
+	alert("");
+	alert("Element: "+v);
+	alert("HTMLMediaElement Properties: ");
+	alert("src:          "+v.src);
+	alert("error & code: "+v.error+":"+v.error.code);
+	alert("currentSrc:   "+v.currentSrc);
+	alert("crossOrigin:  "+v.crossOrigin);
+	alert("networkState: "+v.networkState);
+	alert("preload:      "+v.preload);
+	alert("buffered:     "+v.buffered);
+	print_ranges(v.buffered);
+	alert("readyState:   "+v.readyState);
+	alert("seeking:      "+v.seeking);
+	alert("currentTime:  "+v.currentTime);
+	alert("duration:     "+v.duration);
+	alert("startDate:    "+v.startDate);
+	alert("paused:       "+v.paused);
+	alert("def playrate: "+v.defaultPlaybackRate);
+	alert("play rate:    "+v.playbackRate);
+	alert("played:       "+v.played);
+	print_ranges(v.played);
+	alert("seekable:     "+v.seekable);
+	print_ranges(v.seekable);
+	alert("ended:        "+v.ended);
+	alert("autoplay:     "+v.autoplay);
+	alert("loop:         "+v.loop);
+	alert("mediaGroup:   "+v.mediaGroup);
+	alert("controller:   "+v.controller);
+	alert("controls:     "+v.controls);
+	alert("volume:       "+v.volume);
+	alert("muted:        "+v.muted);
+	alert("defaultMuted: "+v.defaultMuted);
+	alert("audioTracks:  "+v.audioTracks+ " length ("+v.audioTracks.length+")");
+	print_tracks(v.audioTracks);
+	alert("videoTracks:  "+v.videoTracks+ " length ("+v.videoTracks.length+")");
+	print_tracks(v.videoTracks);
+	alert("textTracks:   "+v.textTracks+ " length ("+v.textTracks.length+")");
+	print_tracks(v.textTracks);
+	alert("");
+	alert("HTMLVideoElement specific properties: ");
+	alert("width:        "+v.width);
+	alert("height:       "+v.height);
+	alert("wideoWidth:   "+v.videoWidth);
+	alert("videoHeight:  "+v.videoHeight);
+	alert("poster:       "+v.poster);
+	alert("");
+}
+
+function init()
+{	
+	var v = document.getElementById("v");
+	v.src = "media/counter-10mn_I25_640x360_160kbps_openGOP_dash.mp4";
+	v.addEventListener("click", print_media_info);
+	enumerate(v);
+}
\ No newline at end of file

gpac-0.5.0.svn4668.tar.bz2/regression_tests/html5_video/basic_video.svg Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/html5_video/implementation_notes.txt Added

@@ -0,0 +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
+ - detect/react when first append is not an init segment.
\ No newline at end of file

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

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

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

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

@@ -0,0 +1,28 @@
+/* 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/mse-overlap.js Added

@@ -0,0 +1,71 @@
+'use strict';
+/*****************************************************************************************
+ *
+ * Example code using the Media Source Extension API with GPAC
+ *
+ *****************************************************************************************/
+alert("Media Source Script loaded");
+
+var baseURL = "http://download.tsi.telecom-paristech.fr/gpac/DASH_CONFORMANCE/TelecomParisTech/mp4-main-multi/"
+var medias = [
+    { url: "mp4-main-multi-mpd-V-BS_init.mp4", offset: 0 },
+    { url: "mp4-main-multi-h264bl_low-1.m4s", offset: 0 },
+    { url: "mp4-main-multi-h264bl_low-1.m4s", offset: 10 },
+    { url: "mp4-main-multi-h264bl_low-1.m4s", offset: 15 },
+    { url: "mp4-main-multi-h264bl_low-1.m4s", offset: 20 },
+    { url: "mp4-main-multi-h264bl_low-1.m4s", offset: 25 },
+    { url: "mp4-main-multi-h264bl_low-1.m4s", offset: 30 }
+];
+
+function addMediaToTimelineAndPlay(sb, i)
+{
+    var xhr = new XMLHttpRequest();
+    xhr.sb = sb;
+    xhr.index = (i == undefined ? 0 : i);
+    xhr.timeOffset = medias[xhr.index].offset;
+    xhr.open("GET", baseURL+medias[xhr.index].url);
+    xhr.responseType = "arraybuffer";
+    xhr.onreadystatechange = function () {
+        if (this.readyState == this.DONE) {
+            if (this.sb.updating == false) {
+                this.sb.timestampOffset = this.timeOffset;
+                this.sb.appendBuffer(this.response);
+                if (this.index < medias.length) {
+                    addMediaToTimelineAndPlay(this.sb, this.index+1);
+                } else {
+                    this.sb.v.play();
+                }
+            } else {
+                alert("two appends at the same time");
+            }
+        }
+    };
+    xhr.send(); 
+}
+
+function onSourceOpen(event) {
+    var sb;
+    alert("MediaSource opened");
+    /* GPAC Hack: since the event is not targeted to the MediaSource, we need to get the MediaSource back */
+    var v = event.target;
+    var ms = v.ms;
+    sb = ms.addSourceBuffer("video/mp4");
+    sb.v = v;
+    addMediaToTimelineAndPlay(sb);
+}
+
+function init() {
+
+    var v = document.getElementById("v");
+    /* GPAC Hack: the event should be dispatched to the MediaSource object not to the video */
+    v.addEventListener("sourceopen", onSourceOpen);
+
+    alert("Creating new MediaSource");
+    var ms = new MediaSource();
+    v.src = URL.createObjectURL(ms);
+
+    /* GPAC hack to retrieve the MediaSource from the video when the sourceopen event is dispatched to the video */
+    v.ms = ms;
+
+}
+

gpac-0.5.0.svn4668.tar.bz2/regression_tests/html5_video/video.svg Added

@@ -0,0 +1,30 @@
+<svg width="800" height="800" viewBox="0 0 800 800" 
+     xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" onload="init()">
+
+  
+  <rect id="r" fill="orange" x="10" y="10" width="180" height="40" rx="5"/>
+  <text x="30" y="30">Click to toggle quality</text>
+
+  
+  <g id="t" transform="translate(10, 60)"/>
+
+  <video id="v" y="100" width="800" height="600"/>
+
+  
+  <g>
+    <animate id="a" begin="0" dur="0.1" repeatCount="indefinite" attributeName="visibilty" from="visible" to="hidden" />
+  </g>
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  <script type="application/ecmascript" xlink:href="mse-events.js"/>
+</svg>
\ No newline at end of file

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

@@ -0,0 +1,228 @@
+'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.svg Added

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

@@ -0,0 +1,36 @@
+/*****************************************************************************************
+ * 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/regression_tests/webvtt Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/comments.vtt Added

@@ -0,0 +1,45 @@
+WEBVTT - Example with comments
+
+00:11.000 --> 00:13.000
+<v Roger Bingham>We are in New York City
+NOTE comment just after a cue
+
+00:13.000 --> 00:16.000
+<v Roger Bingham>We're actually at the Lucern Hotel, just down the street
+
+NOTE comment just before a cue identifier
+some id
+00:16.000 --> 00:18.000
+<v Roger Bingham>from the American Museum of Natural History
+
+NOTE in between cues
+
+00:18.000 --> 00:20.000
+<v Roger Bingham>And with me is Neil deGrasse Tyson
+
+00:20.000 --> 00:22.000
+<v Roger Bingham>Astrophysicist, Director of the Hayden Planetarium
+
+00:22.000 --> 00:24.000
+<v Roger Bingham>at the AMNH.
+
+00:24.000 --> 00:26.000
+<v Roger Bingham>Thank you for walking down here.
+
+00:27.000 --> 00:30.000
+<v Roger Bingham>And I want to do a follow-up on the last conversation we did.
+
+00:30.000 --> 00:31.500 align:end size:50%
+<v Roger Bingham>When we e-mailed-
+
+00:30.500 --> 00:32.500 align:start size:50%
+<v Neil deGrasse Tyson>Didn't we talk about enough in that conversation?
+
+00:32.000 --> 00:35.500 align:end size:50%
+<v Roger Bingham>No! No no no no; 'cos 'cos obviously 'cos
+
+00:32.500 --> 00:33.500 align:start size:50%
+<v Neil deGrasse Tyson><i>Laughs</i>
+
+00:35.500 --> 00:38.000
+<v Roger Bingham>You know I'm so excited my glasses are falling off here.
\ No newline at end of file

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/concatenation.vtt Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/elephants-dream-chapters-en.vtt Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/elephants-dream-subtitles-de.vtt Added

@@ -0,0 +1,309 @@
+WEBVTT
+
+1
+00:00:15.042 --> 00:00:18.042 align:start
+<v Proog>Auf der linken Seite sehen wir...</v>
+
+2
+00:00:18.750 --> 00:00:20.333 align:middle
+<v Proog>Auf der rechten Seite sehen wir die...</v>
+
+3
+00:00:20.417 --> 00:00:21.917
+<v Proog>...die <c.highlight>Enthaupter</c>.</v>
+
+4
+00:00:22.000 --> 00:00:24.625 align:end
+<v Proog>Alles ist sicher. Vollkommen sicher.</v>
+
+5
+00:00:26.333 --> 00:00:27.333
+<v Proog>Emo?</v>
+
+6
+00:00:28.875 --> 00:00:30.250 line:6% size:110%
+<v Proog>Pass auf!</v>
+
+7
+00:00:47.125 --> 00:00:48.250
+<v Proog>Bist du verletzt?</v>
+
+8
+00:00:51.917 --> 00:00:53.917
+<v Emo>Ich glaube nicht. Und du?</v>
+
+9
+00:00:55.625 --> 00:00:57.125
+<v Proog>Mir fehlt nichts.</v>
+
+10
+00:00:57.583 --> 00:01:01.667
+<v Proog>Steh auf! Emo, es ist gefährlich hier.</v>
+
+11
+00:01:02.208 --> 00:01:03.667
+<v Proog>Weiter!</v>
+
+12
+00:01:03.750 --> 00:01:05.750
+<v Emo>Was jetzt?</v>
+
+13
+00:01:05.875 --> 00:01:07.875
+<v Proog>Du wirst es sehen.</v>
+
+14
+00:01:16.167 --> 00:01:18.375
+<v Proog>Emo, hier lang.</v>
+
+15
+00:01:34.958 --> 00:01:35.792
+<v Proog>Mir nach!</v>
+
+16
+00:02:11.583 --> 00:02:12.792
+<v Proog>Schneller, Emo!</v>
+
+17
+00:02:48.375 --> 00:02:50.083
+<v Proog>Du bist unaufmerksam!</v>
+
+18
+00:02:50.750 --> 00:02:54.500
+<v Emo>Ich wollte doch nur an... ...ans Telefon gehen.</v>
+
+19
+00:02:55.000 --> 00:02:58.208
+<v Proog>Emo, schau, ich meine, hör zu.</v>
+
+20
+00:02:59.750 --> 00:03:02.292
+<v Proog>Du musst lernen zuzuhören.</v>
+
+21
+00:03:03.625 --> 00:03:05.125
+<v Proog>Das hier ist kein Spiel.</v>
+
+22
+00:03:06.167 --> 00:03:08.750
+<v Proog>u, wir, könnten hier draußen leicht sterben.</v>
+
+23
+00:03:10.208 --> 00:03:14.125
+<v Proog>Hör zu... Hör dem Klang der Maschine zu.</v>
+
+24
+00:03:18.333 --> 00:03:20.417
+<v Proog>Hör auf deinen Atem.</v>
+
+25
+00:04:27.208 --> 00:04:29.250
+<v Emo>Hast du nie genug davon?</v>
+
+26
+00:04:29.583 --> 00:04:31.083
+<v Proog>Genug?!?</v>
+
+27
+00:04:31.750 --> 00:04:34.667
+<v Proog>Die Maschine ist wie ein Uhrwerk.</v>
+
+28
+00:04:35.500 --> 00:04:37.708
+<v Proog>Ein falscher Schritt...</v>
+
+29
+00:04:37.833 --> 00:04:39.792
+<v Proog>...und du wirst zerquetscht.</v>
+
+30
+00:04:41.042 --> 00:04:42.375
+<v Emo>Aber ist es nicht...</v>
+
+31
+00:04:42.417 --> 00:04:46.542
+<v Proog>Zerquetscht, Emo! Willst du das? Zerquetscht werden?</v>
+
+32
+00:04:48.083 --> 00:04:50.000
+<v Proog>Dein Lebensziel?</v>
+
+33
+00:04:50.583 --> 00:04:52.250
+<v Proog>Zerquetscht!</v>
+
+34
+00:05:41.833 --> 00:05:43.458
+<v Proog>Emo, schließ die Augen.</v>
+
+35
+00:05:44.917 --> 00:05:46.583
+<v Emo>Warum? - </v><v Proog>Sofort!</v>
+
+36
+00:05:53.750 --> 00:05:56.042
+<v Emo>Gut.</v>
+
+37
+00:05:59.542 --> 00:06:02.792
+<v Proog>Was siehst du zu deiner Linken, Emo?</v>
+
+38
+00:06:04.417 --> 00:06:06.000
+<v Emo>Nichts. - </v><v Proog>Wirklich?</v>
+
+39
+00:06:06.333 --> 00:06:07.917
+<v Emo>Überhaupt nichts.</v>
+
+40
+00:06:08.042 --> 00:06:12.417
+<v Proog>Und zu deiner Rechten, was siehst du zu deiner Rechten, Emo?</v>
+
+41
+00:06:13.875 --> 00:06:16.917
+<v Proog>Dasselbe, Proog, genau dasselbe...</v>
+
+42
+00:06:17.083 --> 00:06:18.583
+<v Emo>Nichts!</v>
+
+43
+00:06:40.625 --> 00:06:42.958
+<v Emo>Hör mal, Proog! Hörst du das?</v>
+
+44
+00:06:43.625 --> 00:06:45.042
+<v Emo>Können wir hier hingehen?</v>
+
+45
+00:06:45.208 --> 00:06:48.042
+<v Proog>Dorthin? Das ist gefährlich.</v>
+
+46
+00:06:49.917 --> 00:06:52.500
+<v Emo>Aber... - </v><v Proog>Vertrau mir, es ist gefährlich.</v>
+
+47
+00:06:53.292 --> 00:06:54.792
+<v Emo>Vielleicht könnte ich...</v>
+
+48
+00:06:54.833 --> 00:06:56.333
+<v Proog>Nein.</v>
+
+49
+00:06:57.667 --> 00:07:00.167
+<v Proog>NEIN!</v>
+
+50
+00:07:00.875 --> 00:07:03.750
+<v Proog>Sonst noch Fragen, Emo?</v>
+
+51
+00:07:04.250 --> 00:07:05.917
+<v Emo>Nein.</v>
+
+52
+00:07:09.458 --> 00:07:10.833
+<v Proog>Emo.</v>
+
+53
+00:07:11.875 --> 00:07:13.542
+<v Proog>Emo, warum...</v>
+
+54
+00:07:13.583 --> 00:07:14.458
+<v Proog>Emo...</v>
+
+55
+00:07:14.500 --> 00:07:18.500
+<v Proog>...warum erkennst du nicht die Schönheit dieses Ortes?</v>
+
+56
+00:07:18.833 --> 00:07:20.750
+<v Proog>ie alles funktioniert.</v>
+
+57
+00:07:20.875 --> 00:07:24.000
+<v Proog>Wie vollkommen es ist.</v>
+
+58
+00:07:24.083 --> 00:07:27.417
+<v Emo>Nein, Proog, ich erkenne nichts.</v>
+
+59
+00:07:27.542 --> 00:07:30.333
+<v Emo>Ich erkenne nichts, weil da nichts ist.</v>
+
+60
+00:07:31.500 --> 00:07:35.333
+<v Emo>Und warum sollte ich mein Leben etwas anvertrauen, das gar nicht da ist?</v>
+
+61
+00:07:35.583 --> 00:07:37.042
+<v Emo>Kannst du mir das sagen? - </v><v Proog>Emo...</v>
+
+62
+00:07:37.500 --> 00:07:39.167
+<v Emo>Antworte mir!</v>
+
+63
+00:07:43.208 --> 00:07:44.583
+<v Emo>Proog...</v>
+
+64
+00:07:45.500 --> 00:07:47.333
+<v Emo>Du bist krank, Mann!</v>
+
+65
+00:07:47.375 --> 00:07:49.208
+<v Emo>Bleib weg von mir!</v>
+
+66
+00:07:52.583 --> 00:07:55.083
+<v Proog>Nein! Emo! Das ist eine Falle!</v>
+
+67
+00:07:55.833 --> 00:07:57.167
+<v Emo>Haha, eine Falle.</v>
+
+68
+00:07:57.208 --> 00:08:01.750
+<v Emo>Auf der linken Seite sieht man die Hängenden Gärten von Babylon.</v>
+
+69
+00:08:02.250 --> 00:08:04.292
+<v Emo>Wie wär das als Falle?</v>
+
+70
+00:08:05.458 --> 00:08:07.125
+<v Proog>Nein, Emo.</v>
+
+71
+00:08:09.417 --> 00:08:12.792
+<v Emo>Auf der rechten Seite sieht man... ...rate mal...</v>
+
+72
+00:08:13.000 --> 00:08:14.750
+<v Emo>...den Koloss von Rhodos!</v>
+
+73
+00:08:15.833 --> 00:08:16.708
+<v Proog>Nein!</v>
+
+74
+00:08:16.750 --> 00:08:22.167
+<v Emo>Den Koloss von Rhodos und er ist nur für dich hier, Proog.</v>
+
+75
+00:08:51.333 --> 00:08:53.167
+<v Proog>Es ist da...</v>
+
+76
+00:08:53.208 --> 00:08:55.500
+<v Proog>Wenn ich es dir doch sage, Emo...</v>
+
+77
+00:08:57.333 --> 00:09:00.000
+<v Proog>...es ist da.</v>
\ No newline at end of file

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/elephants-dream-subtitles-en.vtt Added

@@ -0,0 +1,357 @@
+WEBVTT
+
+1
+00:00:15.000 --> 00:00:18.000 align:start
+<v Proog>At the left we can see...</v>
+
+2
+00:00:18.167 --> 00:00:20.083 align:middle
+<v Proog>At the right we can see the...</v>
+
+3
+00:00:20.083 --> 00:00:22.000
+<v Proog>...the <c.highlight>head-snarlers</c></v>
+
+4
+00:00:22.000 --> 00:00:24.417 align:end
+<v Proog>Everything is safe. Perfectly safe.</v>
+
+5
+00:00:24.583 --> 00:00:27.083
+<v Proog>Emo?</v>
+
+6
+00:00:28.208 --> 00:00:30.042 line:6% size:110%
+<v Proog><b>Watch out!</b></v>
+
+7
+00:00:47.042 --> 00:00:48.542
+<v Proog>Are you hurt?</v>
+
+8
+00:00:52.000 --> 00:00:54.000
+<v Emo>I don't think so. You?</v>
+
+9
+00:00:55.167 --> 00:00:57.042
+<v Proog>I'm Ok.</v>
+
+10
+00:00:57.125 --> 00:01:01.167
+<v Proog>Get up. Emo, it's not safe here.</v>
+
+11
+00:01:02.042 --> 00:01:03.167
+<v Proog>Let's go.</v>
+
+12
+00:01:03.167 --> 00:01:05.167
+<v Emo>What's next?</v>
+
+13
+00:01:05.208 --> 00:01:09.208
+<v Proog>You'll see!</v>
+
+14
+00:01:12.000 --> 00:01:14.000
+(howling wind)
+
+15
+00:01:16.042 --> 00:01:18.083
+<v Proog>Emo. This way.</v>
+
+16
+00:01:34.250 --> 00:01:35.542
+<v Proog>Follow me!</v>
+
+17
+00:01:39.000 --> 00:01:42.000
+(buzzing wires and chattery conversations)
+
+18
+00:02:11.125 --> 00:02:12.542
+<v Proog>Hurry Emo!</v>
+
+19
+00:02:20.292 --> 00:02:22.792
+(louder telephone voices)
+
+20
+00:02:32.000 --> 00:02:34.500
+(phone ringing)
+
+21
+00:02:48.083 --> 00:02:50.000
+<v Proog>You're not paying attention!</v>
+
+22
+00:02:50.167 --> 00:02:54.125
+<v Emo>I just want to answer the... ...phone.</v>
+
+23
+00:02:55.000 --> 00:02:58.042
+<v Proog>Emo, look, I mean listen.</v>
+
+24
+00:02:59.167 --> 00:03:02.083
+<v Proog>You have to learn to listen.</v>
+
+25
+00:03:03.167 --> 00:03:05.042
+<v Proog>This is not some game.</v>
+
+26
+00:03:05.083 --> 00:03:09.417
+<v Proog>You, I mean we, we could easily die out here.</v>
+
+27
+00:03:10.042 --> 00:03:14.042
+<v Proog>Listen, listen to the sounds of the machine.</v>
+
+28
+00:03:18.083 --> 00:03:20.083
+<v Proog>Listen to your breathing.</v>
+
+29
+00:03:27.000 --> 00:03:29.000
+(Buzzing wires)
+
+30
+00:03:34.500 --> 00:03:36.500
+(laughing)
+
+31
+00:04:13.417 --> 00:04:15.417
+(oriental dance music)
+
+32
+00:04:27.042 --> 00:04:29.042
+<v Emo>Well, don't you ever get tired of this?</v>
+
+33
+00:04:29.125 --> 00:04:31.000
+<v Proog>Tired?!?</v>
+
+34
+00:04:31.167 --> 00:04:34.583
+<v Proog>Emo, the machine is like clockwork.</v>
+
+35
+00:04:35.125 --> 00:04:37.167
+<v Proog>One move out of place...</v>
+
+36
+00:04:37.208 --> 00:04:39.208
+<v Proog>...and you're ground to a pulp.</v>
+
+37
+00:04:41.000 --> 00:04:42.083
+<v Emo>But isn't it -</v>
+
+38
+00:04:42.083 --> 00:04:46.125
+<v Proog>Pulp, Emo! Is that what you want, pulp?</v>
+
+39
+00:04:47.083 --> 00:04:49.083
+<v Proog>Emo, your goal in life...</v>
+
+40
+00:04:50.125 --> 00:04:52.042
+<v Proog>...pulp?</v>
+
+41
+00:05:08.000 --> 00:05:10.500
+(loud metal sounds)
+
+42
+00:05:41.208 --> 00:05:43.125
+<v Proog>Emo, close your eyes.</v>
+
+43
+00:05:44.208 --> 00:05:46.125
+<v Emo>Why?</v> - <v Proog>Now!</v>
+
+44
+00:05:51.208 --> 00:05:52.208
+<v Emo>Ok.</v>
+
+45
+00:05:53.167 --> 00:05:54.792
+<v Proog>Good.</v>
+
+46
+00:05:59.125 --> 00:06:02.208
+<v Proog>What do you see at your left side, Emo?</v>
+
+47
+00:06:04.083 --> 00:06:06.000
+<v Emo>Nothing.</v> - <v Proog>Really?</v>
+
+48
+00:06:06.083 --> 00:06:07.208
+<v Emo>No, nothing at all.</v>
+
+49
+00:06:08.000 --> 00:06:12.083
+<v Proog>And at your right, what do you see at your right side, Emo?</v>
+
+50
+00:06:13.208 --> 00:06:16.208
+<v Emo>The same Proog, exactly the same...</v>
+
+51
+00:06:17.000 --> 00:06:19.208
+<v Emo>...nothing!</v> - <v Proog>Great.</v>
+
+52
+00:06:25.208 --> 00:06:27.208
+(sound of camera flash)
+
+53
+00:06:29.792 --> 00:06:31.792
+(engine drone)
+
+54
+00:06:40.167 --> 00:06:42.833
+<v Emo>Listen Proog! Do you hear that!</v> (amusement park music)
+
+55
+00:06:43.167 --> 00:06:45.000
+<v Emo>Can we go here?</v>
+
+56
+00:06:45.042 --> 00:06:48.000
+<v Proog>There? It isn't safe, Emo.</v>
+
+57
+00:06:49.208 --> 00:06:52.125
+<v Emo>But...</v> - <v Proog>Trust me, it's not.</v>
+
+58
+00:06:53.083 --> 00:06:54.208
+<v Emo>Maybe I could...</v>
+
+59
+00:06:54.208 --> 00:06:56.083
+<v Proog>No.</v>
+
+60
+00:06:57.167 --> 00:07:00.042
+<v Proog>NO!</v>
+
+61
+00:07:00.208 --> 00:07:03.167
+<v Proog>Any further questions, Emo?</v>
+
+62
+00:07:04.042 --> 00:07:05.208
+<v Emo>No.</v>
+
+63
+00:07:09.125 --> 00:07:10.208
+<v Proog>Emo?</v>
+
+64
+00:07:11.208 --> 00:07:13.125
+<v Proog>Emo, why...</v>
+
+65
+00:07:13.125 --> 00:07:14.125
+<v Proog>Emo...</v>
+
+66
+00:07:14.125 --> 00:07:18.125
+<v Proog>...why can't you see the beauty of this place?</v>
+
+67
+00:07:18.208 --> 00:07:20.167
+<v Proog>The way it works.</v>
+
+68
+00:07:20.208 --> 00:07:24.000
+<v Proog>How perfect it is.</v>
+
+69
+00:07:24.000 --> 00:07:27.083
+<v Emo>No, Proog, I don't see.</v>
+
+70
+00:07:27.125 --> 00:07:30.083
+<v Emo>I don't see because there's nothing there.</v>
+
+71
+00:07:31.125 --> 00:07:35.083
+<v Emo>And why should I trust my life to something that isn't there?</v>
+
+72
+00:07:35.125 --> 00:07:37.042
+<v Emo>Well can you tell me that?</v> - <v Proog>Emo...</v>
+
+73
+00:07:37.125 --> 00:07:39.042
+<v Emo>Answer me!</v>
+
+74
+00:07:43.042 --> 00:07:44.125
+<v Emo>Proog...</v>
+
+75
+00:07:45.125 --> 00:07:47.083
+<v Emo>...you're a sick man!</v>
+
+76
+00:07:47.083 --> 00:07:49.042
+<v Emo>Stay away from me!</v>
+
+77
+00:07:52.125 --> 00:07:55.000
+<v Proog>No! Emo! It's a trap!</v>
+
+78
+00:07:55.208 --> 00:07:57.042
+<v Emo>Hah, it's a trap.</v>
+
+79
+00:07:57.042 --> 00:08:01.167
+<v Emo>At the left side you can see the hanging gardens of Babylon!</v>
+
+80
+00:08:02.042 --> 00:08:04.083
+<v Emo>How's that for a trap?</v>
+
+81
+00:08:05.125 --> 00:08:07.042
+<v Proog>No, Emo.</v>
+
+82
+00:08:09.083 --> 00:08:12.208
+<v Emo>At the right side you can see... ...well guess what...</v>
+
+83
+00:08:13.000 --> 00:08:14.792
+<v Emo>...the colossus of Rhodes!</v>
+
+84
+00:08:15.208 --> 00:08:16.167
+<v Proog>No!</v>
+
+85
+00:08:16.167 --> 00:08:22.042
+<v Emo>The colossus of Rhodes and it is here just for you Proog.</v>
+
+86
+00:08:51.083 --> 00:08:53.042
+<v Proog>It is there...</v>
+
+87
+00:08:53.042 --> 00:08:56.167
+<v Proog>I'm telling you, Emo...</v>
+
+88
+00:08:57.083 --> 00:09:00.000
+<v Proog>...it is, it is.</v>
+
+89
+00:09:05.000 --> 00:09:07.500
+(howling wind)
\ No newline at end of file

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/empty.vtt Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/empty2.vtt Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/empty3.vtt Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/empty4.vtt Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/header.vtt Added

@@ -0,0 +1,42 @@
+WEBVTT
+This is a header
+with an empty line
+
+00:11.000 --> 00:13.000
+<v Roger Bingham>We are in New York City
+
+00:13.000 --> 00:16.000
+<v Roger Bingham>We're actually at the Lucern Hotel, just down the street
+
+00:16.000 --> 00:18.000
+<v Roger Bingham>from the American Museum of Natural History
+
+00:18.000 --> 00:20.000
+<v Roger Bingham>And with me is Neil deGrasse Tyson
+
+00:20.000 --> 00:22.000
+<v Roger Bingham>Astrophysicist, Director of the Hayden Planetarium
+
+00:22.000 --> 00:24.000
+<v Roger Bingham>at the AMNH.
+
+00:24.000 --> 00:26.000
+<v Roger Bingham>Thank you for walking down here.
+
+00:27.000 --> 00:30.000
+<v Roger Bingham>And I want to do a follow-up on the last conversation we did.
+
+00:30.000 --> 00:31.500 align:end size:50%
+<v Roger Bingham>When we e-mailed-
+
+00:30.500 --> 00:32.500 align:start size:50%
+<v Neil deGrasse Tyson>Didn't we talk about enough in that conversation?
+
+00:32.000 --> 00:35.500 align:end size:50%
+<v Roger Bingham>No! No no no no; 'cos 'cos obviously 'cos
+
+00:32.500 --> 00:33.500 align:start size:50%
+<v Neil deGrasse Tyson><i>Laughs</i>
+
+00:35.500 --> 00:38.000
+<v Roger Bingham>You know I'm so excited my glasses are falling off here.
\ No newline at end of file

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/invalid1.vtt Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/invalid2.vtt Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/invalid3.vtt Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/invalid4.vtt Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/invalid5.vtt Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/long-duration.vtt Added

@@ -0,0 +1,43814 @@
+WEBVTT long duration file
+
+0
+00:00:00.000 --> 00:00:02.000
+This is cue #0
+
+1
+00:00:01.000 --> 00:00:02.000
+This is cue #1
+
+2
+00:00:02.000 --> 00:00:03.000
+This is cue #2
+
+3
+00:00:03.000 --> 00:00:04.000
+This is cue #3
+
+4
+00:00:04.000 --> 00:00:05.000
+This is cue #4
+
+5
+00:00:05.000 --> 00:00:06.000
+This is cue #5
+
+6
+00:00:06.000 --> 00:00:07.000
+This is cue #6
+
+7
+00:00:07.000 --> 00:00:08.000
+This is cue #7
+
+8
+00:00:08.000 --> 00:00:09.000
+This is cue #8
+
+9
+00:00:09.000 --> 00:00:10.000
+This is cue #9
+
+10
+00:00:10.000 --> 00:00:11.000
+This is cue #10
+
+11
+00:00:11.000 --> 00:00:12.000
+This is cue #11
+
+12
+00:00:12.000 --> 00:00:13.000
+This is cue #12
+
+13
+00:00:13.000 --> 00:00:14.000
+This is cue #13
+
+14
+00:00:14.000 --> 00:00:15.000
+This is cue #14
+
+15
+00:00:15.000 --> 00:00:16.000
+This is cue #15
+
+16
+00:00:16.000 --> 00:00:17.000
+This is cue #16
+
+17
+00:00:17.000 --> 00:00:18.000
+This is cue #17
+
+18
+00:00:18.000 --> 00:00:19.000
+This is cue #18
+
+19
+00:00:19.000 --> 00:00:20.000
+This is cue #19
+
+20
+00:00:20.000 --> 00:00:21.000
+This is cue #20
+
+21
+00:00:21.000 --> 00:00:22.000
+This is cue #21
+
+22
+00:00:22.000 --> 00:00:23.000
+This is cue #22
+
+23
+00:00:23.000 --> 00:00:24.000
+This is cue #23
+
+24
+00:00:24.000 --> 00:00:25.000
+This is cue #24
+
+25
+00:00:25.000 --> 00:00:26.000
+This is cue #25
+
+26
+00:00:26.000 --> 00:00:27.000
+This is cue #26
+
+27
+00:00:27.000 --> 00:00:28.000
+This is cue #27
+
+28
+00:00:28.000 --> 00:00:29.000
+This is cue #28
+
+29
+00:00:29.000 --> 00:00:30.000
+This is cue #29
+
+30
+00:00:30.000 --> 00:00:31.000
+This is cue #30
+
+31
+00:00:31.000 --> 00:00:32.000
+This is cue #31
+
+32
+00:00:32.000 --> 00:00:33.000
+This is cue #32
+
+33
+00:00:33.000 --> 00:00:34.000
+This is cue #33
+
+34
+00:00:34.000 --> 00:00:35.000
+This is cue #34
+
+35
+00:00:35.000 --> 00:00:36.000
+This is cue #35
+
+36
+00:00:36.000 --> 00:00:37.000
+This is cue #36
+
+37
+00:00:37.000 --> 00:00:38.000
+This is cue #37
+
+38
+00:00:38.000 --> 00:00:39.000
+This is cue #38
+
+39
+00:00:39.000 --> 00:00:40.000
+This is cue #39
+
+40
+00:00:40.000 --> 00:00:41.000
+This is cue #40
+
+41
+00:00:41.000 --> 00:00:42.000
+This is cue #41
+
+42
+00:00:42.000 --> 00:00:43.000
+This is cue #42
+
+43
+00:00:43.000 --> 00:00:44.000
+This is cue #43
+
+44
+00:00:44.000 --> 00:00:45.000
+This is cue #44
+
+45
+00:00:45.000 --> 00:00:46.000
+This is cue #45
+
+46
+00:00:46.000 --> 00:00:47.000
+This is cue #46
+
+47
+00:00:47.000 --> 00:00:48.000
+This is cue #47
+
+48
+00:00:48.000 --> 00:00:49.000
+This is cue #48
+
+49
+00:00:49.000 --> 00:00:50.000
+This is cue #49
+
+50
+00:00:50.000 --> 00:00:51.000
+This is cue #50
+
+51
+00:00:51.000 --> 00:00:52.000
+This is cue #51
+
+52
+00:00:52.000 --> 00:00:53.000
+This is cue #52
+
+53
+00:00:53.000 --> 00:00:54.000
+This is cue #53
+
+54
+00:00:54.000 --> 00:00:55.000
+This is cue #54
+
+55
+00:00:55.000 --> 00:00:56.000
+This is cue #55
+
+56
+00:00:56.000 --> 00:00:57.000
+This is cue #56
+
+57
+00:00:57.000 --> 00:00:58.000
+This is cue #57
+
+58
+00:00:58.000 --> 00:00:59.000
+This is cue #58
+
+59
+00:00:59.000 --> 00:01:00.000
+This is cue #59
+
+60
+00:01:00.000 --> 00:01:01.000
+This is cue #60
+
+61
+00:01:01.000 --> 00:01:02.000
+This is cue #61
+
+62
+00:01:02.000 --> 00:01:03.000
+This is cue #62
+
+63
+00:01:03.000 --> 00:01:04.000
+This is cue #63
+
+64
+00:01:04.000 --> 00:01:05.000
+This is cue #64
+
+65
+00:01:05.000 --> 00:01:06.000
+This is cue #65
+
+66
+00:01:06.000 --> 00:01:07.000
+This is cue #66
+
+67
+00:01:07.000 --> 00:01:08.000
+This is cue #67
+
+68
+00:01:08.000 --> 00:01:09.000
+This is cue #68
+
+69
+00:01:09.000 --> 00:01:10.000
+This is cue #69
+
+70
+00:01:10.000 --> 00:01:11.000
+This is cue #70
+
+71
+00:01:11.000 --> 00:01:12.000
+This is cue #71
+
+72
+00:01:12.000 --> 00:01:13.000
+This is cue #72
+
+73
+00:01:13.000 --> 00:01:14.000
+This is cue #73
+
+74
+00:01:14.000 --> 00:01:15.000
+This is cue #74
+
+75
+00:01:15.000 --> 00:01:16.000
+This is cue #75
+
+76
+00:01:16.000 --> 00:01:17.000
+This is cue #76
+
+77
+00:01:17.000 --> 00:01:18.000
+This is cue #77
+
+78
+00:01:18.000 --> 00:01:19.000
+This is cue #78
+
+79
+00:01:19.000 --> 00:01:20.000
+This is cue #79
+
+80
+00:01:20.000 --> 00:01:21.000
+This is cue #80
+
+81
+00:01:21.000 --> 00:01:22.000
+This is cue #81
+
+82
+00:01:22.000 --> 00:01:23.000
+This is cue #82
+
+83
+00:01:23.000 --> 00:01:24.000
+This is cue #83
+
+84
+00:01:24.000 --> 00:01:25.000
+This is cue #84
+
+85
+00:01:25.000 --> 00:01:26.000
+This is cue #85
+
+86
+00:01:26.000 --> 00:01:27.000
+This is cue #86
+
+87
+00:01:27.000 --> 00:01:28.000
+This is cue #87
+
+88
+00:01:28.000 --> 00:01:29.000
+This is cue #88
+
+89
+00:01:29.000 --> 00:01:30.000
+This is cue #89
+
+90
+00:01:30.000 --> 00:01:31.000
+This is cue #90
+
+91
+00:01:31.000 --> 00:01:32.000
+This is cue #91
+
+92
+00:01:32.000 --> 00:01:33.000
+This is cue #92
+
+93
+00:01:33.000 --> 00:01:34.000
+This is cue #93
+
+94
+00:01:34.000 --> 00:01:35.000
+This is cue #94
+
+95
+00:01:35.000 --> 00:01:36.000
+This is cue #95
+
+96
+00:01:36.000 --> 00:01:37.000
+This is cue #96
+
+97
+00:01:37.000 --> 00:01:38.000
+This is cue #97
+
+98
+00:01:38.000 --> 00:01:39.000
+This is cue #98
+
+99
+00:01:39.000 --> 00:01:40.000
+This is cue #99
+
+100
+00:01:40.000 --> 00:01:41.000
+This is cue #100
+
+101
+00:01:41.000 --> 00:01:42.000
+This is cue #101
+
+102
+00:01:42.000 --> 00:01:43.000
+This is cue #102
+
+103
+00:01:43.000 --> 00:01:44.000
+This is cue #103
+
+104
+00:01:44.000 --> 00:01:45.000
+This is cue #104
+
+105
+00:01:45.000 --> 00:01:46.000
+This is cue #105
+
+106
+00:01:46.000 --> 00:01:47.000
+This is cue #106
+
+107
+00:01:47.000 --> 00:01:48.000
+This is cue #107
+
+108
+00:01:48.000 --> 00:01:49.000
+This is cue #108
+
+109
+00:01:49.000 --> 00:01:50.000
+This is cue #109
+
+110
+00:01:50.000 --> 00:01:51.000
+This is cue #110
+
+111
+00:01:51.000 --> 00:01:52.000
+This is cue #111
+
+112
+00:01:52.000 --> 00:01:53.000
+This is cue #112
+
+113
+00:01:53.000 --> 00:01:54.000
+This is cue #113
+
+114
+00:01:54.000 --> 00:01:55.000
+This is cue #114
+
+115
+00:01:55.000 --> 00:01:56.000
+This is cue #115
+
+116
+00:01:56.000 --> 00:01:57.000
+This is cue #116
+
+117
+00:01:57.000 --> 00:01:58.000
+This is cue #117
+
+118
+00:01:58.000 --> 00:01:59.000
+This is cue #118
+
+119
+00:01:59.000 --> 00:02:00.000
+This is cue #119
+
+120
+00:02:00.000 --> 00:02:01.000
+This is cue #120
+
+121
+00:02:01.000 --> 00:02:02.000
+This is cue #121
+
+122
+00:02:02.000 --> 00:02:03.000
+This is cue #122
+
+123
+00:02:03.000 --> 00:02:04.000
+This is cue #123
+
+124
+00:02:04.000 --> 00:02:05.000
+This is cue #124
+
+125
+00:02:05.000 --> 00:02:06.000
+This is cue #125
+
+126
+00:02:06.000 --> 00:02:07.000
+This is cue #126
+
+127
+00:02:07.000 --> 00:02:08.000
+This is cue #127
+
+128
+00:02:08.000 --> 00:02:09.000
+This is cue #128
+
+129
+00:02:09.000 --> 00:02:10.000
+This is cue #129
+
+130
+00:02:10.000 --> 00:02:11.000
+This is cue #130
+
+131
+00:02:11.000 --> 00:02:12.000
+This is cue #131
+
+132
+00:02:12.000 --> 00:02:13.000
+This is cue #132
+
+133
+00:02:13.000 --> 00:02:14.000
+This is cue #133
+
+134
+00:02:14.000 --> 00:02:15.000
+This is cue #134
+
+135
+00:02:15.000 --> 00:02:16.000
+This is cue #135
+
+136
+00:02:16.000 --> 00:02:17.000
+This is cue #136
+
+137
+00:02:17.000 --> 00:02:18.000
+This is cue #137
+
+138
+00:02:18.000 --> 00:02:19.000
+This is cue #138
+
+139
+00:02:19.000 --> 00:02:20.000
+This is cue #139
+
+140
+00:02:20.000 --> 00:02:21.000
+This is cue #140
+
+141
+00:02:21.000 --> 00:02:22.000
+This is cue #141
+
+142
+00:02:22.000 --> 00:02:23.000
+This is cue #142
+
+143
+00:02:23.000 --> 00:02:24.000
+This is cue #143
+
+144
+00:02:24.000 --> 00:02:25.000
+This is cue #144
+
+145
+00:02:25.000 --> 00:02:26.000
+This is cue #145
+
+146
+00:02:26.000 --> 00:02:27.000
+This is cue #146
+
+147
+00:02:27.000 --> 00:02:28.000
+This is cue #147
+
+148
+00:02:28.000 --> 00:02:29.000
+This is cue #148
+
+149
+00:02:29.000 --> 00:02:30.000
+This is cue #149
+
+150
+00:02:30.000 --> 00:02:31.000
+This is cue #150
+
+151
+00:02:31.000 --> 00:02:32.000
+This is cue #151
+
+152
+00:02:32.000 --> 00:02:33.000
+This is cue #152
+
+153
+00:02:33.000 --> 00:02:34.000
+This is cue #153
+
+154
+00:02:34.000 --> 00:02:35.000
+This is cue #154
+
+155
+00:02:35.000 --> 00:02:36.000
+This is cue #155
+
+156
+00:02:36.000 --> 00:02:37.000
+This is cue #156
+
+157
+00:02:37.000 --> 00:02:38.000
+This is cue #157
+
+158
+00:02:38.000 --> 00:02:39.000
+This is cue #158
+
+159
+00:02:39.000 --> 00:02:40.000
+This is cue #159
+
+160
+00:02:40.000 --> 00:02:41.000
+This is cue #160
+
+161
+00:02:41.000 --> 00:02:42.000
+This is cue #161
+
+162
+00:02:42.000 --> 00:02:43.000
+This is cue #162
+
+163
+00:02:43.000 --> 00:02:44.000
+This is cue #163
+
+164
+00:02:44.000 --> 00:02:45.000
+This is cue #164
+
+165
+00:02:45.000 --> 00:02:46.000
+This is cue #165
+
+166
+00:02:46.000 --> 00:02:47.000
+This is cue #166
+
+167
+00:02:47.000 --> 00:02:48.000
+This is cue #167
+
+168
+00:02:48.000 --> 00:02:49.000
+This is cue #168
+
+169
+00:02:49.000 --> 00:02:50.000
+This is cue #169
+
+170
+00:02:50.000 --> 00:02:51.000
+This is cue #170
+
+171
+00:02:51.000 --> 00:02:52.000
+This is cue #171
+
+172
+00:02:52.000 --> 00:02:53.000
+This is cue #172
+
+173
+00:02:53.000 --> 00:02:54.000
+This is cue #173
+
+174
+00:02:54.000 --> 00:02:55.000
+This is cue #174
+
+175
+00:02:55.000 --> 00:02:56.000
+This is cue #175
+
+176
+00:02:56.000 --> 00:02:57.000
+This is cue #176
+
+177
+00:02:57.000 --> 00:02:58.000
+This is cue #177
+
+178
+00:02:58.000 --> 00:02:59.000
+This is cue #178
+
+179
+00:02:59.000 --> 00:03:00.000
+This is cue #179
+
+180
+00:03:00.000 --> 00:03:01.000
+This is cue #180
+
+181
+00:03:01.000 --> 00:03:02.000
+This is cue #181
+
+182
+00:03:02.000 --> 00:03:03.000
+This is cue #182
+
+183
+00:03:03.000 --> 00:03:04.000
+This is cue #183
+
+184
+00:03:04.000 --> 00:03:05.000
+This is cue #184
+
+185
+00:03:05.000 --> 00:03:06.000
+This is cue #185
+
+186
+00:03:06.000 --> 00:03:07.000
+This is cue #186
+
+187
+00:03:07.000 --> 00:03:08.000
+This is cue #187
+
+188
+00:03:08.000 --> 00:03:09.000
+This is cue #188
+
+189
+00:03:09.000 --> 00:03:10.000
+This is cue #189
+
+190
+00:03:10.000 --> 00:03:11.000
+This is cue #190
+
+191
+00:03:11.000 --> 00:03:12.000
+This is cue #191
+
+192
+00:03:12.000 --> 00:03:13.000
+This is cue #192
+
+193
+00:03:13.000 --> 00:03:14.000
+This is cue #193
+
+194
+00:03:14.000 --> 00:03:15.000
+This is cue #194
+
+195
+00:03:15.000 --> 00:03:16.000
+This is cue #195
+
+196
+00:03:16.000 --> 00:03:17.000
+This is cue #196
+
+197
+00:03:17.000 --> 00:03:18.000
+This is cue #197
+
+198
+00:03:18.000 --> 00:03:19.000
+This is cue #198
+
+199
+00:03:19.000 --> 00:03:20.000
+This is cue #199
+
+200
+00:03:20.000 --> 00:03:21.000
+This is cue #200
+
+201
+00:03:21.000 --> 00:03:22.000
+This is cue #201
+
+202
+00:03:22.000 --> 00:03:23.000
+This is cue #202
+
+203
+00:03:23.000 --> 00:03:24.000
+This is cue #203
+
+204
+00:03:24.000 --> 00:03:25.000
+This is cue #204
+
+205
+00:03:25.000 --> 00:03:26.000
+This is cue #205
+
+206
+00:03:26.000 --> 00:03:27.000
+This is cue #206
+
+207
+00:03:27.000 --> 00:03:28.000
+This is cue #207
+
+208
+00:03:28.000 --> 00:03:29.000
+This is cue #208
+
+209
+00:03:29.000 --> 00:03:30.000
+This is cue #209
+
+210
+00:03:30.000 --> 00:03:31.000
+This is cue #210
+
+211
+00:03:31.000 --> 00:03:32.000
+This is cue #211
+
+212
+00:03:32.000 --> 00:03:33.000
+This is cue #212
+
+213
+00:03:33.000 --> 00:03:34.000
+This is cue #213
+
+214
+00:03:34.000 --> 00:03:35.000
+This is cue #214
+
+215
+00:03:35.000 --> 00:03:36.000
+This is cue #215
+
+216
+00:03:36.000 --> 00:03:37.000
+This is cue #216
+
+217
+00:03:37.000 --> 00:03:38.000
+This is cue #217
+
+218
+00:03:38.000 --> 00:03:39.000
+This is cue #218
+
+219
+00:03:39.000 --> 00:03:40.000
+This is cue #219
+
+220
+00:03:40.000 --> 00:03:41.000
+This is cue #220
+
+221
+00:03:41.000 --> 00:03:42.000
+This is cue #221
+
+222
+00:03:42.000 --> 00:03:43.000
+This is cue #222
+
+223
+00:03:43.000 --> 00:03:44.000
+This is cue #223
+
+224
+00:03:44.000 --> 00:03:45.000
+This is cue #224
+
+225
+00:03:45.000 --> 00:03:46.000
+This is cue #225
+
+226
+00:03:46.000 --> 00:03:47.000
+This is cue #226
+
+227
+00:03:47.000 --> 00:03:48.000
+This is cue #227
+
+228
+00:03:48.000 --> 00:03:49.000
+This is cue #228
+
+229
+00:03:49.000 --> 00:03:50.000
+This is cue #229
+
+230
+00:03:50.000 --> 00:03:51.000
+This is cue #230
+
+231
+00:03:51.000 --> 00:03:52.000
+This is cue #231
+
+232
+00:03:52.000 --> 00:03:53.000
+This is cue #232
+
+233
+00:03:53.000 --> 00:03:54.000
+This is cue #233
+
+234
+00:03:54.000 --> 00:03:55.000
+This is cue #234
+
+235
+00:03:55.000 --> 00:03:56.000
+This is cue #235
+
+236
+00:03:56.000 --> 00:03:57.000
+This is cue #236
+
+237
+00:03:57.000 --> 00:03:58.000
+This is cue #237
+
+238
+00:03:58.000 --> 00:03:59.000
+This is cue #238
+
+239
+00:03:59.000 --> 00:04:00.000
+This is cue #239
+
+240
+00:04:00.000 --> 00:04:01.000
+This is cue #240
+
+241
+00:04:01.000 --> 00:04:02.000
+This is cue #241
+
+242
+00:04:02.000 --> 00:04:03.000
+This is cue #242
+
+243
+00:04:03.000 --> 00:04:04.000
+This is cue #243
+
+244
+00:04:04.000 --> 00:04:05.000
+This is cue #244
+
+245
+00:04:05.000 --> 00:04:06.000
+This is cue #245
+
+246
+00:04:06.000 --> 00:04:07.000
+This is cue #246
+
+247
+00:04:07.000 --> 00:04:08.000
+This is cue #247
+
+248
+00:04:08.000 --> 00:04:09.000
+This is cue #248
+
+249
+00:04:09.000 --> 00:04:10.000
+This is cue #249
+
+250
+00:04:10.000 --> 00:04:11.000
+This is cue #250
+
+251
+00:04:11.000 --> 00:04:12.000
+This is cue #251
+
+252
+00:04:12.000 --> 00:04:13.000
+This is cue #252
+
+253
+00:04:13.000 --> 00:04:14.000
+This is cue #253
+
+254
+00:04:14.000 --> 00:04:15.000
+This is cue #254
+
+255
+00:04:15.000 --> 00:04:16.000
+This is cue #255
+
+256
+00:04:16.000 --> 00:04:17.000
+This is cue #256
+
+257
+00:04:17.000 --> 00:04:18.000
+This is cue #257
+
+258
+00:04:18.000 --> 00:04:19.000
+This is cue #258
+
+259
+00:04:19.000 --> 00:04:20.000
+This is cue #259
+
+260
+00:04:20.000 --> 00:04:21.000
+This is cue #260
+
+261
+00:04:21.000 --> 00:04:22.000
+This is cue #261
+
+262
+00:04:22.000 --> 00:04:23.000
+This is cue #262
+
+263
+00:04:23.000 --> 00:04:24.000
+This is cue #263
+
+264
+00:04:24.000 --> 00:04:25.000
+This is cue #264
+
+265
+00:04:25.000 --> 00:04:26.000
+This is cue #265
+
+266
+00:04:26.000 --> 00:04:27.000
+This is cue #266
+
+267
+00:04:27.000 --> 00:04:28.000
+This is cue #267
+
+268
+00:04:28.000 --> 00:04:29.000
+This is cue #268
+
+269
+00:04:29.000 --> 00:04:30.000
+This is cue #269
+
+270
+00:04:30.000 --> 00:04:31.000
+This is cue #270
+
+271
+00:04:31.000 --> 00:04:32.000
+This is cue #271
+
+272
+00:04:32.000 --> 00:04:33.000
+This is cue #272
+
+273
+00:04:33.000 --> 00:04:34.000
+This is cue #273
+
+274
+00:04:34.000 --> 00:04:35.000
+This is cue #274
+
+275
+00:04:35.000 --> 00:04:36.000
+This is cue #275
+
+276
+00:04:36.000 --> 00:04:37.000
+This is cue #276
+
+277
+00:04:37.000 --> 00:04:38.000
+This is cue #277
+
+278
+00:04:38.000 --> 00:04:39.000
+This is cue #278
+
+279
+00:04:39.000 --> 00:04:40.000
+This is cue #279
+
+280
+00:04:40.000 --> 00:04:41.000
+This is cue #280
+
+281
+00:04:41.000 --> 00:04:42.000
+This is cue #281
+
+282
+00:04:42.000 --> 00:04:43.000
+This is cue #282
+
+283
+00:04:43.000 --> 00:04:44.000
+This is cue #283
+
+284
+00:04:44.000 --> 00:04:45.000
+This is cue #284
+
+285
+00:04:45.000 --> 00:04:46.000
+This is cue #285
+
+286
+00:04:46.000 --> 00:04:47.000
+This is cue #286
+
+287
+00:04:47.000 --> 00:04:48.000
+This is cue #287
+
+288
+00:04:48.000 --> 00:04:49.000
+This is cue #288
+
+289
+00:04:49.000 --> 00:04:50.000
+This is cue #289
+
+290
+00:04:50.000 --> 00:04:51.000
+This is cue #290
+
+291
+00:04:51.000 --> 00:04:52.000
+This is cue #291
+
+292
+00:04:52.000 --> 00:04:53.000
+This is cue #292
+
+293
+00:04:53.000 --> 00:04:54.000
+This is cue #293
+
+294
+00:04:54.000 --> 00:04:55.000
+This is cue #294
+
+295
+00:04:55.000 --> 00:04:56.000
+This is cue #295
+
+296
+00:04:56.000 --> 00:04:57.000
+This is cue #296
+
+297
+00:04:57.000 --> 00:04:58.000
+This is cue #297
+
+298
+00:04:58.000 --> 00:04:59.000
+This is cue #298
+
+299
+00:04:59.000 --> 00:05:00.000
+This is cue #299
+
+300
+00:05:00.000 --> 00:05:01.000
+This is cue #300
+
+301
+00:05:01.000 --> 00:05:02.000
+This is cue #301
+
+302
+00:05:02.000 --> 00:05:03.000
+This is cue #302
+
+303
+00:05:03.000 --> 00:05:04.000
+This is cue #303
+
+304
+00:05:04.000 --> 00:05:05.000
+This is cue #304
+
+305
+00:05:05.000 --> 00:05:06.000
+This is cue #305
+
+306
+00:05:06.000 --> 00:05:07.000
+This is cue #306
+
+307
+00:05:07.000 --> 00:05:08.000
+This is cue #307
+
+308
+00:05:08.000 --> 00:05:09.000
+This is cue #308
+
+309
+00:05:09.000 --> 00:05:10.000
+This is cue #309
+
+310
+00:05:10.000 --> 00:05:11.000
+This is cue #310
+
+311
+00:05:11.000 --> 00:05:12.000
+This is cue #311
+
+312
+00:05:12.000 --> 00:05:13.000
+This is cue #312
+
+313
+00:05:13.000 --> 00:05:14.000
+This is cue #313
+
+314
+00:05:14.000 --> 00:05:15.000
+This is cue #314
+
+315
+00:05:15.000 --> 00:05:16.000
+This is cue #315
+
+316
+00:05:16.000 --> 00:05:17.000
+This is cue #316
+
+317
+00:05:17.000 --> 00:05:18.000
+This is cue #317
+
+318
+00:05:18.000 --> 00:05:19.000
+This is cue #318
+
+319
+00:05:19.000 --> 00:05:20.000
+This is cue #319
+
+320
+00:05:20.000 --> 00:05:21.000
+This is cue #320
+
+321
+00:05:21.000 --> 00:05:22.000
+This is cue #321
+
+322
+00:05:22.000 --> 00:05:23.000
+This is cue #322
+
+323
+00:05:23.000 --> 00:05:24.000
+This is cue #323
+
+324
+00:05:24.000 --> 00:05:25.000
+This is cue #324
+
+325
+00:05:25.000 --> 00:05:26.000
+This is cue #325
+
+326
+00:05:26.000 --> 00:05:27.000
+This is cue #326
+
+327
+00:05:27.000 --> 00:05:28.000
+This is cue #327
+
+328
+00:05:28.000 --> 00:05:29.000
+This is cue #328
+
+329
+00:05:29.000 --> 00:05:30.000
+This is cue #329
+
+330
+00:05:30.000 --> 00:05:31.000
+This is cue #330
+
+331
+00:05:31.000 --> 00:05:32.000
+This is cue #331
+
+332
+00:05:32.000 --> 00:05:33.000
+This is cue #332
+
+333
+00:05:33.000 --> 00:05:34.000
+This is cue #333
+
+334
+00:05:34.000 --> 00:05:35.000
+This is cue #334
+
+335
+00:05:35.000 --> 00:05:36.000
+This is cue #335
+
+336
+00:05:36.000 --> 00:05:37.000
+This is cue #336
+
+337
+00:05:37.000 --> 00:05:38.000
+This is cue #337
+
+338
+00:05:38.000 --> 00:05:39.000
+This is cue #338
+
+339
+00:05:39.000 --> 00:05:40.000
+This is cue #339
+
+340
+00:05:40.000 --> 00:05:41.000
+This is cue #340
+
+341
+00:05:41.000 --> 00:05:42.000
+This is cue #341
+
+342
+00:05:42.000 --> 00:05:43.000
+This is cue #342
+
+343
+00:05:43.000 --> 00:05:44.000
+This is cue #343
+
+344
+00:05:44.000 --> 00:05:45.000
+This is cue #344
+
+345
+00:05:45.000 --> 00:05:46.000
+This is cue #345
+
+346
+00:05:46.000 --> 00:05:47.000
+This is cue #346
+
+347
+00:05:47.000 --> 00:05:48.000
+This is cue #347
+
+348
+00:05:48.000 --> 00:05:49.000
+This is cue #348
+
+349
+00:05:49.000 --> 00:05:50.000
+This is cue #349
+
+350
+00:05:50.000 --> 00:05:51.000
+This is cue #350
+
+351
+00:05:51.000 --> 00:05:52.000
+This is cue #351
+
+352
+00:05:52.000 --> 00:05:53.000
+This is cue #352
+
+353
+00:05:53.000 --> 00:05:54.000
+This is cue #353
+
+354
+00:05:54.000 --> 00:05:55.000
+This is cue #354
+
+355
+00:05:55.000 --> 00:05:56.000
+This is cue #355
+
+356
+00:05:56.000 --> 00:05:57.000
+This is cue #356
+
+357
+00:05:57.000 --> 00:05:58.000
+This is cue #357
+
+358
+00:05:58.000 --> 00:05:59.000
+This is cue #358
+
+359
+00:05:59.000 --> 00:06:00.000
+This is cue #359
+
+360
+00:06:00.000 --> 00:06:01.000
+This is cue #360
+
+361
+00:06:01.000 --> 00:06:02.000
+This is cue #361
+
+362
+00:06:02.000 --> 00:06:03.000
+This is cue #362
+
+363
+00:06:03.000 --> 00:06:04.000
+This is cue #363
+
+364
+00:06:04.000 --> 00:06:05.000
+This is cue #364
+
+365
+00:06:05.000 --> 00:06:06.000
+This is cue #365
+
+366
+00:06:06.000 --> 00:06:07.000
+This is cue #366
+
+367
+00:06:07.000 --> 00:06:08.000
+This is cue #367
+
+368
+00:06:08.000 --> 00:06:09.000
+This is cue #368
+
+369
+00:06:09.000 --> 00:06:10.000
+This is cue #369
+
+370
+00:06:10.000 --> 00:06:11.000
+This is cue #370
+
+371
+00:06:11.000 --> 00:06:12.000
+This is cue #371
+
+372
+00:06:12.000 --> 00:06:13.000
+This is cue #372
+
+373
+00:06:13.000 --> 00:06:14.000
+This is cue #373
+
+374
+00:06:14.000 --> 00:06:15.000
+This is cue #374
+
+375
+00:06:15.000 --> 00:06:16.000
+This is cue #375
+
+376
+00:06:16.000 --> 00:06:17.000
+This is cue #376
+
+377
+00:06:17.000 --> 00:06:18.000
+This is cue #377
+
+378
+00:06:18.000 --> 00:06:19.000
+This is cue #378
+
+379
+00:06:19.000 --> 00:06:20.000
+This is cue #379
+
+380
+00:06:20.000 --> 00:06:21.000
+This is cue #380
+
+381
+00:06:21.000 --> 00:06:22.000
+This is cue #381
+
+382
+00:06:22.000 --> 00:06:23.000
+This is cue #382
+
+383
+00:06:23.000 --> 00:06:24.000
+This is cue #383
+
+384
+00:06:24.000 --> 00:06:25.000
+This is cue #384
+
+385
+00:06:25.000 --> 00:06:26.000
+This is cue #385
+
+386
+00:06:26.000 --> 00:06:27.000
+This is cue #386
+
+387
+00:06:27.000 --> 00:06:28.000
+This is cue #387
+
+388
+00:06:28.000 --> 00:06:29.000
+This is cue #388
+
+389
+00:06:29.000 --> 00:06:30.000
+This is cue #389
+
+390
+00:06:30.000 --> 00:06:31.000
+This is cue #390
+
+391
+00:06:31.000 --> 00:06:32.000
+This is cue #391
+
+392
+00:06:32.000 --> 00:06:33.000
+This is cue #392
+
+393
+00:06:33.000 --> 00:06:34.000
+This is cue #393
+
+394
+00:06:34.000 --> 00:06:35.000
+This is cue #394
+
+395
+00:06:35.000 --> 00:06:36.000
+This is cue #395
+
+396
+00:06:36.000 --> 00:06:37.000
+This is cue #396
+
+397
+00:06:37.000 --> 00:06:38.000
+This is cue #397
+
+398
+00:06:38.000 --> 00:06:39.000
+This is cue #398
+
+399
+00:06:39.000 --> 00:06:40.000
+This is cue #399
+
+400
+00:06:40.000 --> 00:06:41.000
+This is cue #400
+
+401
+00:06:41.000 --> 00:06:42.000
+This is cue #401
+
+402
+00:06:42.000 --> 00:06:43.000
+This is cue #402
+
+403
+00:06:43.000 --> 00:06:44.000
+This is cue #403
+
+404
+00:06:44.000 --> 00:06:45.000
+This is cue #404
+
+405
+00:06:45.000 --> 00:06:46.000
+This is cue #405
+
+406
+00:06:46.000 --> 00:06:47.000
+This is cue #406
+
+407
+00:06:47.000 --> 00:06:48.000
+This is cue #407
+
+408
+00:06:48.000 --> 00:06:49.000
+This is cue #408
+
+409
+00:06:49.000 --> 00:06:50.000
+This is cue #409
+
+410
+00:06:50.000 --> 00:06:51.000
+This is cue #410
+
+411
+00:06:51.000 --> 00:06:52.000
+This is cue #411
+
+412
+00:06:52.000 --> 00:06:53.000
+This is cue #412
+
+413
+00:06:53.000 --> 00:06:54.000
+This is cue #413
+
+414
+00:06:54.000 --> 00:06:55.000
+This is cue #414
+
+415
+00:06:55.000 --> 00:06:56.000
+This is cue #415
+
+416
+00:06:56.000 --> 00:06:57.000
+This is cue #416
+
+417
+00:06:57.000 --> 00:06:58.000
+This is cue #417
+
+418
+00:06:58.000 --> 00:06:59.000
+This is cue #418
+
+419
+00:06:59.000 --> 00:07:00.000
+This is cue #419
+
+420
+00:07:00.000 --> 00:07:01.000
+This is cue #420
+
+421
+00:07:01.000 --> 00:07:02.000
+This is cue #421
+
+422
+00:07:02.000 --> 00:07:03.000
+This is cue #422
+
+423
+00:07:03.000 --> 00:07:04.000
+This is cue #423
+
+424
+00:07:04.000 --> 00:07:05.000
+This is cue #424
+
+425
+00:07:05.000 --> 00:07:06.000
+This is cue #425
+
+426
+00:07:06.000 --> 00:07:07.000
+This is cue #426
+
+427
+00:07:07.000 --> 00:07:08.000
+This is cue #427
+
+428
+00:07:08.000 --> 00:07:09.000
+This is cue #428
+
+429
+00:07:09.000 --> 00:07:10.000
+This is cue #429
+
+430
+00:07:10.000 --> 00:07:11.000
+This is cue #430
+
+431
+00:07:11.000 --> 00:07:12.000
+This is cue #431
+
+432
+00:07:12.000 --> 00:07:13.000
+This is cue #432
+
+433
+00:07:13.000 --> 00:07:14.000
+This is cue #433
+
+434
+00:07:14.000 --> 00:07:15.000
+This is cue #434
+
+435
+00:07:15.000 --> 00:07:16.000
+This is cue #435
+
+436
+00:07:16.000 --> 00:07:17.000
+This is cue #436
+
+437
+00:07:17.000 --> 00:07:18.000
+This is cue #437
+
+438
+00:07:18.000 --> 00:07:19.000
+This is cue #438
+
+439
+00:07:19.000 --> 00:07:20.000
+This is cue #439
+
+440
+00:07:20.000 --> 00:07:21.000
+This is cue #440
+
+441
+00:07:21.000 --> 00:07:22.000
+This is cue #441
+
+442
+00:07:22.000 --> 00:07:23.000
+This is cue #442
+
+443
+00:07:23.000 --> 00:07:24.000
+This is cue #443
+
+444
+00:07:24.000 --> 00:07:25.000
+This is cue #444
+
+445
+00:07:25.000 --> 00:07:26.000
+This is cue #445
+
+446
+00:07:26.000 --> 00:07:27.000
+This is cue #446
+
+447
+00:07:27.000 --> 00:07:28.000
+This is cue #447
+
+448
+00:07:28.000 --> 00:07:29.000
+This is cue #448
+
+449
+00:07:29.000 --> 00:07:30.000
+This is cue #449
+
+450
+00:07:30.000 --> 00:07:31.000
+This is cue #450
+
+451
+00:07:31.000 --> 00:07:32.000
+This is cue #451
+
+452
+00:07:32.000 --> 00:07:33.000
+This is cue #452
+
+453
+00:07:33.000 --> 00:07:34.000
+This is cue #453
+
+454
+00:07:34.000 --> 00:07:35.000
+This is cue #454
+
+455
+00:07:35.000 --> 00:07:36.000
+This is cue #455
+
+456
+00:07:36.000 --> 00:07:37.000
+This is cue #456
+
+457
+00:07:37.000 --> 00:07:38.000
+This is cue #457
+
+458
+00:07:38.000 --> 00:07:39.000
+This is cue #458
+
+459
+00:07:39.000 --> 00:07:40.000
+This is cue #459
+
+460
+00:07:40.000 --> 00:07:41.000
+This is cue #460
+
+461
+00:07:41.000 --> 00:07:42.000
+This is cue #461
+
+462
+00:07:42.000 --> 00:07:43.000
+This is cue #462
+
+463
+00:07:43.000 --> 00:07:44.000
+This is cue #463
+
+464
+00:07:44.000 --> 00:07:45.000
+This is cue #464
+
+465
+00:07:45.000 --> 00:07:46.000
+This is cue #465
+
+466
+00:07:46.000 --> 00:07:47.000
+This is cue #466
+
+467
+00:07:47.000 --> 00:07:48.000
+This is cue #467
+
+468
+00:07:48.000 --> 00:07:49.000
+This is cue #468
+
+469
+00:07:49.000 --> 00:07:50.000
+This is cue #469
+
+470
+00:07:50.000 --> 00:07:51.000
+This is cue #470
+
+471
+00:07:51.000 --> 00:07:52.000
+This is cue #471
+
+472
+00:07:52.000 --> 00:07:53.000
+This is cue #472
+
+473
+00:07:53.000 --> 00:07:54.000
+This is cue #473
+
+474
+00:07:54.000 --> 00:07:55.000
+This is cue #474
+
+475
+00:07:55.000 --> 00:07:56.000
+This is cue #475
+
+476
+00:07:56.000 --> 00:07:57.000
+This is cue #476
+
+477
+00:07:57.000 --> 00:07:58.000
+This is cue #477
+
+478
+00:07:58.000 --> 00:07:59.000
+This is cue #478
+
+479
+00:07:59.000 --> 00:08:00.000
+This is cue #479
+
+480
+00:08:00.000 --> 00:08:01.000
+This is cue #480
+
+481
+00:08:01.000 --> 00:08:02.000
+This is cue #481
+
+482
+00:08:02.000 --> 00:08:03.000
+This is cue #482
+
+483
+00:08:03.000 --> 00:08:04.000
+This is cue #483
+
+484
+00:08:04.000 --> 00:08:05.000
+This is cue #484
+
+485
+00:08:05.000 --> 00:08:06.000
+This is cue #485
+
+486
+00:08:06.000 --> 00:08:07.000
+This is cue #486
+
+487
+00:08:07.000 --> 00:08:08.000
+This is cue #487
+
+488
+00:08:08.000 --> 00:08:09.000
+This is cue #488
+
+489
+00:08:09.000 --> 00:08:10.000
+This is cue #489
+
+490
+00:08:10.000 --> 00:08:11.000
+This is cue #490
+
+491
+00:08:11.000 --> 00:08:12.000
+This is cue #491
+
+492
+00:08:12.000 --> 00:08:13.000
+This is cue #492
+
+493
+00:08:13.000 --> 00:08:14.000
+This is cue #493
+
+494
+00:08:14.000 --> 00:08:15.000
+This is cue #494
+
+495
+00:08:15.000 --> 00:08:16.000
+This is cue #495
+
+496
+00:08:16.000 --> 00:08:17.000
+This is cue #496
+
+497
+00:08:17.000 --> 00:08:18.000
+This is cue #497
+
+498
+00:08:18.000 --> 00:08:19.000
+This is cue #498
+
+499
+00:08:19.000 --> 00:08:20.000
+This is cue #499
+
+500
+00:08:20.000 --> 00:08:21.000
+This is cue #500
+
+501
+00:08:21.000 --> 00:08:22.000
+This is cue #501
+
+502
+00:08:22.000 --> 00:08:23.000
+This is cue #502
+
+503
+00:08:23.000 --> 00:08:24.000
+This is cue #503
+
+504
+00:08:24.000 --> 00:08:25.000
+This is cue #504
+
+505
+00:08:25.000 --> 00:08:26.000
+This is cue #505
+
+506
+00:08:26.000 --> 00:08:27.000
+This is cue #506
+
+507
+00:08:27.000 --> 00:08:28.000
+This is cue #507
+
+508
+00:08:28.000 --> 00:08:29.000
+This is cue #508
+
+509
+00:08:29.000 --> 00:08:30.000
+This is cue #509
+
+510
+00:08:30.000 --> 00:08:31.000
+This is cue #510
+
+511
+00:08:31.000 --> 00:08:32.000
+This is cue #511
+
+512
+00:08:32.000 --> 00:08:33.000
+This is cue #512
+
+513
+00:08:33.000 --> 00:08:34.000
+This is cue #513
+
+514
+00:08:34.000 --> 00:08:35.000
+This is cue #514
+
+515
+00:08:35.000 --> 00:08:36.000
+This is cue #515
+
+516
+00:08:36.000 --> 00:08:37.000
+This is cue #516
+
+517
+00:08:37.000 --> 00:08:38.000
+This is cue #517
+
+518
+00:08:38.000 --> 00:08:39.000
+This is cue #518
+
+519
+00:08:39.000 --> 00:08:40.000
+This is cue #519
+
+520
+00:08:40.000 --> 00:08:41.000
+This is cue #520
+
+521
+00:08:41.000 --> 00:08:42.000
+This is cue #521
+
+522
+00:08:42.000 --> 00:08:43.000
+This is cue #522
+
+523
+00:08:43.000 --> 00:08:44.000
+This is cue #523
+
+524
+00:08:44.000 --> 00:08:45.000
+This is cue #524
+
+525
+00:08:45.000 --> 00:08:46.000
+This is cue #525
+
+526
+00:08:46.000 --> 00:08:47.000
+This is cue #526
+
+527
+00:08:47.000 --> 00:08:48.000
+This is cue #527
+
+528
+00:08:48.000 --> 00:08:49.000
+This is cue #528
+
+529
+00:08:49.000 --> 00:08:50.000
+This is cue #529
+
+530
+00:08:50.000 --> 00:08:51.000
+This is cue #530
+
+531
+00:08:51.000 --> 00:08:52.000
+This is cue #531
+
+532
+00:08:52.000 --> 00:08:53.000
+This is cue #532
+
+533
+00:08:53.000 --> 00:08:54.000
+This is cue #533
+
+534
+00:08:54.000 --> 00:08:55.000
+This is cue #534
+
+535
+00:08:55.000 --> 00:08:56.000
+This is cue #535
+
+536
+00:08:56.000 --> 00:08:57.000
+This is cue #536
+
+537
+00:08:57.000 --> 00:08:58.000
+This is cue #537
+
+538
+00:08:58.000 --> 00:08:59.000
+This is cue #538
+
+539
+00:08:59.000 --> 00:09:00.000
+This is cue #539
+
+540
+00:09:00.000 --> 00:09:01.000
+This is cue #540
+
+541
+00:09:01.000 --> 00:09:02.000
+This is cue #541
+
+542
+00:09:02.000 --> 00:09:03.000
+This is cue #542
+
+543
+00:09:03.000 --> 00:09:04.000
+This is cue #543
+
+544
+00:09:04.000 --> 00:09:05.000
+This is cue #544
+
+545
+00:09:05.000 --> 00:09:06.000
+This is cue #545
+
+546
+00:09:06.000 --> 00:09:07.000
+This is cue #546
+
+547
+00:09:07.000 --> 00:09:08.000
+This is cue #547
+
+548
+00:09:08.000 --> 00:09:09.000
+This is cue #548
+
+549
+00:09:09.000 --> 00:09:10.000
+This is cue #549
+
+550
+00:09:10.000 --> 00:09:11.000
+This is cue #550
+
+551
+00:09:11.000 --> 00:09:12.000
+This is cue #551
+
+552
+00:09:12.000 --> 00:09:13.000
+This is cue #552
+
+553
+00:09:13.000 --> 00:09:14.000
+This is cue #553
+
+554
+00:09:14.000 --> 00:09:15.000
+This is cue #554
+
+555
+00:09:15.000 --> 00:09:16.000
+This is cue #555
+
+556
+00:09:16.000 --> 00:09:17.000
+This is cue #556
+
+557
+00:09:17.000 --> 00:09:18.000
+This is cue #557
+
+558
+00:09:18.000 --> 00:09:19.000
+This is cue #558
+
+559
+00:09:19.000 --> 00:09:20.000
+This is cue #559
+
+560
+00:09:20.000 --> 00:09:21.000
+This is cue #560
+
+561
+00:09:21.000 --> 00:09:22.000
+This is cue #561
+
+562
+00:09:22.000 --> 00:09:23.000
+This is cue #562
+
+563
+00:09:23.000 --> 00:09:24.000
+This is cue #563
+
+564
+00:09:24.000 --> 00:09:25.000
+This is cue #564
+
+565
+00:09:25.000 --> 00:09:26.000
+This is cue #565
+
+566
+00:09:26.000 --> 00:09:27.000
+This is cue #566
+
+567
+00:09:27.000 --> 00:09:28.000
+This is cue #567
+
+568
+00:09:28.000 --> 00:09:29.000
+This is cue #568
+
+569
+00:09:29.000 --> 00:09:30.000
+This is cue #569
+
+570
+00:09:30.000 --> 00:09:31.000
+This is cue #570
+
+571
+00:09:31.000 --> 00:09:32.000
+This is cue #571
+
+572
+00:09:32.000 --> 00:09:33.000
+This is cue #572
+
+573
+00:09:33.000 --> 00:09:34.000
+This is cue #573
+
+574
+00:09:34.000 --> 00:09:35.000
+This is cue #574
+
+575
+00:09:35.000 --> 00:09:36.000
+This is cue #575
+
+576
+00:09:36.000 --> 00:09:37.000
+This is cue #576
+
+577
+00:09:37.000 --> 00:09:38.000
+This is cue #577
+
+578
+00:09:38.000 --> 00:09:39.000
+This is cue #578
+
+579
+00:09:39.000 --> 00:09:40.000
+This is cue #579
+
+580
+00:09:40.000 --> 00:09:41.000
+This is cue #580
+
+581
+00:09:41.000 --> 00:09:42.000
+This is cue #581
+
+582
+00:09:42.000 --> 00:09:43.000
+This is cue #582
+
+583
+00:09:43.000 --> 00:09:44.000
+This is cue #583
+
+584
+00:09:44.000 --> 00:09:45.000
+This is cue #584
+
+585
+00:09:45.000 --> 00:09:46.000
+This is cue #585
+
+586
+00:09:46.000 --> 00:09:47.000
+This is cue #586
+
+587
+00:09:47.000 --> 00:09:48.000
+This is cue #587
+
+588
+00:09:48.000 --> 00:09:49.000
+This is cue #588
+
+589
+00:09:49.000 --> 00:09:50.000
+This is cue #589
+
+590
+00:09:50.000 --> 00:09:51.000
+This is cue #590
+
+591
+00:09:51.000 --> 00:09:52.000
+This is cue #591
+
+592
+00:09:52.000 --> 00:09:53.000
+This is cue #592
+
+593
+00:09:53.000 --> 00:09:54.000
+This is cue #593
+
+594
+00:09:54.000 --> 00:09:55.000
+This is cue #594
+
+595
+00:09:55.000 --> 00:09:56.000
+This is cue #595
+
+596
+00:09:56.000 --> 00:09:57.000
+This is cue #596
+
+597
+00:09:57.000 --> 00:09:58.000
+This is cue #597
+
+598
+00:09:58.000 --> 00:09:59.000
+This is cue #598
+
+599
+00:09:59.000 --> 00:10:00.000
+This is cue #599
+
+600
+00:10:00.000 --> 00:10:01.000
+This is cue #600
+
+601
+00:10:01.000 --> 00:10:02.000
+This is cue #601
+
+602
+00:10:02.000 --> 00:10:03.000
+This is cue #602
+
+603
+00:10:03.000 --> 00:10:04.000
+This is cue #603
+
+604
+00:10:04.000 --> 00:10:05.000
+This is cue #604
+
+605
+00:10:05.000 --> 00:10:06.000
+This is cue #605
+
+606
+00:10:06.000 --> 00:10:07.000
+This is cue #606
+
+607
+00:10:07.000 --> 00:10:08.000
+This is cue #607
+
+608
+00:10:08.000 --> 00:10:09.000
+This is cue #608
+
+609
+00:10:09.000 --> 00:10:10.000
+This is cue #609
+
+610
+00:10:10.000 --> 00:10:11.000
+This is cue #610
+
+611
+00:10:11.000 --> 00:10:12.000
+This is cue #611
+
+612
+00:10:12.000 --> 00:10:13.000
+This is cue #612
+
+613
+00:10:13.000 --> 00:10:14.000
+This is cue #613
+
+614
+00:10:14.000 --> 00:10:15.000
+This is cue #614
+
+615
+00:10:15.000 --> 00:10:16.000
+This is cue #615
+
+616
+00:10:16.000 --> 00:10:17.000
+This is cue #616
+
+617
+00:10:17.000 --> 00:10:18.000
+This is cue #617
+
+618
+00:10:18.000 --> 00:10:19.000
+This is cue #618
+
+619
+00:10:19.000 --> 00:10:20.000
+This is cue #619
+
+620
+00:10:20.000 --> 00:10:21.000
+This is cue #620
+
+621
+00:10:21.000 --> 00:10:22.000
+This is cue #621
+
+622
+00:10:22.000 --> 00:10:23.000
+This is cue #622
+
+623
+00:10:23.000 --> 00:10:24.000
+This is cue #623
+
+624
+00:10:24.000 --> 00:10:25.000
+This is cue #624
+
+625
+00:10:25.000 --> 00:10:26.000
+This is cue #625
+
+626
+00:10:26.000 --> 00:10:27.000
+This is cue #626
+
+627
+00:10:27.000 --> 00:10:28.000
+This is cue #627
+
+628
+00:10:28.000 --> 00:10:29.000
+This is cue #628
+
+629
+00:10:29.000 --> 00:10:30.000
+This is cue #629
+
+630
+00:10:30.000 --> 00:10:31.000
+This is cue #630
+
+631
+00:10:31.000 --> 00:10:32.000
+This is cue #631
+
+632
+00:10:32.000 --> 00:10:33.000
+This is cue #632
+
+633
+00:10:33.000 --> 00:10:34.000
+This is cue #633
+
+634
+00:10:34.000 --> 00:10:35.000
+This is cue #634
+
+635
+00:10:35.000 --> 00:10:36.000
+This is cue #635
+
+636
+00:10:36.000 --> 00:10:37.000
+This is cue #636
+
+637
+00:10:37.000 --> 00:10:38.000
+This is cue #637
+
+638
+00:10:38.000 --> 00:10:39.000
+This is cue #638
+
+639
+00:10:39.000 --> 00:10:40.000
+This is cue #639
+
+640
+00:10:40.000 --> 00:10:41.000
+This is cue #640
+
+641
+00:10:41.000 --> 00:10:42.000
+This is cue #641
+
+642
+00:10:42.000 --> 00:10:43.000
+This is cue #642
+
+643
+00:10:43.000 --> 00:10:44.000
+This is cue #643
+
+644
+00:10:44.000 --> 00:10:45.000
+This is cue #644
+
+645
+00:10:45.000 --> 00:10:46.000
+This is cue #645
+
+646
+00:10:46.000 --> 00:10:47.000
+This is cue #646
+
+647
+00:10:47.000 --> 00:10:48.000
+This is cue #647
+
+648
+00:10:48.000 --> 00:10:49.000
+This is cue #648
+
+649
+00:10:49.000 --> 00:10:50.000
+This is cue #649
+
+650
+00:10:50.000 --> 00:10:51.000
+This is cue #650
+
+651
+00:10:51.000 --> 00:10:52.000
+This is cue #651
+
+652
+00:10:52.000 --> 00:10:53.000
+This is cue #652
+
+653
+00:10:53.000 --> 00:10:54.000
+This is cue #653
+
+654
+00:10:54.000 --> 00:10:55.000
+This is cue #654
+
+655
+00:10:55.000 --> 00:10:56.000
+This is cue #655
+
+656
+00:10:56.000 --> 00:10:57.000
+This is cue #656
+
+657
+00:10:57.000 --> 00:10:58.000
+This is cue #657
+
+658
+00:10:58.000 --> 00:10:59.000
+This is cue #658
+
+659
+00:10:59.000 --> 00:11:00.000
+This is cue #659
+
+660
+00:11:00.000 --> 00:11:01.000
+This is cue #660
+
+661
+00:11:01.000 --> 00:11:02.000
+This is cue #661
+
+662
+00:11:02.000 --> 00:11:03.000
+This is cue #662
+
+663
+00:11:03.000 --> 00:11:04.000
+This is cue #663
+
+664
+00:11:04.000 --> 00:11:05.000
+This is cue #664
+
+665
+00:11:05.000 --> 00:11:06.000
+This is cue #665
+
+666
+00:11:06.000 --> 00:11:07.000
+This is cue #666
+
+667
+00:11:07.000 --> 00:11:08.000
+This is cue #667
+
+668
+00:11:08.000 --> 00:11:09.000
+This is cue #668
+
+669
+00:11:09.000 --> 00:11:10.000
+This is cue #669
+
+670
+00:11:10.000 --> 00:11:11.000
+This is cue #670
+
+671
+00:11:11.000 --> 00:11:12.000
+This is cue #671
+
+672
+00:11:12.000 --> 00:11:13.000
+This is cue #672
+
+673
+00:11:13.000 --> 00:11:14.000
+This is cue #673
+
+674
+00:11:14.000 --> 00:11:15.000
+This is cue #674
+
+675
+00:11:15.000 --> 00:11:16.000
+This is cue #675
+
+676
+00:11:16.000 --> 00:11:17.000
+This is cue #676
+
+677
+00:11:17.000 --> 00:11:18.000
+This is cue #677
+
+678
+00:11:18.000 --> 00:11:19.000
+This is cue #678
+
+679
+00:11:19.000 --> 00:11:20.000
+This is cue #679
+
+680
+00:11:20.000 --> 00:11:21.000
+This is cue #680
+
+681
+00:11:21.000 --> 00:11:22.000
+This is cue #681
+
+682
+00:11:22.000 --> 00:11:23.000
+This is cue #682
+
+683
+00:11:23.000 --> 00:11:24.000
+This is cue #683
+
+684
+00:11:24.000 --> 00:11:25.000
+This is cue #684
+
+685
+00:11:25.000 --> 00:11:26.000
+This is cue #685
+
+686
+00:11:26.000 --> 00:11:27.000
+This is cue #686
+
+687
+00:11:27.000 --> 00:11:28.000
+This is cue #687
+
+688
+00:11:28.000 --> 00:11:29.000
+This is cue #688
+
+689
+00:11:29.000 --> 00:11:30.000
+This is cue #689
+
+690
+00:11:30.000 --> 00:11:31.000
+This is cue #690
+
+691
+00:11:31.000 --> 00:11:32.000
+This is cue #691
+
+692
+00:11:32.000 --> 00:11:33.000
+This is cue #692
+
+693
+00:11:33.000 --> 00:11:34.000
+This is cue #693
+
+694
+00:11:34.000 --> 00:11:35.000
+This is cue #694
+
+695
+00:11:35.000 --> 00:11:36.000
+This is cue #695
+
+696
+00:11:36.000 --> 00:11:37.000
+This is cue #696
+
+697
+00:11:37.000 --> 00:11:38.000
+This is cue #697
+
+698
+00:11:38.000 --> 00:11:39.000
+This is cue #698
+
+699
+00:11:39.000 --> 00:11:40.000
+This is cue #699
+
+700
+00:11:40.000 --> 00:11:41.000
+This is cue #700
+
+701
+00:11:41.000 --> 00:11:42.000
+This is cue #701
+
+702
+00:11:42.000 --> 00:11:43.000
+This is cue #702
+
+703
+00:11:43.000 --> 00:11:44.000
+This is cue #703
+
+704
+00:11:44.000 --> 00:11:45.000
+This is cue #704
+
+705
+00:11:45.000 --> 00:11:46.000
+This is cue #705
+
+706
+00:11:46.000 --> 00:11:47.000
+This is cue #706
+
+707
+00:11:47.000 --> 00:11:48.000
+This is cue #707
+
+708
+00:11:48.000 --> 00:11:49.000
+This is cue #708
+
+709
+00:11:49.000 --> 00:11:50.000
+This is cue #709
+
+710
+00:11:50.000 --> 00:11:51.000
+This is cue #710
+
+711
+00:11:51.000 --> 00:11:52.000
+This is cue #711
+
+712
+00:11:52.000 --> 00:11:53.000
+This is cue #712
+
+713
+00:11:53.000 --> 00:11:54.000
+This is cue #713
+
+714
+00:11:54.000 --> 00:11:55.000
+This is cue #714
+
+715
+00:11:55.000 --> 00:11:56.000
+This is cue #715
+
+716
+00:11:56.000 --> 00:11:57.000
+This is cue #716
+
+717
+00:11:57.000 --> 00:11:58.000
+This is cue #717
+
+718
+00:11:58.000 --> 00:11:59.000
+This is cue #718
+
+719
+00:11:59.000 --> 00:12:00.000
+This is cue #719
+
+720
+00:12:00.000 --> 00:12:01.000
+This is cue #720
+
+721
+00:12:01.000 --> 00:12:02.000
+This is cue #721
+
+722
+00:12:02.000 --> 00:12:03.000
+This is cue #722
+
+723
+00:12:03.000 --> 00:12:04.000
+This is cue #723
+
+724
+00:12:04.000 --> 00:12:05.000
+This is cue #724
+
+725
+00:12:05.000 --> 00:12:06.000
+This is cue #725
+
+726
+00:12:06.000 --> 00:12:07.000
+This is cue #726
+
+727
+00:12:07.000 --> 00:12:08.000
+This is cue #727
+
+728
+00:12:08.000 --> 00:12:09.000
+This is cue #728
+
+729
+00:12:09.000 --> 00:12:10.000
+This is cue #729
+
+730
+00:12:10.000 --> 00:12:11.000
+This is cue #730
+
+731
+00:12:11.000 --> 00:12:12.000
+This is cue #731
+
+732
+00:12:12.000 --> 00:12:13.000
+This is cue #732
+
+733
+00:12:13.000 --> 00:12:14.000
+This is cue #733
+
+734
+00:12:14.000 --> 00:12:15.000
+This is cue #734
+
+735
+00:12:15.000 --> 00:12:16.000
+This is cue #735
+
+736
+00:12:16.000 --> 00:12:17.000
+This is cue #736
+
+737
+00:12:17.000 --> 00:12:18.000
+This is cue #737
+
+738
+00:12:18.000 --> 00:12:19.000
+This is cue #738
+
+739
+00:12:19.000 --> 00:12:20.000
+This is cue #739
+
+740
+00:12:20.000 --> 00:12:21.000
+This is cue #740
+
+741
+00:12:21.000 --> 00:12:22.000
+This is cue #741
+
+742
+00:12:22.000 --> 00:12:23.000
+This is cue #742
+
+743
+00:12:23.000 --> 00:12:24.000
+This is cue #743
+
+744
+00:12:24.000 --> 00:12:25.000
+This is cue #744
+
+745
+00:12:25.000 --> 00:12:26.000
+This is cue #745
+
+746
+00:12:26.000 --> 00:12:27.000
+This is cue #746
+
+747
+00:12:27.000 --> 00:12:28.000
+This is cue #747
+
+748
+00:12:28.000 --> 00:12:29.000
+This is cue #748
+
+749
+00:12:29.000 --> 00:12:30.000
+This is cue #749
+
+750
+00:12:30.000 --> 00:12:31.000
+This is cue #750
+
+751
+00:12:31.000 --> 00:12:32.000
+This is cue #751
+
+752
+00:12:32.000 --> 00:12:33.000
+This is cue #752
+
+753
+00:12:33.000 --> 00:12:34.000
+This is cue #753
+
+754
+00:12:34.000 --> 00:12:35.000
+This is cue #754
+
+755
+00:12:35.000 --> 00:12:36.000
+This is cue #755
+
+756
+00:12:36.000 --> 00:12:37.000
+This is cue #756
+
+757
+00:12:37.000 --> 00:12:38.000
+This is cue #757
+
+758
+00:12:38.000 --> 00:12:39.000
+This is cue #758
+
+759
+00:12:39.000 --> 00:12:40.000
+This is cue #759
+
+760
+00:12:40.000 --> 00:12:41.000
+This is cue #760
+
+761
+00:12:41.000 --> 00:12:42.000
+This is cue #761
+
+762
+00:12:42.000 --> 00:12:43.000
+This is cue #762
+
+763
+00:12:43.000 --> 00:12:44.000
+This is cue #763
+
+764
+00:12:44.000 --> 00:12:45.000
+This is cue #764
+
+765
+00:12:45.000 --> 00:12:46.000
+This is cue #765
+
+766
+00:12:46.000 --> 00:12:47.000
+This is cue #766
+
+767
+00:12:47.000 --> 00:12:48.000
+This is cue #767
+
+768
+00:12:48.000 --> 00:12:49.000
+This is cue #768
+
+769
+00:12:49.000 --> 00:12:50.000
+This is cue #769
+
+770
+00:12:50.000 --> 00:12:51.000
+This is cue #770
+
+771
+00:12:51.000 --> 00:12:52.000
+This is cue #771
+
+772
+00:12:52.000 --> 00:12:53.000
+This is cue #772
+
+773
+00:12:53.000 --> 00:12:54.000
+This is cue #773
+
+774
+00:12:54.000 --> 00:12:55.000
+This is cue #774
+
+775
+00:12:55.000 --> 00:12:56.000
+This is cue #775
+
+776
+00:12:56.000 --> 00:12:57.000
+This is cue #776
+
+777
+00:12:57.000 --> 00:12:58.000
+This is cue #777
+
+778
+00:12:58.000 --> 00:12:59.000
+This is cue #778
+
+779
+00:12:59.000 --> 00:13:00.000
+This is cue #779
+
+780
+00:13:00.000 --> 00:13:01.000
+This is cue #780
+
+781
+00:13:01.000 --> 00:13:02.000
+This is cue #781
+
+782
+00:13:02.000 --> 00:13:03.000
+This is cue #782
+
+783
+00:13:03.000 --> 00:13:04.000
+This is cue #783
+
+784
+00:13:04.000 --> 00:13:05.000
+This is cue #784
+
+785
+00:13:05.000 --> 00:13:06.000
+This is cue #785
+
+786
+00:13:06.000 --> 00:13:07.000
+This is cue #786
+
+787
+00:13:07.000 --> 00:13:08.000
+This is cue #787
+
+788
+00:13:08.000 --> 00:13:09.000
+This is cue #788
+
+789
+00:13:09.000 --> 00:13:10.000
+This is cue #789
+
+790
+00:13:10.000 --> 00:13:11.000
+This is cue #790
+
+791
+00:13:11.000 --> 00:13:12.000
+This is cue #791
+
+792
+00:13:12.000 --> 00:13:13.000
+This is cue #792
+
+793
+00:13:13.000 --> 00:13:14.000
+This is cue #793
+
+794
+00:13:14.000 --> 00:13:15.000
+This is cue #794
+
+795
+00:13:15.000 --> 00:13:16.000
+This is cue #795
+
+796
+00:13:16.000 --> 00:13:17.000
+This is cue #796
+
+797
+00:13:17.000 --> 00:13:18.000
+This is cue #797
+
+798
+00:13:18.000 --> 00:13:19.000
+This is cue #798
+
+799
+00:13:19.000 --> 00:13:20.000
+This is cue #799
+
+800
+00:13:20.000 --> 00:13:21.000
+This is cue #800
+
+801
+00:13:21.000 --> 00:13:22.000
+This is cue #801
+
+802
+00:13:22.000 --> 00:13:23.000
+This is cue #802
+
+803
+00:13:23.000 --> 00:13:24.000
+This is cue #803
+
+804
+00:13:24.000 --> 00:13:25.000
+This is cue #804
+
+805
+00:13:25.000 --> 00:13:26.000
+This is cue #805
+
+806
+00:13:26.000 --> 00:13:27.000
+This is cue #806
+
+807
+00:13:27.000 --> 00:13:28.000
+This is cue #807
+
+808
+00:13:28.000 --> 00:13:29.000
+This is cue #808
+
+809
+00:13:29.000 --> 00:13:30.000
+This is cue #809
+
+810
+00:13:30.000 --> 00:13:31.000
+This is cue #810
+
+811
+00:13:31.000 --> 00:13:32.000
+This is cue #811
+
+812
+00:13:32.000 --> 00:13:33.000
+This is cue #812
+
+813
+00:13:33.000 --> 00:13:34.000
+This is cue #813
+
+814
+00:13:34.000 --> 00:13:35.000
+This is cue #814
+
+815
+00:13:35.000 --> 00:13:36.000
+This is cue #815
+
+816
+00:13:36.000 --> 00:13:37.000
+This is cue #816
+
+817
+00:13:37.000 --> 00:13:38.000
+This is cue #817
+
+818
+00:13:38.000 --> 00:13:39.000
+This is cue #818
+
+819
+00:13:39.000 --> 00:13:40.000
+This is cue #819
+
+820
+00:13:40.000 --> 00:13:41.000
+This is cue #820
+
+821
+00:13:41.000 --> 00:13:42.000
+This is cue #821
+
+822
+00:13:42.000 --> 00:13:43.000
+This is cue #822
+
+823
+00:13:43.000 --> 00:13:44.000
+This is cue #823
+
+824
+00:13:44.000 --> 00:13:45.000
+This is cue #824
+
+825
+00:13:45.000 --> 00:13:46.000
+This is cue #825
+
+826
+00:13:46.000 --> 00:13:47.000
+This is cue #826
+
+827
+00:13:47.000 --> 00:13:48.000
+This is cue #827
+
+828
+00:13:48.000 --> 00:13:49.000
+This is cue #828
+
+829
+00:13:49.000 --> 00:13:50.000
+This is cue #829
+
+830
+00:13:50.000 --> 00:13:51.000
+This is cue #830
+
+831
+00:13:51.000 --> 00:13:52.000
+This is cue #831
+
+832
+00:13:52.000 --> 00:13:53.000
+This is cue #832
+
+833
+00:13:53.000 --> 00:13:54.000
+This is cue #833
+
+834
+00:13:54.000 --> 00:13:55.000
+This is cue #834
+
+835
+00:13:55.000 --> 00:13:56.000
+This is cue #835
+
+836
+00:13:56.000 --> 00:13:57.000
+This is cue #836
+
+837
+00:13:57.000 --> 00:13:58.000
+This is cue #837
+
+838
+00:13:58.000 --> 00:13:59.000
+This is cue #838
+
+839
+00:13:59.000 --> 00:14:00.000
+This is cue #839
+
+840
+00:14:00.000 --> 00:14:01.000
+This is cue #840
+
+841
+00:14:01.000 --> 00:14:02.000
+This is cue #841
+
+842
+00:14:02.000 --> 00:14:03.000
+This is cue #842
+
+843
+00:14:03.000 --> 00:14:04.000
+This is cue #843
+
+844
+00:14:04.000 --> 00:14:05.000
+This is cue #844
+
+845
+00:14:05.000 --> 00:14:06.000
+This is cue #845
+
+846
+00:14:06.000 --> 00:14:07.000
+This is cue #846
+
+847
+00:14:07.000 --> 00:14:08.000
+This is cue #847
+
+848
+00:14:08.000 --> 00:14:09.000
+This is cue #848
+
+849
+00:14:09.000 --> 00:14:10.000
+This is cue #849
+
+850
+00:14:10.000 --> 00:14:11.000
+This is cue #850
+
+851
+00:14:11.000 --> 00:14:12.000
+This is cue #851
+
+852
+00:14:12.000 --> 00:14:13.000
+This is cue #852
+
+853
+00:14:13.000 --> 00:14:14.000
+This is cue #853
+
+854
+00:14:14.000 --> 00:14:15.000
+This is cue #854
+
+855
+00:14:15.000 --> 00:14:16.000
+This is cue #855
+
+856
+00:14:16.000 --> 00:14:17.000
+This is cue #856
+
+857
+00:14:17.000 --> 00:14:18.000
+This is cue #857
+
+858
+00:14:18.000 --> 00:14:19.000
+This is cue #858
+
+859
+00:14:19.000 --> 00:14:20.000
+This is cue #859
+
+860
+00:14:20.000 --> 00:14:21.000
+This is cue #860
+
+861
+00:14:21.000 --> 00:14:22.000
+This is cue #861
+
+862
+00:14:22.000 --> 00:14:23.000
+This is cue #862
+
+863
+00:14:23.000 --> 00:14:24.000
+This is cue #863
+
+864
+00:14:24.000 --> 00:14:25.000
+This is cue #864
+
+865
+00:14:25.000 --> 00:14:26.000
+This is cue #865
+
+866
+00:14:26.000 --> 00:14:27.000
+This is cue #866
+
+867
+00:14:27.000 --> 00:14:28.000
+This is cue #867
+
+868
+00:14:28.000 --> 00:14:29.000
+This is cue #868
+
+869
+00:14:29.000 --> 00:14:30.000
+This is cue #869
+
+870
+00:14:30.000 --> 00:14:31.000
+This is cue #870
+
+871
+00:14:31.000 --> 00:14:32.000
+This is cue #871
+
+872
+00:14:32.000 --> 00:14:33.000
+This is cue #872
+
+873
+00:14:33.000 --> 00:14:34.000
+This is cue #873
+
+874
+00:14:34.000 --> 00:14:35.000
+This is cue #874
+
+875
+00:14:35.000 --> 00:14:36.000
+This is cue #875
+
+876
+00:14:36.000 --> 00:14:37.000
+This is cue #876
+
+877
+00:14:37.000 --> 00:14:38.000
+This is cue #877
+
+878
+00:14:38.000 --> 00:14:39.000
+This is cue #878
+
+879
+00:14:39.000 --> 00:14:40.000
+This is cue #879
+
+880
+00:14:40.000 --> 00:14:41.000
+This is cue #880
+
+881
+00:14:41.000 --> 00:14:42.000
+This is cue #881
+
+882
+00:14:42.000 --> 00:14:43.000
+This is cue #882
+
+883
+00:14:43.000 --> 00:14:44.000
+This is cue #883
+
+884
+00:14:44.000 --> 00:14:45.000
+This is cue #884
+
+885
+00:14:45.000 --> 00:14:46.000
+This is cue #885
+
+886
+00:14:46.000 --> 00:14:47.000
+This is cue #886
+
+887
+00:14:47.000 --> 00:14:48.000
+This is cue #887
+
+888
+00:14:48.000 --> 00:14:49.000
+This is cue #888
+
+889
+00:14:49.000 --> 00:14:50.000
+This is cue #889
+
+890
+00:14:50.000 --> 00:14:51.000
+This is cue #890
+
+891
+00:14:51.000 --> 00:14:52.000
+This is cue #891
+
+892
+00:14:52.000 --> 00:14:53.000
+This is cue #892
+
+893
+00:14:53.000 --> 00:14:54.000
+This is cue #893
+
+894
+00:14:54.000 --> 00:14:55.000
+This is cue #894
+
+895
+00:14:55.000 --> 00:14:56.000
+This is cue #895
+
+896
+00:14:56.000 --> 00:14:57.000
+This is cue #896
+
+897
+00:14:57.000 --> 00:14:58.000
+This is cue #897
+
+898
+00:14:58.000 --> 00:14:59.000
+This is cue #898
+
+899
+00:14:59.000 --> 00:15:00.000
+This is cue #899
+
+900
+00:15:00.000 --> 00:15:01.000
+This is cue #900
+
+901
+00:15:01.000 --> 00:15:02.000
+This is cue #901
+
+902
+00:15:02.000 --> 00:15:03.000
+This is cue #902
+
+903
+00:15:03.000 --> 00:15:04.000
+This is cue #903
+
+904
+00:15:04.000 --> 00:15:05.000
+This is cue #904
+
+905
+00:15:05.000 --> 00:15:06.000
+This is cue #905
+
+906
+00:15:06.000 --> 00:15:07.000
+This is cue #906
+
+907
+00:15:07.000 --> 00:15:08.000
+This is cue #907
+
+908
+00:15:08.000 --> 00:15:09.000
+This is cue #908
+
+909
+00:15:09.000 --> 00:15:10.000
+This is cue #909
+
+910
+00:15:10.000 --> 00:15:11.000
+This is cue #910
+
+911
+00:15:11.000 --> 00:15:12.000
+This is cue #911
+
+912
+00:15:12.000 --> 00:15:13.000
+This is cue #912
+
+913
+00:15:13.000 --> 00:15:14.000
+This is cue #913
+
+914
+00:15:14.000 --> 00:15:15.000
+This is cue #914
+
+915
+00:15:15.000 --> 00:15:16.000
+This is cue #915
+
+916
+00:15:16.000 --> 00:15:17.000
+This is cue #916
+
+917
+00:15:17.000 --> 00:15:18.000
+This is cue #917
+
+918
+00:15:18.000 --> 00:15:19.000
+This is cue #918
+
+919
+00:15:19.000 --> 00:15:20.000
+This is cue #919
+
+920
+00:15:20.000 --> 00:15:21.000
+This is cue #920
+
+921
+00:15:21.000 --> 00:15:22.000
+This is cue #921
+
+922
+00:15:22.000 --> 00:15:23.000
+This is cue #922
+
+923
+00:15:23.000 --> 00:15:24.000
+This is cue #923
+
+924
+00:15:24.000 --> 00:15:25.000
+This is cue #924
+
+925
+00:15:25.000 --> 00:15:26.000
+This is cue #925
+
+926
+00:15:26.000 --> 00:15:27.000
+This is cue #926
+
+927
+00:15:27.000 --> 00:15:28.000
+This is cue #927
+
+928
+00:15:28.000 --> 00:15:29.000
+This is cue #928
+
+929
+00:15:29.000 --> 00:15:30.000
+This is cue #929
+
+930
+00:15:30.000 --> 00:15:31.000
+This is cue #930
+
+931
+00:15:31.000 --> 00:15:32.000
+This is cue #931
+
+932
+00:15:32.000 --> 00:15:33.000
+This is cue #932
+
+933
+00:15:33.000 --> 00:15:34.000
+This is cue #933
+
+934
+00:15:34.000 --> 00:15:35.000
+This is cue #934
+
+935
+00:15:35.000 --> 00:15:36.000
+This is cue #935
+
+936
+00:15:36.000 --> 00:15:37.000
+This is cue #936
+
+937
+00:15:37.000 --> 00:15:38.000
+This is cue #937
+
+938
+00:15:38.000 --> 00:15:39.000
+This is cue #938
+
+939
+00:15:39.000 --> 00:15:40.000
+This is cue #939
+
+940
+00:15:40.000 --> 00:15:41.000
+This is cue #940
+
+941
+00:15:41.000 --> 00:15:42.000
+This is cue #941
+
+942
+00:15:42.000 --> 00:15:43.000
+This is cue #942
+
+943
+00:15:43.000 --> 00:15:44.000
+This is cue #943
+
+944
+00:15:44.000 --> 00:15:45.000
+This is cue #944
+
+945
+00:15:45.000 --> 00:15:46.000
+This is cue #945
+
+946
+00:15:46.000 --> 00:15:47.000
+This is cue #946
+
+947
+00:15:47.000 --> 00:15:48.000
+This is cue #947
+
+948
+00:15:48.000 --> 00:15:49.000
+This is cue #948
+
+949
+00:15:49.000 --> 00:15:50.000
+This is cue #949
+
+950
+00:15:50.000 --> 00:15:51.000
+This is cue #950
+
+951
+00:15:51.000 --> 00:15:52.000
+This is cue #951
+
+952
+00:15:52.000 --> 00:15:53.000
+This is cue #952
+
+953
+00:15:53.000 --> 00:15:54.000
+This is cue #953
+
+954
+00:15:54.000 --> 00:15:55.000
+This is cue #954
+
+955
+00:15:55.000 --> 00:15:56.000
+This is cue #955
+
+956
+00:15:56.000 --> 00:15:57.000
+This is cue #956
+
+957
+00:15:57.000 --> 00:15:58.000
+This is cue #957
+
+958
+00:15:58.000 --> 00:15:59.000
+This is cue #958
+
+959
+00:15:59.000 --> 00:16:00.000
+This is cue #959
+
+960
+00:16:00.000 --> 00:16:01.000
+This is cue #960
+
+961
+00:16:01.000 --> 00:16:02.000
+This is cue #961
+
+962
+00:16:02.000 --> 00:16:03.000
+This is cue #962
+
+963
+00:16:03.000 --> 00:16:04.000
+This is cue #963
+
+964
+00:16:04.000 --> 00:16:05.000
+This is cue #964
+
+965
+00:16:05.000 --> 00:16:06.000
+This is cue #965
+
+966
+00:16:06.000 --> 00:16:07.000
+This is cue #966
+
+967
+00:16:07.000 --> 00:16:08.000
+This is cue #967
+
+968
+00:16:08.000 --> 00:16:09.000
+This is cue #968
+
+969
+00:16:09.000 --> 00:16:10.000
+This is cue #969
+
+970
+00:16:10.000 --> 00:16:11.000
+This is cue #970
+
+971
+00:16:11.000 --> 00:16:12.000
+This is cue #971
+
+972
+00:16:12.000 --> 00:16:13.000
+This is cue #972
+
+973
+00:16:13.000 --> 00:16:14.000
+This is cue #973
+
+974
+00:16:14.000 --> 00:16:15.000
+This is cue #974
+
+975
+00:16:15.000 --> 00:16:16.000
+This is cue #975
+
+976
+00:16:16.000 --> 00:16:17.000
+This is cue #976
+
+977
+00:16:17.000 --> 00:16:18.000
+This is cue #977
+
+978
+00:16:18.000 --> 00:16:19.000
+This is cue #978
+
+979
+00:16:19.000 --> 00:16:20.000
+This is cue #979
+
+980
+00:16:20.000 --> 00:16:21.000
+This is cue #980
+
+981
+00:16:21.000 --> 00:16:22.000
+This is cue #981
+
+982
+00:16:22.000 --> 00:16:23.000
+This is cue #982
+
+983
+00:16:23.000 --> 00:16:24.000
+This is cue #983
+
+984
+00:16:24.000 --> 00:16:25.000
+This is cue #984
+
+985
+00:16:25.000 --> 00:16:26.000
+This is cue #985
+
+986
+00:16:26.000 --> 00:16:27.000
+This is cue #986
+
+987
+00:16:27.000 --> 00:16:28.000
+This is cue #987
+
+988
+00:16:28.000 --> 00:16:29.000
+This is cue #988
+
+989
+00:16:29.000 --> 00:16:30.000
+This is cue #989
+
+990
+00:16:30.000 --> 00:16:31.000
+This is cue #990
+
+991
+00:16:31.000 --> 00:16:32.000
+This is cue #991
+
+992
+00:16:32.000 --> 00:16:33.000
+This is cue #992
+
+993
+00:16:33.000 --> 00:16:34.000
+This is cue #993
+
+994
+00:16:34.000 --> 00:16:35.000
+This is cue #994
+
+995
+00:16:35.000 --> 00:16:36.000
+This is cue #995
+
+996
+00:16:36.000 --> 00:16:37.000
+This is cue #996
+
+997
+00:16:37.000 --> 00:16:38.000
+This is cue #997
+
+998
+00:16:38.000 --> 00:16:39.000
+This is cue #998
+
+999
+00:16:39.000 --> 00:16:40.000
+This is cue #999
+
+1000
+00:16:40.000 --> 00:16:41.000
+This is cue #1000
+
+1001
+00:16:41.000 --> 00:16:42.000
+This is cue #1001
+
+1002
+00:16:42.000 --> 00:16:43.000
+This is cue #1002
+
+1003
+00:16:43.000 --> 00:16:44.000
+This is cue #1003
+
+1004
+00:16:44.000 --> 00:16:45.000
+This is cue #1004
+
+1005
+00:16:45.000 --> 00:16:46.000
+This is cue #1005
+
+1006
+00:16:46.000 --> 00:16:47.000
+This is cue #1006
+
+1007
+00:16:47.000 --> 00:16:48.000
+This is cue #1007
+
+1008
+00:16:48.000 --> 00:16:49.000
+This is cue #1008
+
+1009
+00:16:49.000 --> 00:16:50.000
+This is cue #1009
+
+1010
+00:16:50.000 --> 00:16:51.000
+This is cue #1010
+
+1011
+00:16:51.000 --> 00:16:52.000
+This is cue #1011
+
+1012
+00:16:52.000 --> 00:16:53.000
+This is cue #1012
+
+1013
+00:16:53.000 --> 00:16:54.000
+This is cue #1013
+
+1014
+00:16:54.000 --> 00:16:55.000
+This is cue #1014
+
+1015
+00:16:55.000 --> 00:16:56.000
+This is cue #1015
+
+1016
+00:16:56.000 --> 00:16:57.000
+This is cue #1016
+
+1017
+00:16:57.000 --> 00:16:58.000
+This is cue #1017
+
+1018
+00:16:58.000 --> 00:16:59.000
+This is cue #1018
+
+1019
+00:16:59.000 --> 00:17:00.000
+This is cue #1019
+
+1020
+00:17:00.000 --> 00:17:01.000
+This is cue #1020
+
+1021
+00:17:01.000 --> 00:17:02.000
+This is cue #1021
+
+1022
+00:17:02.000 --> 00:17:03.000
+This is cue #1022
+
+1023
+00:17:03.000 --> 00:17:04.000
+This is cue #1023
+
+1024
+00:17:04.000 --> 00:17:05.000
+This is cue #1024
+
+1025
+00:17:05.000 --> 00:17:06.000
+This is cue #1025
+
+1026
+00:17:06.000 --> 00:17:07.000
+This is cue #1026
+
+1027
+00:17:07.000 --> 00:17:08.000
+This is cue #1027
+
+1028
+00:17:08.000 --> 00:17:09.000
+This is cue #1028
+
+1029
+00:17:09.000 --> 00:17:10.000
+This is cue #1029
+
+1030
+00:17:10.000 --> 00:17:11.000
+This is cue #1030
+
+1031
+00:17:11.000 --> 00:17:12.000
+This is cue #1031
+
+1032
+00:17:12.000 --> 00:17:13.000
+This is cue #1032
+
+1033
+00:17:13.000 --> 00:17:14.000
+This is cue #1033
+
+1034
+00:17:14.000 --> 00:17:15.000
+This is cue #1034
+
+1035
+00:17:15.000 --> 00:17:16.000
+This is cue #1035
+
+1036
+00:17:16.000 --> 00:17:17.000
+This is cue #1036
+
+1037
+00:17:17.000 --> 00:17:18.000
+This is cue #1037
+
+1038
+00:17:18.000 --> 00:17:19.000
+This is cue #1038
+
+1039
+00:17:19.000 --> 00:17:20.000
+This is cue #1039
+
+1040
+00:17:20.000 --> 00:17:21.000
+This is cue #1040
+
+1041
+00:17:21.000 --> 00:17:22.000
+This is cue #1041
+
+1042
+00:17:22.000 --> 00:17:23.000
+This is cue #1042
+
+1043
+00:17:23.000 --> 00:17:24.000
+This is cue #1043
+
+1044
+00:17:24.000 --> 00:17:25.000
+This is cue #1044
+
+1045
+00:17:25.000 --> 00:17:26.000
+This is cue #1045
+
+1046
+00:17:26.000 --> 00:17:27.000
+This is cue #1046
+
+1047
+00:17:27.000 --> 00:17:28.000
+This is cue #1047
+
+1048
+00:17:28.000 --> 00:17:29.000
+This is cue #1048
+
+1049
+00:17:29.000 --> 00:17:30.000
+This is cue #1049
+
+1050
+00:17:30.000 --> 00:17:31.000
+This is cue #1050
+
+1051
+00:17:31.000 --> 00:17:32.000
+This is cue #1051
+
+1052
+00:17:32.000 --> 00:17:33.000
+This is cue #1052
+
+1053
+00:17:33.000 --> 00:17:34.000
+This is cue #1053
+
+1054
+00:17:34.000 --> 00:17:35.000
+This is cue #1054
+
+1055
+00:17:35.000 --> 00:17:36.000
+This is cue #1055
+
+1056
+00:17:36.000 --> 00:17:37.000
+This is cue #1056
+
+1057
+00:17:37.000 --> 00:17:38.000
+This is cue #1057
+
+1058
+00:17:38.000 --> 00:17:39.000
+This is cue #1058
+
+1059
+00:17:39.000 --> 00:17:40.000
+This is cue #1059
+
+1060
+00:17:40.000 --> 00:17:41.000
+This is cue #1060
+
+1061
+00:17:41.000 --> 00:17:42.000
+This is cue #1061
+
+1062
+00:17:42.000 --> 00:17:43.000
+This is cue #1062
+
+1063
+00:17:43.000 --> 00:17:44.000
+This is cue #1063
+
+1064
+00:17:44.000 --> 00:17:45.000
+This is cue #1064
+
+1065
+00:17:45.000 --> 00:17:46.000
+This is cue #1065
+
+1066
+00:17:46.000 --> 00:17:47.000
+This is cue #1066
+
+1067
+00:17:47.000 --> 00:17:48.000
+This is cue #1067
+
+1068
+00:17:48.000 --> 00:17:49.000
+This is cue #1068
+
+1069
+00:17:49.000 --> 00:17:50.000
+This is cue #1069
+
+1070
+00:17:50.000 --> 00:17:51.000
+This is cue #1070
+
+1071
+00:17:51.000 --> 00:17:52.000
+This is cue #1071
+
+1072
+00:17:52.000 --> 00:17:53.000
+This is cue #1072
+
+1073
+00:17:53.000 --> 00:17:54.000
+This is cue #1073
+
+1074
+00:17:54.000 --> 00:17:55.000
+This is cue #1074
+
+1075
+00:17:55.000 --> 00:17:56.000
+This is cue #1075
+
+1076
+00:17:56.000 --> 00:17:57.000
+This is cue #1076
+
+1077
+00:17:57.000 --> 00:17:58.000
+This is cue #1077
+
+1078
+00:17:58.000 --> 00:17:59.000
+This is cue #1078
+
+1079
+00:17:59.000 --> 00:18:00.000
+This is cue #1079
+
+1080
+00:18:00.000 --> 00:18:01.000
+This is cue #1080
+
+1081
+00:18:01.000 --> 00:18:02.000
+This is cue #1081
+
+1082
+00:18:02.000 --> 00:18:03.000
+This is cue #1082
+
+1083
+00:18:03.000 --> 00:18:04.000
+This is cue #1083
+
+1084
+00:18:04.000 --> 00:18:05.000
+This is cue #1084
+
+1085
+00:18:05.000 --> 00:18:06.000
+This is cue #1085
+
+1086
+00:18:06.000 --> 00:18:07.000
+This is cue #1086
+
+1087
+00:18:07.000 --> 00:18:08.000
+This is cue #1087
+
+1088
+00:18:08.000 --> 00:18:09.000
+This is cue #1088
+
+1089
+00:18:09.000 --> 00:18:10.000
+This is cue #1089
+
+1090
+00:18:10.000 --> 00:18:11.000
+This is cue #1090
+
+1091
+00:18:11.000 --> 00:18:12.000
+This is cue #1091
+
+1092
+00:18:12.000 --> 00:18:13.000
+This is cue #1092
+
+1093
+00:18:13.000 --> 00:18:14.000
+This is cue #1093
+
+1094
+00:18:14.000 --> 00:18:15.000
+This is cue #1094
+
+1095
+00:18:15.000 --> 00:18:16.000
+This is cue #1095
+
+1096
+00:18:16.000 --> 00:18:17.000
+This is cue #1096
+
+1097
+00:18:17.000 --> 00:18:18.000
+This is cue #1097
+
+1098
+00:18:18.000 --> 00:18:19.000
+This is cue #1098
+
+1099
+00:18:19.000 --> 00:18:20.000
+This is cue #1099
+
+1100
+00:18:20.000 --> 00:18:21.000
+This is cue #1100
+
+1101
+00:18:21.000 --> 00:18:22.000
+This is cue #1101
+
+1102
+00:18:22.000 --> 00:18:23.000
+This is cue #1102
+
+1103
+00:18:23.000 --> 00:18:24.000
+This is cue #1103
+
+1104
+00:18:24.000 --> 00:18:25.000
+This is cue #1104
+
+1105
+00:18:25.000 --> 00:18:26.000
+This is cue #1105
+
+1106
+00:18:26.000 --> 00:18:27.000
+This is cue #1106
+
+1107
+00:18:27.000 --> 00:18:28.000
+This is cue #1107
+
+1108
+00:18:28.000 --> 00:18:29.000
+This is cue #1108
+
+1109
+00:18:29.000 --> 00:18:30.000
+This is cue #1109
+
+1110
+00:18:30.000 --> 00:18:31.000
+This is cue #1110
+
+1111
+00:18:31.000 --> 00:18:32.000
+This is cue #1111
+
+1112
+00:18:32.000 --> 00:18:33.000
+This is cue #1112
+
+1113
+00:18:33.000 --> 00:18:34.000
+This is cue #1113
+
+1114
+00:18:34.000 --> 00:18:35.000
+This is cue #1114
+
+1115
+00:18:35.000 --> 00:18:36.000
+This is cue #1115
+
+1116
+00:18:36.000 --> 00:18:37.000
+This is cue #1116
+
+1117
+00:18:37.000 --> 00:18:38.000
+This is cue #1117
+
+1118
+00:18:38.000 --> 00:18:39.000
+This is cue #1118
+
+1119
+00:18:39.000 --> 00:18:40.000
+This is cue #1119
+
+1120
+00:18:40.000 --> 00:18:41.000
+This is cue #1120
+
+1121
+00:18:41.000 --> 00:18:42.000
+This is cue #1121
+
+1122
+00:18:42.000 --> 00:18:43.000
+This is cue #1122
+
+1123
+00:18:43.000 --> 00:18:44.000
+This is cue #1123
+
+1124
+00:18:44.000 --> 00:18:45.000
+This is cue #1124
+
+1125
+00:18:45.000 --> 00:18:46.000
+This is cue #1125
+
+1126
+00:18:46.000 --> 00:18:47.000
+This is cue #1126
+
+1127
+00:18:47.000 --> 00:18:48.000
+This is cue #1127
+
+1128
+00:18:48.000 --> 00:18:49.000
+This is cue #1128
+
+1129
+00:18:49.000 --> 00:18:50.000
+This is cue #1129
+
+1130
+00:18:50.000 --> 00:18:51.000
+This is cue #1130
+
+1131
+00:18:51.000 --> 00:18:52.000
+This is cue #1131
+
+1132
+00:18:52.000 --> 00:18:53.000
+This is cue #1132
+
+1133
+00:18:53.000 --> 00:18:54.000
+This is cue #1133
+
+1134
+00:18:54.000 --> 00:18:55.000
+This is cue #1134
+
+1135
+00:18:55.000 --> 00:18:56.000
+This is cue #1135
+
+1136
+00:18:56.000 --> 00:18:57.000
+This is cue #1136
+
+1137
+00:18:57.000 --> 00:18:58.000
+This is cue #1137
+
+1138
+00:18:58.000 --> 00:18:59.000
+This is cue #1138
+
+1139
+00:18:59.000 --> 00:19:00.000
+This is cue #1139
+
+1140
+00:19:00.000 --> 00:19:01.000
+This is cue #1140
+
+1141
+00:19:01.000 --> 00:19:02.000
+This is cue #1141
+
+1142
+00:19:02.000 --> 00:19:03.000
+This is cue #1142
+
+1143
+00:19:03.000 --> 00:19:04.000
+This is cue #1143
+
+1144
+00:19:04.000 --> 00:19:05.000
+This is cue #1144
+
+1145
+00:19:05.000 --> 00:19:06.000
+This is cue #1145
+
+1146
+00:19:06.000 --> 00:19:07.000
+This is cue #1146
+
+1147
+00:19:07.000 --> 00:19:08.000
+This is cue #1147
+
+1148
+00:19:08.000 --> 00:19:09.000
+This is cue #1148
+
+1149
+00:19:09.000 --> 00:19:10.000
+This is cue #1149
+
+1150
+00:19:10.000 --> 00:19:11.000
+This is cue #1150
+
+1151
+00:19:11.000 --> 00:19:12.000
+This is cue #1151
+
+1152
+00:19:12.000 --> 00:19:13.000
+This is cue #1152
+
+1153
+00:19:13.000 --> 00:19:14.000
+This is cue #1153
+
+1154
+00:19:14.000 --> 00:19:15.000
+This is cue #1154
+
+1155
+00:19:15.000 --> 00:19:16.000
+This is cue #1155
+
+1156
+00:19:16.000 --> 00:19:17.000
+This is cue #1156
+
+1157
+00:19:17.000 --> 00:19:18.000
+This is cue #1157
+
+1158
+00:19:18.000 --> 00:19:19.000
+This is cue #1158
+
+1159
+00:19:19.000 --> 00:19:20.000
+This is cue #1159
+
+1160
+00:19:20.000 --> 00:19:21.000
+This is cue #1160
+
+1161
+00:19:21.000 --> 00:19:22.000
+This is cue #1161
+
+1162
+00:19:22.000 --> 00:19:23.000
+This is cue #1162
+
+1163
+00:19:23.000 --> 00:19:24.000
+This is cue #1163
+
+1164
+00:19:24.000 --> 00:19:25.000
+This is cue #1164
+
+1165
+00:19:25.000 --> 00:19:26.000
+This is cue #1165
+
+1166
+00:19:26.000 --> 00:19:27.000
+This is cue #1166
+
+1167
+00:19:27.000 --> 00:19:28.000
+This is cue #1167
+
+1168
+00:19:28.000 --> 00:19:29.000
+This is cue #1168
+
+1169
+00:19:29.000 --> 00:19:30.000
+This is cue #1169
+
+1170
+00:19:30.000 --> 00:19:31.000
+This is cue #1170
+
+1171
+00:19:31.000 --> 00:19:32.000
+This is cue #1171
+
+1172
+00:19:32.000 --> 00:19:33.000
+This is cue #1172
+
+1173
+00:19:33.000 --> 00:19:34.000
+This is cue #1173
+
+1174
+00:19:34.000 --> 00:19:35.000
+This is cue #1174
+
+1175
+00:19:35.000 --> 00:19:36.000
+This is cue #1175
+
+1176
+00:19:36.000 --> 00:19:37.000
+This is cue #1176
+
+1177
+00:19:37.000 --> 00:19:38.000
+This is cue #1177
+
+1178
+00:19:38.000 --> 00:19:39.000
+This is cue #1178
+
+1179
+00:19:39.000 --> 00:19:40.000
+This is cue #1179
+
+1180
+00:19:40.000 --> 00:19:41.000
+This is cue #1180
+
+1181
+00:19:41.000 --> 00:19:42.000
+This is cue #1181
+
+1182
+00:19:42.000 --> 00:19:43.000
+This is cue #1182
+
+1183
+00:19:43.000 --> 00:19:44.000
+This is cue #1183
+
+1184
+00:19:44.000 --> 00:19:45.000
+This is cue #1184
+
+1185
+00:19:45.000 --> 00:19:46.000
+This is cue #1185
+
+1186
+00:19:46.000 --> 00:19:47.000
+This is cue #1186
+
+1187
+00:19:47.000 --> 00:19:48.000
+This is cue #1187
+
+1188
+00:19:48.000 --> 00:19:49.000
+This is cue #1188
+
+1189
+00:19:49.000 --> 00:19:50.000
+This is cue #1189
+
+1190
+00:19:50.000 --> 00:19:51.000
+This is cue #1190
+
+1191
+00:19:51.000 --> 00:19:52.000
+This is cue #1191
+
+1192
+00:19:52.000 --> 00:19:53.000
+This is cue #1192
+
+1193
+00:19:53.000 --> 00:19:54.000
+This is cue #1193
+
+1194
+00:19:54.000 --> 00:19:55.000
+This is cue #1194
+
+1195
+00:19:55.000 --> 00:19:56.000
+This is cue #1195
+
+1196
+00:19:56.000 --> 00:19:57.000
+This is cue #1196
+
+1197
+00:19:57.000 --> 00:19:58.000
+This is cue #1197
+
+1198
+00:19:58.000 --> 00:19:59.000
+This is cue #1198
+
+1199
+00:19:59.000 --> 00:20:00.000
+This is cue #1199
+
+1200
+00:20:00.000 --> 00:20:01.000
+This is cue #1200
+
+1201
+00:20:01.000 --> 00:20:02.000
+This is cue #1201
+
+1202
+00:20:02.000 --> 00:20:03.000
+This is cue #1202
+
+1203
+00:20:03.000 --> 00:20:04.000
+This is cue #1203
+
+1204
+00:20:04.000 --> 00:20:05.000
+This is cue #1204
+
+1205
+00:20:05.000 --> 00:20:06.000
+This is cue #1205
+
+1206
+00:20:06.000 --> 00:20:07.000
+This is cue #1206
+
+1207
+00:20:07.000 --> 00:20:08.000
+This is cue #1207
+
+1208
+00:20:08.000 --> 00:20:09.000
+This is cue #1208
+
+1209
+00:20:09.000 --> 00:20:10.000
+This is cue #1209
+
+1210
+00:20:10.000 --> 00:20:11.000
+This is cue #1210
+
+1211
+00:20:11.000 --> 00:20:12.000
+This is cue #1211
+
+1212
+00:20:12.000 --> 00:20:13.000
+This is cue #1212
+
+1213
+00:20:13.000 --> 00:20:14.000
+This is cue #1213
+
+1214
+00:20:14.000 --> 00:20:15.000
+This is cue #1214
+
+1215
+00:20:15.000 --> 00:20:16.000
+This is cue #1215
+
+1216
+00:20:16.000 --> 00:20:17.000
+This is cue #1216
+
+1217
+00:20:17.000 --> 00:20:18.000
+This is cue #1217
+
+1218
+00:20:18.000 --> 00:20:19.000
+This is cue #1218
+
+1219
+00:20:19.000 --> 00:20:20.000
+This is cue #1219
+
+1220
+00:20:20.000 --> 00:20:21.000
+This is cue #1220
+
+1221
+00:20:21.000 --> 00:20:22.000
+This is cue #1221
+
+1222
+00:20:22.000 --> 00:20:23.000
+This is cue #1222
+
+1223
+00:20:23.000 --> 00:20:24.000
+This is cue #1223
+
+1224
+00:20:24.000 --> 00:20:25.000
+This is cue #1224
+
+1225
+00:20:25.000 --> 00:20:26.000
+This is cue #1225
+
+1226
+00:20:26.000 --> 00:20:27.000
+This is cue #1226
+
+1227
+00:20:27.000 --> 00:20:28.000
+This is cue #1227
+
+1228
+00:20:28.000 --> 00:20:29.000
+This is cue #1228
+
+1229
+00:20:29.000 --> 00:20:30.000
+This is cue #1229
+
+1230
+00:20:30.000 --> 00:20:31.000
+This is cue #1230
+
+1231
+00:20:31.000 --> 00:20:32.000
+This is cue #1231
+
+1232
+00:20:32.000 --> 00:20:33.000
+This is cue #1232
+
+1233
+00:20:33.000 --> 00:20:34.000
+This is cue #1233
+
+1234
+00:20:34.000 --> 00:20:35.000
+This is cue #1234
+
+1235
+00:20:35.000 --> 00:20:36.000
+This is cue #1235
+
+1236
+00:20:36.000 --> 00:20:37.000
+This is cue #1236
+
+1237
+00:20:37.000 --> 00:20:38.000
+This is cue #1237
+
+1238
+00:20:38.000 --> 00:20:39.000
+This is cue #1238
+
+1239
+00:20:39.000 --> 00:20:40.000
+This is cue #1239
+
+1240
+00:20:40.000 --> 00:20:41.000
+This is cue #1240
+
+1241
+00:20:41.000 --> 00:20:42.000
+This is cue #1241
+
+1242
+00:20:42.000 --> 00:20:43.000
+This is cue #1242
+
+1243
+00:20:43.000 --> 00:20:44.000
+This is cue #1243
+
+1244
+00:20:44.000 --> 00:20:45.000
+This is cue #1244
+
+1245
+00:20:45.000 --> 00:20:46.000
+This is cue #1245
+
+1246
+00:20:46.000 --> 00:20:47.000
+This is cue #1246
+
+1247
+00:20:47.000 --> 00:20:48.000
+This is cue #1247
+
+1248
+00:20:48.000 --> 00:20:49.000
+This is cue #1248
+
+1249
+00:20:49.000 --> 00:20:50.000
+This is cue #1249
+
+1250
+00:20:50.000 --> 00:20:51.000
+This is cue #1250
+
+1251
+00:20:51.000 --> 00:20:52.000
+This is cue #1251
+
+1252
+00:20:52.000 --> 00:20:53.000
+This is cue #1252
+
+1253
+00:20:53.000 --> 00:20:54.000
+This is cue #1253
+
+1254
+00:20:54.000 --> 00:20:55.000
+This is cue #1254
+
+1255
+00:20:55.000 --> 00:20:56.000
+This is cue #1255
+
+1256
+00:20:56.000 --> 00:20:57.000
+This is cue #1256
+
+1257
+00:20:57.000 --> 00:20:58.000
+This is cue #1257
+
+1258
+00:20:58.000 --> 00:20:59.000
+This is cue #1258
+
+1259
+00:20:59.000 --> 00:21:00.000
+This is cue #1259
+
+1260
+00:21:00.000 --> 00:21:01.000
+This is cue #1260
+
+1261
+00:21:01.000 --> 00:21:02.000
+This is cue #1261
+
+1262
+00:21:02.000 --> 00:21:03.000
+This is cue #1262
+
+1263
+00:21:03.000 --> 00:21:04.000
+This is cue #1263
+
+1264
+00:21:04.000 --> 00:21:05.000
+This is cue #1264
+
+1265
+00:21:05.000 --> 00:21:06.000
+This is cue #1265
+
+1266
+00:21:06.000 --> 00:21:07.000
+This is cue #1266
+
+1267
+00:21:07.000 --> 00:21:08.000
+This is cue #1267
+
+1268
+00:21:08.000 --> 00:21:09.000
+This is cue #1268
+
+1269
+00:21:09.000 --> 00:21:10.000
+This is cue #1269
+
+1270
+00:21:10.000 --> 00:21:11.000
+This is cue #1270
+
+1271
+00:21:11.000 --> 00:21:12.000
+This is cue #1271
+
+1272
+00:21:12.000 --> 00:21:13.000
+This is cue #1272
+
+1273
+00:21:13.000 --> 00:21:14.000
+This is cue #1273
+
+1274
+00:21:14.000 --> 00:21:15.000
+This is cue #1274
+
+1275
+00:21:15.000 --> 00:21:16.000
+This is cue #1275
+
+1276
+00:21:16.000 --> 00:21:17.000
+This is cue #1276
+
+1277
+00:21:17.000 --> 00:21:18.000
+This is cue #1277
+
+1278
+00:21:18.000 --> 00:21:19.000
+This is cue #1278
+
+1279
+00:21:19.000 --> 00:21:20.000
+This is cue #1279
+
+1280
+00:21:20.000 --> 00:21:21.000
+This is cue #1280
+
+1281
+00:21:21.000 --> 00:21:22.000
+This is cue #1281
+
+1282
+00:21:22.000 --> 00:21:23.000
+This is cue #1282
+
+1283
+00:21:23.000 --> 00:21:24.000
+This is cue #1283
+
+1284
+00:21:24.000 --> 00:21:25.000
+This is cue #1284
+
+1285
+00:21:25.000 --> 00:21:26.000
+This is cue #1285
+
+1286
+00:21:26.000 --> 00:21:27.000
+This is cue #1286
+
+1287
+00:21:27.000 --> 00:21:28.000
+This is cue #1287
+
+1288
+00:21:28.000 --> 00:21:29.000
+This is cue #1288
+
+1289
+00:21:29.000 --> 00:21:30.000
+This is cue #1289
+
+1290
+00:21:30.000 --> 00:21:31.000
+This is cue #1290
+
+1291
+00:21:31.000 --> 00:21:32.000
+This is cue #1291
+
+1292
+00:21:32.000 --> 00:21:33.000
+This is cue #1292
+
+1293
+00:21:33.000 --> 00:21:34.000
+This is cue #1293
+
+1294
+00:21:34.000 --> 00:21:35.000
+This is cue #1294
+
+1295
+00:21:35.000 --> 00:21:36.000
+This is cue #1295
+
+1296
+00:21:36.000 --> 00:21:37.000
+This is cue #1296
+
+1297
+00:21:37.000 --> 00:21:38.000
+This is cue #1297
+
+1298
+00:21:38.000 --> 00:21:39.000
+This is cue #1298
+
+1299
+00:21:39.000 --> 00:21:40.000
+This is cue #1299
+
+1300
+00:21:40.000 --> 00:21:41.000
+This is cue #1300
+
+1301
+00:21:41.000 --> 00:21:42.000
+This is cue #1301
+
+1302
+00:21:42.000 --> 00:21:43.000
+This is cue #1302
+
+1303
+00:21:43.000 --> 00:21:44.000
+This is cue #1303
+
+1304
+00:21:44.000 --> 00:21:45.000
+This is cue #1304
+
+1305
+00:21:45.000 --> 00:21:46.000
+This is cue #1305
+
+1306
+00:21:46.000 --> 00:21:47.000
+This is cue #1306
+
+1307
+00:21:47.000 --> 00:21:48.000
+This is cue #1307
+
+1308
+00:21:48.000 --> 00:21:49.000
+This is cue #1308
+
+1309
+00:21:49.000 --> 00:21:50.000
+This is cue #1309
+
+1310
+00:21:50.000 --> 00:21:51.000
+This is cue #1310
+
+1311
+00:21:51.000 --> 00:21:52.000
+This is cue #1311
+
+1312
+00:21:52.000 --> 00:21:53.000
+This is cue #1312
+
+1313
+00:21:53.000 --> 00:21:54.000
+This is cue #1313
+
+1314
+00:21:54.000 --> 00:21:55.000
+This is cue #1314
+
+1315
+00:21:55.000 --> 00:21:56.000
+This is cue #1315
+
+1316
+00:21:56.000 --> 00:21:57.000
+This is cue #1316
+
+1317
+00:21:57.000 --> 00:21:58.000
+This is cue #1317
+
+1318
+00:21:58.000 --> 00:21:59.000
+This is cue #1318
+
+1319
+00:21:59.000 --> 00:22:00.000
+This is cue #1319
+
+1320
+00:22:00.000 --> 00:22:01.000
+This is cue #1320
+
+1321
+00:22:01.000 --> 00:22:02.000
+This is cue #1321
+
+1322
+00:22:02.000 --> 00:22:03.000
+This is cue #1322
+
+1323
+00:22:03.000 --> 00:22:04.000
+This is cue #1323
+
+1324
+00:22:04.000 --> 00:22:05.000
+This is cue #1324
+
+1325
+00:22:05.000 --> 00:22:06.000
+This is cue #1325
+
+1326
+00:22:06.000 --> 00:22:07.000
+This is cue #1326
+
+1327
+00:22:07.000 --> 00:22:08.000
+This is cue #1327
+
+1328
+00:22:08.000 --> 00:22:09.000
+This is cue #1328
+
+1329
+00:22:09.000 --> 00:22:10.000
+This is cue #1329
+
+1330
+00:22:10.000 --> 00:22:11.000
+This is cue #1330
+
+1331
+00:22:11.000 --> 00:22:12.000
+This is cue #1331
+
+1332
+00:22:12.000 --> 00:22:13.000
+This is cue #1332
+
+1333
+00:22:13.000 --> 00:22:14.000
+This is cue #1333
+
+1334
+00:22:14.000 --> 00:22:15.000
+This is cue #1334
+
+1335
+00:22:15.000 --> 00:22:16.000
+This is cue #1335
+
+1336
+00:22:16.000 --> 00:22:17.000
+This is cue #1336
+
+1337
+00:22:17.000 --> 00:22:18.000
+This is cue #1337
+
+1338
+00:22:18.000 --> 00:22:19.000
+This is cue #1338
+
+1339
+00:22:19.000 --> 00:22:20.000
+This is cue #1339
+
+1340
+00:22:20.000 --> 00:22:21.000
+This is cue #1340
+
+1341
+00:22:21.000 --> 00:22:22.000
+This is cue #1341
+
+1342
+00:22:22.000 --> 00:22:23.000
+This is cue #1342
+
+1343
+00:22:23.000 --> 00:22:24.000
+This is cue #1343
+
+1344
+00:22:24.000 --> 00:22:25.000
+This is cue #1344
+
+1345
+00:22:25.000 --> 00:22:26.000
+This is cue #1345
+
+1346
+00:22:26.000 --> 00:22:27.000
+This is cue #1346
+
+1347
+00:22:27.000 --> 00:22:28.000
+This is cue #1347
+
+1348
+00:22:28.000 --> 00:22:29.000
+This is cue #1348
+
+1349
+00:22:29.000 --> 00:22:30.000
+This is cue #1349
+
+1350
+00:22:30.000 --> 00:22:31.000
+This is cue #1350
+
+1351
+00:22:31.000 --> 00:22:32.000
+This is cue #1351
+
+1352
+00:22:32.000 --> 00:22:33.000
+This is cue #1352
+
+1353
+00:22:33.000 --> 00:22:34.000
+This is cue #1353
+
+1354
+00:22:34.000 --> 00:22:35.000
+This is cue #1354
+
+1355
+00:22:35.000 --> 00:22:36.000
+This is cue #1355
+
+1356
+00:22:36.000 --> 00:22:37.000
+This is cue #1356
+
+1357
+00:22:37.000 --> 00:22:38.000
+This is cue #1357
+
+1358
+00:22:38.000 --> 00:22:39.000
+This is cue #1358
+
+1359
+00:22:39.000 --> 00:22:40.000
+This is cue #1359
+
+1360
+00:22:40.000 --> 00:22:41.000
+This is cue #1360
+
+1361
+00:22:41.000 --> 00:22:42.000
+This is cue #1361
+
+1362
+00:22:42.000 --> 00:22:43.000
+This is cue #1362
+
+1363
+00:22:43.000 --> 00:22:44.000
+This is cue #1363
+
+1364
+00:22:44.000 --> 00:22:45.000
+This is cue #1364
+
+1365
+00:22:45.000 --> 00:22:46.000
+This is cue #1365
+
+1366
+00:22:46.000 --> 00:22:47.000
+This is cue #1366
+
+1367
+00:22:47.000 --> 00:22:48.000
+This is cue #1367
+
+1368
+00:22:48.000 --> 00:22:49.000
+This is cue #1368
+
+1369
+00:22:49.000 --> 00:22:50.000
+This is cue #1369
+
+1370
+00:22:50.000 --> 00:22:51.000
+This is cue #1370
+
+1371
+00:22:51.000 --> 00:22:52.000
+This is cue #1371
+
+1372
+00:22:52.000 --> 00:22:53.000
+This is cue #1372
+
+1373
+00:22:53.000 --> 00:22:54.000
+This is cue #1373
+
+1374
+00:22:54.000 --> 00:22:55.000
+This is cue #1374
+
+1375
+00:22:55.000 --> 00:22:56.000
+This is cue #1375
+
+1376
+00:22:56.000 --> 00:22:57.000
+This is cue #1376
+
+1377
+00:22:57.000 --> 00:22:58.000
+This is cue #1377
+
+1378
+00:22:58.000 --> 00:22:59.000
+This is cue #1378
+
+1379
+00:22:59.000 --> 00:23:00.000
+This is cue #1379
+
+1380
+00:23:00.000 --> 00:23:01.000
+This is cue #1380
+
+1381
+00:23:01.000 --> 00:23:02.000
+This is cue #1381
+
+1382
+00:23:02.000 --> 00:23:03.000
+This is cue #1382
+
+1383
+00:23:03.000 --> 00:23:04.000
+This is cue #1383
+
+1384
+00:23:04.000 --> 00:23:05.000
+This is cue #1384
+
+1385
+00:23:05.000 --> 00:23:06.000
+This is cue #1385
+
+1386
+00:23:06.000 --> 00:23:07.000
+This is cue #1386
+
+1387
+00:23:07.000 --> 00:23:08.000
+This is cue #1387
+
+1388
+00:23:08.000 --> 00:23:09.000
+This is cue #1388
+
+1389
+00:23:09.000 --> 00:23:10.000
+This is cue #1389
+
+1390
+00:23:10.000 --> 00:23:11.000
+This is cue #1390
+
+1391
+00:23:11.000 --> 00:23:12.000
+This is cue #1391
+
+1392
+00:23:12.000 --> 00:23:13.000
+This is cue #1392
+
+1393
+00:23:13.000 --> 00:23:14.000
+This is cue #1393
+
+1394
+00:23:14.000 --> 00:23:15.000
+This is cue #1394
+
+1395
+00:23:15.000 --> 00:23:16.000
+This is cue #1395
+
+1396
+00:23:16.000 --> 00:23:17.000
+This is cue #1396
+
+1397
+00:23:17.000 --> 00:23:18.000
+This is cue #1397
+
+1398
+00:23:18.000 --> 00:23:19.000
+This is cue #1398
+
+1399
+00:23:19.000 --> 00:23:20.000
+This is cue #1399
+
+1400
+00:23:20.000 --> 00:23:21.000
+This is cue #1400
+
+1401
+00:23:21.000 --> 00:23:22.000
+This is cue #1401
+
+1402
+00:23:22.000 --> 00:23:23.000
+This is cue #1402
+
+1403
+00:23:23.000 --> 00:23:24.000
+This is cue #1403
+
+1404
+00:23:24.000 --> 00:23:25.000
+This is cue #1404
+
+1405
+00:23:25.000 --> 00:23:26.000
+This is cue #1405
+
+1406
+00:23:26.000 --> 00:23:27.000
+This is cue #1406
+
+1407
+00:23:27.000 --> 00:23:28.000
+This is cue #1407
+
+1408
+00:23:28.000 --> 00:23:29.000
+This is cue #1408
+
+1409
+00:23:29.000 --> 00:23:30.000
+This is cue #1409
+
+1410
+00:23:30.000 --> 00:23:31.000
+This is cue #1410
+
+1411
+00:23:31.000 --> 00:23:32.000
+This is cue #1411
+
+1412
+00:23:32.000 --> 00:23:33.000
+This is cue #1412
+
+1413
+00:23:33.000 --> 00:23:34.000
+This is cue #1413
+
+1414
+00:23:34.000 --> 00:23:35.000
+This is cue #1414
+
+1415
+00:23:35.000 --> 00:23:36.000
+This is cue #1415
+
+1416
+00:23:36.000 --> 00:23:37.000
+This is cue #1416
+
+1417
+00:23:37.000 --> 00:23:38.000
+This is cue #1417
+
+1418
+00:23:38.000 --> 00:23:39.000
+This is cue #1418
+
+1419
+00:23:39.000 --> 00:23:40.000
+This is cue #1419
+
+1420
+00:23:40.000 --> 00:23:41.000
+This is cue #1420
+
+1421
+00:23:41.000 --> 00:23:42.000
+This is cue #1421
+
+1422
+00:23:42.000 --> 00:23:43.000
+This is cue #1422
+
+1423
+00:23:43.000 --> 00:23:44.000
+This is cue #1423
+
+1424
+00:23:44.000 --> 00:23:45.000
+This is cue #1424
+
+1425
+00:23:45.000 --> 00:23:46.000
+This is cue #1425
+
+1426
+00:23:46.000 --> 00:23:47.000
+This is cue #1426
+
+1427
+00:23:47.000 --> 00:23:48.000
+This is cue #1427
+
+1428
+00:23:48.000 --> 00:23:49.000
+This is cue #1428
+
+1429
+00:23:49.000 --> 00:23:50.000
+This is cue #1429
+
+1430
+00:23:50.000 --> 00:23:51.000
+This is cue #1430
+
+1431
+00:23:51.000 --> 00:23:52.000
+This is cue #1431
+
+1432
+00:23:52.000 --> 00:23:53.000
+This is cue #1432
+
+1433
+00:23:53.000 --> 00:23:54.000
+This is cue #1433
+
+1434
+00:23:54.000 --> 00:23:55.000
+This is cue #1434
+
+1435
+00:23:55.000 --> 00:23:56.000
+This is cue #1435
+
+1436
+00:23:56.000 --> 00:23:57.000
+This is cue #1436
+
+1437
+00:23:57.000 --> 00:23:58.000
+This is cue #1437
+
+1438
+00:23:58.000 --> 00:23:59.000
+This is cue #1438
+
+1439
+00:23:59.000 --> 00:24:00.000
+This is cue #1439
+
+1440
+00:24:00.000 --> 00:24:01.000
+This is cue #1440
+
+1441
+00:24:01.000 --> 00:24:02.000
+This is cue #1441
+
+1442
+00:24:02.000 --> 00:24:03.000
+This is cue #1442
+
+1443
+00:24:03.000 --> 00:24:04.000
+This is cue #1443
+
+1444
+00:24:04.000 --> 00:24:05.000
+This is cue #1444
+
+1445
+00:24:05.000 --> 00:24:06.000
+This is cue #1445
+
+1446
+00:24:06.000 --> 00:24:07.000
+This is cue #1446
+
+1447
+00:24:07.000 --> 00:24:08.000
+This is cue #1447
+
+1448
+00:24:08.000 --> 00:24:09.000
+This is cue #1448
+
+1449
+00:24:09.000 --> 00:24:10.000
+This is cue #1449
+
+1450
+00:24:10.000 --> 00:24:11.000
+This is cue #1450
+
+1451
+00:24:11.000 --> 00:24:12.000
+This is cue #1451
+
+1452
+00:24:12.000 --> 00:24:13.000
+This is cue #1452
+
+1453
+00:24:13.000 --> 00:24:14.000
+This is cue #1453
+
+1454
+00:24:14.000 --> 00:24:15.000
+This is cue #1454
+
+1455
+00:24:15.000 --> 00:24:16.000
+This is cue #1455
+
+1456
+00:24:16.000 --> 00:24:17.000
+This is cue #1456
+
+1457
+00:24:17.000 --> 00:24:18.000
+This is cue #1457
+
+1458
+00:24:18.000 --> 00:24:19.000
+This is cue #1458
+
+1459
+00:24:19.000 --> 00:24:20.000
+This is cue #1459
+
+1460
+00:24:20.000 --> 00:24:21.000
+This is cue #1460
+
+1461
+00:24:21.000 --> 00:24:22.000
+This is cue #1461
+
+1462
+00:24:22.000 --> 00:24:23.000
+This is cue #1462
+
+1463
+00:24:23.000 --> 00:24:24.000
+This is cue #1463
+
+1464
+00:24:24.000 --> 00:24:25.000
+This is cue #1464
+
+1465
+00:24:25.000 --> 00:24:26.000
+This is cue #1465
+
+1466
+00:24:26.000 --> 00:24:27.000
+This is cue #1466
+
+1467
+00:24:27.000 --> 00:24:28.000
+This is cue #1467
+
+1468
+00:24:28.000 --> 00:24:29.000
+This is cue #1468
+
+1469
+00:24:29.000 --> 00:24:30.000
+This is cue #1469
+
+1470
+00:24:30.000 --> 00:24:31.000
+This is cue #1470
+
+1471
+00:24:31.000 --> 00:24:32.000
+This is cue #1471
+
+1472
+00:24:32.000 --> 00:24:33.000
+This is cue #1472
+
+1473
+00:24:33.000 --> 00:24:34.000
+This is cue #1473
+
+1474
+00:24:34.000 --> 00:24:35.000
+This is cue #1474
+
+1475
+00:24:35.000 --> 00:24:36.000
+This is cue #1475
+
+1476
+00:24:36.000 --> 00:24:37.000
+This is cue #1476
+
+1477
+00:24:37.000 --> 00:24:38.000
+This is cue #1477
+
+1478
+00:24:38.000 --> 00:24:39.000
+This is cue #1478
+
+1479
+00:24:39.000 --> 00:24:40.000
+This is cue #1479
+
+1480
+00:24:40.000 --> 00:24:41.000
+This is cue #1480
+
+1481
+00:24:41.000 --> 00:24:42.000
+This is cue #1481
+
+1482
+00:24:42.000 --> 00:24:43.000
+This is cue #1482
+
+1483
+00:24:43.000 --> 00:24:44.000
+This is cue #1483
+
+1484
+00:24:44.000 --> 00:24:45.000
+This is cue #1484
+
+1485
+00:24:45.000 --> 00:24:46.000
+This is cue #1485
+
+1486
+00:24:46.000 --> 00:24:47.000
+This is cue #1486
+
+1487
+00:24:47.000 --> 00:24:48.000
+This is cue #1487
+
+1488
+00:24:48.000 --> 00:24:49.000
+This is cue #1488
+
+1489
+00:24:49.000 --> 00:24:50.000
+This is cue #1489
+
+1490
+00:24:50.000 --> 00:24:51.000
+This is cue #1490
+
+1491
+00:24:51.000 --> 00:24:52.000
+This is cue #1491
+
+1492
+00:24:52.000 --> 00:24:53.000
+This is cue #1492
+
+1493
+00:24:53.000 --> 00:24:54.000
+This is cue #1493
+
+1494
+00:24:54.000 --> 00:24:55.000
+This is cue #1494
+
+1495
+00:24:55.000 --> 00:24:56.000
+This is cue #1495
+
+1496
+00:24:56.000 --> 00:24:57.000
+This is cue #1496
+
+1497
+00:24:57.000 --> 00:24:58.000
+This is cue #1497
+
+1498
+00:24:58.000 --> 00:24:59.000
+This is cue #1498
+
+1499
+00:24:59.000 --> 00:25:00.000
+This is cue #1499
+
+1500
+00:25:00.000 --> 00:25:01.000
+This is cue #1500
+
+1501
+00:25:01.000 --> 00:25:02.000
+This is cue #1501
+
+1502
+00:25:02.000 --> 00:25:03.000
+This is cue #1502
+
+1503
+00:25:03.000 --> 00:25:04.000
+This is cue #1503
+
+1504
+00:25:04.000 --> 00:25:05.000
+This is cue #1504
+
+1505
+00:25:05.000 --> 00:25:06.000
+This is cue #1505
+
+1506
+00:25:06.000 --> 00:25:07.000
+This is cue #1506
+
+1507
+00:25:07.000 --> 00:25:08.000
+This is cue #1507
+
+1508
+00:25:08.000 --> 00:25:09.000
+This is cue #1508
+
+1509
+00:25:09.000 --> 00:25:10.000
+This is cue #1509
+
+1510
+00:25:10.000 --> 00:25:11.000
+This is cue #1510
+
+1511
+00:25:11.000 --> 00:25:12.000
+This is cue #1511
+
+1512
+00:25:12.000 --> 00:25:13.000
+This is cue #1512
+
+1513
+00:25:13.000 --> 00:25:14.000
+This is cue #1513
+
+1514
+00:25:14.000 --> 00:25:15.000
+This is cue #1514
+
+1515
+00:25:15.000 --> 00:25:16.000
+This is cue #1515
+
+1516
+00:25:16.000 --> 00:25:17.000
+This is cue #1516
+
+1517
+00:25:17.000 --> 00:25:18.000
+This is cue #1517
+
+1518
+00:25:18.000 --> 00:25:19.000
+This is cue #1518
+
+1519
+00:25:19.000 --> 00:25:20.000
+This is cue #1519
+
+1520
+00:25:20.000 --> 00:25:21.000
+This is cue #1520
+
+1521
+00:25:21.000 --> 00:25:22.000
+This is cue #1521
+
+1522
+00:25:22.000 --> 00:25:23.000
+This is cue #1522
+
+1523
+00:25:23.000 --> 00:25:24.000
+This is cue #1523
+
+1524
+00:25:24.000 --> 00:25:25.000
+This is cue #1524
+
+1525
+00:25:25.000 --> 00:25:26.000
+This is cue #1525
+
+1526
+00:25:26.000 --> 00:25:27.000
+This is cue #1526
+
+1527
+00:25:27.000 --> 00:25:28.000
+This is cue #1527
+
+1528
+00:25:28.000 --> 00:25:29.000
+This is cue #1528
+
+1529
+00:25:29.000 --> 00:25:30.000
+This is cue #1529
+
+1530
+00:25:30.000 --> 00:25:31.000
+This is cue #1530
+
+1531
+00:25:31.000 --> 00:25:32.000
+This is cue #1531
+
+1532
+00:25:32.000 --> 00:25:33.000
+This is cue #1532
+
+1533
+00:25:33.000 --> 00:25:34.000
+This is cue #1533
+
+1534
+00:25:34.000 --> 00:25:35.000
+This is cue #1534
+
+1535
+00:25:35.000 --> 00:25:36.000
+This is cue #1535
+
+1536
+00:25:36.000 --> 00:25:37.000
+This is cue #1536
+
+1537
+00:25:37.000 --> 00:25:38.000
+This is cue #1537
+
+1538
+00:25:38.000 --> 00:25:39.000
+This is cue #1538
+
+1539
+00:25:39.000 --> 00:25:40.000
+This is cue #1539
+
+1540
+00:25:40.000 --> 00:25:41.000
+This is cue #1540
+
+1541
+00:25:41.000 --> 00:25:42.000
+This is cue #1541
+
+1542
+00:25:42.000 --> 00:25:43.000
+This is cue #1542
+
+1543
+00:25:43.000 --> 00:25:44.000
+This is cue #1543
+
+1544
+00:25:44.000 --> 00:25:45.000
+This is cue #1544
+
+1545
+00:25:45.000 --> 00:25:46.000
+This is cue #1545
+
+1546
+00:25:46.000 --> 00:25:47.000
+This is cue #1546
+
+1547
+00:25:47.000 --> 00:25:48.000
+This is cue #1547
+
+1548
+00:25:48.000 --> 00:25:49.000
+This is cue #1548
+
+1549
+00:25:49.000 --> 00:25:50.000
+This is cue #1549
+
+1550
+00:25:50.000 --> 00:25:51.000
+This is cue #1550
+
+1551
+00:25:51.000 --> 00:25:52.000
+This is cue #1551
+
+1552
+00:25:52.000 --> 00:25:53.000
+This is cue #1552
+
+1553
+00:25:53.000 --> 00:25:54.000
+This is cue #1553
+
+1554
+00:25:54.000 --> 00:25:55.000
+This is cue #1554
+
+1555
+00:25:55.000 --> 00:25:56.000
+This is cue #1555
+
+1556
+00:25:56.000 --> 00:25:57.000
+This is cue #1556
+
+1557
+00:25:57.000 --> 00:25:58.000
+This is cue #1557
+
+1558
+00:25:58.000 --> 00:25:59.000
+This is cue #1558
+
+1559
+00:25:59.000 --> 00:26:00.000
+This is cue #1559
+
+1560
+00:26:00.000 --> 00:26:01.000
+This is cue #1560
+
+1561
+00:26:01.000 --> 00:26:02.000
+This is cue #1561
+
+1562
+00:26:02.000 --> 00:26:03.000
+This is cue #1562
+
+1563
+00:26:03.000 --> 00:26:04.000
+This is cue #1563
+
+1564
+00:26:04.000 --> 00:26:05.000
+This is cue #1564
+
+1565
+00:26:05.000 --> 00:26:06.000
+This is cue #1565
+
+1566
+00:26:06.000 --> 00:26:07.000
+This is cue #1566
+
+1567
+00:26:07.000 --> 00:26:08.000
+This is cue #1567
+
+1568
+00:26:08.000 --> 00:26:09.000
+This is cue #1568
+
+1569
+00:26:09.000 --> 00:26:10.000
+This is cue #1569
+
+1570
+00:26:10.000 --> 00:26:11.000
+This is cue #1570
+
+1571
+00:26:11.000 --> 00:26:12.000
+This is cue #1571
+
+1572
+00:26:12.000 --> 00:26:13.000
+This is cue #1572
+
+1573
+00:26:13.000 --> 00:26:14.000
+This is cue #1573
+
+1574
+00:26:14.000 --> 00:26:15.000
+This is cue #1574
+
+1575
+00:26:15.000 --> 00:26:16.000
+This is cue #1575
+
+1576
+00:26:16.000 --> 00:26:17.000
+This is cue #1576
+
+1577
+00:26:17.000 --> 00:26:18.000
+This is cue #1577
+
+1578
+00:26:18.000 --> 00:26:19.000
+This is cue #1578
+
+1579
+00:26:19.000 --> 00:26:20.000
+This is cue #1579
+
+1580
+00:26:20.000 --> 00:26:21.000
+This is cue #1580
+
+1581
+00:26:21.000 --> 00:26:22.000
+This is cue #1581
+
+1582
+00:26:22.000 --> 00:26:23.000
+This is cue #1582
+
+1583
+00:26:23.000 --> 00:26:24.000
+This is cue #1583
+
+1584
+00:26:24.000 --> 00:26:25.000
+This is cue #1584
+
+1585
+00:26:25.000 --> 00:26:26.000
+This is cue #1585
+
+1586
+00:26:26.000 --> 00:26:27.000
+This is cue #1586
+
+1587
+00:26:27.000 --> 00:26:28.000
+This is cue #1587
+
+1588
+00:26:28.000 --> 00:26:29.000
+This is cue #1588
+
+1589
+00:26:29.000 --> 00:26:30.000
+This is cue #1589
+
+1590
+00:26:30.000 --> 00:26:31.000
+This is cue #1590
+
+1591
+00:26:31.000 --> 00:26:32.000
+This is cue #1591
+
+1592
+00:26:32.000 --> 00:26:33.000
+This is cue #1592
+
+1593
+00:26:33.000 --> 00:26:34.000
+This is cue #1593
+
+1594
+00:26:34.000 --> 00:26:35.000
+This is cue #1594
+
+1595
+00:26:35.000 --> 00:26:36.000
+This is cue #1595
+
+1596
+00:26:36.000 --> 00:26:37.000
+This is cue #1596
+
+1597
+00:26:37.000 --> 00:26:38.000
+This is cue #1597
+
+1598
+00:26:38.000 --> 00:26:39.000
+This is cue #1598
+
+1599
+00:26:39.000 --> 00:26:40.000
+This is cue #1599
+
+1600
+00:26:40.000 --> 00:26:41.000
+This is cue #1600
+
+1601
+00:26:41.000 --> 00:26:42.000
+This is cue #1601
+
+1602
+00:26:42.000 --> 00:26:43.000
+This is cue #1602
+
+1603
+00:26:43.000 --> 00:26:44.000
+This is cue #1603
+
+1604
+00:26:44.000 --> 00:26:45.000
+This is cue #1604
+
+1605
+00:26:45.000 --> 00:26:46.000
+This is cue #1605
+
+1606
+00:26:46.000 --> 00:26:47.000
+This is cue #1606
+
+1607
+00:26:47.000 --> 00:26:48.000
+This is cue #1607
+
+1608
+00:26:48.000 --> 00:26:49.000
+This is cue #1608
+
+1609
+00:26:49.000 --> 00:26:50.000
+This is cue #1609
+
+1610
+00:26:50.000 --> 00:26:51.000
+This is cue #1610
+
+1611
+00:26:51.000 --> 00:26:52.000
+This is cue #1611
+
+1612
+00:26:52.000 --> 00:26:53.000
+This is cue #1612
+
+1613
+00:26:53.000 --> 00:26:54.000
+This is cue #1613
+
+1614
+00:26:54.000 --> 00:26:55.000
+This is cue #1614
+
+1615
+00:26:55.000 --> 00:26:56.000
+This is cue #1615
+
+1616
+00:26:56.000 --> 00:26:57.000
+This is cue #1616
+
+1617
+00:26:57.000 --> 00:26:58.000
+This is cue #1617
+
+1618
+00:26:58.000 --> 00:26:59.000
+This is cue #1618
+
+1619
+00:26:59.000 --> 00:27:00.000
+This is cue #1619
+
+1620
+00:27:00.000 --> 00:27:01.000
+This is cue #1620
+
+1621
+00:27:01.000 --> 00:27:02.000
+This is cue #1621
+
+1622
+00:27:02.000 --> 00:27:03.000
+This is cue #1622
+
+1623
+00:27:03.000 --> 00:27:04.000
+This is cue #1623
+
+1624
+00:27:04.000 --> 00:27:05.000
+This is cue #1624
+
+1625
+00:27:05.000 --> 00:27:06.000
+This is cue #1625
+
+1626
+00:27:06.000 --> 00:27:07.000
+This is cue #1626
+
+1627
+00:27:07.000 --> 00:27:08.000
+This is cue #1627
+
+1628
+00:27:08.000 --> 00:27:09.000
+This is cue #1628
+
+1629
+00:27:09.000 --> 00:27:10.000
+This is cue #1629
+
+1630
+00:27:10.000 --> 00:27:11.000
+This is cue #1630
+
+1631
+00:27:11.000 --> 00:27:12.000
+This is cue #1631
+
+1632
+00:27:12.000 --> 00:27:13.000
+This is cue #1632
+
+1633
+00:27:13.000 --> 00:27:14.000
+This is cue #1633
+
+1634
+00:27:14.000 --> 00:27:15.000
+This is cue #1634
+
+1635
+00:27:15.000 --> 00:27:16.000
+This is cue #1635
+
+1636
+00:27:16.000 --> 00:27:17.000
+This is cue #1636
+
+1637
+00:27:17.000 --> 00:27:18.000
+This is cue #1637
+
+1638
+00:27:18.000 --> 00:27:19.000
+This is cue #1638
+
+1639
+00:27:19.000 --> 00:27:20.000
+This is cue #1639
+
+1640
+00:27:20.000 --> 00:27:21.000
+This is cue #1640
+
+1641
+00:27:21.000 --> 00:27:22.000
+This is cue #1641
+
+1642
+00:27:22.000 --> 00:27:23.000
+This is cue #1642
+
+1643
+00:27:23.000 --> 00:27:24.000
+This is cue #1643
+
+1644
+00:27:24.000 --> 00:27:25.000
+This is cue #1644
+
+1645
+00:27:25.000 --> 00:27:26.000
+This is cue #1645
+
+1646
+00:27:26.000 --> 00:27:27.000
+This is cue #1646
+
+1647
+00:27:27.000 --> 00:27:28.000
+This is cue #1647
+
+1648
+00:27:28.000 --> 00:27:29.000
+This is cue #1648
+
+1649
+00:27:29.000 --> 00:27:30.000
+This is cue #1649
+
+1650
+00:27:30.000 --> 00:27:31.000
+This is cue #1650
+
+1651
+00:27:31.000 --> 00:27:32.000
+This is cue #1651
+
+1652
+00:27:32.000 --> 00:27:33.000
+This is cue #1652
+
+1653
+00:27:33.000 --> 00:27:34.000
+This is cue #1653
+
+1654
+00:27:34.000 --> 00:27:35.000
+This is cue #1654
+
+1655
+00:27:35.000 --> 00:27:36.000
+This is cue #1655
+
+1656
+00:27:36.000 --> 00:27:37.000
+This is cue #1656
+
+1657
+00:27:37.000 --> 00:27:38.000
+This is cue #1657
+
+1658
+00:27:38.000 --> 00:27:39.000
+This is cue #1658
+
+1659
+00:27:39.000 --> 00:27:40.000
+This is cue #1659
+
+1660
+00:27:40.000 --> 00:27:41.000
+This is cue #1660
+
+1661
+00:27:41.000 --> 00:27:42.000
+This is cue #1661
+
+1662
+00:27:42.000 --> 00:27:43.000
+This is cue #1662
+
+1663
+00:27:43.000 --> 00:27:44.000
+This is cue #1663
+
+1664
+00:27:44.000 --> 00:27:45.000
+This is cue #1664
+
+1665
+00:27:45.000 --> 00:27:46.000
+This is cue #1665
+
+1666
+00:27:46.000 --> 00:27:47.000
+This is cue #1666
+
+1667
+00:27:47.000 --> 00:27:48.000
+This is cue #1667
+
+1668
+00:27:48.000 --> 00:27:49.000
+This is cue #1668
+
+1669
+00:27:49.000 --> 00:27:50.000
+This is cue #1669
+
+1670
+00:27:50.000 --> 00:27:51.000
+This is cue #1670
+
+1671
+00:27:51.000 --> 00:27:52.000
+This is cue #1671
+
+1672
+00:27:52.000 --> 00:27:53.000
+This is cue #1672
+
+1673
+00:27:53.000 --> 00:27:54.000
+This is cue #1673
+
+1674
+00:27:54.000 --> 00:27:55.000
+This is cue #1674
+
+1675
+00:27:55.000 --> 00:27:56.000
+This is cue #1675
+
+1676
+00:27:56.000 --> 00:27:57.000
+This is cue #1676
+
+1677
+00:27:57.000 --> 00:27:58.000
+This is cue #1677
+
+1678
+00:27:58.000 --> 00:27:59.000
+This is cue #1678
+
+1679
+00:27:59.000 --> 00:28:00.000
+This is cue #1679
+
+1680
+00:28:00.000 --> 00:28:01.000
+This is cue #1680
+
+1681
+00:28:01.000 --> 00:28:02.000
+This is cue #1681
+
+1682
+00:28:02.000 --> 00:28:03.000
+This is cue #1682
+
+1683
+00:28:03.000 --> 00:28:04.000
+This is cue #1683
+
+1684
+00:28:04.000 --> 00:28:05.000
+This is cue #1684
+
+1685
+00:28:05.000 --> 00:28:06.000
+This is cue #1685
+
+1686
+00:28:06.000 --> 00:28:07.000
+This is cue #1686
+
+1687
+00:28:07.000 --> 00:28:08.000
+This is cue #1687
+
+1688
+00:28:08.000 --> 00:28:09.000
+This is cue #1688
+
+1689
+00:28:09.000 --> 00:28:10.000
+This is cue #1689
+
+1690
+00:28:10.000 --> 00:28:11.000
+This is cue #1690
+
+1691
+00:28:11.000 --> 00:28:12.000
+This is cue #1691
+
+1692
+00:28:12.000 --> 00:28:13.000
+This is cue #1692
+
+1693
+00:28:13.000 --> 00:28:14.000
+This is cue #1693
+
+1694
+00:28:14.000 --> 00:28:15.000
+This is cue #1694
+
+1695
+00:28:15.000 --> 00:28:16.000
+This is cue #1695
+
+1696
+00:28:16.000 --> 00:28:17.000
+This is cue #1696
+
+1697
+00:28:17.000 --> 00:28:18.000
+This is cue #1697
+
+1698
+00:28:18.000 --> 00:28:19.000
+This is cue #1698
+
+1699
+00:28:19.000 --> 00:28:20.000
+This is cue #1699
+
+1700
+00:28:20.000 --> 00:28:21.000
+This is cue #1700
+
+1701
+00:28:21.000 --> 00:28:22.000
+This is cue #1701
+
+1702
+00:28:22.000 --> 00:28:23.000
+This is cue #1702
+
+1703
+00:28:23.000 --> 00:28:24.000
+This is cue #1703
+
+1704
+00:28:24.000 --> 00:28:25.000
+This is cue #1704
+
+1705
+00:28:25.000 --> 00:28:26.000
+This is cue #1705
+
+1706
+00:28:26.000 --> 00:28:27.000
+This is cue #1706
+
+1707
+00:28:27.000 --> 00:28:28.000
+This is cue #1707
+
+1708
+00:28:28.000 --> 00:28:29.000
+This is cue #1708
+
+1709
+00:28:29.000 --> 00:28:30.000
+This is cue #1709
+
+1710
+00:28:30.000 --> 00:28:31.000
+This is cue #1710
+
+1711
+00:28:31.000 --> 00:28:32.000
+This is cue #1711
+
+1712
+00:28:32.000 --> 00:28:33.000
+This is cue #1712
+
+1713
+00:28:33.000 --> 00:28:34.000
+This is cue #1713
+
+1714
+00:28:34.000 --> 00:28:35.000
+This is cue #1714
+
+1715
+00:28:35.000 --> 00:28:36.000
+This is cue #1715
+
+1716
+00:28:36.000 --> 00:28:37.000
+This is cue #1716
+
+1717
+00:28:37.000 --> 00:28:38.000
+This is cue #1717
+
+1718
+00:28:38.000 --> 00:28:39.000
+This is cue #1718
+
+1719
+00:28:39.000 --> 00:28:40.000
+This is cue #1719
+
+1720
+00:28:40.000 --> 00:28:41.000
+This is cue #1720
+
+1721
+00:28:41.000 --> 00:28:42.000
+This is cue #1721
+
+1722
+00:28:42.000 --> 00:28:43.000
+This is cue #1722
+
+1723
+00:28:43.000 --> 00:28:44.000
+This is cue #1723
+
+1724
+00:28:44.000 --> 00:28:45.000
+This is cue #1724
+
+1725
+00:28:45.000 --> 00:28:46.000
+This is cue #1725
+
+1726
+00:28:46.000 --> 00:28:47.000
+This is cue #1726
+
+1727
+00:28:47.000 --> 00:28:48.000
+This is cue #1727
+
+1728
+00:28:48.000 --> 00:28:49.000
+This is cue #1728
+
+1729
+00:28:49.000 --> 00:28:50.000
+This is cue #1729
+
+1730
+00:28:50.000 --> 00:28:51.000
+This is cue #1730
+
+1731
+00:28:51.000 --> 00:28:52.000
+This is cue #1731
+
+1732
+00:28:52.000 --> 00:28:53.000
+This is cue #1732
+
+1733
+00:28:53.000 --> 00:28:54.000
+This is cue #1733
+
+1734
+00:28:54.000 --> 00:28:55.000
+This is cue #1734
+
+1735
+00:28:55.000 --> 00:28:56.000
+This is cue #1735
+
+1736
+00:28:56.000 --> 00:28:57.000
+This is cue #1736
+
+1737
+00:28:57.000 --> 00:28:58.000
+This is cue #1737
+
+1738
+00:28:58.000 --> 00:28:59.000
+This is cue #1738
+
+1739
+00:28:59.000 --> 00:29:00.000
+This is cue #1739
+
+1740
+00:29:00.000 --> 00:29:01.000
+This is cue #1740
+
+1741
+00:29:01.000 --> 00:29:02.000
+This is cue #1741
+
+1742
+00:29:02.000 --> 00:29:03.000
+This is cue #1742
+
+1743
+00:29:03.000 --> 00:29:04.000
+This is cue #1743
+
+1744
+00:29:04.000 --> 00:29:05.000
+This is cue #1744
+
+1745
+00:29:05.000 --> 00:29:06.000
+This is cue #1745
+
+1746
+00:29:06.000 --> 00:29:07.000
+This is cue #1746
+
+1747
+00:29:07.000 --> 00:29:08.000
+This is cue #1747
+
+1748
+00:29:08.000 --> 00:29:09.000
+This is cue #1748
+
+1749
+00:29:09.000 --> 00:29:10.000
+This is cue #1749
+
+1750
+00:29:10.000 --> 00:29:11.000
+This is cue #1750
+
+1751
+00:29:11.000 --> 00:29:12.000
+This is cue #1751
+
+1752
+00:29:12.000 --> 00:29:13.000
+This is cue #1752
+
+1753
+00:29:13.000 --> 00:29:14.000
+This is cue #1753
+
+1754
+00:29:14.000 --> 00:29:15.000
+This is cue #1754
+
+1755
+00:29:15.000 --> 00:29:16.000
+This is cue #1755
+
+1756
+00:29:16.000 --> 00:29:17.000
+This is cue #1756
+
+1757
+00:29:17.000 --> 00:29:18.000
+This is cue #1757
+
+1758
+00:29:18.000 --> 00:29:19.000
+This is cue #1758
+
+1759
+00:29:19.000 --> 00:29:20.000
+This is cue #1759
+
+1760
+00:29:20.000 --> 00:29:21.000
+This is cue #1760
+
+1761
+00:29:21.000 --> 00:29:22.000
+This is cue #1761
+
+1762
+00:29:22.000 --> 00:29:23.000
+This is cue #1762
+
+1763
+00:29:23.000 --> 00:29:24.000
+This is cue #1763
+
+1764
+00:29:24.000 --> 00:29:25.000
+This is cue #1764
+
+1765
+00:29:25.000 --> 00:29:26.000
+This is cue #1765
+
+1766
+00:29:26.000 --> 00:29:27.000
+This is cue #1766
+
+1767
+00:29:27.000 --> 00:29:28.000
+This is cue #1767
+
+1768
+00:29:28.000 --> 00:29:29.000
+This is cue #1768
+
+1769
+00:29:29.000 --> 00:29:30.000
+This is cue #1769
+
+1770
+00:29:30.000 --> 00:29:31.000
+This is cue #1770
+
+1771
+00:29:31.000 --> 00:29:32.000
+This is cue #1771
+
+1772
+00:29:32.000 --> 00:29:33.000
+This is cue #1772
+
+1773
+00:29:33.000 --> 00:29:34.000
+This is cue #1773
+
+1774
+00:29:34.000 --> 00:29:35.000
+This is cue #1774
+
+1775
+00:29:35.000 --> 00:29:36.000
+This is cue #1775
+
+1776
+00:29:36.000 --> 00:29:37.000
+This is cue #1776
+
+1777
+00:29:37.000 --> 00:29:38.000
+This is cue #1777
+
+1778
+00:29:38.000 --> 00:29:39.000
+This is cue #1778
+
+1779
+00:29:39.000 --> 00:29:40.000
+This is cue #1779
+
+1780
+00:29:40.000 --> 00:29:41.000
+This is cue #1780
+
+1781
+00:29:41.000 --> 00:29:42.000
+This is cue #1781
+
+1782
+00:29:42.000 --> 00:29:43.000
+This is cue #1782
+
+1783
+00:29:43.000 --> 00:29:44.000
+This is cue #1783
+
+1784
+00:29:44.000 --> 00:29:45.000
+This is cue #1784
+
+1785
+00:29:45.000 --> 00:29:46.000
+This is cue #1785
+
+1786
+00:29:46.000 --> 00:29:47.000
+This is cue #1786
+
+1787
+00:29:47.000 --> 00:29:48.000
+This is cue #1787
+
+1788
+00:29:48.000 --> 00:29:49.000
+This is cue #1788
+
+1789
+00:29:49.000 --> 00:29:50.000
+This is cue #1789
+
+1790
+00:29:50.000 --> 00:29:51.000
+This is cue #1790
+
+1791
+00:29:51.000 --> 00:29:52.000
+This is cue #1791
+
+1792
+00:29:52.000 --> 00:29:53.000
+This is cue #1792
+
+1793
+00:29:53.000 --> 00:29:54.000
+This is cue #1793
+
+1794
+00:29:54.000 --> 00:29:55.000
+This is cue #1794
+
+1795
+00:29:55.000 --> 00:29:56.000
+This is cue #1795
+
+1796
+00:29:56.000 --> 00:29:57.000
+This is cue #1796
+
+1797
+00:29:57.000 --> 00:29:58.000
+This is cue #1797
+
+1798
+00:29:58.000 --> 00:29:59.000
+This is cue #1798
+
+1799
+00:29:59.000 --> 00:30:00.000
+This is cue #1799
+
+1800
+00:30:00.000 --> 00:30:01.000
+This is cue #1800
+
+1801
+00:30:01.000 --> 00:30:02.000
+This is cue #1801
+
+1802
+00:30:02.000 --> 00:30:03.000
+This is cue #1802
+
+1803
+00:30:03.000 --> 00:30:04.000
+This is cue #1803
+
+1804
+00:30:04.000 --> 00:30:05.000
+This is cue #1804
+
+1805
+00:30:05.000 --> 00:30:06.000
+This is cue #1805
+
+1806
+00:30:06.000 --> 00:30:07.000
+This is cue #1806
+
+1807
+00:30:07.000 --> 00:30:08.000
+This is cue #1807
+
+1808
+00:30:08.000 --> 00:30:09.000
+This is cue #1808
+
+1809
+00:30:09.000 --> 00:30:10.000
+This is cue #1809
+
+1810
+00:30:10.000 --> 00:30:11.000
+This is cue #1810
+
+1811
+00:30:11.000 --> 00:30:12.000
+This is cue #1811
+
+1812
+00:30:12.000 --> 00:30:13.000
+This is cue #1812
+
+1813
+00:30:13.000 --> 00:30:14.000
+This is cue #1813
+
+1814
+00:30:14.000 --> 00:30:15.000
+This is cue #1814
+
+1815
+00:30:15.000 --> 00:30:16.000
+This is cue #1815
+
+1816
+00:30:16.000 --> 00:30:17.000
+This is cue #1816
+
+1817
+00:30:17.000 --> 00:30:18.000
+This is cue #1817
+
+1818
+00:30:18.000 --> 00:30:19.000
+This is cue #1818
+
+1819
+00:30:19.000 --> 00:30:20.000
+This is cue #1819
+
+1820
+00:30:20.000 --> 00:30:21.000
+This is cue #1820
+
+1821
+00:30:21.000 --> 00:30:22.000
+This is cue #1821
+
+1822
+00:30:22.000 --> 00:30:23.000
+This is cue #1822
+
+1823
+00:30:23.000 --> 00:30:24.000
+This is cue #1823
+
+1824
+00:30:24.000 --> 00:30:25.000
+This is cue #1824
+
+1825
+00:30:25.000 --> 00:30:26.000
+This is cue #1825
+
+1826
+00:30:26.000 --> 00:30:27.000
+This is cue #1826
+
+1827
+00:30:27.000 --> 00:30:28.000
+This is cue #1827
+
+1828
+00:30:28.000 --> 00:30:29.000
+This is cue #1828
+
+1829
+00:30:29.000 --> 00:30:30.000
+This is cue #1829
+
+1830
+00:30:30.000 --> 00:30:31.000
+This is cue #1830
+
+1831
+00:30:31.000 --> 00:30:32.000
+This is cue #1831
+
+1832
+00:30:32.000 --> 00:30:33.000
+This is cue #1832
+
+1833
+00:30:33.000 --> 00:30:34.000
+This is cue #1833
+
+1834
+00:30:34.000 --> 00:30:35.000
+This is cue #1834
+
+1835
+00:30:35.000 --> 00:30:36.000
+This is cue #1835
+
+1836
+00:30:36.000 --> 00:30:37.000
+This is cue #1836
+
+1837
+00:30:37.000 --> 00:30:38.000
+This is cue #1837
+
+1838
+00:30:38.000 --> 00:30:39.000
+This is cue #1838
+
+1839
+00:30:39.000 --> 00:30:40.000
+This is cue #1839
+
+1840
+00:30:40.000 --> 00:30:41.000
+This is cue #1840
+
+1841
+00:30:41.000 --> 00:30:42.000
+This is cue #1841
+
+1842
+00:30:42.000 --> 00:30:43.000
+This is cue #1842
+
+1843
+00:30:43.000 --> 00:30:44.000
+This is cue #1843
+
+1844
+00:30:44.000 --> 00:30:45.000
+This is cue #1844
+
+1845
+00:30:45.000 --> 00:30:46.000
+This is cue #1845
+
+1846
+00:30:46.000 --> 00:30:47.000
+This is cue #1846
+
+1847
+00:30:47.000 --> 00:30:48.000
+This is cue #1847
+
+1848
+00:30:48.000 --> 00:30:49.000
+This is cue #1848
+
+1849
+00:30:49.000 --> 00:30:50.000
+This is cue #1849
+
+1850
+00:30:50.000 --> 00:30:51.000
+This is cue #1850
+
+1851
+00:30:51.000 --> 00:30:52.000
+This is cue #1851
+
+1852
+00:30:52.000 --> 00:30:53.000
+This is cue #1852
+
+1853
+00:30:53.000 --> 00:30:54.000
+This is cue #1853
+
+1854
+00:30:54.000 --> 00:30:55.000
+This is cue #1854
+
+1855
+00:30:55.000 --> 00:30:56.000
+This is cue #1855
+
+1856
+00:30:56.000 --> 00:30:57.000
+This is cue #1856
+
+1857
+00:30:57.000 --> 00:30:58.000
+This is cue #1857
+
+1858
+00:30:58.000 --> 00:30:59.000
+This is cue #1858
+
+1859
+00:30:59.000 --> 00:31:00.000
+This is cue #1859
+
+1860
+00:31:00.000 --> 00:31:01.000
+This is cue #1860
+
+1861
+00:31:01.000 --> 00:31:02.000
+This is cue #1861
+
+1862
+00:31:02.000 --> 00:31:03.000
+This is cue #1862
+
+1863
+00:31:03.000 --> 00:31:04.000
+This is cue #1863
+
+1864
+00:31:04.000 --> 00:31:05.000
+This is cue #1864
+
+1865
+00:31:05.000 --> 00:31:06.000
+This is cue #1865
+
+1866
+00:31:06.000 --> 00:31:07.000
+This is cue #1866
+
+1867
+00:31:07.000 --> 00:31:08.000
+This is cue #1867
+
+1868
+00:31:08.000 --> 00:31:09.000
+This is cue #1868
+
+1869
+00:31:09.000 --> 00:31:10.000
+This is cue #1869
+
+1870
+00:31:10.000 --> 00:31:11.000
+This is cue #1870
+
+1871
+00:31:11.000 --> 00:31:12.000
+This is cue #1871
+
+1872
+00:31:12.000 --> 00:31:13.000
+This is cue #1872
+
+1873
+00:31:13.000 --> 00:31:14.000
+This is cue #1873
+
+1874
+00:31:14.000 --> 00:31:15.000
+This is cue #1874
+
+1875
+00:31:15.000 --> 00:31:16.000
+This is cue #1875
+
+1876
+00:31:16.000 --> 00:31:17.000
+This is cue #1876
+
+1877
+00:31:17.000 --> 00:31:18.000
+This is cue #1877
+
+1878
+00:31:18.000 --> 00:31:19.000
+This is cue #1878
+
+1879
+00:31:19.000 --> 00:31:20.000
+This is cue #1879
+
+1880
+00:31:20.000 --> 00:31:21.000
+This is cue #1880
+
+1881
+00:31:21.000 --> 00:31:22.000
+This is cue #1881
+
+1882
+00:31:22.000 --> 00:31:23.000
+This is cue #1882
+
+1883
+00:31:23.000 --> 00:31:24.000
+This is cue #1883
+
+1884
+00:31:24.000 --> 00:31:25.000
+This is cue #1884
+
+1885
+00:31:25.000 --> 00:31:26.000
+This is cue #1885
+
+1886
+00:31:26.000 --> 00:31:27.000
+This is cue #1886
+
+1887
+00:31:27.000 --> 00:31:28.000
+This is cue #1887
+
+1888
+00:31:28.000 --> 00:31:29.000
+This is cue #1888
+
+1889
+00:31:29.000 --> 00:31:30.000
+This is cue #1889
+
+1890
+00:31:30.000 --> 00:31:31.000
+This is cue #1890
+
+1891
+00:31:31.000 --> 00:31:32.000
+This is cue #1891
+
+1892
+00:31:32.000 --> 00:31:33.000
+This is cue #1892
+
+1893
+00:31:33.000 --> 00:31:34.000
+This is cue #1893
+
+1894
+00:31:34.000 --> 00:31:35.000
+This is cue #1894
+
+1895
+00:31:35.000 --> 00:31:36.000
+This is cue #1895
+
+1896
+00:31:36.000 --> 00:31:37.000
+This is cue #1896
+
+1897
+00:31:37.000 --> 00:31:38.000
+This is cue #1897
+
+1898
+00:31:38.000 --> 00:31:39.000
+This is cue #1898
+
+1899
+00:31:39.000 --> 00:31:40.000
+This is cue #1899
+
+1900
+00:31:40.000 --> 00:31:41.000
+This is cue #1900
+
+1901
+00:31:41.000 --> 00:31:42.000
+This is cue #1901
+
+1902
+00:31:42.000 --> 00:31:43.000
+This is cue #1902
+
+1903
+00:31:43.000 --> 00:31:44.000
+This is cue #1903
+
+1904
+00:31:44.000 --> 00:31:45.000
+This is cue #1904
+
+1905
+00:31:45.000 --> 00:31:46.000
+This is cue #1905
+
+1906
+00:31:46.000 --> 00:31:47.000
+This is cue #1906
+
+1907
+00:31:47.000 --> 00:31:48.000
+This is cue #1907
+
+1908
+00:31:48.000 --> 00:31:49.000
+This is cue #1908
+
+1909
+00:31:49.000 --> 00:31:50.000
+This is cue #1909
+
+1910
+00:31:50.000 --> 00:31:51.000
+This is cue #1910
+
+1911
+00:31:51.000 --> 00:31:52.000
+This is cue #1911
+
+1912
+00:31:52.000 --> 00:31:53.000
+This is cue #1912
+
+1913
+00:31:53.000 --> 00:31:54.000
+This is cue #1913
+
+1914
+00:31:54.000 --> 00:31:55.000
+This is cue #1914
+
+1915
+00:31:55.000 --> 00:31:56.000
+This is cue #1915
+
+1916
+00:31:56.000 --> 00:31:57.000
+This is cue #1916
+
+1917
+00:31:57.000 --> 00:31:58.000
+This is cue #1917
+
+1918
+00:31:58.000 --> 00:31:59.000
+This is cue #1918
+
+1919
+00:31:59.000 --> 00:32:00.000
+This is cue #1919
+
+1920
+00:32:00.000 --> 00:32:01.000
+This is cue #1920
+
+1921
+00:32:01.000 --> 00:32:02.000
+This is cue #1921
+
+1922
+00:32:02.000 --> 00:32:03.000
+This is cue #1922
+
+1923
+00:32:03.000 --> 00:32:04.000
+This is cue #1923
+
+1924
+00:32:04.000 --> 00:32:05.000
+This is cue #1924
+
+1925
+00:32:05.000 --> 00:32:06.000
+This is cue #1925
+
+1926
+00:32:06.000 --> 00:32:07.000
+This is cue #1926
+
+1927
+00:32:07.000 --> 00:32:08.000
+This is cue #1927
+
+1928
+00:32:08.000 --> 00:32:09.000
+This is cue #1928
+
+1929
+00:32:09.000 --> 00:32:10.000
+This is cue #1929
+
+1930
+00:32:10.000 --> 00:32:11.000
+This is cue #1930
+
+1931
+00:32:11.000 --> 00:32:12.000
+This is cue #1931
+
+1932
+00:32:12.000 --> 00:32:13.000
+This is cue #1932
+
+1933
+00:32:13.000 --> 00:32:14.000
+This is cue #1933
+
+1934
+00:32:14.000 --> 00:32:15.000
+This is cue #1934
+
+1935
+00:32:15.000 --> 00:32:16.000
+This is cue #1935
+
+1936
+00:32:16.000 --> 00:32:17.000
+This is cue #1936
+
+1937
+00:32:17.000 --> 00:32:18.000
+This is cue #1937
+
+1938
+00:32:18.000 --> 00:32:19.000
+This is cue #1938
+
+1939
+00:32:19.000 --> 00:32:20.000
+This is cue #1939
+
+1940
+00:32:20.000 --> 00:32:21.000
+This is cue #1940
+
+1941
+00:32:21.000 --> 00:32:22.000
+This is cue #1941
+
+1942
+00:32:22.000 --> 00:32:23.000
+This is cue #1942
+
+1943
+00:32:23.000 --> 00:32:24.000
+This is cue #1943
+
+1944
+00:32:24.000 --> 00:32:25.000
+This is cue #1944
+
+1945
+00:32:25.000 --> 00:32:26.000
+This is cue #1945
+
+1946
+00:32:26.000 --> 00:32:27.000
+This is cue #1946
+
+1947
+00:32:27.000 --> 00:32:28.000
+This is cue #1947
+
+1948
+00:32:28.000 --> 00:32:29.000
+This is cue #1948
+
+1949
+00:32:29.000 --> 00:32:30.000
+This is cue #1949
+
+1950
+00:32:30.000 --> 00:32:31.000
+This is cue #1950
+
+1951
+00:32:31.000 --> 00:32:32.000
+This is cue #1951
+
+1952
+00:32:32.000 --> 00:32:33.000
+This is cue #1952
+
+1953
+00:32:33.000 --> 00:32:34.000
+This is cue #1953
+
+1954
+00:32:34.000 --> 00:32:35.000
+This is cue #1954
+
+1955
+00:32:35.000 --> 00:32:36.000
+This is cue #1955
+
+1956
+00:32:36.000 --> 00:32:37.000
+This is cue #1956
+
+1957
+00:32:37.000 --> 00:32:38.000
+This is cue #1957
+
+1958
+00:32:38.000 --> 00:32:39.000
+This is cue #1958
+
+1959
+00:32:39.000 --> 00:32:40.000
+This is cue #1959
+
+1960
+00:32:40.000 --> 00:32:41.000
+This is cue #1960
+
+1961
+00:32:41.000 --> 00:32:42.000
+This is cue #1961
+
+1962
+00:32:42.000 --> 00:32:43.000
+This is cue #1962
+
+1963
+00:32:43.000 --> 00:32:44.000
+This is cue #1963
+
+1964
+00:32:44.000 --> 00:32:45.000
+This is cue #1964
+
+1965
+00:32:45.000 --> 00:32:46.000
+This is cue #1965
+
+1966
+00:32:46.000 --> 00:32:47.000
+This is cue #1966
+
+1967
+00:32:47.000 --> 00:32:48.000
+This is cue #1967
+
+1968
+00:32:48.000 --> 00:32:49.000
+This is cue #1968
+
+1969
+00:32:49.000 --> 00:32:50.000
+This is cue #1969
+
+1970
+00:32:50.000 --> 00:32:51.000
+This is cue #1970
+
+1971
+00:32:51.000 --> 00:32:52.000
+This is cue #1971
+
+1972
+00:32:52.000 --> 00:32:53.000
+This is cue #1972
+
+1973
+00:32:53.000 --> 00:32:54.000
+This is cue #1973
+
+1974
+00:32:54.000 --> 00:32:55.000
+This is cue #1974
+
+1975
+00:32:55.000 --> 00:32:56.000
+This is cue #1975
+
+1976
+00:32:56.000 --> 00:32:57.000
+This is cue #1976
+
+1977
+00:32:57.000 --> 00:32:58.000
+This is cue #1977
+
+1978
+00:32:58.000 --> 00:32:59.000
+This is cue #1978
+
+1979
+00:32:59.000 --> 00:33:00.000
+This is cue #1979
+
+1980
+00:33:00.000 --> 00:33:01.000
+This is cue #1980
+
+1981
+00:33:01.000 --> 00:33:02.000
+This is cue #1981
+
+1982
+00:33:02.000 --> 00:33:03.000
+This is cue #1982
+
+1983
+00:33:03.000 --> 00:33:04.000
+This is cue #1983
+
+1984
+00:33:04.000 --> 00:33:05.000
+This is cue #1984
+
+1985
+00:33:05.000 --> 00:33:06.000
+This is cue #1985
+
+1986
+00:33:06.000 --> 00:33:07.000
+This is cue #1986
+
+1987
+00:33:07.000 --> 00:33:08.000
+This is cue #1987
+
+1988
+00:33:08.000 --> 00:33:09.000
+This is cue #1988
+
+1989
+00:33:09.000 --> 00:33:10.000
+This is cue #1989
+
+1990
+00:33:10.000 --> 00:33:11.000
+This is cue #1990
+
+1991
+00:33:11.000 --> 00:33:12.000
+This is cue #1991
+
+1992
+00:33:12.000 --> 00:33:13.000
+This is cue #1992
+
+1993
+00:33:13.000 --> 00:33:14.000
+This is cue #1993
+
+1994
+00:33:14.000 --> 00:33:15.000
+This is cue #1994
+
+1995
+00:33:15.000 --> 00:33:16.000
+This is cue #1995
+
+1996
+00:33:16.000 --> 00:33:17.000
+This is cue #1996
+
+1997
+00:33:17.000 --> 00:33:18.000
+This is cue #1997
+
+1998
+00:33:18.000 --> 00:33:19.000
+This is cue #1998
+
+1999
+00:33:19.000 --> 00:33:20.000
+This is cue #1999
+
+2000
+00:33:20.000 --> 00:33:21.000
+This is cue #2000
+
+2001
+00:33:21.000 --> 00:33:22.000
+This is cue #2001
+
+2002
+00:33:22.000 --> 00:33:23.000
+This is cue #2002
+
+2003
+00:33:23.000 --> 00:33:24.000
+This is cue #2003
+
+2004
+00:33:24.000 --> 00:33:25.000
+This is cue #2004
+
+2005
+00:33:25.000 --> 00:33:26.000
+This is cue #2005
+
+2006
+00:33:26.000 --> 00:33:27.000
+This is cue #2006
+
+2007
+00:33:27.000 --> 00:33:28.000
+This is cue #2007
+
+2008
+00:33:28.000 --> 00:33:29.000
+This is cue #2008
+
+2009
+00:33:29.000 --> 00:33:30.000
+This is cue #2009
+
+2010
+00:33:30.000 --> 00:33:31.000
+This is cue #2010
+
+2011
+00:33:31.000 --> 00:33:32.000
+This is cue #2011
+
+2012
+00:33:32.000 --> 00:33:33.000
+This is cue #2012
+
+2013
+00:33:33.000 --> 00:33:34.000
+This is cue #2013
+
+2014
+00:33:34.000 --> 00:33:35.000
+This is cue #2014
+
+2015
+00:33:35.000 --> 00:33:36.000
+This is cue #2015
+
+2016
+00:33:36.000 --> 00:33:37.000
+This is cue #2016
+
+2017
+00:33:37.000 --> 00:33:38.000
+This is cue #2017
+
+2018
+00:33:38.000 --> 00:33:39.000
+This is cue #2018
+
+2019
+00:33:39.000 --> 00:33:40.000
+This is cue #2019
+
+2020
+00:33:40.000 --> 00:33:41.000
+This is cue #2020
+
+2021
+00:33:41.000 --> 00:33:42.000
+This is cue #2021
+
+2022
+00:33:42.000 --> 00:33:43.000
+This is cue #2022
+
+2023
+00:33:43.000 --> 00:33:44.000
+This is cue #2023
+
+2024
+00:33:44.000 --> 00:33:45.000
+This is cue #2024
+
+2025
+00:33:45.000 --> 00:33:46.000
+This is cue #2025
+
+2026
+00:33:46.000 --> 00:33:47.000
+This is cue #2026
+
+2027
+00:33:47.000 --> 00:33:48.000
+This is cue #2027
+
+2028
+00:33:48.000 --> 00:33:49.000
+This is cue #2028
+
+2029
+00:33:49.000 --> 00:33:50.000
+This is cue #2029
+
+2030
+00:33:50.000 --> 00:33:51.000
+This is cue #2030
+
+2031
+00:33:51.000 --> 00:33:52.000
+This is cue #2031
+
+2032
+00:33:52.000 --> 00:33:53.000
+This is cue #2032
+
+2033
+00:33:53.000 --> 00:33:54.000
+This is cue #2033
+
+2034
+00:33:54.000 --> 00:33:55.000
+This is cue #2034
+
+2035
+00:33:55.000 --> 00:33:56.000
+This is cue #2035
+
+2036
+00:33:56.000 --> 00:33:57.000
+This is cue #2036
+
+2037
+00:33:57.000 --> 00:33:58.000
+This is cue #2037
+
+2038
+00:33:58.000 --> 00:33:59.000
+This is cue #2038
+
+2039
+00:33:59.000 --> 00:34:00.000
+This is cue #2039
+
+2040
+00:34:00.000 --> 00:34:01.000
+This is cue #2040
+
+2041
+00:34:01.000 --> 00:34:02.000
+This is cue #2041
+
+2042
+00:34:02.000 --> 00:34:03.000
+This is cue #2042
+
+2043
+00:34:03.000 --> 00:34:04.000
+This is cue #2043
+
+2044
+00:34:04.000 --> 00:34:05.000
+This is cue #2044
+
+2045
+00:34:05.000 --> 00:34:06.000
+This is cue #2045
+
+2046
+00:34:06.000 --> 00:34:07.000
+This is cue #2046
+
+2047
+00:34:07.000 --> 00:34:08.000
+This is cue #2047
+
+2048
+00:34:08.000 --> 00:34:09.000
+This is cue #2048
+
+2049
+00:34:09.000 --> 00:34:10.000
+This is cue #2049
+
+2050
+00:34:10.000 --> 00:34:11.000
+This is cue #2050
+
+2051
+00:34:11.000 --> 00:34:12.000
+This is cue #2051
+
+2052
+00:34:12.000 --> 00:34:13.000
+This is cue #2052
+
+2053
+00:34:13.000 --> 00:34:14.000
+This is cue #2053
+
+2054
+00:34:14.000 --> 00:34:15.000
+This is cue #2054
+
+2055
+00:34:15.000 --> 00:34:16.000
+This is cue #2055
+
+2056
+00:34:16.000 --> 00:34:17.000
+This is cue #2056
+
+2057
+00:34:17.000 --> 00:34:18.000
+This is cue #2057
+
+2058
+00:34:18.000 --> 00:34:19.000
+This is cue #2058
+
+2059
+00:34:19.000 --> 00:34:20.000
+This is cue #2059
+
+2060
+00:34:20.000 --> 00:34:21.000
+This is cue #2060
+
+2061
+00:34:21.000 --> 00:34:22.000
+This is cue #2061
+
+2062
+00:34:22.000 --> 00:34:23.000
+This is cue #2062
+
+2063
+00:34:23.000 --> 00:34:24.000
+This is cue #2063
+
+2064
+00:34:24.000 --> 00:34:25.000
+This is cue #2064
+
+2065
+00:34:25.000 --> 00:34:26.000
+This is cue #2065
+
+2066
+00:34:26.000 --> 00:34:27.000
+This is cue #2066
+
+2067
+00:34:27.000 --> 00:34:28.000
+This is cue #2067
+
+2068
+00:34:28.000 --> 00:34:29.000
+This is cue #2068
+
+2069
+00:34:29.000 --> 00:34:30.000
+This is cue #2069
+
+2070
+00:34:30.000 --> 00:34:31.000
+This is cue #2070
+
+2071
+00:34:31.000 --> 00:34:32.000
+This is cue #2071
+
+2072
+00:34:32.000 --> 00:34:33.000
+This is cue #2072
+
+2073
+00:34:33.000 --> 00:34:34.000
+This is cue #2073
+
+2074
+00:34:34.000 --> 00:34:35.000
+This is cue #2074
+
+2075
+00:34:35.000 --> 00:34:36.000
+This is cue #2075
+
+2076
+00:34:36.000 --> 00:34:37.000
+This is cue #2076
+
+2077
+00:34:37.000 --> 00:34:38.000
+This is cue #2077
+
+2078
+00:34:38.000 --> 00:34:39.000
+This is cue #2078
+
+2079
+00:34:39.000 --> 00:34:40.000
+This is cue #2079
+
+2080
+00:34:40.000 --> 00:34:41.000
+This is cue #2080
+
+2081
+00:34:41.000 --> 00:34:42.000
+This is cue #2081
+
+2082
+00:34:42.000 --> 00:34:43.000
+This is cue #2082
+
+2083
+00:34:43.000 --> 00:34:44.000
+This is cue #2083
+
+2084
+00:34:44.000 --> 00:34:45.000
+This is cue #2084
+
+2085
+00:34:45.000 --> 00:34:46.000
+This is cue #2085
+
+2086
+00:34:46.000 --> 00:34:47.000
+This is cue #2086
+
+2087
+00:34:47.000 --> 00:34:48.000
+This is cue #2087
+
+2088
+00:34:48.000 --> 00:34:49.000
+This is cue #2088
+
+2089
+00:34:49.000 --> 00:34:50.000
+This is cue #2089
+
+2090
+00:34:50.000 --> 00:34:51.000
+This is cue #2090
+
+2091
+00:34:51.000 --> 00:34:52.000
+This is cue #2091
+
+2092
+00:34:52.000 --> 00:34:53.000
+This is cue #2092
+
+2093
+00:34:53.000 --> 00:34:54.000
+This is cue #2093
+
+2094
+00:34:54.000 --> 00:34:55.000
+This is cue #2094
+
+2095
+00:34:55.000 --> 00:34:56.000
+This is cue #2095
+
+2096
+00:34:56.000 --> 00:34:57.000
+This is cue #2096
+
+2097
+00:34:57.000 --> 00:34:58.000
+This is cue #2097
+
+2098
+00:34:58.000 --> 00:34:59.000
+This is cue #2098
+
+2099
+00:34:59.000 --> 00:35:00.000
+This is cue #2099
+
+2100
+00:35:00.000 --> 00:35:01.000
+This is cue #2100
+
+2101
+00:35:01.000 --> 00:35:02.000
+This is cue #2101
+
+2102
+00:35:02.000 --> 00:35:03.000
+This is cue #2102
+
+2103
+00:35:03.000 --> 00:35:04.000
+This is cue #2103
+
+2104
+00:35:04.000 --> 00:35:05.000
+This is cue #2104
+
+2105
+00:35:05.000 --> 00:35:06.000
+This is cue #2105
+
+2106
+00:35:06.000 --> 00:35:07.000
+This is cue #2106
+
+2107
+00:35:07.000 --> 00:35:08.000
+This is cue #2107
+
+2108
+00:35:08.000 --> 00:35:09.000
+This is cue #2108
+
+2109
+00:35:09.000 --> 00:35:10.000
+This is cue #2109
+
+2110
+00:35:10.000 --> 00:35:11.000
+This is cue #2110
+
+2111
+00:35:11.000 --> 00:35:12.000
+This is cue #2111
+
+2112
+00:35:12.000 --> 00:35:13.000
+This is cue #2112
+
+2113
+00:35:13.000 --> 00:35:14.000
+This is cue #2113
+
+2114
+00:35:14.000 --> 00:35:15.000
+This is cue #2114
+
+2115
+00:35:15.000 --> 00:35:16.000
+This is cue #2115
+
+2116
+00:35:16.000 --> 00:35:17.000
+This is cue #2116
+
+2117
+00:35:17.000 --> 00:35:18.000
+This is cue #2117
+
+2118
+00:35:18.000 --> 00:35:19.000
+This is cue #2118
+
+2119
+00:35:19.000 --> 00:35:20.000
+This is cue #2119
+
+2120
+00:35:20.000 --> 00:35:21.000
+This is cue #2120
+
+2121
+00:35:21.000 --> 00:35:22.000
+This is cue #2121
+
+2122
+00:35:22.000 --> 00:35:23.000
+This is cue #2122
+
+2123
+00:35:23.000 --> 00:35:24.000
+This is cue #2123
+
+2124
+00:35:24.000 --> 00:35:25.000
+This is cue #2124
+
+2125
+00:35:25.000 --> 00:35:26.000
+This is cue #2125
+
+2126
+00:35:26.000 --> 00:35:27.000
+This is cue #2126
+
+2127
+00:35:27.000 --> 00:35:28.000
+This is cue #2127
+
+2128
+00:35:28.000 --> 00:35:29.000
+This is cue #2128
+
+2129
+00:35:29.000 --> 00:35:30.000
+This is cue #2129
+
+2130
+00:35:30.000 --> 00:35:31.000
+This is cue #2130
+
+2131
+00:35:31.000 --> 00:35:32.000
+This is cue #2131
+
+2132
+00:35:32.000 --> 00:35:33.000
+This is cue #2132
+
+2133
+00:35:33.000 --> 00:35:34.000
+This is cue #2133
+
+2134
+00:35:34.000 --> 00:35:35.000
+This is cue #2134
+
+2135
+00:35:35.000 --> 00:35:36.000
+This is cue #2135
+
+2136
+00:35:36.000 --> 00:35:37.000
+This is cue #2136
+
+2137
+00:35:37.000 --> 00:35:38.000
+This is cue #2137
+
+2138
+00:35:38.000 --> 00:35:39.000
+This is cue #2138
+
+2139
+00:35:39.000 --> 00:35:40.000
+This is cue #2139
+
+2140
+00:35:40.000 --> 00:35:41.000
+This is cue #2140
+
+2141
+00:35:41.000 --> 00:35:42.000
+This is cue #2141
+
+2142
+00:35:42.000 --> 00:35:43.000
+This is cue #2142
+
+2143
+00:35:43.000 --> 00:35:44.000
+This is cue #2143
+
+2144
+00:35:44.000 --> 00:35:45.000
+This is cue #2144
+
+2145
+00:35:45.000 --> 00:35:46.000
+This is cue #2145
+
+2146
+00:35:46.000 --> 00:35:47.000
+This is cue #2146
+
+2147
+00:35:47.000 --> 00:35:48.000
+This is cue #2147
+
+2148
+00:35:48.000 --> 00:35:49.000
+This is cue #2148
+
+2149
+00:35:49.000 --> 00:35:50.000
+This is cue #2149
+
+2150
+00:35:50.000 --> 00:35:51.000
+This is cue #2150
+
+2151
+00:35:51.000 --> 00:35:52.000
+This is cue #2151
+
+2152
+00:35:52.000 --> 00:35:53.000
+This is cue #2152
+
+2153
+00:35:53.000 --> 00:35:54.000
+This is cue #2153
+
+2154
+00:35:54.000 --> 00:35:55.000
+This is cue #2154
+
+2155
+00:35:55.000 --> 00:35:56.000
+This is cue #2155
+
+2156
+00:35:56.000 --> 00:35:57.000
+This is cue #2156
+
+2157
+00:35:57.000 --> 00:35:58.000
+This is cue #2157
+
+2158
+00:35:58.000 --> 00:35:59.000
+This is cue #2158
+
+2159
+00:35:59.000 --> 00:36:00.000
+This is cue #2159
+
+2160
+00:36:00.000 --> 00:36:01.000
+This is cue #2160
+
+2161
+00:36:01.000 --> 00:36:02.000
+This is cue #2161
+
+2162
+00:36:02.000 --> 00:36:03.000
+This is cue #2162
+
+2163
+00:36:03.000 --> 00:36:04.000
+This is cue #2163
+
+2164
+00:36:04.000 --> 00:36:05.000
+This is cue #2164
+
+2165
+00:36:05.000 --> 00:36:06.000
+This is cue #2165
+
+2166
+00:36:06.000 --> 00:36:07.000
+This is cue #2166
+
+2167
+00:36:07.000 --> 00:36:08.000
+This is cue #2167
+
+2168
+00:36:08.000 --> 00:36:09.000
+This is cue #2168
+
+2169
+00:36:09.000 --> 00:36:10.000
+This is cue #2169
+
+2170
+00:36:10.000 --> 00:36:11.000
+This is cue #2170
+
+2171
+00:36:11.000 --> 00:36:12.000
+This is cue #2171
+
+2172
+00:36:12.000 --> 00:36:13.000
+This is cue #2172
+
+2173
+00:36:13.000 --> 00:36:14.000
+This is cue #2173
+
+2174
+00:36:14.000 --> 00:36:15.000
+This is cue #2174
+
+2175
+00:36:15.000 --> 00:36:16.000
+This is cue #2175
+
+2176
+00:36:16.000 --> 00:36:17.000
+This is cue #2176
+
+2177
+00:36:17.000 --> 00:36:18.000
+This is cue #2177
+
+2178
+00:36:18.000 --> 00:36:19.000
+This is cue #2178
+
+2179
+00:36:19.000 --> 00:36:20.000
+This is cue #2179
+
+2180
+00:36:20.000 --> 00:36:21.000
+This is cue #2180
+
+2181
+00:36:21.000 --> 00:36:22.000
+This is cue #2181
+
+2182
+00:36:22.000 --> 00:36:23.000
+This is cue #2182
+
+2183
+00:36:23.000 --> 00:36:24.000
+This is cue #2183
+
+2184
+00:36:24.000 --> 00:36:25.000
+This is cue #2184
+
+2185
+00:36:25.000 --> 00:36:26.000
+This is cue #2185
+
+2186
+00:36:26.000 --> 00:36:27.000
+This is cue #2186
+
+2187
+00:36:27.000 --> 00:36:28.000
+This is cue #2187
+
+2188
+00:36:28.000 --> 00:36:29.000
+This is cue #2188
+
+2189
+00:36:29.000 --> 00:36:30.000
+This is cue #2189
+
+2190
+00:36:30.000 --> 00:36:31.000
+This is cue #2190
+
+2191
+00:36:31.000 --> 00:36:32.000
+This is cue #2191
+
+2192
+00:36:32.000 --> 00:36:33.000
+This is cue #2192
+
+2193
+00:36:33.000 --> 00:36:34.000
+This is cue #2193
+
+2194
+00:36:34.000 --> 00:36:35.000
+This is cue #2194
+
+2195
+00:36:35.000 --> 00:36:36.000
+This is cue #2195
+
+2196
+00:36:36.000 --> 00:36:37.000
+This is cue #2196
+
+2197
+00:36:37.000 --> 00:36:38.000
+This is cue #2197
+
+2198
+00:36:38.000 --> 00:36:39.000
+This is cue #2198
+
+2199
+00:36:39.000 --> 00:36:40.000
+This is cue #2199
+
+2200
+00:36:40.000 --> 00:36:41.000
+This is cue #2200
+
+2201
+00:36:41.000 --> 00:36:42.000
+This is cue #2201
+
+2202
+00:36:42.000 --> 00:36:43.000
+This is cue #2202
+
+2203
+00:36:43.000 --> 00:36:44.000
+This is cue #2203
+
+2204
+00:36:44.000 --> 00:36:45.000
+This is cue #2204
+
+2205
+00:36:45.000 --> 00:36:46.000
+This is cue #2205
+
+2206
+00:36:46.000 --> 00:36:47.000
+This is cue #2206
+
+2207
+00:36:47.000 --> 00:36:48.000
+This is cue #2207
+
+2208
+00:36:48.000 --> 00:36:49.000
+This is cue #2208
+
+2209
+00:36:49.000 --> 00:36:50.000
+This is cue #2209
+
+2210
+00:36:50.000 --> 00:36:51.000
+This is cue #2210
+
+2211
+00:36:51.000 --> 00:36:52.000
+This is cue #2211
+
+2212
+00:36:52.000 --> 00:36:53.000
+This is cue #2212
+
+2213
+00:36:53.000 --> 00:36:54.000
+This is cue #2213
+
+2214
+00:36:54.000 --> 00:36:55.000
+This is cue #2214
+
+2215
+00:36:55.000 --> 00:36:56.000
+This is cue #2215
+
+2216
+00:36:56.000 --> 00:36:57.000
+This is cue #2216
+
+2217
+00:36:57.000 --> 00:36:58.000
+This is cue #2217
+
+2218
+00:36:58.000 --> 00:36:59.000
+This is cue #2218
+
+2219
+00:36:59.000 --> 00:37:00.000
+This is cue #2219
+
+2220
+00:37:00.000 --> 00:37:01.000
+This is cue #2220
+
+2221
+00:37:01.000 --> 00:37:02.000
+This is cue #2221
+
+2222
+00:37:02.000 --> 00:37:03.000
+This is cue #2222
+
+2223
+00:37:03.000 --> 00:37:04.000
+This is cue #2223
+
+2224
+00:37:04.000 --> 00:37:05.000
+This is cue #2224
+
+2225
+00:37:05.000 --> 00:37:06.000
+This is cue #2225
+
+2226
+00:37:06.000 --> 00:37:07.000
+This is cue #2226
+
+2227
+00:37:07.000 --> 00:37:08.000
+This is cue #2227
+
+2228
+00:37:08.000 --> 00:37:09.000
+This is cue #2228
+
+2229
+00:37:09.000 --> 00:37:10.000
+This is cue #2229
+
+2230
+00:37:10.000 --> 00:37:11.000
+This is cue #2230
+
+2231
+00:37:11.000 --> 00:37:12.000
+This is cue #2231
+
+2232
+00:37:12.000 --> 00:37:13.000
+This is cue #2232
+
+2233
+00:37:13.000 --> 00:37:14.000
+This is cue #2233
+
+2234
+00:37:14.000 --> 00:37:15.000
+This is cue #2234
+
+2235
+00:37:15.000 --> 00:37:16.000
+This is cue #2235
+
+2236
+00:37:16.000 --> 00:37:17.000
+This is cue #2236
+
+2237
+00:37:17.000 --> 00:37:18.000
+This is cue #2237
+
+2238
+00:37:18.000 --> 00:37:19.000
+This is cue #2238
+
+2239
+00:37:19.000 --> 00:37:20.000
+This is cue #2239
+
+2240
+00:37:20.000 --> 00:37:21.000
+This is cue #2240
+
+2241
+00:37:21.000 --> 00:37:22.000
+This is cue #2241
+
+2242
+00:37:22.000 --> 00:37:23.000
+This is cue #2242
+
+2243
+00:37:23.000 --> 00:37:24.000
+This is cue #2243
+
+2244
+00:37:24.000 --> 00:37:25.000
+This is cue #2244
+
+2245
+00:37:25.000 --> 00:37:26.000
+This is cue #2245
+
+2246
+00:37:26.000 --> 00:37:27.000
+This is cue #2246
+
+2247
+00:37:27.000 --> 00:37:28.000
+This is cue #2247
+
+2248
+00:37:28.000 --> 00:37:29.000
+This is cue #2248
+
+2249
+00:37:29.000 --> 00:37:30.000
+This is cue #2249
+
+2250
+00:37:30.000 --> 00:37:31.000
+This is cue #2250
+
+2251
+00:37:31.000 --> 00:37:32.000
+This is cue #2251
+
+2252
+00:37:32.000 --> 00:37:33.000
+This is cue #2252
+
+2253
+00:37:33.000 --> 00:37:34.000
+This is cue #2253
+
+2254
+00:37:34.000 --> 00:37:35.000
+This is cue #2254
+
+2255
+00:37:35.000 --> 00:37:36.000
+This is cue #2255
+
+2256
+00:37:36.000 --> 00:37:37.000
+This is cue #2256
+
+2257
+00:37:37.000 --> 00:37:38.000
+This is cue #2257
+
+2258
+00:37:38.000 --> 00:37:39.000
+This is cue #2258
+
+2259
+00:37:39.000 --> 00:37:40.000
+This is cue #2259
+
+2260
+00:37:40.000 --> 00:37:41.000
+This is cue #2260
+
+2261
+00:37:41.000 --> 00:37:42.000
+This is cue #2261
+
+2262
+00:37:42.000 --> 00:37:43.000
+This is cue #2262
+
+2263
+00:37:43.000 --> 00:37:44.000
+This is cue #2263
+
+2264
+00:37:44.000 --> 00:37:45.000
+This is cue #2264
+
+2265
+00:37:45.000 --> 00:37:46.000
+This is cue #2265
+
+2266
+00:37:46.000 --> 00:37:47.000
+This is cue #2266
+
+2267
+00:37:47.000 --> 00:37:48.000
+This is cue #2267
+
+2268
+00:37:48.000 --> 00:37:49.000
+This is cue #2268
+
+2269
+00:37:49.000 --> 00:37:50.000
+This is cue #2269
+
+2270
+00:37:50.000 --> 00:37:51.000
+This is cue #2270
+
+2271
+00:37:51.000 --> 00:37:52.000
+This is cue #2271
+
+2272
+00:37:52.000 --> 00:37:53.000
+This is cue #2272
+
+2273
+00:37:53.000 --> 00:37:54.000
+This is cue #2273
+
+2274
+00:37:54.000 --> 00:37:55.000
+This is cue #2274
+
+2275
+00:37:55.000 --> 00:37:56.000
+This is cue #2275
+
+2276
+00:37:56.000 --> 00:37:57.000
+This is cue #2276
+
+2277
+00:37:57.000 --> 00:37:58.000
+This is cue #2277
+
+2278
+00:37:58.000 --> 00:37:59.000
+This is cue #2278
+
+2279
+00:37:59.000 --> 00:38:00.000
+This is cue #2279
+
+2280
+00:38:00.000 --> 00:38:01.000
+This is cue #2280
+
+2281
+00:38:01.000 --> 00:38:02.000
+This is cue #2281
+
+2282
+00:38:02.000 --> 00:38:03.000
+This is cue #2282
+
+2283
+00:38:03.000 --> 00:38:04.000
+This is cue #2283
+
+2284
+00:38:04.000 --> 00:38:05.000
+This is cue #2284
+
+2285
+00:38:05.000 --> 00:38:06.000
+This is cue #2285
+
+2286
+00:38:06.000 --> 00:38:07.000
+This is cue #2286
+
+2287
+00:38:07.000 --> 00:38:08.000
+This is cue #2287
+
+2288
+00:38:08.000 --> 00:38:09.000
+This is cue #2288
+
+2289
+00:38:09.000 --> 00:38:10.000
+This is cue #2289
+
+2290
+00:38:10.000 --> 00:38:11.000
+This is cue #2290
+
+2291
+00:38:11.000 --> 00:38:12.000
+This is cue #2291
+
+2292
+00:38:12.000 --> 00:38:13.000
+This is cue #2292
+
+2293
+00:38:13.000 --> 00:38:14.000
+This is cue #2293
+
+2294
+00:38:14.000 --> 00:38:15.000
+This is cue #2294
+
+2295
+00:38:15.000 --> 00:38:16.000
+This is cue #2295
+
+2296
+00:38:16.000 --> 00:38:17.000
+This is cue #2296
+
+2297
+00:38:17.000 --> 00:38:18.000
+This is cue #2297
+
+2298
+00:38:18.000 --> 00:38:19.000
+This is cue #2298
+
+2299
+00:38:19.000 --> 00:38:20.000
+This is cue #2299
+
+2300
+00:38:20.000 --> 00:38:21.000
+This is cue #2300
+
+2301
+00:38:21.000 --> 00:38:22.000
+This is cue #2301
+
+2302
+00:38:22.000 --> 00:38:23.000
+This is cue #2302
+
+2303
+00:38:23.000 --> 00:38:24.000
+This is cue #2303
+
+2304
+00:38:24.000 --> 00:38:25.000
+This is cue #2304
+
+2305
+00:38:25.000 --> 00:38:26.000
+This is cue #2305
+
+2306
+00:38:26.000 --> 00:38:27.000
+This is cue #2306
+
+2307
+00:38:27.000 --> 00:38:28.000
+This is cue #2307
+
+2308
+00:38:28.000 --> 00:38:29.000
+This is cue #2308
+
+2309
+00:38:29.000 --> 00:38:30.000
+This is cue #2309
+
+2310
+00:38:30.000 --> 00:38:31.000
+This is cue #2310
+
+2311
+00:38:31.000 --> 00:38:32.000
+This is cue #2311
+
+2312
+00:38:32.000 --> 00:38:33.000
+This is cue #2312
+
+2313
+00:38:33.000 --> 00:38:34.000
+This is cue #2313
+
+2314
+00:38:34.000 --> 00:38:35.000
+This is cue #2314
+
+2315
+00:38:35.000 --> 00:38:36.000
+This is cue #2315
+
+2316
+00:38:36.000 --> 00:38:37.000
+This is cue #2316
+
+2317
+00:38:37.000 --> 00:38:38.000
+This is cue #2317
+
+2318
+00:38:38.000 --> 00:38:39.000
+This is cue #2318
+
+2319
+00:38:39.000 --> 00:38:40.000
+This is cue #2319
+
+2320
+00:38:40.000 --> 00:38:41.000
+This is cue #2320
+
+2321
+00:38:41.000 --> 00:38:42.000
+This is cue #2321
+
+2322
+00:38:42.000 --> 00:38:43.000
+This is cue #2322
+
+2323
+00:38:43.000 --> 00:38:44.000
+This is cue #2323
+
+2324
+00:38:44.000 --> 00:38:45.000
+This is cue #2324
+
+2325
+00:38:45.000 --> 00:38:46.000
+This is cue #2325
+
+2326
+00:38:46.000 --> 00:38:47.000
+This is cue #2326
+
+2327
+00:38:47.000 --> 00:38:48.000
+This is cue #2327
+
+2328
+00:38:48.000 --> 00:38:49.000
+This is cue #2328
+
+2329
+00:38:49.000 --> 00:38:50.000
+This is cue #2329
+
+2330
+00:38:50.000 --> 00:38:51.000
+This is cue #2330
+
+2331
+00:38:51.000 --> 00:38:52.000
+This is cue #2331
+
+2332
+00:38:52.000 --> 00:38:53.000
+This is cue #2332
+
+2333
+00:38:53.000 --> 00:38:54.000
+This is cue #2333
+
+2334
+00:38:54.000 --> 00:38:55.000
+This is cue #2334
+
+2335
+00:38:55.000 --> 00:38:56.000
+This is cue #2335
+
+2336
+00:38:56.000 --> 00:38:57.000
+This is cue #2336
+
+2337
+00:38:57.000 --> 00:38:58.000
+This is cue #2337
+
+2338
+00:38:58.000 --> 00:38:59.000
+This is cue #2338
+
+2339
+00:38:59.000 --> 00:39:00.000
+This is cue #2339
+
+2340
+00:39:00.000 --> 00:39:01.000
+This is cue #2340
+
+2341
+00:39:01.000 --> 00:39:02.000
+This is cue #2341
+
+2342
+00:39:02.000 --> 00:39:03.000
+This is cue #2342
+
+2343
+00:39:03.000 --> 00:39:04.000
+This is cue #2343
+
+2344
+00:39:04.000 --> 00:39:05.000
+This is cue #2344
+
+2345
+00:39:05.000 --> 00:39:06.000
+This is cue #2345
+
+2346
+00:39:06.000 --> 00:39:07.000
+This is cue #2346
+
+2347
+00:39:07.000 --> 00:39:08.000
+This is cue #2347
+
+2348
+00:39:08.000 --> 00:39:09.000
+This is cue #2348
+
+2349
+00:39:09.000 --> 00:39:10.000
+This is cue #2349
+
+2350
+00:39:10.000 --> 00:39:11.000
+This is cue #2350
+
+2351
+00:39:11.000 --> 00:39:12.000
+This is cue #2351
+
+2352
+00:39:12.000 --> 00:39:13.000
+This is cue #2352
+
+2353
+00:39:13.000 --> 00:39:14.000
+This is cue #2353
+
+2354
+00:39:14.000 --> 00:39:15.000
+This is cue #2354
+
+2355
+00:39:15.000 --> 00:39:16.000
+This is cue #2355
+
+2356
+00:39:16.000 --> 00:39:17.000
+This is cue #2356
+
+2357
+00:39:17.000 --> 00:39:18.000
+This is cue #2357
+
+2358
+00:39:18.000 --> 00:39:19.000
+This is cue #2358
+
+2359
+00:39:19.000 --> 00:39:20.000
+This is cue #2359
+
+2360
+00:39:20.000 --> 00:39:21.000
+This is cue #2360
+
+2361
+00:39:21.000 --> 00:39:22.000
+This is cue #2361
+
+2362
+00:39:22.000 --> 00:39:23.000
+This is cue #2362
+
+2363
+00:39:23.000 --> 00:39:24.000
+This is cue #2363
+
+2364
+00:39:24.000 --> 00:39:25.000
+This is cue #2364
+
+2365
+00:39:25.000 --> 00:39:26.000
+This is cue #2365
+
+2366
+00:39:26.000 --> 00:39:27.000
+This is cue #2366
+
+2367
+00:39:27.000 --> 00:39:28.000
+This is cue #2367
+
+2368
+00:39:28.000 --> 00:39:29.000
+This is cue #2368
+
+2369
+00:39:29.000 --> 00:39:30.000
+This is cue #2369
+
+2370
+00:39:30.000 --> 00:39:31.000
+This is cue #2370
+
+2371
+00:39:31.000 --> 00:39:32.000
+This is cue #2371
+
+2372
+00:39:32.000 --> 00:39:33.000
+This is cue #2372
+
+2373
+00:39:33.000 --> 00:39:34.000
+This is cue #2373
+
+2374
+00:39:34.000 --> 00:39:35.000
+This is cue #2374
+
+2375
+00:39:35.000 --> 00:39:36.000
+This is cue #2375
+
+2376
+00:39:36.000 --> 00:39:37.000
+This is cue #2376
+
+2377
+00:39:37.000 --> 00:39:38.000
+This is cue #2377
+
+2378
+00:39:38.000 --> 00:39:39.000
+This is cue #2378
+
+2379
+00:39:39.000 --> 00:39:40.000
+This is cue #2379
+
+2380
+00:39:40.000 --> 00:39:41.000
+This is cue #2380
+
+2381
+00:39:41.000 --> 00:39:42.000
+This is cue #2381
+
+2382
+00:39:42.000 --> 00:39:43.000
+This is cue #2382
+
+2383
+00:39:43.000 --> 00:39:44.000
+This is cue #2383
+
+2384
+00:39:44.000 --> 00:39:45.000
+This is cue #2384
+
+2385
+00:39:45.000 --> 00:39:46.000
+This is cue #2385
+
+2386
+00:39:46.000 --> 00:39:47.000
+This is cue #2386
+
+2387
+00:39:47.000 --> 00:39:48.000
+This is cue #2387
+
+2388
+00:39:48.000 --> 00:39:49.000
+This is cue #2388
+
+2389
+00:39:49.000 --> 00:39:50.000
+This is cue #2389
+
+2390
+00:39:50.000 --> 00:39:51.000
+This is cue #2390
+
+2391
+00:39:51.000 --> 00:39:52.000
+This is cue #2391
+
+2392
+00:39:52.000 --> 00:39:53.000
+This is cue #2392
+
+2393
+00:39:53.000 --> 00:39:54.000
+This is cue #2393
+
+2394
+00:39:54.000 --> 00:39:55.000
+This is cue #2394
+
+2395
+00:39:55.000 --> 00:39:56.000
+This is cue #2395
+
+2396
+00:39:56.000 --> 00:39:57.000
+This is cue #2396
+
+2397
+00:39:57.000 --> 00:39:58.000
+This is cue #2397
+
+2398
+00:39:58.000 --> 00:39:59.000
+This is cue #2398
+
+2399
+00:39:59.000 --> 00:40:00.000
+This is cue #2399
+
+2400
+00:40:00.000 --> 00:40:01.000
+This is cue #2400
+
+2401
+00:40:01.000 --> 00:40:02.000
+This is cue #2401
+
+2402
+00:40:02.000 --> 00:40:03.000
+This is cue #2402
+
+2403
+00:40:03.000 --> 00:40:04.000
+This is cue #2403
+
+2404
+00:40:04.000 --> 00:40:05.000
+This is cue #2404
+
+2405
+00:40:05.000 --> 00:40:06.000
+This is cue #2405
+
+2406
+00:40:06.000 --> 00:40:07.000
+This is cue #2406
+
+2407
+00:40:07.000 --> 00:40:08.000
+This is cue #2407
+
+2408
+00:40:08.000 --> 00:40:09.000
+This is cue #2408
+
+2409
+00:40:09.000 --> 00:40:10.000
+This is cue #2409
+
+2410
+00:40:10.000 --> 00:40:11.000
+This is cue #2410
+
+2411
+00:40:11.000 --> 00:40:12.000
+This is cue #2411
+
+2412
+00:40:12.000 --> 00:40:13.000
+This is cue #2412
+
+2413
+00:40:13.000 --> 00:40:14.000
+This is cue #2413
+
+2414
+00:40:14.000 --> 00:40:15.000
+This is cue #2414
+
+2415
+00:40:15.000 --> 00:40:16.000
+This is cue #2415
+
+2416
+00:40:16.000 --> 00:40:17.000
+This is cue #2416
+
+2417
+00:40:17.000 --> 00:40:18.000
+This is cue #2417
+
+2418
+00:40:18.000 --> 00:40:19.000
+This is cue #2418
+
+2419
+00:40:19.000 --> 00:40:20.000
+This is cue #2419
+
+2420
+00:40:20.000 --> 00:40:21.000
+This is cue #2420
+
+2421
+00:40:21.000 --> 00:40:22.000
+This is cue #2421
+
+2422
+00:40:22.000 --> 00:40:23.000
+This is cue #2422
+
+2423
+00:40:23.000 --> 00:40:24.000
+This is cue #2423
+
+2424
+00:40:24.000 --> 00:40:25.000
+This is cue #2424
+
+2425
+00:40:25.000 --> 00:40:26.000
+This is cue #2425
+
+2426
+00:40:26.000 --> 00:40:27.000
+This is cue #2426
+
+2427
+00:40:27.000 --> 00:40:28.000
+This is cue #2427
+
+2428
+00:40:28.000 --> 00:40:29.000
+This is cue #2428
+
+2429
+00:40:29.000 --> 00:40:30.000
+This is cue #2429
+
+2430
+00:40:30.000 --> 00:40:31.000
+This is cue #2430
+
+2431
+00:40:31.000 --> 00:40:32.000
+This is cue #2431
+
+2432
+00:40:32.000 --> 00:40:33.000
+This is cue #2432
+
+2433
+00:40:33.000 --> 00:40:34.000
+This is cue #2433
+
+2434
+00:40:34.000 --> 00:40:35.000
+This is cue #2434
+
+2435
+00:40:35.000 --> 00:40:36.000
+This is cue #2435
+
+2436
+00:40:36.000 --> 00:40:37.000
+This is cue #2436
+
+2437
+00:40:37.000 --> 00:40:38.000
+This is cue #2437
+
+2438
+00:40:38.000 --> 00:40:39.000
+This is cue #2438
+
+2439
+00:40:39.000 --> 00:40:40.000
+This is cue #2439
+
+2440
+00:40:40.000 --> 00:40:41.000
+This is cue #2440
+
+2441
+00:40:41.000 --> 00:40:42.000
+This is cue #2441
+
+2442
+00:40:42.000 --> 00:40:43.000
+This is cue #2442
+
+2443
+00:40:43.000 --> 00:40:44.000
+This is cue #2443
+
+2444
+00:40:44.000 --> 00:40:45.000
+This is cue #2444
+
+2445
+00:40:45.000 --> 00:40:46.000
+This is cue #2445
+
+2446
+00:40:46.000 --> 00:40:47.000
+This is cue #2446
+
+2447
+00:40:47.000 --> 00:40:48.000
+This is cue #2447
+
+2448
+00:40:48.000 --> 00:40:49.000
+This is cue #2448
+
+2449
+00:40:49.000 --> 00:40:50.000
+This is cue #2449
+
+2450
+00:40:50.000 --> 00:40:51.000
+This is cue #2450
+
+2451
+00:40:51.000 --> 00:40:52.000
+This is cue #2451
+
+2452
+00:40:52.000 --> 00:40:53.000
+This is cue #2452
+
+2453
+00:40:53.000 --> 00:40:54.000
+This is cue #2453
+
+2454
+00:40:54.000 --> 00:40:55.000
+This is cue #2454
+
+2455
+00:40:55.000 --> 00:40:56.000
+This is cue #2455
+
+2456
+00:40:56.000 --> 00:40:57.000
+This is cue #2456
+
+2457
+00:40:57.000 --> 00:40:58.000
+This is cue #2457
+
+2458
+00:40:58.000 --> 00:40:59.000
+This is cue #2458
+
+2459
+00:40:59.000 --> 00:41:00.000
+This is cue #2459
+
+2460
+00:41:00.000 --> 00:41:01.000
+This is cue #2460
+
+2461
+00:41:01.000 --> 00:41:02.000
+This is cue #2461
+
+2462
+00:41:02.000 --> 00:41:03.000
+This is cue #2462
+
+2463
+00:41:03.000 --> 00:41:04.000
+This is cue #2463
+
+2464
+00:41:04.000 --> 00:41:05.000
+This is cue #2464
+
+2465
+00:41:05.000 --> 00:41:06.000
+This is cue #2465
+
+2466
+00:41:06.000 --> 00:41:07.000
+This is cue #2466
+
+2467
+00:41:07.000 --> 00:41:08.000
+This is cue #2467
+
+2468
+00:41:08.000 --> 00:41:09.000
+This is cue #2468
+
+2469
+00:41:09.000 --> 00:41:10.000
+This is cue #2469
+
+2470
+00:41:10.000 --> 00:41:11.000
+This is cue #2470
+
+2471
+00:41:11.000 --> 00:41:12.000
+This is cue #2471
+
+2472
+00:41:12.000 --> 00:41:13.000
+This is cue #2472
+
+2473
+00:41:13.000 --> 00:41:14.000
+This is cue #2473
+
+2474
+00:41:14.000 --> 00:41:15.000
+This is cue #2474
+
+2475
+00:41:15.000 --> 00:41:16.000
+This is cue #2475
+
+2476
+00:41:16.000 --> 00:41:17.000
+This is cue #2476
+
+2477
+00:41:17.000 --> 00:41:18.000
+This is cue #2477
+
+2478
+00:41:18.000 --> 00:41:19.000
+This is cue #2478
+
+2479
+00:41:19.000 --> 00:41:20.000
+This is cue #2479
+
+2480
+00:41:20.000 --> 00:41:21.000
+This is cue #2480
+
+2481
+00:41:21.000 --> 00:41:22.000
+This is cue #2481
+
+2482
+00:41:22.000 --> 00:41:23.000
+This is cue #2482
+
+2483
+00:41:23.000 --> 00:41:24.000
+This is cue #2483
+
+2484
+00:41:24.000 --> 00:41:25.000
+This is cue #2484
+
+2485
+00:41:25.000 --> 00:41:26.000
+This is cue #2485
+
+2486
+00:41:26.000 --> 00:41:27.000
+This is cue #2486
+
+2487
+00:41:27.000 --> 00:41:28.000
+This is cue #2487
+
+2488
+00:41:28.000 --> 00:41:29.000
+This is cue #2488
+
+2489
+00:41:29.000 --> 00:41:30.000
+This is cue #2489
+
+2490
+00:41:30.000 --> 00:41:31.000
+This is cue #2490
+
+2491
+00:41:31.000 --> 00:41:32.000
+This is cue #2491
+
+2492
+00:41:32.000 --> 00:41:33.000
+This is cue #2492
+
+2493
+00:41:33.000 --> 00:41:34.000
+This is cue #2493
+
+2494
+00:41:34.000 --> 00:41:35.000
+This is cue #2494
+
+2495
+00:41:35.000 --> 00:41:36.000
+This is cue #2495
+
+2496
+00:41:36.000 --> 00:41:37.000
+This is cue #2496
+
+2497
+00:41:37.000 --> 00:41:38.000
+This is cue #2497
+
+2498
+00:41:38.000 --> 00:41:39.000
+This is cue #2498
+
+2499
+00:41:39.000 --> 00:41:40.000
+This is cue #2499
+
+2500
+00:41:40.000 --> 00:41:41.000
+This is cue #2500
+
+2501
+00:41:41.000 --> 00:41:42.000
+This is cue #2501
+
+2502
+00:41:42.000 --> 00:41:43.000
+This is cue #2502
+
+2503
+00:41:43.000 --> 00:41:44.000
+This is cue #2503
+
+2504
+00:41:44.000 --> 00:41:45.000
+This is cue #2504
+
+2505
+00:41:45.000 --> 00:41:46.000
+This is cue #2505
+
+2506
+00:41:46.000 --> 00:41:47.000
+This is cue #2506
+
+2507
+00:41:47.000 --> 00:41:48.000
+This is cue #2507
+
+2508
+00:41:48.000 --> 00:41:49.000
+This is cue #2508
+
+2509
+00:41:49.000 --> 00:41:50.000
+This is cue #2509
+
+2510
+00:41:50.000 --> 00:41:51.000
+This is cue #2510
+
+2511
+00:41:51.000 --> 00:41:52.000
+This is cue #2511
+
+2512
+00:41:52.000 --> 00:41:53.000
+This is cue #2512
+
+2513
+00:41:53.000 --> 00:41:54.000
+This is cue #2513
+
+2514
+00:41:54.000 --> 00:41:55.000
+This is cue #2514
+
+2515
+00:41:55.000 --> 00:41:56.000
+This is cue #2515
+
+2516
+00:41:56.000 --> 00:41:57.000
+This is cue #2516
+
+2517
+00:41:57.000 --> 00:41:58.000
+This is cue #2517
+
+2518
+00:41:58.000 --> 00:41:59.000
+This is cue #2518
+
+2519
+00:41:59.000 --> 00:42:00.000
+This is cue #2519
+
+2520
+00:42:00.000 --> 00:42:01.000
+This is cue #2520
+
+2521
+00:42:01.000 --> 00:42:02.000
+This is cue #2521
+
+2522
+00:42:02.000 --> 00:42:03.000
+This is cue #2522
+
+2523
+00:42:03.000 --> 00:42:04.000
+This is cue #2523
+
+2524
+00:42:04.000 --> 00:42:05.000
+This is cue #2524
+
+2525
+00:42:05.000 --> 00:42:06.000
+This is cue #2525
+
+2526
+00:42:06.000 --> 00:42:07.000
+This is cue #2526
+
+2527
+00:42:07.000 --> 00:42:08.000
+This is cue #2527
+
+2528
+00:42:08.000 --> 00:42:09.000
+This is cue #2528
+
+2529
+00:42:09.000 --> 00:42:10.000
+This is cue #2529
+
+2530
+00:42:10.000 --> 00:42:11.000
+This is cue #2530
+
+2531
+00:42:11.000 --> 00:42:12.000
+This is cue #2531
+
+2532
+00:42:12.000 --> 00:42:13.000
+This is cue #2532
+
+2533
+00:42:13.000 --> 00:42:14.000
+This is cue #2533
+
+2534
+00:42:14.000 --> 00:42:15.000
+This is cue #2534
+
+2535
+00:42:15.000 --> 00:42:16.000
+This is cue #2535
+
+2536
+00:42:16.000 --> 00:42:17.000
+This is cue #2536
+
+2537
+00:42:17.000 --> 00:42:18.000
+This is cue #2537
+
+2538
+00:42:18.000 --> 00:42:19.000
+This is cue #2538
+
+2539
+00:42:19.000 --> 00:42:20.000
+This is cue #2539
+
+2540
+00:42:20.000 --> 00:42:21.000
+This is cue #2540
+
+2541
+00:42:21.000 --> 00:42:22.000
+This is cue #2541
+
+2542
+00:42:22.000 --> 00:42:23.000
+This is cue #2542
+
+2543
+00:42:23.000 --> 00:42:24.000
+This is cue #2543
+
+2544
+00:42:24.000 --> 00:42:25.000
+This is cue #2544
+
+2545
+00:42:25.000 --> 00:42:26.000
+This is cue #2545
+
+2546
+00:42:26.000 --> 00:42:27.000
+This is cue #2546
+
+2547
+00:42:27.000 --> 00:42:28.000
+This is cue #2547
+
+2548
+00:42:28.000 --> 00:42:29.000
+This is cue #2548
+
+2549
+00:42:29.000 --> 00:42:30.000
+This is cue #2549
+
+2550
+00:42:30.000 --> 00:42:31.000
+This is cue #2550
+
+2551
+00:42:31.000 --> 00:42:32.000
+This is cue #2551
+
+2552
+00:42:32.000 --> 00:42:33.000
+This is cue #2552
+
+2553
+00:42:33.000 --> 00:42:34.000
+This is cue #2553
+
+2554
+00:42:34.000 --> 00:42:35.000
+This is cue #2554
+
+2555
+00:42:35.000 --> 00:42:36.000
+This is cue #2555
+
+2556
+00:42:36.000 --> 00:42:37.000
+This is cue #2556
+
+2557
+00:42:37.000 --> 00:42:38.000
+This is cue #2557
+
+2558
+00:42:38.000 --> 00:42:39.000
+This is cue #2558
+
+2559
+00:42:39.000 --> 00:42:40.000
+This is cue #2559
+
+2560
+00:42:40.000 --> 00:42:41.000
+This is cue #2560
+
+2561
+00:42:41.000 --> 00:42:42.000
+This is cue #2561
+
+2562
+00:42:42.000 --> 00:42:43.000
+This is cue #2562
+
+2563
+00:42:43.000 --> 00:42:44.000
+This is cue #2563
+
+2564
+00:42:44.000 --> 00:42:45.000
+This is cue #2564
+
+2565
+00:42:45.000 --> 00:42:46.000
+This is cue #2565
+
+2566
+00:42:46.000 --> 00:42:47.000
+This is cue #2566
+
+2567
+00:42:47.000 --> 00:42:48.000
+This is cue #2567
+
+2568
+00:42:48.000 --> 00:42:49.000
+This is cue #2568
+
+2569
+00:42:49.000 --> 00:42:50.000
+This is cue #2569
+
+2570
+00:42:50.000 --> 00:42:51.000
+This is cue #2570
+
+2571
+00:42:51.000 --> 00:42:52.000
+This is cue #2571
+
+2572
+00:42:52.000 --> 00:42:53.000
+This is cue #2572
+
+2573
+00:42:53.000 --> 00:42:54.000
+This is cue #2573
+
+2574
+00:42:54.000 --> 00:42:55.000
+This is cue #2574
+
+2575
+00:42:55.000 --> 00:42:56.000
+This is cue #2575
+
+2576
+00:42:56.000 --> 00:42:57.000
+This is cue #2576
+
+2577
+00:42:57.000 --> 00:42:58.000
+This is cue #2577
+
+2578
+00:42:58.000 --> 00:42:59.000
+This is cue #2578
+
+2579
+00:42:59.000 --> 00:43:00.000
+This is cue #2579
+
+2580
+00:43:00.000 --> 00:43:01.000
+This is cue #2580
+
+2581
+00:43:01.000 --> 00:43:02.000
+This is cue #2581
+
+2582
+00:43:02.000 --> 00:43:03.000
+This is cue #2582
+
+2583
+00:43:03.000 --> 00:43:04.000
+This is cue #2583
+
+2584
+00:43:04.000 --> 00:43:05.000
+This is cue #2584
+
+2585
+00:43:05.000 --> 00:43:06.000
+This is cue #2585
+
+2586
+00:43:06.000 --> 00:43:07.000
+This is cue #2586
+
+2587
+00:43:07.000 --> 00:43:08.000
+This is cue #2587
+
+2588
+00:43:08.000 --> 00:43:09.000
+This is cue #2588
+
+2589
+00:43:09.000 --> 00:43:10.000
+This is cue #2589
+
+2590
+00:43:10.000 --> 00:43:11.000
+This is cue #2590
+
+2591
+00:43:11.000 --> 00:43:12.000
+This is cue #2591
+
+2592
+00:43:12.000 --> 00:43:13.000
+This is cue #2592
+
+2593
+00:43:13.000 --> 00:43:14.000
+This is cue #2593
+
+2594
+00:43:14.000 --> 00:43:15.000
+This is cue #2594
+
+2595
+00:43:15.000 --> 00:43:16.000
+This is cue #2595
+
+2596
+00:43:16.000 --> 00:43:17.000
+This is cue #2596
+
+2597
+00:43:17.000 --> 00:43:18.000
+This is cue #2597
+
+2598
+00:43:18.000 --> 00:43:19.000
+This is cue #2598
+
+2599
+00:43:19.000 --> 00:43:20.000
+This is cue #2599
+
+2600
+00:43:20.000 --> 00:43:21.000
+This is cue #2600
+
+2601
+00:43:21.000 --> 00:43:22.000
+This is cue #2601
+
+2602
+00:43:22.000 --> 00:43:23.000
+This is cue #2602
+
+2603
+00:43:23.000 --> 00:43:24.000
+This is cue #2603
+
+2604
+00:43:24.000 --> 00:43:25.000
+This is cue #2604
+
+2605
+00:43:25.000 --> 00:43:26.000
+This is cue #2605
+
+2606
+00:43:26.000 --> 00:43:27.000
+This is cue #2606
+
+2607
+00:43:27.000 --> 00:43:28.000
+This is cue #2607
+
+2608
+00:43:28.000 --> 00:43:29.000
+This is cue #2608
+
+2609
+00:43:29.000 --> 00:43:30.000
+This is cue #2609
+
+2610
+00:43:30.000 --> 00:43:31.000
+This is cue #2610
+
+2611
+00:43:31.000 --> 00:43:32.000
+This is cue #2611
+
+2612
+00:43:32.000 --> 00:43:33.000
+This is cue #2612
+
+2613
+00:43:33.000 --> 00:43:34.000
+This is cue #2613
+
+2614
+00:43:34.000 --> 00:43:35.000
+This is cue #2614
+
+2615
+00:43:35.000 --> 00:43:36.000
+This is cue #2615
+
+2616
+00:43:36.000 --> 00:43:37.000
+This is cue #2616
+
+2617
+00:43:37.000 --> 00:43:38.000
+This is cue #2617
+
+2618
+00:43:38.000 --> 00:43:39.000
+This is cue #2618
+
+2619
+00:43:39.000 --> 00:43:40.000
+This is cue #2619
+
+2620
+00:43:40.000 --> 00:43:41.000
+This is cue #2620
+
+2621
+00:43:41.000 --> 00:43:42.000
+This is cue #2621
+
+2622
+00:43:42.000 --> 00:43:43.000
+This is cue #2622
+
+2623
+00:43:43.000 --> 00:43:44.000
+This is cue #2623
+
+2624
+00:43:44.000 --> 00:43:45.000
+This is cue #2624
+
+2625
+00:43:45.000 --> 00:43:46.000
+This is cue #2625
+
+2626
+00:43:46.000 --> 00:43:47.000
+This is cue #2626
+
+2627
+00:43:47.000 --> 00:43:48.000
+This is cue #2627
+
+2628
+00:43:48.000 --> 00:43:49.000
+This is cue #2628
+
+2629
+00:43:49.000 --> 00:43:50.000
+This is cue #2629
+
+2630
+00:43:50.000 --> 00:43:51.000
+This is cue #2630
+
+2631
+00:43:51.000 --> 00:43:52.000
+This is cue #2631
+
+2632
+00:43:52.000 --> 00:43:53.000
+This is cue #2632
+
+2633
+00:43:53.000 --> 00:43:54.000
+This is cue #2633
+
+2634
+00:43:54.000 --> 00:43:55.000
+This is cue #2634
+
+2635
+00:43:55.000 --> 00:43:56.000
+This is cue #2635
+
+2636
+00:43:56.000 --> 00:43:57.000
+This is cue #2636
+
+2637
+00:43:57.000 --> 00:43:58.000
+This is cue #2637
+
+2638
+00:43:58.000 --> 00:43:59.000
+This is cue #2638
+
+2639
+00:43:59.000 --> 00:44:00.000
+This is cue #2639
+
+2640
+00:44:00.000 --> 00:44:01.000
+This is cue #2640
+
+2641
+00:44:01.000 --> 00:44:02.000
+This is cue #2641
+
+2642
+00:44:02.000 --> 00:44:03.000
+This is cue #2642
+
+2643
+00:44:03.000 --> 00:44:04.000
+This is cue #2643
+
+2644
+00:44:04.000 --> 00:44:05.000
+This is cue #2644
+
+2645
+00:44:05.000 --> 00:44:06.000
+This is cue #2645
+
+2646
+00:44:06.000 --> 00:44:07.000
+This is cue #2646
+
+2647
+00:44:07.000 --> 00:44:08.000
+This is cue #2647
+
+2648
+00:44:08.000 --> 00:44:09.000
+This is cue #2648
+
+2649
+00:44:09.000 --> 00:44:10.000
+This is cue #2649
+
+2650
+00:44:10.000 --> 00:44:11.000
+This is cue #2650
+
+2651
+00:44:11.000 --> 00:44:12.000
+This is cue #2651
+
+2652
+00:44:12.000 --> 00:44:13.000
+This is cue #2652
+
+2653
+00:44:13.000 --> 00:44:14.000
+This is cue #2653
+
+2654
+00:44:14.000 --> 00:44:15.000
+This is cue #2654
+
+2655
+00:44:15.000 --> 00:44:16.000
+This is cue #2655
+
+2656
+00:44:16.000 --> 00:44:17.000
+This is cue #2656
+
+2657
+00:44:17.000 --> 00:44:18.000
+This is cue #2657
+
+2658
+00:44:18.000 --> 00:44:19.000
+This is cue #2658
+
+2659
+00:44:19.000 --> 00:44:20.000
+This is cue #2659
+
+2660
+00:44:20.000 --> 00:44:21.000
+This is cue #2660
+
+2661
+00:44:21.000 --> 00:44:22.000
+This is cue #2661
+
+2662
+00:44:22.000 --> 00:44:23.000
+This is cue #2662
+
+2663
+00:44:23.000 --> 00:44:24.000
+This is cue #2663
+
+2664
+00:44:24.000 --> 00:44:25.000
+This is cue #2664
+
+2665
+00:44:25.000 --> 00:44:26.000
+This is cue #2665
+
+2666
+00:44:26.000 --> 00:44:27.000
+This is cue #2666
+
+2667
+00:44:27.000 --> 00:44:28.000
+This is cue #2667
+
+2668
+00:44:28.000 --> 00:44:29.000
+This is cue #2668
+
+2669
+00:44:29.000 --> 00:44:30.000
+This is cue #2669
+
+2670
+00:44:30.000 --> 00:44:31.000
+This is cue #2670
+
+2671
+00:44:31.000 --> 00:44:32.000
+This is cue #2671
+
+2672
+00:44:32.000 --> 00:44:33.000
+This is cue #2672
+
+2673
+00:44:33.000 --> 00:44:34.000
+This is cue #2673
+
+2674
+00:44:34.000 --> 00:44:35.000
+This is cue #2674
+
+2675
+00:44:35.000 --> 00:44:36.000
+This is cue #2675
+
+2676
+00:44:36.000 --> 00:44:37.000
+This is cue #2676
+
+2677
+00:44:37.000 --> 00:44:38.000
+This is cue #2677
+
+2678
+00:44:38.000 --> 00:44:39.000
+This is cue #2678
+
+2679
+00:44:39.000 --> 00:44:40.000
+This is cue #2679
+
+2680
+00:44:40.000 --> 00:44:41.000
+This is cue #2680
+
+2681
+00:44:41.000 --> 00:44:42.000
+This is cue #2681
+
+2682
+00:44:42.000 --> 00:44:43.000
+This is cue #2682
+
+2683
+00:44:43.000 --> 00:44:44.000
+This is cue #2683
+
+2684
+00:44:44.000 --> 00:44:45.000
+This is cue #2684
+
+2685
+00:44:45.000 --> 00:44:46.000
+This is cue #2685
+
+2686
+00:44:46.000 --> 00:44:47.000
+This is cue #2686
+
+2687
+00:44:47.000 --> 00:44:48.000
+This is cue #2687
+
+2688
+00:44:48.000 --> 00:44:49.000
+This is cue #2688
+
+2689
+00:44:49.000 --> 00:44:50.000
+This is cue #2689
+
+2690
+00:44:50.000 --> 00:44:51.000
+This is cue #2690
+
+2691
+00:44:51.000 --> 00:44:52.000
+This is cue #2691
+
+2692
+00:44:52.000 --> 00:44:53.000
+This is cue #2692
+
+2693
+00:44:53.000 --> 00:44:54.000
+This is cue #2693
+
+2694
+00:44:54.000 --> 00:44:55.000
+This is cue #2694
+
+2695
+00:44:55.000 --> 00:44:56.000
+This is cue #2695
+
+2696
+00:44:56.000 --> 00:44:57.000
+This is cue #2696
+
+2697
+00:44:57.000 --> 00:44:58.000
+This is cue #2697
+
+2698
+00:44:58.000 --> 00:44:59.000
+This is cue #2698
+
+2699
+00:44:59.000 --> 00:45:00.000
+This is cue #2699
+
+2700
+00:45:00.000 --> 00:45:01.000
+This is cue #2700
+
+2701
+00:45:01.000 --> 00:45:02.000
+This is cue #2701
+
+2702
+00:45:02.000 --> 00:45:03.000
+This is cue #2702
+
+2703
+00:45:03.000 --> 00:45:04.000
+This is cue #2703
+
+2704
+00:45:04.000 --> 00:45:05.000
+This is cue #2704
+
+2705
+00:45:05.000 --> 00:45:06.000
+This is cue #2705
+
+2706
+00:45:06.000 --> 00:45:07.000
+This is cue #2706
+
+2707
+00:45:07.000 --> 00:45:08.000
+This is cue #2707
+
+2708
+00:45:08.000 --> 00:45:09.000
+This is cue #2708
+
+2709
+00:45:09.000 --> 00:45:10.000
+This is cue #2709
+
+2710
+00:45:10.000 --> 00:45:11.000
+This is cue #2710
+
+2711
+00:45:11.000 --> 00:45:12.000
+This is cue #2711
+
+2712
+00:45:12.000 --> 00:45:13.000
+This is cue #2712
+
+2713
+00:45:13.000 --> 00:45:14.000
+This is cue #2713
+
+2714
+00:45:14.000 --> 00:45:15.000
+This is cue #2714
+
+2715
+00:45:15.000 --> 00:45:16.000
+This is cue #2715
+
+2716
+00:45:16.000 --> 00:45:17.000
+This is cue #2716
+
+2717
+00:45:17.000 --> 00:45:18.000
+This is cue #2717
+
+2718
+00:45:18.000 --> 00:45:19.000
+This is cue #2718
+
+2719
+00:45:19.000 --> 00:45:20.000
+This is cue #2719
+
+2720
+00:45:20.000 --> 00:45:21.000
+This is cue #2720
+
+2721
+00:45:21.000 --> 00:45:22.000
+This is cue #2721
+
+2722
+00:45:22.000 --> 00:45:23.000
+This is cue #2722
+
+2723
+00:45:23.000 --> 00:45:24.000
+This is cue #2723
+
+2724
+00:45:24.000 --> 00:45:25.000
+This is cue #2724
+
+2725
+00:45:25.000 --> 00:45:26.000
+This is cue #2725
+
+2726
+00:45:26.000 --> 00:45:27.000
+This is cue #2726
+
+2727
+00:45:27.000 --> 00:45:28.000
+This is cue #2727
+
+2728
+00:45:28.000 --> 00:45:29.000
+This is cue #2728
+
+2729
+00:45:29.000 --> 00:45:30.000
+This is cue #2729
+
+2730
+00:45:30.000 --> 00:45:31.000
+This is cue #2730
+
+2731
+00:45:31.000 --> 00:45:32.000
+This is cue #2731
+
+2732
+00:45:32.000 --> 00:45:33.000
+This is cue #2732
+
+2733
+00:45:33.000 --> 00:45:34.000
+This is cue #2733
+
+2734
+00:45:34.000 --> 00:45:35.000
+This is cue #2734
+
+2735
+00:45:35.000 --> 00:45:36.000
+This is cue #2735
+
+2736
+00:45:36.000 --> 00:45:37.000
+This is cue #2736
+
+2737
+00:45:37.000 --> 00:45:38.000
+This is cue #2737
+
+2738
+00:45:38.000 --> 00:45:39.000
+This is cue #2738
+
+2739
+00:45:39.000 --> 00:45:40.000
+This is cue #2739
+
+2740
+00:45:40.000 --> 00:45:41.000
+This is cue #2740
+
+2741
+00:45:41.000 --> 00:45:42.000
+This is cue #2741
+
+2742
+00:45:42.000 --> 00:45:43.000
+This is cue #2742
+
+2743
+00:45:43.000 --> 00:45:44.000
+This is cue #2743
+
+2744
+00:45:44.000 --> 00:45:45.000
+This is cue #2744
+
+2745
+00:45:45.000 --> 00:45:46.000
+This is cue #2745
+
+2746
+00:45:46.000 --> 00:45:47.000
+This is cue #2746
+
+2747
+00:45:47.000 --> 00:45:48.000
+This is cue #2747
+
+2748
+00:45:48.000 --> 00:45:49.000
+This is cue #2748
+
+2749
+00:45:49.000 --> 00:45:50.000
+This is cue #2749
+
+2750
+00:45:50.000 --> 00:45:51.000
+This is cue #2750
+
+2751
+00:45:51.000 --> 00:45:52.000
+This is cue #2751
+
+2752
+00:45:52.000 --> 00:45:53.000
+This is cue #2752
+
+2753
+00:45:53.000 --> 00:45:54.000
+This is cue #2753
+
+2754
+00:45:54.000 --> 00:45:55.000
+This is cue #2754
+
+2755
+00:45:55.000 --> 00:45:56.000
+This is cue #2755
+
+2756
+00:45:56.000 --> 00:45:57.000
+This is cue #2756
+
+2757
+00:45:57.000 --> 00:45:58.000
+This is cue #2757
+
+2758
+00:45:58.000 --> 00:45:59.000
+This is cue #2758
+
+2759
+00:45:59.000 --> 00:46:00.000
+This is cue #2759
+
+2760
+00:46:00.000 --> 00:46:01.000
+This is cue #2760
+
+2761
+00:46:01.000 --> 00:46:02.000
+This is cue #2761
+
+2762
+00:46:02.000 --> 00:46:03.000
+This is cue #2762
+
+2763
+00:46:03.000 --> 00:46:04.000
+This is cue #2763
+
+2764
+00:46:04.000 --> 00:46:05.000
+This is cue #2764
+
+2765
+00:46:05.000 --> 00:46:06.000
+This is cue #2765
+
+2766
+00:46:06.000 --> 00:46:07.000
+This is cue #2766
+
+2767
+00:46:07.000 --> 00:46:08.000
+This is cue #2767
+
+2768
+00:46:08.000 --> 00:46:09.000
+This is cue #2768
+
+2769
+00:46:09.000 --> 00:46:10.000
+This is cue #2769
+
+2770
+00:46:10.000 --> 00:46:11.000
+This is cue #2770
+
+2771
+00:46:11.000 --> 00:46:12.000
+This is cue #2771
+
+2772
+00:46:12.000 --> 00:46:13.000
+This is cue #2772
+
+2773
+00:46:13.000 --> 00:46:14.000
+This is cue #2773
+
+2774
+00:46:14.000 --> 00:46:15.000
+This is cue #2774
+
+2775
+00:46:15.000 --> 00:46:16.000
+This is cue #2775
+
+2776
+00:46:16.000 --> 00:46:17.000
+This is cue #2776
+
+2777
+00:46:17.000 --> 00:46:18.000
+This is cue #2777
+
+2778
+00:46:18.000 --> 00:46:19.000
+This is cue #2778
+
+2779
+00:46:19.000 --> 00:46:20.000
+This is cue #2779
+
+2780
+00:46:20.000 --> 00:46:21.000
+This is cue #2780
+
+2781
+00:46:21.000 --> 00:46:22.000
+This is cue #2781
+
+2782
+00:46:22.000 --> 00:46:23.000
+This is cue #2782
+
+2783
+00:46:23.000 --> 00:46:24.000
+This is cue #2783
+
+2784
+00:46:24.000 --> 00:46:25.000
+This is cue #2784
+
+2785
+00:46:25.000 --> 00:46:26.000
+This is cue #2785
+
+2786
+00:46:26.000 --> 00:46:27.000
+This is cue #2786
+
+2787
+00:46:27.000 --> 00:46:28.000
+This is cue #2787
+
+2788
+00:46:28.000 --> 00:46:29.000
+This is cue #2788
+
+2789
+00:46:29.000 --> 00:46:30.000
+This is cue #2789
+
+2790
+00:46:30.000 --> 00:46:31.000
+This is cue #2790
+
+2791
+00:46:31.000 --> 00:46:32.000
+This is cue #2791
+
+2792
+00:46:32.000 --> 00:46:33.000
+This is cue #2792
+
+2793
+00:46:33.000 --> 00:46:34.000
+This is cue #2793
+
+2794
+00:46:34.000 --> 00:46:35.000
+This is cue #2794
+
+2795
+00:46:35.000 --> 00:46:36.000
+This is cue #2795
+
+2796
+00:46:36.000 --> 00:46:37.000
+This is cue #2796
+
+2797
+00:46:37.000 --> 00:46:38.000
+This is cue #2797
+
+2798
+00:46:38.000 --> 00:46:39.000
+This is cue #2798
+
+2799
+00:46:39.000 --> 00:46:40.000
+This is cue #2799
+
+2800
+00:46:40.000 --> 00:46:41.000
+This is cue #2800
+
+2801
+00:46:41.000 --> 00:46:42.000
+This is cue #2801
+
+2802
+00:46:42.000 --> 00:46:43.000
+This is cue #2802
+
+2803
+00:46:43.000 --> 00:46:44.000
+This is cue #2803
+
+2804
+00:46:44.000 --> 00:46:45.000
+This is cue #2804
+
+2805
+00:46:45.000 --> 00:46:46.000
+This is cue #2805
+
+2806
+00:46:46.000 --> 00:46:47.000
+This is cue #2806
+
+2807
+00:46:47.000 --> 00:46:48.000
+This is cue #2807
+
+2808
+00:46:48.000 --> 00:46:49.000
+This is cue #2808
+
+2809
+00:46:49.000 --> 00:46:50.000
+This is cue #2809
+
+2810
+00:46:50.000 --> 00:46:51.000
+This is cue #2810
+
+2811
+00:46:51.000 --> 00:46:52.000
+This is cue #2811
+
+2812
+00:46:52.000 --> 00:46:53.000
+This is cue #2812
+
+2813
+00:46:53.000 --> 00:46:54.000
+This is cue #2813
+
+2814
+00:46:54.000 --> 00:46:55.000
+This is cue #2814
+
+2815
+00:46:55.000 --> 00:46:56.000
+This is cue #2815
+
+2816
+00:46:56.000 --> 00:46:57.000
+This is cue #2816
+
+2817
+00:46:57.000 --> 00:46:58.000
+This is cue #2817
+
+2818
+00:46:58.000 --> 00:46:59.000
+This is cue #2818
+
+2819
+00:46:59.000 --> 00:47:00.000
+This is cue #2819
+
+2820
+00:47:00.000 --> 00:47:01.000
+This is cue #2820
+
+2821
+00:47:01.000 --> 00:47:02.000
+This is cue #2821
+
+2822
+00:47:02.000 --> 00:47:03.000
+This is cue #2822
+
+2823
+00:47:03.000 --> 00:47:04.000
+This is cue #2823
+
+2824
+00:47:04.000 --> 00:47:05.000
+This is cue #2824
+
+2825
+00:47:05.000 --> 00:47:06.000
+This is cue #2825
+
+2826
+00:47:06.000 --> 00:47:07.000
+This is cue #2826
+
+2827
+00:47:07.000 --> 00:47:08.000
+This is cue #2827
+
+2828
+00:47:08.000 --> 00:47:09.000
+This is cue #2828
+
+2829
+00:47:09.000 --> 00:47:10.000
+This is cue #2829
+
+2830
+00:47:10.000 --> 00:47:11.000
+This is cue #2830
+
+2831
+00:47:11.000 --> 00:47:12.000
+This is cue #2831
+
+2832
+00:47:12.000 --> 00:47:13.000
+This is cue #2832
+
+2833
+00:47:13.000 --> 00:47:14.000
+This is cue #2833
+
+2834
+00:47:14.000 --> 00:47:15.000
+This is cue #2834
+
+2835
+00:47:15.000 --> 00:47:16.000
+This is cue #2835
+
+2836
+00:47:16.000 --> 00:47:17.000
+This is cue #2836
+
+2837
+00:47:17.000 --> 00:47:18.000
+This is cue #2837
+
+2838
+00:47:18.000 --> 00:47:19.000
+This is cue #2838
+
+2839
+00:47:19.000 --> 00:47:20.000
+This is cue #2839
+
+2840
+00:47:20.000 --> 00:47:21.000
+This is cue #2840
+
+2841
+00:47:21.000 --> 00:47:22.000
+This is cue #2841
+
+2842
+00:47:22.000 --> 00:47:23.000
+This is cue #2842
+
+2843
+00:47:23.000 --> 00:47:24.000
+This is cue #2843
+
+2844
+00:47:24.000 --> 00:47:25.000
+This is cue #2844
+
+2845
+00:47:25.000 --> 00:47:26.000
+This is cue #2845
+
+2846
+00:47:26.000 --> 00:47:27.000
+This is cue #2846
+
+2847
+00:47:27.000 --> 00:47:28.000
+This is cue #2847
+
+2848
+00:47:28.000 --> 00:47:29.000
+This is cue #2848
+
+2849
+00:47:29.000 --> 00:47:30.000
+This is cue #2849
+
+2850
+00:47:30.000 --> 00:47:31.000
+This is cue #2850
+
+2851
+00:47:31.000 --> 00:47:32.000
+This is cue #2851
+
+2852
+00:47:32.000 --> 00:47:33.000
+This is cue #2852
+
+2853
+00:47:33.000 --> 00:47:34.000
+This is cue #2853
+
+2854
+00:47:34.000 --> 00:47:35.000
+This is cue #2854
+
+2855
+00:47:35.000 --> 00:47:36.000
+This is cue #2855
+
+2856
+00:47:36.000 --> 00:47:37.000
+This is cue #2856
+
+2857
+00:47:37.000 --> 00:47:38.000
+This is cue #2857
+
+2858
+00:47:38.000 --> 00:47:39.000
+This is cue #2858
+
+2859
+00:47:39.000 --> 00:47:40.000
+This is cue #2859
+
+2860
+00:47:40.000 --> 00:47:41.000
+This is cue #2860
+
+2861
+00:47:41.000 --> 00:47:42.000
+This is cue #2861
+
+2862
+00:47:42.000 --> 00:47:43.000
+This is cue #2862
+
+2863
+00:47:43.000 --> 00:47:44.000
+This is cue #2863
+
+2864
+00:47:44.000 --> 00:47:45.000
+This is cue #2864
+
+2865
+00:47:45.000 --> 00:47:46.000
+This is cue #2865
+
+2866
+00:47:46.000 --> 00:47:47.000
+This is cue #2866
+
+2867
+00:47:47.000 --> 00:47:48.000
+This is cue #2867
+
+2868
+00:47:48.000 --> 00:47:49.000
+This is cue #2868
+
+2869
+00:47:49.000 --> 00:47:50.000
+This is cue #2869
+
+2870
+00:47:50.000 --> 00:47:51.000
+This is cue #2870
+
+2871
+00:47:51.000 --> 00:47:52.000
+This is cue #2871
+
+2872
+00:47:52.000 --> 00:47:53.000
+This is cue #2872
+
+2873
+00:47:53.000 --> 00:47:54.000
+This is cue #2873
+
+2874
+00:47:54.000 --> 00:47:55.000
+This is cue #2874
+
+2875
+00:47:55.000 --> 00:47:56.000
+This is cue #2875
+
+2876
+00:47:56.000 --> 00:47:57.000
+This is cue #2876
+
+2877
+00:47:57.000 --> 00:47:58.000
+This is cue #2877
+
+2878
+00:47:58.000 --> 00:47:59.000
+This is cue #2878
+
+2879
+00:47:59.000 --> 00:48:00.000
+This is cue #2879
+
+2880
+00:48:00.000 --> 00:48:01.000
+This is cue #2880
+
+2881
+00:48:01.000 --> 00:48:02.000
+This is cue #2881
+
+2882
+00:48:02.000 --> 00:48:03.000
+This is cue #2882
+
+2883
+00:48:03.000 --> 00:48:04.000
+This is cue #2883
+
+2884
+00:48:04.000 --> 00:48:05.000
+This is cue #2884
+
+2885
+00:48:05.000 --> 00:48:06.000
+This is cue #2885
+
+2886
+00:48:06.000 --> 00:48:07.000
+This is cue #2886
+
+2887
+00:48:07.000 --> 00:48:08.000
+This is cue #2887
+
+2888
+00:48:08.000 --> 00:48:09.000
+This is cue #2888
+
+2889
+00:48:09.000 --> 00:48:10.000
+This is cue #2889
+
+2890
+00:48:10.000 --> 00:48:11.000
+This is cue #2890
+
+2891
+00:48:11.000 --> 00:48:12.000
+This is cue #2891
+
+2892
+00:48:12.000 --> 00:48:13.000
+This is cue #2892
+
+2893
+00:48:13.000 --> 00:48:14.000
+This is cue #2893
+
+2894
+00:48:14.000 --> 00:48:15.000
+This is cue #2894
+
+2895
+00:48:15.000 --> 00:48:16.000
+This is cue #2895
+
+2896
+00:48:16.000 --> 00:48:17.000
+This is cue #2896
+
+2897
+00:48:17.000 --> 00:48:18.000
+This is cue #2897
+
+2898
+00:48:18.000 --> 00:48:19.000
+This is cue #2898
+
+2899
+00:48:19.000 --> 00:48:20.000
+This is cue #2899
+
+2900
+00:48:20.000 --> 00:48:21.000
+This is cue #2900
+
+2901
+00:48:21.000 --> 00:48:22.000
+This is cue #2901
+
+2902
+00:48:22.000 --> 00:48:23.000
+This is cue #2902
+
+2903
+00:48:23.000 --> 00:48:24.000
+This is cue #2903
+
+2904
+00:48:24.000 --> 00:48:25.000
+This is cue #2904
+
+2905
+00:48:25.000 --> 00:48:26.000
+This is cue #2905
+
+2906
+00:48:26.000 --> 00:48:27.000
+This is cue #2906
+
+2907
+00:48:27.000 --> 00:48:28.000
+This is cue #2907
+
+2908
+00:48:28.000 --> 00:48:29.000
+This is cue #2908
+
+2909
+00:48:29.000 --> 00:48:30.000
+This is cue #2909
+
+2910
+00:48:30.000 --> 00:48:31.000
+This is cue #2910
+
+2911
+00:48:31.000 --> 00:48:32.000
+This is cue #2911
+
+2912
+00:48:32.000 --> 00:48:33.000
+This is cue #2912
+
+2913
+00:48:33.000 --> 00:48:34.000
+This is cue #2913
+
+2914
+00:48:34.000 --> 00:48:35.000
+This is cue #2914
+
+2915
+00:48:35.000 --> 00:48:36.000
+This is cue #2915
+
+2916
+00:48:36.000 --> 00:48:37.000
+This is cue #2916
+
+2917
+00:48:37.000 --> 00:48:38.000
+This is cue #2917
+
+2918
+00:48:38.000 --> 00:48:39.000
+This is cue #2918
+
+2919
+00:48:39.000 --> 00:48:40.000
+This is cue #2919
+
+2920
+00:48:40.000 --> 00:48:41.000
+This is cue #2920
+
+2921
+00:48:41.000 --> 00:48:42.000
+This is cue #2921
+
+2922
+00:48:42.000 --> 00:48:43.000
+This is cue #2922
+
+2923
+00:48:43.000 --> 00:48:44.000
+This is cue #2923
+
+2924
+00:48:44.000 --> 00:48:45.000
+This is cue #2924
+
+2925
+00:48:45.000 --> 00:48:46.000
+This is cue #2925
+
+2926
+00:48:46.000 --> 00:48:47.000
+This is cue #2926
+
+2927
+00:48:47.000 --> 00:48:48.000
+This is cue #2927
+
+2928
+00:48:48.000 --> 00:48:49.000
+This is cue #2928
+
+2929
+00:48:49.000 --> 00:48:50.000
+This is cue #2929
+
+2930
+00:48:50.000 --> 00:48:51.000
+This is cue #2930
+
+2931
+00:48:51.000 --> 00:48:52.000
+This is cue #2931
+
+2932
+00:48:52.000 --> 00:48:53.000
+This is cue #2932
+
+2933
+00:48:53.000 --> 00:48:54.000
+This is cue #2933
+
+2934
+00:48:54.000 --> 00:48:55.000
+This is cue #2934
+
+2935
+00:48:55.000 --> 00:48:56.000
+This is cue #2935
+
+2936
+00:48:56.000 --> 00:48:57.000
+This is cue #2936
+
+2937
+00:48:57.000 --> 00:48:58.000
+This is cue #2937
+
+2938
+00:48:58.000 --> 00:48:59.000
+This is cue #2938
+
+2939
+00:48:59.000 --> 00:49:00.000
+This is cue #2939
+
+2940
+00:49:00.000 --> 00:49:01.000
+This is cue #2940
+
+2941
+00:49:01.000 --> 00:49:02.000
+This is cue #2941
+
+2942
+00:49:02.000 --> 00:49:03.000
+This is cue #2942
+
+2943
+00:49:03.000 --> 00:49:04.000
+This is cue #2943
+
+2944
+00:49:04.000 --> 00:49:05.000
+This is cue #2944
+
+2945
+00:49:05.000 --> 00:49:06.000
+This is cue #2945
+
+2946
+00:49:06.000 --> 00:49:07.000
+This is cue #2946
+
+2947
+00:49:07.000 --> 00:49:08.000
+This is cue #2947
+
+2948
+00:49:08.000 --> 00:49:09.000
+This is cue #2948
+
+2949
+00:49:09.000 --> 00:49:10.000
+This is cue #2949
+
+2950
+00:49:10.000 --> 00:49:11.000
+This is cue #2950
+
+2951
+00:49:11.000 --> 00:49:12.000
+This is cue #2951
+
+2952
+00:49:12.000 --> 00:49:13.000
+This is cue #2952
+
+2953
+00:49:13.000 --> 00:49:14.000
+This is cue #2953
+
+2954
+00:49:14.000 --> 00:49:15.000
+This is cue #2954
+
+2955
+00:49:15.000 --> 00:49:16.000
+This is cue #2955
+
+2956
+00:49:16.000 --> 00:49:17.000
+This is cue #2956
+
+2957
+00:49:17.000 --> 00:49:18.000
+This is cue #2957
+
+2958
+00:49:18.000 --> 00:49:19.000
+This is cue #2958
+
+2959
+00:49:19.000 --> 00:49:20.000
+This is cue #2959
+
+2960
+00:49:20.000 --> 00:49:21.000
+This is cue #2960
+
+2961
+00:49:21.000 --> 00:49:22.000
+This is cue #2961
+
+2962
+00:49:22.000 --> 00:49:23.000
+This is cue #2962
+
+2963
+00:49:23.000 --> 00:49:24.000
+This is cue #2963
+
+2964
+00:49:24.000 --> 00:49:25.000
+This is cue #2964
+
+2965
+00:49:25.000 --> 00:49:26.000
+This is cue #2965
+
+2966
+00:49:26.000 --> 00:49:27.000
+This is cue #2966
+
+2967
+00:49:27.000 --> 00:49:28.000
+This is cue #2967
+
+2968
+00:49:28.000 --> 00:49:29.000
+This is cue #2968
+
+2969
+00:49:29.000 --> 00:49:30.000
+This is cue #2969
+
+2970
+00:49:30.000 --> 00:49:31.000
+This is cue #2970
+
+2971
+00:49:31.000 --> 00:49:32.000
+This is cue #2971
+
+2972
+00:49:32.000 --> 00:49:33.000
+This is cue #2972
+
+2973
+00:49:33.000 --> 00:49:34.000
+This is cue #2973
+
+2974
+00:49:34.000 --> 00:49:35.000
+This is cue #2974
+
+2975
+00:49:35.000 --> 00:49:36.000
+This is cue #2975
+
+2976
+00:49:36.000 --> 00:49:37.000
+This is cue #2976
+
+2977
+00:49:37.000 --> 00:49:38.000
+This is cue #2977
+
+2978
+00:49:38.000 --> 00:49:39.000
+This is cue #2978
+
+2979
+00:49:39.000 --> 00:49:40.000
+This is cue #2979
+
+2980
+00:49:40.000 --> 00:49:41.000
+This is cue #2980
+
+2981
+00:49:41.000 --> 00:49:42.000
+This is cue #2981
+
+2982
+00:49:42.000 --> 00:49:43.000
+This is cue #2982
+
+2983
+00:49:43.000 --> 00:49:44.000
+This is cue #2983
+
+2984
+00:49:44.000 --> 00:49:45.000
+This is cue #2984
+
+2985
+00:49:45.000 --> 00:49:46.000
+This is cue #2985
+
+2986
+00:49:46.000 --> 00:49:47.000
+This is cue #2986
+
+2987
+00:49:47.000 --> 00:49:48.000
+This is cue #2987
+
+2988
+00:49:48.000 --> 00:49:49.000
+This is cue #2988
+
+2989
+00:49:49.000 --> 00:49:50.000
+This is cue #2989
+
+2990
+00:49:50.000 --> 00:49:51.000
+This is cue #2990
+
+2991
+00:49:51.000 --> 00:49:52.000
+This is cue #2991
+
+2992
+00:49:52.000 --> 00:49:53.000
+This is cue #2992
+
+2993
+00:49:53.000 --> 00:49:54.000
+This is cue #2993
+
+2994
+00:49:54.000 --> 00:49:55.000
+This is cue #2994
+
+2995
+00:49:55.000 --> 00:49:56.000
+This is cue #2995
+
+2996
+00:49:56.000 --> 00:49:57.000
+This is cue #2996
+
+2997
+00:49:57.000 --> 00:49:58.000
+This is cue #2997
+
+2998
+00:49:58.000 --> 00:49:59.000
+This is cue #2998
+
+2999
+00:49:59.000 --> 00:50:00.000
+This is cue #2999
+
+3000
+00:50:00.000 --> 00:50:01.000
+This is cue #3000
+
+3001
+00:50:01.000 --> 00:50:02.000
+This is cue #3001
+
+3002
+00:50:02.000 --> 00:50:03.000
+This is cue #3002
+
+3003
+00:50:03.000 --> 00:50:04.000
+This is cue #3003
+
+3004
+00:50:04.000 --> 00:50:05.000
+This is cue #3004
+
+3005
+00:50:05.000 --> 00:50:06.000
+This is cue #3005
+
+3006
+00:50:06.000 --> 00:50:07.000
+This is cue #3006
+
+3007
+00:50:07.000 --> 00:50:08.000
+This is cue #3007
+
+3008
+00:50:08.000 --> 00:50:09.000
+This is cue #3008
+
+3009
+00:50:09.000 --> 00:50:10.000
+This is cue #3009
+
+3010
+00:50:10.000 --> 00:50:11.000
+This is cue #3010
+
+3011
+00:50:11.000 --> 00:50:12.000
+This is cue #3011
+
+3012
+00:50:12.000 --> 00:50:13.000
+This is cue #3012
+
+3013
+00:50:13.000 --> 00:50:14.000
+This is cue #3013
+
+3014
+00:50:14.000 --> 00:50:15.000
+This is cue #3014
+
+3015
+00:50:15.000 --> 00:50:16.000
+This is cue #3015
+
+3016
+00:50:16.000 --> 00:50:17.000
+This is cue #3016
+
+3017
+00:50:17.000 --> 00:50:18.000
+This is cue #3017
+
+3018
+00:50:18.000 --> 00:50:19.000
+This is cue #3018
+
+3019
+00:50:19.000 --> 00:50:20.000
+This is cue #3019
+
+3020
+00:50:20.000 --> 00:50:21.000
+This is cue #3020
+
+3021
+00:50:21.000 --> 00:50:22.000
+This is cue #3021
+
+3022
+00:50:22.000 --> 00:50:23.000
+This is cue #3022
+
+3023
+00:50:23.000 --> 00:50:24.000
+This is cue #3023
+
+3024
+00:50:24.000 --> 00:50:25.000
+This is cue #3024
+
+3025
+00:50:25.000 --> 00:50:26.000
+This is cue #3025
+
+3026
+00:50:26.000 --> 00:50:27.000
+This is cue #3026
+
+3027
+00:50:27.000 --> 00:50:28.000
+This is cue #3027
+
+3028
+00:50:28.000 --> 00:50:29.000
+This is cue #3028
+
+3029
+00:50:29.000 --> 00:50:30.000
+This is cue #3029
+
+3030
+00:50:30.000 --> 00:50:31.000
+This is cue #3030
+
+3031
+00:50:31.000 --> 00:50:32.000
+This is cue #3031
+
+3032
+00:50:32.000 --> 00:50:33.000
+This is cue #3032
+
+3033
+00:50:33.000 --> 00:50:34.000
+This is cue #3033
+
+3034
+00:50:34.000 --> 00:50:35.000
+This is cue #3034
+
+3035
+00:50:35.000 --> 00:50:36.000
+This is cue #3035
+
+3036
+00:50:36.000 --> 00:50:37.000
+This is cue #3036
+
+3037
+00:50:37.000 --> 00:50:38.000
+This is cue #3037
+
+3038
+00:50:38.000 --> 00:50:39.000
+This is cue #3038
+
+3039
+00:50:39.000 --> 00:50:40.000
+This is cue #3039
+
+3040
+00:50:40.000 --> 00:50:41.000
+This is cue #3040
+
+3041
+00:50:41.000 --> 00:50:42.000
+This is cue #3041
+
+3042
+00:50:42.000 --> 00:50:43.000
+This is cue #3042
+
+3043
+00:50:43.000 --> 00:50:44.000
+This is cue #3043
+
+3044
+00:50:44.000 --> 00:50:45.000
+This is cue #3044
+
+3045
+00:50:45.000 --> 00:50:46.000
+This is cue #3045
+
+3046
+00:50:46.000 --> 00:50:47.000
+This is cue #3046
+
+3047
+00:50:47.000 --> 00:50:48.000
+This is cue #3047
+
+3048
+00:50:48.000 --> 00:50:49.000
+This is cue #3048
+
+3049
+00:50:49.000 --> 00:50:50.000
+This is cue #3049
+
+3050
+00:50:50.000 --> 00:50:51.000
+This is cue #3050
+
+3051
+00:50:51.000 --> 00:50:52.000
+This is cue #3051
+
+3052
+00:50:52.000 --> 00:50:53.000
+This is cue #3052
+
+3053
+00:50:53.000 --> 00:50:54.000
+This is cue #3053
+
+3054
+00:50:54.000 --> 00:50:55.000
+This is cue #3054
+
+3055
+00:50:55.000 --> 00:50:56.000
+This is cue #3055
+
+3056
+00:50:56.000 --> 00:50:57.000
+This is cue #3056
+
+3057
+00:50:57.000 --> 00:50:58.000
+This is cue #3057
+
+3058
+00:50:58.000 --> 00:50:59.000
+This is cue #3058
+
+3059
+00:50:59.000 --> 00:51:00.000
+This is cue #3059
+
+3060
+00:51:00.000 --> 00:51:01.000
+This is cue #3060
+
+3061
+00:51:01.000 --> 00:51:02.000
+This is cue #3061
+
+3062
+00:51:02.000 --> 00:51:03.000
+This is cue #3062
+
+3063
+00:51:03.000 --> 00:51:04.000
+This is cue #3063
+
+3064
+00:51:04.000 --> 00:51:05.000
+This is cue #3064
+
+3065
+00:51:05.000 --> 00:51:06.000
+This is cue #3065
+
+3066
+00:51:06.000 --> 00:51:07.000
+This is cue #3066
+
+3067
+00:51:07.000 --> 00:51:08.000
+This is cue #3067
+
+3068
+00:51:08.000 --> 00:51:09.000
+This is cue #3068
+
+3069
+00:51:09.000 --> 00:51:10.000
+This is cue #3069
+
+3070
+00:51:10.000 --> 00:51:11.000
+This is cue #3070
+
+3071
+00:51:11.000 --> 00:51:12.000
+This is cue #3071
+
+3072
+00:51:12.000 --> 00:51:13.000
+This is cue #3072
+
+3073
+00:51:13.000 --> 00:51:14.000
+This is cue #3073
+
+3074
+00:51:14.000 --> 00:51:15.000
+This is cue #3074
+
+3075
+00:51:15.000 --> 00:51:16.000
+This is cue #3075
+
+3076
+00:51:16.000 --> 00:51:17.000
+This is cue #3076
+
+3077
+00:51:17.000 --> 00:51:18.000
+This is cue #3077
+
+3078
+00:51:18.000 --> 00:51:19.000
+This is cue #3078
+
+3079
+00:51:19.000 --> 00:51:20.000
+This is cue #3079
+
+3080
+00:51:20.000 --> 00:51:21.000
+This is cue #3080
+
+3081
+00:51:21.000 --> 00:51:22.000
+This is cue #3081
+
+3082
+00:51:22.000 --> 00:51:23.000
+This is cue #3082
+
+3083
+00:51:23.000 --> 00:51:24.000
+This is cue #3083
+
+3084
+00:51:24.000 --> 00:51:25.000
+This is cue #3084
+
+3085
+00:51:25.000 --> 00:51:26.000
+This is cue #3085
+
+3086
+00:51:26.000 --> 00:51:27.000
+This is cue #3086
+
+3087
+00:51:27.000 --> 00:51:28.000
+This is cue #3087
+
+3088
+00:51:28.000 --> 00:51:29.000
+This is cue #3088
+
+3089
+00:51:29.000 --> 00:51:30.000
+This is cue #3089
+
+3090
+00:51:30.000 --> 00:51:31.000
+This is cue #3090
+
+3091
+00:51:31.000 --> 00:51:32.000
+This is cue #3091
+
+3092
+00:51:32.000 --> 00:51:33.000
+This is cue #3092
+
+3093
+00:51:33.000 --> 00:51:34.000
+This is cue #3093
+
+3094
+00:51:34.000 --> 00:51:35.000
+This is cue #3094
+
+3095
+00:51:35.000 --> 00:51:36.000
+This is cue #3095
+
+3096
+00:51:36.000 --> 00:51:37.000
+This is cue #3096
+
+3097
+00:51:37.000 --> 00:51:38.000
+This is cue #3097
+
+3098
+00:51:38.000 --> 00:51:39.000
+This is cue #3098
+
+3099
+00:51:39.000 --> 00:51:40.000
+This is cue #3099
+
+3100
+00:51:40.000 --> 00:51:41.000
+This is cue #3100
+
+3101
+00:51:41.000 --> 00:51:42.000
+This is cue #3101
+
+3102
+00:51:42.000 --> 00:51:43.000
+This is cue #3102
+
+3103
+00:51:43.000 --> 00:51:44.000
+This is cue #3103
+
+3104
+00:51:44.000 --> 00:51:45.000
+This is cue #3104
+
+3105
+00:51:45.000 --> 00:51:46.000
+This is cue #3105
+
+3106
+00:51:46.000 --> 00:51:47.000
+This is cue #3106
+
+3107
+00:51:47.000 --> 00:51:48.000
+This is cue #3107
+
+3108
+00:51:48.000 --> 00:51:49.000
+This is cue #3108
+
+3109
+00:51:49.000 --> 00:51:50.000
+This is cue #3109
+
+3110
+00:51:50.000 --> 00:51:51.000
+This is cue #3110
+
+3111
+00:51:51.000 --> 00:51:52.000
+This is cue #3111
+
+3112
+00:51:52.000 --> 00:51:53.000
+This is cue #3112
+
+3113
+00:51:53.000 --> 00:51:54.000
+This is cue #3113
+
+3114
+00:51:54.000 --> 00:51:55.000
+This is cue #3114
+
+3115
+00:51:55.000 --> 00:51:56.000
+This is cue #3115
+
+3116
+00:51:56.000 --> 00:51:57.000
+This is cue #3116
+
+3117
+00:51:57.000 --> 00:51:58.000
+This is cue #3117
+
+3118
+00:51:58.000 --> 00:51:59.000
+This is cue #3118
+
+3119
+00:51:59.000 --> 00:52:00.000
+This is cue #3119
+
+3120
+00:52:00.000 --> 00:52:01.000
+This is cue #3120
+
+3121
+00:52:01.000 --> 00:52:02.000
+This is cue #3121
+
+3122
+00:52:02.000 --> 00:52:03.000
+This is cue #3122
+
+3123
+00:52:03.000 --> 00:52:04.000
+This is cue #3123
+
+3124
+00:52:04.000 --> 00:52:05.000
+This is cue #3124
+
+3125
+00:52:05.000 --> 00:52:06.000
+This is cue #3125
+
+3126
+00:52:06.000 --> 00:52:07.000
+This is cue #3126
+
+3127
+00:52:07.000 --> 00:52:08.000
+This is cue #3127
+
+3128
+00:52:08.000 --> 00:52:09.000
+This is cue #3128
+
+3129
+00:52:09.000 --> 00:52:10.000
+This is cue #3129
+
+3130
+00:52:10.000 --> 00:52:11.000
+This is cue #3130
+
+3131
+00:52:11.000 --> 00:52:12.000
+This is cue #3131
+
+3132
+00:52:12.000 --> 00:52:13.000
+This is cue #3132
+
+3133
+00:52:13.000 --> 00:52:14.000
+This is cue #3133
+
+3134
+00:52:14.000 --> 00:52:15.000
+This is cue #3134
+
+3135
+00:52:15.000 --> 00:52:16.000
+This is cue #3135
+
+3136
+00:52:16.000 --> 00:52:17.000
+This is cue #3136
+
+3137
+00:52:17.000 --> 00:52:18.000
+This is cue #3137
+
+3138
+00:52:18.000 --> 00:52:19.000
+This is cue #3138
+
+3139
+00:52:19.000 --> 00:52:20.000
+This is cue #3139
+
+3140
+00:52:20.000 --> 00:52:21.000
+This is cue #3140
+
+3141
+00:52:21.000 --> 00:52:22.000
+This is cue #3141
+
+3142
+00:52:22.000 --> 00:52:23.000
+This is cue #3142
+
+3143
+00:52:23.000 --> 00:52:24.000
+This is cue #3143
+
+3144
+00:52:24.000 --> 00:52:25.000
+This is cue #3144
+
+3145
+00:52:25.000 --> 00:52:26.000
+This is cue #3145
+
+3146
+00:52:26.000 --> 00:52:27.000
+This is cue #3146
+
+3147
+00:52:27.000 --> 00:52:28.000
+This is cue #3147
+
+3148
+00:52:28.000 --> 00:52:29.000
+This is cue #3148
+
+3149
+00:52:29.000 --> 00:52:30.000
+This is cue #3149
+
+3150
+00:52:30.000 --> 00:52:31.000
+This is cue #3150
+
+3151
+00:52:31.000 --> 00:52:32.000
+This is cue #3151
+
+3152
+00:52:32.000 --> 00:52:33.000
+This is cue #3152
+
+3153
+00:52:33.000 --> 00:52:34.000
+This is cue #3153
+
+3154
+00:52:34.000 --> 00:52:35.000
+This is cue #3154
+
+3155
+00:52:35.000 --> 00:52:36.000
+This is cue #3155
+
+3156
+00:52:36.000 --> 00:52:37.000
+This is cue #3156
+
+3157
+00:52:37.000 --> 00:52:38.000
+This is cue #3157
+
+3158
+00:52:38.000 --> 00:52:39.000
+This is cue #3158
+
+3159
+00:52:39.000 --> 00:52:40.000
+This is cue #3159
+
+3160
+00:52:40.000 --> 00:52:41.000
+This is cue #3160
+
+3161
+00:52:41.000 --> 00:52:42.000
+This is cue #3161
+
+3162
+00:52:42.000 --> 00:52:43.000
+This is cue #3162
+
+3163
+00:52:43.000 --> 00:52:44.000
+This is cue #3163
+
+3164
+00:52:44.000 --> 00:52:45.000
+This is cue #3164
+
+3165
+00:52:45.000 --> 00:52:46.000
+This is cue #3165
+
+3166
+00:52:46.000 --> 00:52:47.000
+This is cue #3166
+
+3167
+00:52:47.000 --> 00:52:48.000
+This is cue #3167
+
+3168
+00:52:48.000 --> 00:52:49.000
+This is cue #3168
+
+3169
+00:52:49.000 --> 00:52:50.000
+This is cue #3169
+
+3170
+00:52:50.000 --> 00:52:51.000
+This is cue #3170
+
+3171
+00:52:51.000 --> 00:52:52.000
+This is cue #3171
+
+3172
+00:52:52.000 --> 00:52:53.000
+This is cue #3172
+
+3173
+00:52:53.000 --> 00:52:54.000
+This is cue #3173
+
+3174
+00:52:54.000 --> 00:52:55.000
+This is cue #3174
+
+3175
+00:52:55.000 --> 00:52:56.000
+This is cue #3175
+
+3176
+00:52:56.000 --> 00:52:57.000
+This is cue #3176
+
+3177
+00:52:57.000 --> 00:52:58.000
+This is cue #3177
+
+3178
+00:52:58.000 --> 00:52:59.000
+This is cue #3178
+
+3179
+00:52:59.000 --> 00:53:00.000
+This is cue #3179
+
+3180
+00:53:00.000 --> 00:53:01.000
+This is cue #3180
+
+3181
+00:53:01.000 --> 00:53:02.000
+This is cue #3181
+
+3182
+00:53:02.000 --> 00:53:03.000
+This is cue #3182
+
+3183
+00:53:03.000 --> 00:53:04.000
+This is cue #3183
+
+3184
+00:53:04.000 --> 00:53:05.000
+This is cue #3184
+
+3185
+00:53:05.000 --> 00:53:06.000
+This is cue #3185
+
+3186
+00:53:06.000 --> 00:53:07.000
+This is cue #3186
+
+3187
+00:53:07.000 --> 00:53:08.000
+This is cue #3187
+
+3188
+00:53:08.000 --> 00:53:09.000
+This is cue #3188
+
+3189
+00:53:09.000 --> 00:53:10.000
+This is cue #3189
+
+3190
+00:53:10.000 --> 00:53:11.000
+This is cue #3190
+
+3191
+00:53:11.000 --> 00:53:12.000
+This is cue #3191
+
+3192
+00:53:12.000 --> 00:53:13.000
+This is cue #3192
+
+3193
+00:53:13.000 --> 00:53:14.000
+This is cue #3193
+
+3194
+00:53:14.000 --> 00:53:15.000
+This is cue #3194
+
+3195
+00:53:15.000 --> 00:53:16.000
+This is cue #3195
+
+3196
+00:53:16.000 --> 00:53:17.000
+This is cue #3196
+
+3197
+00:53:17.000 --> 00:53:18.000
+This is cue #3197
+
+3198
+00:53:18.000 --> 00:53:19.000
+This is cue #3198
+
+3199
+00:53:19.000 --> 00:53:20.000
+This is cue #3199
+
+3200
+00:53:20.000 --> 00:53:21.000
+This is cue #3200
+
+3201
+00:53:21.000 --> 00:53:22.000
+This is cue #3201
+
+3202
+00:53:22.000 --> 00:53:23.000
+This is cue #3202
+
+3203
+00:53:23.000 --> 00:53:24.000
+This is cue #3203
+
+3204
+00:53:24.000 --> 00:53:25.000
+This is cue #3204
+
+3205
+00:53:25.000 --> 00:53:26.000
+This is cue #3205
+
+3206
+00:53:26.000 --> 00:53:27.000
+This is cue #3206
+
+3207
+00:53:27.000 --> 00:53:28.000
+This is cue #3207
+
+3208
+00:53:28.000 --> 00:53:29.000
+This is cue #3208
+
+3209
+00:53:29.000 --> 00:53:30.000
+This is cue #3209
+
+3210
+00:53:30.000 --> 00:53:31.000
+This is cue #3210
+
+3211
+00:53:31.000 --> 00:53:32.000
+This is cue #3211
+
+3212
+00:53:32.000 --> 00:53:33.000
+This is cue #3212
+
+3213
+00:53:33.000 --> 00:53:34.000
+This is cue #3213
+
+3214
+00:53:34.000 --> 00:53:35.000
+This is cue #3214
+
+3215
+00:53:35.000 --> 00:53:36.000
+This is cue #3215
+
+3216
+00:53:36.000 --> 00:53:37.000
+This is cue #3216
+
+3217
+00:53:37.000 --> 00:53:38.000
+This is cue #3217
+
+3218
+00:53:38.000 --> 00:53:39.000
+This is cue #3218
+
+3219
+00:53:39.000 --> 00:53:40.000
+This is cue #3219
+
+3220
+00:53:40.000 --> 00:53:41.000
+This is cue #3220
+
+3221
+00:53:41.000 --> 00:53:42.000
+This is cue #3221
+
+3222
+00:53:42.000 --> 00:53:43.000
+This is cue #3222
+
+3223
+00:53:43.000 --> 00:53:44.000
+This is cue #3223
+
+3224
+00:53:44.000 --> 00:53:45.000
+This is cue #3224
+
+3225
+00:53:45.000 --> 00:53:46.000
+This is cue #3225
+
+3226
+00:53:46.000 --> 00:53:47.000
+This is cue #3226
+
+3227
+00:53:47.000 --> 00:53:48.000
+This is cue #3227
+
+3228
+00:53:48.000 --> 00:53:49.000
+This is cue #3228
+
+3229
+00:53:49.000 --> 00:53:50.000
+This is cue #3229
+
+3230
+00:53:50.000 --> 00:53:51.000
+This is cue #3230
+
+3231
+00:53:51.000 --> 00:53:52.000
+This is cue #3231
+
+3232
+00:53:52.000 --> 00:53:53.000
+This is cue #3232
+
+3233
+00:53:53.000 --> 00:53:54.000
+This is cue #3233
+
+3234
+00:53:54.000 --> 00:53:55.000
+This is cue #3234
+
+3235
+00:53:55.000 --> 00:53:56.000
+This is cue #3235
+
+3236
+00:53:56.000 --> 00:53:57.000
+This is cue #3236
+
+3237
+00:53:57.000 --> 00:53:58.000
+This is cue #3237
+
+3238
+00:53:58.000 --> 00:53:59.000
+This is cue #3238
+
+3239
+00:53:59.000 --> 00:54:00.000
+This is cue #3239
+
+3240
+00:54:00.000 --> 00:54:01.000
+This is cue #3240
+
+3241
+00:54:01.000 --> 00:54:02.000
+This is cue #3241
+
+3242
+00:54:02.000 --> 00:54:03.000
+This is cue #3242
+
+3243
+00:54:03.000 --> 00:54:04.000
+This is cue #3243
+
+3244
+00:54:04.000 --> 00:54:05.000
+This is cue #3244
+
+3245
+00:54:05.000 --> 00:54:06.000
+This is cue #3245
+
+3246
+00:54:06.000 --> 00:54:07.000
+This is cue #3246
+
+3247
+00:54:07.000 --> 00:54:08.000
+This is cue #3247
+
+3248
+00:54:08.000 --> 00:54:09.000
+This is cue #3248
+
+3249
+00:54:09.000 --> 00:54:10.000
+This is cue #3249
+
+3250
+00:54:10.000 --> 00:54:11.000
+This is cue #3250
+
+3251
+00:54:11.000 --> 00:54:12.000
+This is cue #3251
+
+3252
+00:54:12.000 --> 00:54:13.000
+This is cue #3252
+
+3253
+00:54:13.000 --> 00:54:14.000
+This is cue #3253
+
+3254
+00:54:14.000 --> 00:54:15.000
+This is cue #3254
+
+3255
+00:54:15.000 --> 00:54:16.000
+This is cue #3255
+
+3256
+00:54:16.000 --> 00:54:17.000
+This is cue #3256
+
+3257
+00:54:17.000 --> 00:54:18.000
+This is cue #3257
+
+3258
+00:54:18.000 --> 00:54:19.000
+This is cue #3258
+
+3259
+00:54:19.000 --> 00:54:20.000
+This is cue #3259
+
+3260
+00:54:20.000 --> 00:54:21.000
+This is cue #3260
+
+3261
+00:54:21.000 --> 00:54:22.000
+This is cue #3261
+
+3262
+00:54:22.000 --> 00:54:23.000
+This is cue #3262
+
+3263
+00:54:23.000 --> 00:54:24.000
+This is cue #3263
+
+3264
+00:54:24.000 --> 00:54:25.000
+This is cue #3264
+
+3265
+00:54:25.000 --> 00:54:26.000
+This is cue #3265
+
+3266
+00:54:26.000 --> 00:54:27.000
+This is cue #3266
+
+3267
+00:54:27.000 --> 00:54:28.000
+This is cue #3267
+
+3268
+00:54:28.000 --> 00:54:29.000
+This is cue #3268
+
+3269
+00:54:29.000 --> 00:54:30.000
+This is cue #3269
+
+3270
+00:54:30.000 --> 00:54:31.000
+This is cue #3270
+
+3271
+00:54:31.000 --> 00:54:32.000
+This is cue #3271
+
+3272
+00:54:32.000 --> 00:54:33.000
+This is cue #3272
+
+3273
+00:54:33.000 --> 00:54:34.000
+This is cue #3273
+
+3274
+00:54:34.000 --> 00:54:35.000
+This is cue #3274
+
+3275
+00:54:35.000 --> 00:54:36.000
+This is cue #3275
+
+3276
+00:54:36.000 --> 00:54:37.000
+This is cue #3276
+
+3277
+00:54:37.000 --> 00:54:38.000
+This is cue #3277
+
+3278
+00:54:38.000 --> 00:54:39.000
+This is cue #3278
+
+3279
+00:54:39.000 --> 00:54:40.000
+This is cue #3279
+
+3280
+00:54:40.000 --> 00:54:41.000
+This is cue #3280
+
+3281
+00:54:41.000 --> 00:54:42.000
+This is cue #3281
+
+3282
+00:54:42.000 --> 00:54:43.000
+This is cue #3282
+
+3283
+00:54:43.000 --> 00:54:44.000
+This is cue #3283
+
+3284
+00:54:44.000 --> 00:54:45.000
+This is cue #3284
+
+3285
+00:54:45.000 --> 00:54:46.000
+This is cue #3285
+
+3286
+00:54:46.000 --> 00:54:47.000
+This is cue #3286
+
+3287
+00:54:47.000 --> 00:54:48.000
+This is cue #3287
+
+3288
+00:54:48.000 --> 00:54:49.000
+This is cue #3288
+
+3289
+00:54:49.000 --> 00:54:50.000
+This is cue #3289
+
+3290
+00:54:50.000 --> 00:54:51.000
+This is cue #3290
+
+3291
+00:54:51.000 --> 00:54:52.000
+This is cue #3291
+
+3292
+00:54:52.000 --> 00:54:53.000
+This is cue #3292
+
+3293
+00:54:53.000 --> 00:54:54.000
+This is cue #3293
+
+3294
+00:54:54.000 --> 00:54:55.000
+This is cue #3294
+
+3295
+00:54:55.000 --> 00:54:56.000
+This is cue #3295
+
+3296
+00:54:56.000 --> 00:54:57.000
+This is cue #3296
+
+3297
+00:54:57.000 --> 00:54:58.000
+This is cue #3297
+
+3298
+00:54:58.000 --> 00:54:59.000
+This is cue #3298
+
+3299
+00:54:59.000 --> 00:55:00.000
+This is cue #3299
+
+3300
+00:55:00.000 --> 00:55:01.000
+This is cue #3300
+
+3301
+00:55:01.000 --> 00:55:02.000
+This is cue #3301
+
+3302
+00:55:02.000 --> 00:55:03.000
+This is cue #3302
+
+3303
+00:55:03.000 --> 00:55:04.000
+This is cue #3303
+
+3304
+00:55:04.000 --> 00:55:05.000
+This is cue #3304
+
+3305
+00:55:05.000 --> 00:55:06.000
+This is cue #3305
+
+3306
+00:55:06.000 --> 00:55:07.000
+This is cue #3306
+
+3307
+00:55:07.000 --> 00:55:08.000
+This is cue #3307
+
+3308
+00:55:08.000 --> 00:55:09.000
+This is cue #3308
+
+3309
+00:55:09.000 --> 00:55:10.000
+This is cue #3309
+
+3310
+00:55:10.000 --> 00:55:11.000
+This is cue #3310
+
+3311
+00:55:11.000 --> 00:55:12.000
+This is cue #3311
+
+3312
+00:55:12.000 --> 00:55:13.000
+This is cue #3312
+
+3313
+00:55:13.000 --> 00:55:14.000
+This is cue #3313
+
+3314
+00:55:14.000 --> 00:55:15.000
+This is cue #3314
+
+3315
+00:55:15.000 --> 00:55:16.000
+This is cue #3315
+
+3316
+00:55:16.000 --> 00:55:17.000
+This is cue #3316
+
+3317
+00:55:17.000 --> 00:55:18.000
+This is cue #3317
+
+3318
+00:55:18.000 --> 00:55:19.000
+This is cue #3318
+
+3319
+00:55:19.000 --> 00:55:20.000
+This is cue #3319
+
+3320
+00:55:20.000 --> 00:55:21.000
+This is cue #3320
+
+3321
+00:55:21.000 --> 00:55:22.000
+This is cue #3321
+
+3322
+00:55:22.000 --> 00:55:23.000
+This is cue #3322
+
+3323
+00:55:23.000 --> 00:55:24.000
+This is cue #3323
+
+3324
+00:55:24.000 --> 00:55:25.000
+This is cue #3324
+
+3325
+00:55:25.000 --> 00:55:26.000
+This is cue #3325
+
+3326
+00:55:26.000 --> 00:55:27.000
+This is cue #3326
+
+3327
+00:55:27.000 --> 00:55:28.000
+This is cue #3327
+
+3328
+00:55:28.000 --> 00:55:29.000
+This is cue #3328
+
+3329
+00:55:29.000 --> 00:55:30.000
+This is cue #3329
+
+3330
+00:55:30.000 --> 00:55:31.000
+This is cue #3330
+
+3331
+00:55:31.000 --> 00:55:32.000
+This is cue #3331
+
+3332
+00:55:32.000 --> 00:55:33.000
+This is cue #3332
+
+3333
+00:55:33.000 --> 00:55:34.000
+This is cue #3333
+
+3334
+00:55:34.000 --> 00:55:35.000
+This is cue #3334
+
+3335
+00:55:35.000 --> 00:55:36.000
+This is cue #3335
+
+3336
+00:55:36.000 --> 00:55:37.000
+This is cue #3336
+
+3337
+00:55:37.000 --> 00:55:38.000
+This is cue #3337
+
+3338
+00:55:38.000 --> 00:55:39.000
+This is cue #3338
+
+3339
+00:55:39.000 --> 00:55:40.000
+This is cue #3339
+
+3340
+00:55:40.000 --> 00:55:41.000
+This is cue #3340
+
+3341
+00:55:41.000 --> 00:55:42.000
+This is cue #3341
+
+3342
+00:55:42.000 --> 00:55:43.000
+This is cue #3342
+
+3343
+00:55:43.000 --> 00:55:44.000
+This is cue #3343
+
+3344
+00:55:44.000 --> 00:55:45.000
+This is cue #3344
+
+3345
+00:55:45.000 --> 00:55:46.000
+This is cue #3345
+
+3346
+00:55:46.000 --> 00:55:47.000
+This is cue #3346
+
+3347
+00:55:47.000 --> 00:55:48.000
+This is cue #3347
+
+3348
+00:55:48.000 --> 00:55:49.000
+This is cue #3348
+
+3349
+00:55:49.000 --> 00:55:50.000
+This is cue #3349
+
+3350
+00:55:50.000 --> 00:55:51.000
+This is cue #3350
+
+3351
+00:55:51.000 --> 00:55:52.000
+This is cue #3351
+
+3352
+00:55:52.000 --> 00:55:53.000
+This is cue #3352
+
+3353
+00:55:53.000 --> 00:55:54.000
+This is cue #3353
+
+3354
+00:55:54.000 --> 00:55:55.000
+This is cue #3354
+
+3355
+00:55:55.000 --> 00:55:56.000
+This is cue #3355
+
+3356
+00:55:56.000 --> 00:55:57.000
+This is cue #3356
+
+3357
+00:55:57.000 --> 00:55:58.000
+This is cue #3357
+
+3358
+00:55:58.000 --> 00:55:59.000
+This is cue #3358
+
+3359
+00:55:59.000 --> 00:56:00.000
+This is cue #3359
+
+3360
+00:56:00.000 --> 00:56:01.000
+This is cue #3360
+
+3361
+00:56:01.000 --> 00:56:02.000
+This is cue #3361
+
+3362
+00:56:02.000 --> 00:56:03.000
+This is cue #3362
+
+3363
+00:56:03.000 --> 00:56:04.000
+This is cue #3363
+
+3364
+00:56:04.000 --> 00:56:05.000
+This is cue #3364
+
+3365
+00:56:05.000 --> 00:56:06.000
+This is cue #3365
+
+3366
+00:56:06.000 --> 00:56:07.000
+This is cue #3366
+
+3367
+00:56:07.000 --> 00:56:08.000
+This is cue #3367
+
+3368
+00:56:08.000 --> 00:56:09.000
+This is cue #3368
+
+3369
+00:56:09.000 --> 00:56:10.000
+This is cue #3369
+
+3370
+00:56:10.000 --> 00:56:11.000
+This is cue #3370
+
+3371
+00:56:11.000 --> 00:56:12.000
+This is cue #3371
+
+3372
+00:56:12.000 --> 00:56:13.000
+This is cue #3372
+
+3373
+00:56:13.000 --> 00:56:14.000
+This is cue #3373
+
+3374
+00:56:14.000 --> 00:56:15.000
+This is cue #3374
+
+3375
+00:56:15.000 --> 00:56:16.000
+This is cue #3375
+
+3376
+00:56:16.000 --> 00:56:17.000
+This is cue #3376
+
+3377
+00:56:17.000 --> 00:56:18.000
+This is cue #3377
+
+3378
+00:56:18.000 --> 00:56:19.000
+This is cue #3378
+
+3379
+00:56:19.000 --> 00:56:20.000
+This is cue #3379
+
+3380
+00:56:20.000 --> 00:56:21.000
+This is cue #3380
+
+3381
+00:56:21.000 --> 00:56:22.000
+This is cue #3381
+
+3382
+00:56:22.000 --> 00:56:23.000
+This is cue #3382
+
+3383
+00:56:23.000 --> 00:56:24.000
+This is cue #3383
+
+3384
+00:56:24.000 --> 00:56:25.000
+This is cue #3384
+
+3385
+00:56:25.000 --> 00:56:26.000
+This is cue #3385
+
+3386
+00:56:26.000 --> 00:56:27.000
+This is cue #3386
+
+3387
+00:56:27.000 --> 00:56:28.000
+This is cue #3387
+
+3388
+00:56:28.000 --> 00:56:29.000
+This is cue #3388
+
+3389
+00:56:29.000 --> 00:56:30.000
+This is cue #3389
+
+3390
+00:56:30.000 --> 00:56:31.000
+This is cue #3390
+
+3391
+00:56:31.000 --> 00:56:32.000
+This is cue #3391
+
+3392
+00:56:32.000 --> 00:56:33.000
+This is cue #3392
+
+3393
+00:56:33.000 --> 00:56:34.000
+This is cue #3393
+
+3394
+00:56:34.000 --> 00:56:35.000
+This is cue #3394
+
+3395
+00:56:35.000 --> 00:56:36.000
+This is cue #3395
+
+3396
+00:56:36.000 --> 00:56:37.000
+This is cue #3396
+
+3397
+00:56:37.000 --> 00:56:38.000
+This is cue #3397
+
+3398
+00:56:38.000 --> 00:56:39.000
+This is cue #3398
+
+3399
+00:56:39.000 --> 00:56:40.000
+This is cue #3399
+
+3400
+00:56:40.000 --> 00:56:41.000
+This is cue #3400
+
+3401
+00:56:41.000 --> 00:56:42.000
+This is cue #3401
+
+3402
+00:56:42.000 --> 00:56:43.000
+This is cue #3402
+
+3403
+00:56:43.000 --> 00:56:44.000
+This is cue #3403
+
+3404
+00:56:44.000 --> 00:56:45.000
+This is cue #3404
+
+3405
+00:56:45.000 --> 00:56:46.000
+This is cue #3405
+
+3406
+00:56:46.000 --> 00:56:47.000
+This is cue #3406
+
+3407
+00:56:47.000 --> 00:56:48.000
+This is cue #3407
+
+3408
+00:56:48.000 --> 00:56:49.000
+This is cue #3408
+
+3409
+00:56:49.000 --> 00:56:50.000
+This is cue #3409
+
+3410
+00:56:50.000 --> 00:56:51.000
+This is cue #3410
+
+3411
+00:56:51.000 --> 00:56:52.000
+This is cue #3411
+
+3412
+00:56:52.000 --> 00:56:53.000
+This is cue #3412
+
+3413
+00:56:53.000 --> 00:56:54.000
+This is cue #3413
+
+3414
+00:56:54.000 --> 00:56:55.000
+This is cue #3414
+
+3415
+00:56:55.000 --> 00:56:56.000
+This is cue #3415
+
+3416
+00:56:56.000 --> 00:56:57.000
+This is cue #3416
+
+3417
+00:56:57.000 --> 00:56:58.000
+This is cue #3417
+
+3418
+00:56:58.000 --> 00:56:59.000
+This is cue #3418
+
+3419
+00:56:59.000 --> 00:57:00.000
+This is cue #3419
+
+3420
+00:57:00.000 --> 00:57:01.000
+This is cue #3420
+
+3421
+00:57:01.000 --> 00:57:02.000
+This is cue #3421
+
+3422
+00:57:02.000 --> 00:57:03.000
+This is cue #3422
+
+3423
+00:57:03.000 --> 00:57:04.000
+This is cue #3423
+
+3424
+00:57:04.000 --> 00:57:05.000
+This is cue #3424
+
+3425
+00:57:05.000 --> 00:57:06.000
+This is cue #3425
+
+3426
+00:57:06.000 --> 00:57:07.000
+This is cue #3426
+
+3427
+00:57:07.000 --> 00:57:08.000
+This is cue #3427
+
+3428
+00:57:08.000 --> 00:57:09.000
+This is cue #3428
+
+3429
+00:57:09.000 --> 00:57:10.000
+This is cue #3429
+
+3430
+00:57:10.000 --> 00:57:11.000
+This is cue #3430
+
+3431
+00:57:11.000 --> 00:57:12.000
+This is cue #3431
+
+3432
+00:57:12.000 --> 00:57:13.000
+This is cue #3432
+
+3433
+00:57:13.000 --> 00:57:14.000
+This is cue #3433
+
+3434
+00:57:14.000 --> 00:57:15.000
+This is cue #3434
+
+3435
+00:57:15.000 --> 00:57:16.000
+This is cue #3435
+
+3436
+00:57:16.000 --> 00:57:17.000
+This is cue #3436
+
+3437
+00:57:17.000 --> 00:57:18.000
+This is cue #3437
+
+3438
+00:57:18.000 --> 00:57:19.000
+This is cue #3438
+
+3439
+00:57:19.000 --> 00:57:20.000
+This is cue #3439
+
+3440
+00:57:20.000 --> 00:57:21.000
+This is cue #3440
+
+3441
+00:57:21.000 --> 00:57:22.000
+This is cue #3441
+
+3442
+00:57:22.000 --> 00:57:23.000
+This is cue #3442
+
+3443
+00:57:23.000 --> 00:57:24.000
+This is cue #3443
+
+3444
+00:57:24.000 --> 00:57:25.000
+This is cue #3444
+
+3445
+00:57:25.000 --> 00:57:26.000
+This is cue #3445
+
+3446
+00:57:26.000 --> 00:57:27.000
+This is cue #3446
+
+3447
+00:57:27.000 --> 00:57:28.000
+This is cue #3447
+
+3448
+00:57:28.000 --> 00:57:29.000
+This is cue #3448
+
+3449
+00:57:29.000 --> 00:57:30.000
+This is cue #3449
+
+3450
+00:57:30.000 --> 00:57:31.000
+This is cue #3450
+
+3451
+00:57:31.000 --> 00:57:32.000
+This is cue #3451
+
+3452
+00:57:32.000 --> 00:57:33.000
+This is cue #3452
+
+3453
+00:57:33.000 --> 00:57:34.000
+This is cue #3453
+
+3454
+00:57:34.000 --> 00:57:35.000
+This is cue #3454
+
+3455
+00:57:35.000 --> 00:57:36.000
+This is cue #3455
+
+3456
+00:57:36.000 --> 00:57:37.000
+This is cue #3456
+
+3457
+00:57:37.000 --> 00:57:38.000
+This is cue #3457
+
+3458
+00:57:38.000 --> 00:57:39.000
+This is cue #3458
+
+3459
+00:57:39.000 --> 00:57:40.000
+This is cue #3459
+
+3460
+00:57:40.000 --> 00:57:41.000
+This is cue #3460
+
+3461
+00:57:41.000 --> 00:57:42.000
+This is cue #3461
+
+3462
+00:57:42.000 --> 00:57:43.000
+This is cue #3462
+
+3463
+00:57:43.000 --> 00:57:44.000
+This is cue #3463
+
+3464
+00:57:44.000 --> 00:57:45.000
+This is cue #3464
+
+3465
+00:57:45.000 --> 00:57:46.000
+This is cue #3465
+
+3466
+00:57:46.000 --> 00:57:47.000
+This is cue #3466
+
+3467
+00:57:47.000 --> 00:57:48.000
+This is cue #3467
+
+3468
+00:57:48.000 --> 00:57:49.000
+This is cue #3468
+
+3469
+00:57:49.000 --> 00:57:50.000
+This is cue #3469
+
+3470
+00:57:50.000 --> 00:57:51.000
+This is cue #3470
+
+3471
+00:57:51.000 --> 00:57:52.000
+This is cue #3471
+
+3472
+00:57:52.000 --> 00:57:53.000
+This is cue #3472
+
+3473
+00:57:53.000 --> 00:57:54.000
+This is cue #3473
+
+3474
+00:57:54.000 --> 00:57:55.000
+This is cue #3474
+
+3475
+00:57:55.000 --> 00:57:56.000
+This is cue #3475
+
+3476
+00:57:56.000 --> 00:57:57.000
+This is cue #3476
+
+3477
+00:57:57.000 --> 00:57:58.000
+This is cue #3477
+
+3478
+00:57:58.000 --> 00:57:59.000
+This is cue #3478
+
+3479
+00:57:59.000 --> 00:58:00.000
+This is cue #3479
+
+3480
+00:58:00.000 --> 00:58:01.000
+This is cue #3480
+
+3481
+00:58:01.000 --> 00:58:02.000
+This is cue #3481
+
+3482
+00:58:02.000 --> 00:58:03.000
+This is cue #3482
+
+3483
+00:58:03.000 --> 00:58:04.000
+This is cue #3483
+
+3484
+00:58:04.000 --> 00:58:05.000
+This is cue #3484
+
+3485
+00:58:05.000 --> 00:58:06.000
+This is cue #3485
+
+3486
+00:58:06.000 --> 00:58:07.000
+This is cue #3486
+
+3487
+00:58:07.000 --> 00:58:08.000
+This is cue #3487
+
+3488
+00:58:08.000 --> 00:58:09.000
+This is cue #3488
+
+3489
+00:58:09.000 --> 00:58:10.000
+This is cue #3489
+
+3490
+00:58:10.000 --> 00:58:11.000
+This is cue #3490
+
+3491
+00:58:11.000 --> 00:58:12.000
+This is cue #3491
+
+3492
+00:58:12.000 --> 00:58:13.000
+This is cue #3492
+
+3493
+00:58:13.000 --> 00:58:14.000
+This is cue #3493
+
+3494
+00:58:14.000 --> 00:58:15.000
+This is cue #3494
+
+3495
+00:58:15.000 --> 00:58:16.000
+This is cue #3495
+
+3496
+00:58:16.000 --> 00:58:17.000
+This is cue #3496
+
+3497
+00:58:17.000 --> 00:58:18.000
+This is cue #3497
+
+3498
+00:58:18.000 --> 00:58:19.000
+This is cue #3498
+
+3499
+00:58:19.000 --> 00:58:20.000
+This is cue #3499
+
+3500
+00:58:20.000 --> 00:58:21.000
+This is cue #3500
+
+3501
+00:58:21.000 --> 00:58:22.000
+This is cue #3501
+
+3502
+00:58:22.000 --> 00:58:23.000
+This is cue #3502
+
+3503
+00:58:23.000 --> 00:58:24.000
+This is cue #3503
+
+3504
+00:58:24.000 --> 00:58:25.000
+This is cue #3504
+
+3505
+00:58:25.000 --> 00:58:26.000
+This is cue #3505
+
+3506
+00:58:26.000 --> 00:58:27.000
+This is cue #3506
+
+3507
+00:58:27.000 --> 00:58:28.000
+This is cue #3507
+
+3508
+00:58:28.000 --> 00:58:29.000
+This is cue #3508
+
+3509
+00:58:29.000 --> 00:58:30.000
+This is cue #3509
+
+3510
+00:58:30.000 --> 00:58:31.000
+This is cue #3510
+
+3511
+00:58:31.000 --> 00:58:32.000
+This is cue #3511
+
+3512
+00:58:32.000 --> 00:58:33.000
+This is cue #3512
+
+3513
+00:58:33.000 --> 00:58:34.000
+This is cue #3513
+
+3514
+00:58:34.000 --> 00:58:35.000
+This is cue #3514
+
+3515
+00:58:35.000 --> 00:58:36.000
+This is cue #3515
+
+3516
+00:58:36.000 --> 00:58:37.000
+This is cue #3516
+
+3517
+00:58:37.000 --> 00:58:38.000
+This is cue #3517
+
+3518
+00:58:38.000 --> 00:58:39.000
+This is cue #3518
+
+3519
+00:58:39.000 --> 00:58:40.000
+This is cue #3519
+
+3520
+00:58:40.000 --> 00:58:41.000
+This is cue #3520
+
+3521
+00:58:41.000 --> 00:58:42.000
+This is cue #3521
+
+3522
+00:58:42.000 --> 00:58:43.000
+This is cue #3522
+
+3523
+00:58:43.000 --> 00:58:44.000
+This is cue #3523
+
+3524
+00:58:44.000 --> 00:58:45.000
+This is cue #3524
+
+3525
+00:58:45.000 --> 00:58:46.000
+This is cue #3525
+
+3526
+00:58:46.000 --> 00:58:47.000
+This is cue #3526
+
+3527
+00:58:47.000 --> 00:58:48.000
+This is cue #3527
+
+3528
+00:58:48.000 --> 00:58:49.000
+This is cue #3528
+
+3529
+00:58:49.000 --> 00:58:50.000
+This is cue #3529
+
+3530
+00:58:50.000 --> 00:58:51.000
+This is cue #3530
+
+3531
+00:58:51.000 --> 00:58:52.000
+This is cue #3531
+
+3532
+00:58:52.000 --> 00:58:53.000
+This is cue #3532
+
+3533
+00:58:53.000 --> 00:58:54.000
+This is cue #3533
+
+3534
+00:58:54.000 --> 00:58:55.000
+This is cue #3534
+
+3535
+00:58:55.000 --> 00:58:56.000
+This is cue #3535
+
+3536
+00:58:56.000 --> 00:58:57.000
+This is cue #3536
+
+3537
+00:58:57.000 --> 00:58:58.000
+This is cue #3537
+
+3538
+00:58:58.000 --> 00:58:59.000
+This is cue #3538
+
+3539
+00:58:59.000 --> 00:59:00.000
+This is cue #3539
+
+3540
+00:59:00.000 --> 00:59:01.000
+This is cue #3540
+
+3541
+00:59:01.000 --> 00:59:02.000
+This is cue #3541
+
+3542
+00:59:02.000 --> 00:59:03.000
+This is cue #3542
+
+3543
+00:59:03.000 --> 00:59:04.000
+This is cue #3543
+
+3544
+00:59:04.000 --> 00:59:05.000
+This is cue #3544
+
+3545
+00:59:05.000 --> 00:59:06.000
+This is cue #3545
+
+3546
+00:59:06.000 --> 00:59:07.000
+This is cue #3546
+
+3547
+00:59:07.000 --> 00:59:08.000
+This is cue #3547
+
+3548
+00:59:08.000 --> 00:59:09.000
+This is cue #3548
+
+3549
+00:59:09.000 --> 00:59:10.000
+This is cue #3549
+
+3550
+00:59:10.000 --> 00:59:11.000
+This is cue #3550
+
+3551
+00:59:11.000 --> 00:59:12.000
+This is cue #3551
+
+3552
+00:59:12.000 --> 00:59:13.000
+This is cue #3552
+
+3553
+00:59:13.000 --> 00:59:14.000
+This is cue #3553
+
+3554
+00:59:14.000 --> 00:59:15.000
+This is cue #3554
+
+3555
+00:59:15.000 --> 00:59:16.000
+This is cue #3555
+
+3556
+00:59:16.000 --> 00:59:17.000
+This is cue #3556
+
+3557
+00:59:17.000 --> 00:59:18.000
+This is cue #3557
+
+3558
+00:59:18.000 --> 00:59:19.000
+This is cue #3558
+
+3559
+00:59:19.000 --> 00:59:20.000
+This is cue #3559
+
+3560
+00:59:20.000 --> 00:59:21.000
+This is cue #3560
+
+3561
+00:59:21.000 --> 00:59:22.000
+This is cue #3561
+
+3562
+00:59:22.000 --> 00:59:23.000
+This is cue #3562
+
+3563
+00:59:23.000 --> 00:59:24.000
+This is cue #3563
+
+3564
+00:59:24.000 --> 00:59:25.000
+This is cue #3564
+
+3565
+00:59:25.000 --> 00:59:26.000
+This is cue #3565
+
+3566
+00:59:26.000 --> 00:59:27.000
+This is cue #3566
+
+3567
+00:59:27.000 --> 00:59:28.000
+This is cue #3567
+
+3568
+00:59:28.000 --> 00:59:29.000
+This is cue #3568
+
+3569
+00:59:29.000 --> 00:59:30.000
+This is cue #3569
+
+3570
+00:59:30.000 --> 00:59:31.000
+This is cue #3570
+
+3571
+00:59:31.000 --> 00:59:32.000
+This is cue #3571
+
+3572
+00:59:32.000 --> 00:59:33.000
+This is cue #3572
+
+3573
+00:59:33.000 --> 00:59:34.000
+This is cue #3573
+
+3574
+00:59:34.000 --> 00:59:35.000
+This is cue #3574
+
+3575
+00:59:35.000 --> 00:59:36.000
+This is cue #3575
+
+3576
+00:59:36.000 --> 00:59:37.000
+This is cue #3576
+
+3577
+00:59:37.000 --> 00:59:38.000
+This is cue #3577
+
+3578
+00:59:38.000 --> 00:59:39.000
+This is cue #3578
+
+3579
+00:59:39.000 --> 00:59:40.000
+This is cue #3579
+
+3580
+00:59:40.000 --> 00:59:41.000
+This is cue #3580
+
+3581
+00:59:41.000 --> 00:59:42.000
+This is cue #3581
+
+3582
+00:59:42.000 --> 00:59:43.000
+This is cue #3582
+
+3583
+00:59:43.000 --> 00:59:44.000
+This is cue #3583
+
+3584
+00:59:44.000 --> 00:59:45.000
+This is cue #3584
+
+3585
+00:59:45.000 --> 00:59:46.000
+This is cue #3585
+
+3586
+00:59:46.000 --> 00:59:47.000
+This is cue #3586
+
+3587
+00:59:47.000 --> 00:59:48.000
+This is cue #3587
+
+3588
+00:59:48.000 --> 00:59:49.000
+This is cue #3588
+
+3589
+00:59:49.000 --> 00:59:50.000
+This is cue #3589
+
+3590
+00:59:50.000 --> 00:59:51.000
+This is cue #3590
+
+3591
+00:59:51.000 --> 00:59:52.000
+This is cue #3591
+
+3592
+00:59:52.000 --> 00:59:53.000
+This is cue #3592
+
+3593
+00:59:53.000 --> 00:59:54.000
+This is cue #3593
+
+3594
+00:59:54.000 --> 00:59:55.000
+This is cue #3594
+
+3595
+00:59:55.000 --> 00:59:56.000
+This is cue #3595
+
+3596
+00:59:56.000 --> 00:59:57.000
+This is cue #3596
+
+3597
+00:59:57.000 --> 00:59:58.000
+This is cue #3597
+
+3598
+00:59:58.000 --> 00:59:59.000
+This is cue #3598
+
+3599
+00:59:59.000 --> 01:00:00.000
+This is cue #3599
+
+3600
+01:00:00.000 --> 01:00:01.000
+This is cue #3600
+
+3601
+01:00:01.000 --> 01:00:02.000
+This is cue #3601
+
+3602
+01:00:02.000 --> 01:00:03.000
+This is cue #3602
+
+3603
+01:00:03.000 --> 01:00:04.000
+This is cue #3603
+
+3604
+01:00:04.000 --> 01:00:05.000
+This is cue #3604
+
+3605
+01:00:05.000 --> 01:00:06.000
+This is cue #3605
+
+3606
+01:00:06.000 --> 01:00:07.000
+This is cue #3606
+
+3607
+01:00:07.000 --> 01:00:08.000
+This is cue #3607
+
+3608
+01:00:08.000 --> 01:00:09.000
+This is cue #3608
+
+3609
+01:00:09.000 --> 01:00:10.000
+This is cue #3609
+
+3610
+01:00:10.000 --> 01:00:11.000
+This is cue #3610
+
+3611
+01:00:11.000 --> 01:00:12.000
+This is cue #3611
+
+3612
+01:00:12.000 --> 01:00:13.000
+This is cue #3612
+
+3613
+01:00:13.000 --> 01:00:14.000
+This is cue #3613
+
+3614
+01:00:14.000 --> 01:00:15.000
+This is cue #3614
+
+3615
+01:00:15.000 --> 01:00:16.000
+This is cue #3615
+
+3616
+01:00:16.000 --> 01:00:17.000
+This is cue #3616
+
+3617
+01:00:17.000 --> 01:00:18.000
+This is cue #3617
+
+3618
+01:00:18.000 --> 01:00:19.000
+This is cue #3618
+
+3619
+01:00:19.000 --> 01:00:20.000
+This is cue #3619
+
+3620
+01:00:20.000 --> 01:00:21.000
+This is cue #3620
+
+3621
+01:00:21.000 --> 01:00:22.000
+This is cue #3621
+
+3622
+01:00:22.000 --> 01:00:23.000
+This is cue #3622
+
+3623
+01:00:23.000 --> 01:00:24.000
+This is cue #3623
+
+3624
+01:00:24.000 --> 01:00:25.000
+This is cue #3624
+
+3625
+01:00:25.000 --> 01:00:26.000
+This is cue #3625
+
+3626
+01:00:26.000 --> 01:00:27.000
+This is cue #3626
+
+3627
+01:00:27.000 --> 01:00:28.000
+This is cue #3627
+
+3628
+01:00:28.000 --> 01:00:29.000
+This is cue #3628
+
+3629
+01:00:29.000 --> 01:00:30.000
+This is cue #3629
+
+3630
+01:00:30.000 --> 01:00:31.000
+This is cue #3630
+
+3631
+01:00:31.000 --> 01:00:32.000
+This is cue #3631
+
+3632
+01:00:32.000 --> 01:00:33.000
+This is cue #3632
+
+3633
+01:00:33.000 --> 01:00:34.000
+This is cue #3633
+
+3634
+01:00:34.000 --> 01:00:35.000
+This is cue #3634
+
+3635
+01:00:35.000 --> 01:00:36.000
+This is cue #3635
+
+3636
+01:00:36.000 --> 01:00:37.000
+This is cue #3636
+
+3637
+01:00:37.000 --> 01:00:38.000
+This is cue #3637
+
+3638
+01:00:38.000 --> 01:00:39.000
+This is cue #3638
+
+3639
+01:00:39.000 --> 01:00:40.000
+This is cue #3639
+
+3640
+01:00:40.000 --> 01:00:41.000
+This is cue #3640
+
+3641
+01:00:41.000 --> 01:00:42.000
+This is cue #3641
+
+3642
+01:00:42.000 --> 01:00:43.000
+This is cue #3642
+
+3643
+01:00:43.000 --> 01:00:44.000
+This is cue #3643
+
+3644
+01:00:44.000 --> 01:00:45.000
+This is cue #3644
+
+3645
+01:00:45.000 --> 01:00:46.000
+This is cue #3645
+
+3646
+01:00:46.000 --> 01:00:47.000
+This is cue #3646
+
+3647
+01:00:47.000 --> 01:00:48.000
+This is cue #3647
+
+3648
+01:00:48.000 --> 01:00:49.000
+This is cue #3648
+
+3649
+01:00:49.000 --> 01:00:50.000
+This is cue #3649
+
+3650
+01:00:50.000 --> 01:00:51.000
+This is cue #3650
+
+3651
+01:00:51.000 --> 01:00:52.000
+This is cue #3651
+
+3652
+01:00:52.000 --> 01:00:53.000
+This is cue #3652
+
+3653
+01:00:53.000 --> 01:00:54.000
+This is cue #3653
+
+3654
+01:00:54.000 --> 01:00:55.000
+This is cue #3654
+
+3655
+01:00:55.000 --> 01:00:56.000
+This is cue #3655
+
+3656
+01:00:56.000 --> 01:00:57.000
+This is cue #3656
+
+3657
+01:00:57.000 --> 01:00:58.000
+This is cue #3657
+
+3658
+01:00:58.000 --> 01:00:59.000
+This is cue #3658
+
+3659
+01:00:59.000 --> 01:01:00.000
+This is cue #3659
+
+3660
+01:01:00.000 --> 01:01:01.000
+This is cue #3660
+
+3661
+01:01:01.000 --> 01:01:02.000
+This is cue #3661
+
+3662
+01:01:02.000 --> 01:01:03.000
+This is cue #3662
+
+3663
+01:01:03.000 --> 01:01:04.000
+This is cue #3663
+
+3664
+01:01:04.000 --> 01:01:05.000
+This is cue #3664
+
+3665
+01:01:05.000 --> 01:01:06.000
+This is cue #3665
+
+3666
+01:01:06.000 --> 01:01:07.000
+This is cue #3666
+
+3667
+01:01:07.000 --> 01:01:08.000
+This is cue #3667
+
+3668
+01:01:08.000 --> 01:01:09.000
+This is cue #3668
+
+3669
+01:01:09.000 --> 01:01:10.000
+This is cue #3669
+
+3670
+01:01:10.000 --> 01:01:11.000
+This is cue #3670
+
+3671
+01:01:11.000 --> 01:01:12.000
+This is cue #3671
+
+3672
+01:01:12.000 --> 01:01:13.000
+This is cue #3672
+
+3673
+01:01:13.000 --> 01:01:14.000
+This is cue #3673
+
+3674
+01:01:14.000 --> 01:01:15.000
+This is cue #3674
+
+3675
+01:01:15.000 --> 01:01:16.000
+This is cue #3675
+
+3676
+01:01:16.000 --> 01:01:17.000
+This is cue #3676
+
+3677
+01:01:17.000 --> 01:01:18.000
+This is cue #3677
+
+3678
+01:01:18.000 --> 01:01:19.000
+This is cue #3678
+
+3679
+01:01:19.000 --> 01:01:20.000
+This is cue #3679
+
+3680
+01:01:20.000 --> 01:01:21.000
+This is cue #3680
+
+3681
+01:01:21.000 --> 01:01:22.000
+This is cue #3681
+
+3682
+01:01:22.000 --> 01:01:23.000
+This is cue #3682
+
+3683
+01:01:23.000 --> 01:01:24.000
+This is cue #3683
+
+3684
+01:01:24.000 --> 01:01:25.000
+This is cue #3684
+
+3685
+01:01:25.000 --> 01:01:26.000
+This is cue #3685
+
+3686
+01:01:26.000 --> 01:01:27.000
+This is cue #3686
+
+3687
+01:01:27.000 --> 01:01:28.000
+This is cue #3687
+
+3688
+01:01:28.000 --> 01:01:29.000
+This is cue #3688
+
+3689
+01:01:29.000 --> 01:01:30.000
+This is cue #3689
+
+3690
+01:01:30.000 --> 01:01:31.000
+This is cue #3690
+
+3691
+01:01:31.000 --> 01:01:32.000
+This is cue #3691
+
+3692
+01:01:32.000 --> 01:01:33.000
+This is cue #3692
+
+3693
+01:01:33.000 --> 01:01:34.000
+This is cue #3693
+
+3694
+01:01:34.000 --> 01:01:35.000
+This is cue #3694
+
+3695
+01:01:35.000 --> 01:01:36.000
+This is cue #3695
+
+3696
+01:01:36.000 --> 01:01:37.000
+This is cue #3696
+
+3697
+01:01:37.000 --> 01:01:38.000
+This is cue #3697
+
+3698
+01:01:38.000 --> 01:01:39.000
+This is cue #3698
+
+3699
+01:01:39.000 --> 01:01:40.000
+This is cue #3699
+
+3700
+01:01:40.000 --> 01:01:41.000
+This is cue #3700
+
+3701
+01:01:41.000 --> 01:01:42.000
+This is cue #3701
+
+3702
+01:01:42.000 --> 01:01:43.000
+This is cue #3702
+
+3703
+01:01:43.000 --> 01:01:44.000
+This is cue #3703
+
+3704
+01:01:44.000 --> 01:01:45.000
+This is cue #3704
+
+3705
+01:01:45.000 --> 01:01:46.000
+This is cue #3705
+
+3706
+01:01:46.000 --> 01:01:47.000
+This is cue #3706
+
+3707
+01:01:47.000 --> 01:01:48.000
+This is cue #3707
+
+3708
+01:01:48.000 --> 01:01:49.000
+This is cue #3708
+
+3709
+01:01:49.000 --> 01:01:50.000
+This is cue #3709
+
+3710
+01:01:50.000 --> 01:01:51.000
+This is cue #3710
+
+3711
+01:01:51.000 --> 01:01:52.000
+This is cue #3711
+
+3712
+01:01:52.000 --> 01:01:53.000
+This is cue #3712
+
+3713
+01:01:53.000 --> 01:01:54.000
+This is cue #3713
+
+3714
+01:01:54.000 --> 01:01:55.000
+This is cue #3714
+
+3715
+01:01:55.000 --> 01:01:56.000
+This is cue #3715
+
+3716
+01:01:56.000 --> 01:01:57.000
+This is cue #3716
+
+3717
+01:01:57.000 --> 01:01:58.000
+This is cue #3717
+
+3718
+01:01:58.000 --> 01:01:59.000
+This is cue #3718
+
+3719
+01:01:59.000 --> 01:02:00.000
+This is cue #3719
+
+3720
+01:02:00.000 --> 01:02:01.000
+This is cue #3720
+
+3721
+01:02:01.000 --> 01:02:02.000
+This is cue #3721
+
+3722
+01:02:02.000 --> 01:02:03.000
+This is cue #3722
+
+3723
+01:02:03.000 --> 01:02:04.000
+This is cue #3723
+
+3724
+01:02:04.000 --> 01:02:05.000
+This is cue #3724
+
+3725
+01:02:05.000 --> 01:02:06.000
+This is cue #3725
+
+3726
+01:02:06.000 --> 01:02:07.000
+This is cue #3726
+
+3727
+01:02:07.000 --> 01:02:08.000
+This is cue #3727
+
+3728
+01:02:08.000 --> 01:02:09.000
+This is cue #3728
+
+3729
+01:02:09.000 --> 01:02:10.000
+This is cue #3729
+
+3730
+01:02:10.000 --> 01:02:11.000
+This is cue #3730
+
+3731
+01:02:11.000 --> 01:02:12.000
+This is cue #3731
+
+3732
+01:02:12.000 --> 01:02:13.000
+This is cue #3732
+
+3733
+01:02:13.000 --> 01:02:14.000
+This is cue #3733
+
+3734
+01:02:14.000 --> 01:02:15.000
+This is cue #3734
+
+3735
+01:02:15.000 --> 01:02:16.000
+This is cue #3735
+
+3736
+01:02:16.000 --> 01:02:17.000
+This is cue #3736
+
+3737
+01:02:17.000 --> 01:02:18.000
+This is cue #3737
+
+3738
+01:02:18.000 --> 01:02:19.000
+This is cue #3738
+
+3739
+01:02:19.000 --> 01:02:20.000
+This is cue #3739
+
+3740
+01:02:20.000 --> 01:02:21.000
+This is cue #3740
+
+3741
+01:02:21.000 --> 01:02:22.000
+This is cue #3741
+
+3742
+01:02:22.000 --> 01:02:23.000
+This is cue #3742
+
+3743
+01:02:23.000 --> 01:02:24.000
+This is cue #3743
+
+3744
+01:02:24.000 --> 01:02:25.000
+This is cue #3744
+
+3745
+01:02:25.000 --> 01:02:26.000
+This is cue #3745
+
+3746
+01:02:26.000 --> 01:02:27.000
+This is cue #3746
+
+3747
+01:02:27.000 --> 01:02:28.000
+This is cue #3747
+
+3748
+01:02:28.000 --> 01:02:29.000
+This is cue #3748
+
+3749
+01:02:29.000 --> 01:02:30.000
+This is cue #3749
+
+3750
+01:02:30.000 --> 01:02:31.000
+This is cue #3750
+
+3751
+01:02:31.000 --> 01:02:32.000
+This is cue #3751
+
+3752
+01:02:32.000 --> 01:02:33.000
+This is cue #3752
+
+3753
+01:02:33.000 --> 01:02:34.000
+This is cue #3753
+
+3754
+01:02:34.000 --> 01:02:35.000
+This is cue #3754
+
+3755
+01:02:35.000 --> 01:02:36.000
+This is cue #3755
+
+3756
+01:02:36.000 --> 01:02:37.000
+This is cue #3756
+
+3757
+01:02:37.000 --> 01:02:38.000
+This is cue #3757
+
+3758
+01:02:38.000 --> 01:02:39.000
+This is cue #3758
+
+3759
+01:02:39.000 --> 01:02:40.000
+This is cue #3759
+
+3760
+01:02:40.000 --> 01:02:41.000
+This is cue #3760
+
+3761
+01:02:41.000 --> 01:02:42.000
+This is cue #3761
+
+3762
+01:02:42.000 --> 01:02:43.000
+This is cue #3762
+
+3763
+01:02:43.000 --> 01:02:44.000
+This is cue #3763
+
+3764
+01:02:44.000 --> 01:02:45.000
+This is cue #3764
+
+3765
+01:02:45.000 --> 01:02:46.000
+This is cue #3765
+
+3766
+01:02:46.000 --> 01:02:47.000
+This is cue #3766
+
+3767
+01:02:47.000 --> 01:02:48.000
+This is cue #3767
+
+3768
+01:02:48.000 --> 01:02:49.000
+This is cue #3768
+
+3769
+01:02:49.000 --> 01:02:50.000
+This is cue #3769
+
+3770
+01:02:50.000 --> 01:02:51.000
+This is cue #3770
+
+3771
+01:02:51.000 --> 01:02:52.000
+This is cue #3771
+
+3772
+01:02:52.000 --> 01:02:53.000
+This is cue #3772
+
+3773
+01:02:53.000 --> 01:02:54.000
+This is cue #3773
+
+3774
+01:02:54.000 --> 01:02:55.000
+This is cue #3774
+
+3775
+01:02:55.000 --> 01:02:56.000
+This is cue #3775
+
+3776
+01:02:56.000 --> 01:02:57.000
+This is cue #3776
+
+3777
+01:02:57.000 --> 01:02:58.000
+This is cue #3777
+
+3778
+01:02:58.000 --> 01:02:59.000
+This is cue #3778
+
+3779
+01:02:59.000 --> 01:03:00.000
+This is cue #3779
+
+3780
+01:03:00.000 --> 01:03:01.000
+This is cue #3780
+
+3781
+01:03:01.000 --> 01:03:02.000
+This is cue #3781
+
+3782
+01:03:02.000 --> 01:03:03.000
+This is cue #3782
+
+3783
+01:03:03.000 --> 01:03:04.000
+This is cue #3783
+
+3784
+01:03:04.000 --> 01:03:05.000
+This is cue #3784
+
+3785
+01:03:05.000 --> 01:03:06.000
+This is cue #3785
+
+3786
+01:03:06.000 --> 01:03:07.000
+This is cue #3786
+
+3787
+01:03:07.000 --> 01:03:08.000
+This is cue #3787
+
+3788
+01:03:08.000 --> 01:03:09.000
+This is cue #3788
+
+3789
+01:03:09.000 --> 01:03:10.000
+This is cue #3789
+
+3790
+01:03:10.000 --> 01:03:11.000
+This is cue #3790
+
+3791
+01:03:11.000 --> 01:03:12.000
+This is cue #3791
+
+3792
+01:03:12.000 --> 01:03:13.000
+This is cue #3792
+
+3793
+01:03:13.000 --> 01:03:14.000
+This is cue #3793
+
+3794
+01:03:14.000 --> 01:03:15.000
+This is cue #3794
+
+3795
+01:03:15.000 --> 01:03:16.000
+This is cue #3795
+
+3796
+01:03:16.000 --> 01:03:17.000
+This is cue #3796
+
+3797
+01:03:17.000 --> 01:03:18.000
+This is cue #3797
+
+3798
+01:03:18.000 --> 01:03:19.000
+This is cue #3798
+
+3799
+01:03:19.000 --> 01:03:20.000
+This is cue #3799
+
+3800
+01:03:20.000 --> 01:03:21.000
+This is cue #3800
+
+3801
+01:03:21.000 --> 01:03:22.000
+This is cue #3801
+
+3802
+01:03:22.000 --> 01:03:23.000
+This is cue #3802
+
+3803
+01:03:23.000 --> 01:03:24.000
+This is cue #3803
+
+3804
+01:03:24.000 --> 01:03:25.000
+This is cue #3804
+
+3805
+01:03:25.000 --> 01:03:26.000
+This is cue #3805
+
+3806
+01:03:26.000 --> 01:03:27.000
+This is cue #3806
+
+3807
+01:03:27.000 --> 01:03:28.000
+This is cue #3807
+
+3808
+01:03:28.000 --> 01:03:29.000
+This is cue #3808
+
+3809
+01:03:29.000 --> 01:03:30.000
+This is cue #3809
+
+3810
+01:03:30.000 --> 01:03:31.000
+This is cue #3810
+
+3811
+01:03:31.000 --> 01:03:32.000
+This is cue #3811
+
+3812
+01:03:32.000 --> 01:03:33.000
+This is cue #3812
+
+3813
+01:03:33.000 --> 01:03:34.000
+This is cue #3813
+
+3814
+01:03:34.000 --> 01:03:35.000
+This is cue #3814
+
+3815
+01:03:35.000 --> 01:03:36.000
+This is cue #3815
+
+3816
+01:03:36.000 --> 01:03:37.000
+This is cue #3816
+
+3817
+01:03:37.000 --> 01:03:38.000
+This is cue #3817
+
+3818
+01:03:38.000 --> 01:03:39.000
+This is cue #3818
+
+3819
+01:03:39.000 --> 01:03:40.000
+This is cue #3819
+
+3820
+01:03:40.000 --> 01:03:41.000
+This is cue #3820
+
+3821
+01:03:41.000 --> 01:03:42.000
+This is cue #3821
+
+3822
+01:03:42.000 --> 01:03:43.000
+This is cue #3822
+
+3823
+01:03:43.000 --> 01:03:44.000
+This is cue #3823
+
+3824
+01:03:44.000 --> 01:03:45.000
+This is cue #3824
+
+3825
+01:03:45.000 --> 01:03:46.000
+This is cue #3825
+
+3826
+01:03:46.000 --> 01:03:47.000
+This is cue #3826
+
+3827
+01:03:47.000 --> 01:03:48.000
+This is cue #3827
+
+3828
+01:03:48.000 --> 01:03:49.000
+This is cue #3828
+
+3829
+01:03:49.000 --> 01:03:50.000
+This is cue #3829
+
+3830
+01:03:50.000 --> 01:03:51.000
+This is cue #3830
+
+3831
+01:03:51.000 --> 01:03:52.000
+This is cue #3831
+
+3832
+01:03:52.000 --> 01:03:53.000
+This is cue #3832
+
+3833
+01:03:53.000 --> 01:03:54.000
+This is cue #3833
+
+3834
+01:03:54.000 --> 01:03:55.000
+This is cue #3834
+
+3835
+01:03:55.000 --> 01:03:56.000
+This is cue #3835
+
+3836
+01:03:56.000 --> 01:03:57.000
+This is cue #3836
+
+3837
+01:03:57.000 --> 01:03:58.000
+This is cue #3837
+
+3838
+01:03:58.000 --> 01:03:59.000
+This is cue #3838
+
+3839
+01:03:59.000 --> 01:04:00.000
+This is cue #3839
+
+3840
+01:04:00.000 --> 01:04:01.000
+This is cue #3840
+
+3841
+01:04:01.000 --> 01:04:02.000
+This is cue #3841
+
+3842
+01:04:02.000 --> 01:04:03.000
+This is cue #3842
+
+3843
+01:04:03.000 --> 01:04:04.000
+This is cue #3843
+
+3844
+01:04:04.000 --> 01:04:05.000
+This is cue #3844
+
+3845
+01:04:05.000 --> 01:04:06.000
+This is cue #3845
+
+3846
+01:04:06.000 --> 01:04:07.000
+This is cue #3846
+
+3847
+01:04:07.000 --> 01:04:08.000
+This is cue #3847
+
+3848
+01:04:08.000 --> 01:04:09.000
+This is cue #3848
+
+3849
+01:04:09.000 --> 01:04:10.000
+This is cue #3849
+
+3850
+01:04:10.000 --> 01:04:11.000
+This is cue #3850
+
+3851
+01:04:11.000 --> 01:04:12.000
+This is cue #3851
+
+3852
+01:04:12.000 --> 01:04:13.000
+This is cue #3852
+
+3853
+01:04:13.000 --> 01:04:14.000
+This is cue #3853
+
+3854
+01:04:14.000 --> 01:04:15.000
+This is cue #3854
+
+3855
+01:04:15.000 --> 01:04:16.000
+This is cue #3855
+
+3856
+01:04:16.000 --> 01:04:17.000
+This is cue #3856
+
+3857
+01:04:17.000 --> 01:04:18.000
+This is cue #3857
+
+3858
+01:04:18.000 --> 01:04:19.000
+This is cue #3858
+
+3859
+01:04:19.000 --> 01:04:20.000
+This is cue #3859
+
+3860
+01:04:20.000 --> 01:04:21.000
+This is cue #3860
+
+3861
+01:04:21.000 --> 01:04:22.000
+This is cue #3861
+
+3862
+01:04:22.000 --> 01:04:23.000
+This is cue #3862
+
+3863
+01:04:23.000 --> 01:04:24.000
+This is cue #3863
+
+3864
+01:04:24.000 --> 01:04:25.000
+This is cue #3864
+
+3865
+01:04:25.000 --> 01:04:26.000
+This is cue #3865
+
+3866
+01:04:26.000 --> 01:04:27.000
+This is cue #3866
+
+3867
+01:04:27.000 --> 01:04:28.000
+This is cue #3867
+
+3868
+01:04:28.000 --> 01:04:29.000
+This is cue #3868
+
+3869
+01:04:29.000 --> 01:04:30.000
+This is cue #3869
+
+3870
+01:04:30.000 --> 01:04:31.000
+This is cue #3870
+
+3871
+01:04:31.000 --> 01:04:32.000
+This is cue #3871
+
+3872
+01:04:32.000 --> 01:04:33.000
+This is cue #3872
+
+3873
+01:04:33.000 --> 01:04:34.000
+This is cue #3873
+
+3874
+01:04:34.000 --> 01:04:35.000
+This is cue #3874
+
+3875
+01:04:35.000 --> 01:04:36.000
+This is cue #3875
+
+3876
+01:04:36.000 --> 01:04:37.000
+This is cue #3876
+
+3877
+01:04:37.000 --> 01:04:38.000
+This is cue #3877
+
+3878
+01:04:38.000 --> 01:04:39.000
+This is cue #3878
+
+3879
+01:04:39.000 --> 01:04:40.000
+This is cue #3879
+
+3880
+01:04:40.000 --> 01:04:41.000
+This is cue #3880
+
+3881
+01:04:41.000 --> 01:04:42.000
+This is cue #3881
+
+3882
+01:04:42.000 --> 01:04:43.000
+This is cue #3882
+
+3883
+01:04:43.000 --> 01:04:44.000
+This is cue #3883
+
+3884
+01:04:44.000 --> 01:04:45.000
+This is cue #3884
+
+3885
+01:04:45.000 --> 01:04:46.000
+This is cue #3885
+
+3886
+01:04:46.000 --> 01:04:47.000
+This is cue #3886
+
+3887
+01:04:47.000 --> 01:04:48.000
+This is cue #3887
+
+3888
+01:04:48.000 --> 01:04:49.000
+This is cue #3888
+
+3889
+01:04:49.000 --> 01:04:50.000
+This is cue #3889
+
+3890
+01:04:50.000 --> 01:04:51.000
+This is cue #3890
+
+3891
+01:04:51.000 --> 01:04:52.000
+This is cue #3891
+
+3892
+01:04:52.000 --> 01:04:53.000
+This is cue #3892
+
+3893
+01:04:53.000 --> 01:04:54.000
+This is cue #3893
+
+3894
+01:04:54.000 --> 01:04:55.000
+This is cue #3894
+
+3895
+01:04:55.000 --> 01:04:56.000
+This is cue #3895
+
+3896
+01:04:56.000 --> 01:04:57.000
+This is cue #3896
+
+3897
+01:04:57.000 --> 01:04:58.000
+This is cue #3897
+
+3898
+01:04:58.000 --> 01:04:59.000
+This is cue #3898
+
+3899
+01:04:59.000 --> 01:05:00.000
+This is cue #3899
+
+3900
+01:05:00.000 --> 01:05:01.000
+This is cue #3900
+
+3901
+01:05:01.000 --> 01:05:02.000
+This is cue #3901
+
+3902
+01:05:02.000 --> 01:05:03.000
+This is cue #3902
+
+3903
+01:05:03.000 --> 01:05:04.000
+This is cue #3903
+
+3904
+01:05:04.000 --> 01:05:05.000
+This is cue #3904
+
+3905
+01:05:05.000 --> 01:05:06.000
+This is cue #3905
+
+3906
+01:05:06.000 --> 01:05:07.000
+This is cue #3906
+
+3907
+01:05:07.000 --> 01:05:08.000
+This is cue #3907
+
+3908
+01:05:08.000 --> 01:05:09.000
+This is cue #3908
+
+3909
+01:05:09.000 --> 01:05:10.000
+This is cue #3909
+
+3910
+01:05:10.000 --> 01:05:11.000
+This is cue #3910
+
+3911
+01:05:11.000 --> 01:05:12.000
+This is cue #3911
+
+3912
+01:05:12.000 --> 01:05:13.000
+This is cue #3912
+
+3913
+01:05:13.000 --> 01:05:14.000
+This is cue #3913
+
+3914
+01:05:14.000 --> 01:05:15.000
+This is cue #3914
+
+3915
+01:05:15.000 --> 01:05:16.000
+This is cue #3915
+
+3916
+01:05:16.000 --> 01:05:17.000
+This is cue #3916
+
+3917
+01:05:17.000 --> 01:05:18.000
+This is cue #3917
+
+3918
+01:05:18.000 --> 01:05:19.000
+This is cue #3918
+
+3919
+01:05:19.000 --> 01:05:20.000
+This is cue #3919
+
+3920
+01:05:20.000 --> 01:05:21.000
+This is cue #3920
+
+3921
+01:05:21.000 --> 01:05:22.000
+This is cue #3921
+
+3922
+01:05:22.000 --> 01:05:23.000
+This is cue #3922
+
+3923
+01:05:23.000 --> 01:05:24.000
+This is cue #3923
+
+3924
+01:05:24.000 --> 01:05:25.000
+This is cue #3924
+
+3925
+01:05:25.000 --> 01:05:26.000
+This is cue #3925
+
+3926
+01:05:26.000 --> 01:05:27.000
+This is cue #3926
+
+3927
+01:05:27.000 --> 01:05:28.000
+This is cue #3927
+
+3928
+01:05:28.000 --> 01:05:29.000
+This is cue #3928
+
+3929
+01:05:29.000 --> 01:05:30.000
+This is cue #3929
+
+3930
+01:05:30.000 --> 01:05:31.000
+This is cue #3930
+
+3931
+01:05:31.000 --> 01:05:32.000
+This is cue #3931
+
+3932
+01:05:32.000 --> 01:05:33.000
+This is cue #3932
+
+3933
+01:05:33.000 --> 01:05:34.000
+This is cue #3933
+
+3934
+01:05:34.000 --> 01:05:35.000
+This is cue #3934
+
+3935
+01:05:35.000 --> 01:05:36.000
+This is cue #3935
+
+3936
+01:05:36.000 --> 01:05:37.000
+This is cue #3936
+
+3937
+01:05:37.000 --> 01:05:38.000
+This is cue #3937
+
+3938
+01:05:38.000 --> 01:05:39.000
+This is cue #3938
+
+3939
+01:05:39.000 --> 01:05:40.000
+This is cue #3939
+
+3940
+01:05:40.000 --> 01:05:41.000
+This is cue #3940
+
+3941
+01:05:41.000 --> 01:05:42.000
+This is cue #3941
+
+3942
+01:05:42.000 --> 01:05:43.000
+This is cue #3942
+
+3943
+01:05:43.000 --> 01:05:44.000
+This is cue #3943
+
+3944
+01:05:44.000 --> 01:05:45.000
+This is cue #3944
+
+3945
+01:05:45.000 --> 01:05:46.000
+This is cue #3945
+
+3946
+01:05:46.000 --> 01:05:47.000
+This is cue #3946
+
+3947
+01:05:47.000 --> 01:05:48.000
+This is cue #3947
+
+3948
+01:05:48.000 --> 01:05:49.000
+This is cue #3948
+
+3949
+01:05:49.000 --> 01:05:50.000
+This is cue #3949
+
+3950
+01:05:50.000 --> 01:05:51.000
+This is cue #3950
+
+3951
+01:05:51.000 --> 01:05:52.000
+This is cue #3951
+
+3952
+01:05:52.000 --> 01:05:53.000
+This is cue #3952
+
+3953
+01:05:53.000 --> 01:05:54.000
+This is cue #3953
+
+3954
+01:05:54.000 --> 01:05:55.000
+This is cue #3954
+
+3955
+01:05:55.000 --> 01:05:56.000
+This is cue #3955
+
+3956
+01:05:56.000 --> 01:05:57.000
+This is cue #3956
+
+3957
+01:05:57.000 --> 01:05:58.000
+This is cue #3957
+
+3958
+01:05:58.000 --> 01:05:59.000
+This is cue #3958
+
+3959
+01:05:59.000 --> 01:06:00.000
+This is cue #3959
+
+3960
+01:06:00.000 --> 01:06:01.000
+This is cue #3960
+
+3961
+01:06:01.000 --> 01:06:02.000
+This is cue #3961
+
+3962
+01:06:02.000 --> 01:06:03.000
+This is cue #3962
+
+3963
+01:06:03.000 --> 01:06:04.000
+This is cue #3963
+
+3964
+01:06:04.000 --> 01:06:05.000
+This is cue #3964
+
+3965
+01:06:05.000 --> 01:06:06.000
+This is cue #3965
+
+3966
+01:06:06.000 --> 01:06:07.000
+This is cue #3966
+
+3967
+01:06:07.000 --> 01:06:08.000
+This is cue #3967
+
+3968
+01:06:08.000 --> 01:06:09.000
+This is cue #3968
+
+3969
+01:06:09.000 --> 01:06:10.000
+This is cue #3969
+
+3970
+01:06:10.000 --> 01:06:11.000
+This is cue #3970
+
+3971
+01:06:11.000 --> 01:06:12.000
+This is cue #3971
+
+3972
+01:06:12.000 --> 01:06:13.000
+This is cue #3972
+
+3973
+01:06:13.000 --> 01:06:14.000
+This is cue #3973
+
+3974
+01:06:14.000 --> 01:06:15.000
+This is cue #3974
+
+3975
+01:06:15.000 --> 01:06:16.000
+This is cue #3975
+
+3976
+01:06:16.000 --> 01:06:17.000
+This is cue #3976
+
+3977
+01:06:17.000 --> 01:06:18.000
+This is cue #3977
+
+3978
+01:06:18.000 --> 01:06:19.000
+This is cue #3978
+
+3979
+01:06:19.000 --> 01:06:20.000
+This is cue #3979
+
+3980
+01:06:20.000 --> 01:06:21.000
+This is cue #3980
+
+3981
+01:06:21.000 --> 01:06:22.000
+This is cue #3981
+
+3982
+01:06:22.000 --> 01:06:23.000
+This is cue #3982
+
+3983
+01:06:23.000 --> 01:06:24.000
+This is cue #3983
+
+3984
+01:06:24.000 --> 01:06:25.000
+This is cue #3984
+
+3985
+01:06:25.000 --> 01:06:26.000
+This is cue #3985
+
+3986
+01:06:26.000 --> 01:06:27.000
+This is cue #3986
+
+3987
+01:06:27.000 --> 01:06:28.000
+This is cue #3987
+
+3988
+01:06:28.000 --> 01:06:29.000
+This is cue #3988
+
+3989
+01:06:29.000 --> 01:06:30.000
+This is cue #3989
+
+3990
+01:06:30.000 --> 01:06:31.000
+This is cue #3990
+
+3991
+01:06:31.000 --> 01:06:32.000
+This is cue #3991
+
+3992
+01:06:32.000 --> 01:06:33.000
+This is cue #3992
+
+3993
+01:06:33.000 --> 01:06:34.000
+This is cue #3993
+
+3994
+01:06:34.000 --> 01:06:35.000
+This is cue #3994
+
+3995
+01:06:35.000 --> 01:06:36.000
+This is cue #3995
+
+3996
+01:06:36.000 --> 01:06:37.000
+This is cue #3996
+
+3997
+01:06:37.000 --> 01:06:38.000
+This is cue #3997
+
+3998
+01:06:38.000 --> 01:06:39.000
+This is cue #3998
+
+3999
+01:06:39.000 --> 01:06:40.000
+This is cue #3999
+
+4000
+01:06:40.000 --> 01:06:41.000
+This is cue #4000
+
+4001
+01:06:41.000 --> 01:06:42.000
+This is cue #4001
+
+4002
+01:06:42.000 --> 01:06:43.000
+This is cue #4002
+
+4003
+01:06:43.000 --> 01:06:44.000
+This is cue #4003
+
+4004
+01:06:44.000 --> 01:06:45.000
+This is cue #4004
+
+4005
+01:06:45.000 --> 01:06:46.000
+This is cue #4005
+
+4006
+01:06:46.000 --> 01:06:47.000
+This is cue #4006
+
+4007
+01:06:47.000 --> 01:06:48.000
+This is cue #4007
+
+4008
+01:06:48.000 --> 01:06:49.000
+This is cue #4008
+
+4009
+01:06:49.000 --> 01:06:50.000
+This is cue #4009
+
+4010
+01:06:50.000 --> 01:06:51.000
+This is cue #4010
+
+4011
+01:06:51.000 --> 01:06:52.000
+This is cue #4011
+
+4012
+01:06:52.000 --> 01:06:53.000
+This is cue #4012
+
+4013
+01:06:53.000 --> 01:06:54.000
+This is cue #4013
+
+4014
+01:06:54.000 --> 01:06:55.000
+This is cue #4014
+
+4015
+01:06:55.000 --> 01:06:56.000
+This is cue #4015
+
+4016
+01:06:56.000 --> 01:06:57.000
+This is cue #4016
+
+4017
+01:06:57.000 --> 01:06:58.000
+This is cue #4017
+
+4018
+01:06:58.000 --> 01:06:59.000
+This is cue #4018
+
+4019
+01:06:59.000 --> 01:07:00.000
+This is cue #4019
+
+4020
+01:07:00.000 --> 01:07:01.000
+This is cue #4020
+
+4021
+01:07:01.000 --> 01:07:02.000
+This is cue #4021
+
+4022
+01:07:02.000 --> 01:07:03.000
+This is cue #4022
+
+4023
+01:07:03.000 --> 01:07:04.000
+This is cue #4023
+
+4024
+01:07:04.000 --> 01:07:05.000
+This is cue #4024
+
+4025
+01:07:05.000 --> 01:07:06.000
+This is cue #4025
+
+4026
+01:07:06.000 --> 01:07:07.000
+This is cue #4026
+
+4027
+01:07:07.000 --> 01:07:08.000
+This is cue #4027
+
+4028
+01:07:08.000 --> 01:07:09.000
+This is cue #4028
+
+4029
+01:07:09.000 --> 01:07:10.000
+This is cue #4029
+
+4030
+01:07:10.000 --> 01:07:11.000
+This is cue #4030
+
+4031
+01:07:11.000 --> 01:07:12.000
+This is cue #4031
+
+4032
+01:07:12.000 --> 01:07:13.000
+This is cue #4032
+
+4033
+01:07:13.000 --> 01:07:14.000
+This is cue #4033
+
+4034
+01:07:14.000 --> 01:07:15.000
+This is cue #4034
+
+4035
+01:07:15.000 --> 01:07:16.000
+This is cue #4035
+
+4036
+01:07:16.000 --> 01:07:17.000
+This is cue #4036
+
+4037
+01:07:17.000 --> 01:07:18.000
+This is cue #4037
+
+4038
+01:07:18.000 --> 01:07:19.000
+This is cue #4038
+
+4039
+01:07:19.000 --> 01:07:20.000
+This is cue #4039
+
+4040
+01:07:20.000 --> 01:07:21.000
+This is cue #4040
+
+4041
+01:07:21.000 --> 01:07:22.000
+This is cue #4041
+
+4042
+01:07:22.000 --> 01:07:23.000
+This is cue #4042
+
+4043
+01:07:23.000 --> 01:07:24.000
+This is cue #4043
+
+4044
+01:07:24.000 --> 01:07:25.000
+This is cue #4044
+
+4045
+01:07:25.000 --> 01:07:26.000
+This is cue #4045
+
+4046
+01:07:26.000 --> 01:07:27.000
+This is cue #4046
+
+4047
+01:07:27.000 --> 01:07:28.000
+This is cue #4047
+
+4048
+01:07:28.000 --> 01:07:29.000
+This is cue #4048
+
+4049
+01:07:29.000 --> 01:07:30.000
+This is cue #4049
+
+4050
+01:07:30.000 --> 01:07:31.000
+This is cue #4050
+
+4051
+01:07:31.000 --> 01:07:32.000
+This is cue #4051
+
+4052
+01:07:32.000 --> 01:07:33.000
+This is cue #4052
+
+4053
+01:07:33.000 --> 01:07:34.000
+This is cue #4053
+
+4054
+01:07:34.000 --> 01:07:35.000
+This is cue #4054
+
+4055
+01:07:35.000 --> 01:07:36.000
+This is cue #4055
+
+4056
+01:07:36.000 --> 01:07:37.000
+This is cue #4056
+
+4057
+01:07:37.000 --> 01:07:38.000
+This is cue #4057
+
+4058
+01:07:38.000 --> 01:07:39.000
+This is cue #4058
+
+4059
+01:07:39.000 --> 01:07:40.000
+This is cue #4059
+
+4060
+01:07:40.000 --> 01:07:41.000
+This is cue #4060
+
+4061
+01:07:41.000 --> 01:07:42.000
+This is cue #4061
+
+4062
+01:07:42.000 --> 01:07:43.000
+This is cue #4062
+
+4063
+01:07:43.000 --> 01:07:44.000
+This is cue #4063
+
+4064
+01:07:44.000 --> 01:07:45.000
+This is cue #4064
+
+4065
+01:07:45.000 --> 01:07:46.000
+This is cue #4065
+
+4066
+01:07:46.000 --> 01:07:47.000
+This is cue #4066
+
+4067
+01:07:47.000 --> 01:07:48.000
+This is cue #4067
+
+4068
+01:07:48.000 --> 01:07:49.000
+This is cue #4068
+
+4069
+01:07:49.000 --> 01:07:50.000
+This is cue #4069
+
+4070
+01:07:50.000 --> 01:07:51.000
+This is cue #4070
+
+4071
+01:07:51.000 --> 01:07:52.000
+This is cue #4071
+
+4072
+01:07:52.000 --> 01:07:53.000
+This is cue #4072
+
+4073
+01:07:53.000 --> 01:07:54.000
+This is cue #4073
+
+4074
+01:07:54.000 --> 01:07:55.000
+This is cue #4074
+
+4075
+01:07:55.000 --> 01:07:56.000
+This is cue #4075
+
+4076
+01:07:56.000 --> 01:07:57.000
+This is cue #4076
+
+4077
+01:07:57.000 --> 01:07:58.000
+This is cue #4077
+
+4078
+01:07:58.000 --> 01:07:59.000
+This is cue #4078
+
+4079
+01:07:59.000 --> 01:08:00.000
+This is cue #4079
+
+4080
+01:08:00.000 --> 01:08:01.000
+This is cue #4080
+
+4081
+01:08:01.000 --> 01:08:02.000
+This is cue #4081
+
+4082
+01:08:02.000 --> 01:08:03.000
+This is cue #4082
+
+4083
+01:08:03.000 --> 01:08:04.000
+This is cue #4083
+
+4084
+01:08:04.000 --> 01:08:05.000
+This is cue #4084
+
+4085
+01:08:05.000 --> 01:08:06.000
+This is cue #4085
+
+4086
+01:08:06.000 --> 01:08:07.000
+This is cue #4086
+
+4087
+01:08:07.000 --> 01:08:08.000
+This is cue #4087
+
+4088
+01:08:08.000 --> 01:08:09.000
+This is cue #4088
+
+4089
+01:08:09.000 --> 01:08:10.000
+This is cue #4089
+
+4090
+01:08:10.000 --> 01:08:11.000
+This is cue #4090
+
+4091
+01:08:11.000 --> 01:08:12.000
+This is cue #4091
+
+4092
+01:08:12.000 --> 01:08:13.000
+This is cue #4092
+
+4093
+01:08:13.000 --> 01:08:14.000
+This is cue #4093
+
+4094
+01:08:14.000 --> 01:08:15.000
+This is cue #4094
+
+4095
+01:08:15.000 --> 01:08:16.000
+This is cue #4095
+
+4096
+01:08:16.000 --> 01:08:17.000
+This is cue #4096
+
+4097
+01:08:17.000 --> 01:08:18.000
+This is cue #4097
+
+4098
+01:08:18.000 --> 01:08:19.000
+This is cue #4098
+
+4099
+01:08:19.000 --> 01:08:20.000
+This is cue #4099
+
+4100
+01:08:20.000 --> 01:08:21.000
+This is cue #4100
+
+4101
+01:08:21.000 --> 01:08:22.000
+This is cue #4101
+
+4102
+01:08:22.000 --> 01:08:23.000
+This is cue #4102
+
+4103
+01:08:23.000 --> 01:08:24.000
+This is cue #4103
+
+4104
+01:08:24.000 --> 01:08:25.000
+This is cue #4104
+
+4105
+01:08:25.000 --> 01:08:26.000
+This is cue #4105
+
+4106
+01:08:26.000 --> 01:08:27.000
+This is cue #4106
+
+4107
+01:08:27.000 --> 01:08:28.000
+This is cue #4107
+
+4108
+01:08:28.000 --> 01:08:29.000
+This is cue #4108
+
+4109
+01:08:29.000 --> 01:08:30.000
+This is cue #4109
+
+4110
+01:08:30.000 --> 01:08:31.000
+This is cue #4110
+
+4111
+01:08:31.000 --> 01:08:32.000
+This is cue #4111
+
+4112
+01:08:32.000 --> 01:08:33.000
+This is cue #4112
+
+4113
+01:08:33.000 --> 01:08:34.000
+This is cue #4113
+
+4114
+01:08:34.000 --> 01:08:35.000
+This is cue #4114
+
+4115
+01:08:35.000 --> 01:08:36.000
+This is cue #4115
+
+4116
+01:08:36.000 --> 01:08:37.000
+This is cue #4116
+
+4117
+01:08:37.000 --> 01:08:38.000
+This is cue #4117
+
+4118
+01:08:38.000 --> 01:08:39.000
+This is cue #4118
+
+4119
+01:08:39.000 --> 01:08:40.000
+This is cue #4119
+
+4120
+01:08:40.000 --> 01:08:41.000
+This is cue #4120
+
+4121
+01:08:41.000 --> 01:08:42.000
+This is cue #4121
+
+4122
+01:08:42.000 --> 01:08:43.000
+This is cue #4122
+
+4123
+01:08:43.000 --> 01:08:44.000
+This is cue #4123
+
+4124
+01:08:44.000 --> 01:08:45.000
+This is cue #4124
+
+4125
+01:08:45.000 --> 01:08:46.000
+This is cue #4125
+
+4126
+01:08:46.000 --> 01:08:47.000
+This is cue #4126
+
+4127
+01:08:47.000 --> 01:08:48.000
+This is cue #4127
+
+4128
+01:08:48.000 --> 01:08:49.000
+This is cue #4128
+
+4129
+01:08:49.000 --> 01:08:50.000
+This is cue #4129
+
+4130
+01:08:50.000 --> 01:08:51.000
+This is cue #4130
+
+4131
+01:08:51.000 --> 01:08:52.000
+This is cue #4131
+
+4132
+01:08:52.000 --> 01:08:53.000
+This is cue #4132
+
+4133
+01:08:53.000 --> 01:08:54.000
+This is cue #4133
+
+4134
+01:08:54.000 --> 01:08:55.000
+This is cue #4134
+
+4135
+01:08:55.000 --> 01:08:56.000
+This is cue #4135
+
+4136
+01:08:56.000 --> 01:08:57.000
+This is cue #4136
+
+4137
+01:08:57.000 --> 01:08:58.000
+This is cue #4137
+
+4138
+01:08:58.000 --> 01:08:59.000
+This is cue #4138
+
+4139
+01:08:59.000 --> 01:09:00.000
+This is cue #4139
+
+4140
+01:09:00.000 --> 01:09:01.000
+This is cue #4140
+
+4141
+01:09:01.000 --> 01:09:02.000
+This is cue #4141
+
+4142
+01:09:02.000 --> 01:09:03.000
+This is cue #4142
+
+4143
+01:09:03.000 --> 01:09:04.000
+This is cue #4143
+
+4144
+01:09:04.000 --> 01:09:05.000
+This is cue #4144
+
+4145
+01:09:05.000 --> 01:09:06.000
+This is cue #4145
+
+4146
+01:09:06.000 --> 01:09:07.000
+This is cue #4146
+
+4147
+01:09:07.000 --> 01:09:08.000
+This is cue #4147
+
+4148
+01:09:08.000 --> 01:09:09.000
+This is cue #4148
+
+4149
+01:09:09.000 --> 01:09:10.000
+This is cue #4149
+
+4150
+01:09:10.000 --> 01:09:11.000
+This is cue #4150
+
+4151
+01:09:11.000 --> 01:09:12.000
+This is cue #4151
+
+4152
+01:09:12.000 --> 01:09:13.000
+This is cue #4152
+
+4153
+01:09:13.000 --> 01:09:14.000
+This is cue #4153
+
+4154
+01:09:14.000 --> 01:09:15.000
+This is cue #4154
+
+4155
+01:09:15.000 --> 01:09:16.000
+This is cue #4155
+
+4156
+01:09:16.000 --> 01:09:17.000
+This is cue #4156
+
+4157
+01:09:17.000 --> 01:09:18.000
+This is cue #4157
+
+4158
+01:09:18.000 --> 01:09:19.000
+This is cue #4158
+
+4159
+01:09:19.000 --> 01:09:20.000
+This is cue #4159
+
+4160
+01:09:20.000 --> 01:09:21.000
+This is cue #4160
+
+4161
+01:09:21.000 --> 01:09:22.000
+This is cue #4161
+
+4162
+01:09:22.000 --> 01:09:23.000
+This is cue #4162
+
+4163
+01:09:23.000 --> 01:09:24.000
+This is cue #4163
+
+4164
+01:09:24.000 --> 01:09:25.000
+This is cue #4164
+
+4165
+01:09:25.000 --> 01:09:26.000
+This is cue #4165
+
+4166
+01:09:26.000 --> 01:09:27.000
+This is cue #4166
+
+4167
+01:09:27.000 --> 01:09:28.000
+This is cue #4167
+
+4168
+01:09:28.000 --> 01:09:29.000
+This is cue #4168
+
+4169
+01:09:29.000 --> 01:09:30.000
+This is cue #4169
+
+4170
+01:09:30.000 --> 01:09:31.000
+This is cue #4170
+
+4171
+01:09:31.000 --> 01:09:32.000
+This is cue #4171
+
+4172
+01:09:32.000 --> 01:09:33.000
+This is cue #4172
+
+4173
+01:09:33.000 --> 01:09:34.000
+This is cue #4173
+
+4174
+01:09:34.000 --> 01:09:35.000
+This is cue #4174
+
+4175
+01:09:35.000 --> 01:09:36.000
+This is cue #4175
+
+4176
+01:09:36.000 --> 01:09:37.000
+This is cue #4176
+
+4177
+01:09:37.000 --> 01:09:38.000
+This is cue #4177
+
+4178
+01:09:38.000 --> 01:09:39.000
+This is cue #4178
+
+4179
+01:09:39.000 --> 01:09:40.000
+This is cue #4179
+
+4180
+01:09:40.000 --> 01:09:41.000
+This is cue #4180
+
+4181
+01:09:41.000 --> 01:09:42.000
+This is cue #4181
+
+4182
+01:09:42.000 --> 01:09:43.000
+This is cue #4182
+
+4183
+01:09:43.000 --> 01:09:44.000
+This is cue #4183
+
+4184
+01:09:44.000 --> 01:09:45.000
+This is cue #4184
+
+4185
+01:09:45.000 --> 01:09:46.000
+This is cue #4185
+
+4186
+01:09:46.000 --> 01:09:47.000
+This is cue #4186
+
+4187
+01:09:47.000 --> 01:09:48.000
+This is cue #4187
+
+4188
+01:09:48.000 --> 01:09:49.000
+This is cue #4188
+
+4189
+01:09:49.000 --> 01:09:50.000
+This is cue #4189
+
+4190
+01:09:50.000 --> 01:09:51.000
+This is cue #4190
+
+4191
+01:09:51.000 --> 01:09:52.000
+This is cue #4191
+
+4192
+01:09:52.000 --> 01:09:53.000
+This is cue #4192
+
+4193
+01:09:53.000 --> 01:09:54.000
+This is cue #4193
+
+4194
+01:09:54.000 --> 01:09:55.000
+This is cue #4194
+
+4195
+01:09:55.000 --> 01:09:56.000
+This is cue #4195
+
+4196
+01:09:56.000 --> 01:09:57.000
+This is cue #4196
+
+4197
+01:09:57.000 --> 01:09:58.000
+This is cue #4197
+
+4198
+01:09:58.000 --> 01:09:59.000
+This is cue #4198
+
+4199
+01:09:59.000 --> 01:10:00.000
+This is cue #4199
+
+4200
+01:10:00.000 --> 01:10:01.000
+This is cue #4200
+
+4201
+01:10:01.000 --> 01:10:02.000
+This is cue #4201
+
+4202
+01:10:02.000 --> 01:10:03.000
+This is cue #4202
+
+4203
+01:10:03.000 --> 01:10:04.000
+This is cue #4203
+
+4204
+01:10:04.000 --> 01:10:05.000
+This is cue #4204
+
+4205
+01:10:05.000 --> 01:10:06.000
+This is cue #4205
+
+4206
+01:10:06.000 --> 01:10:07.000
+This is cue #4206
+
+4207
+01:10:07.000 --> 01:10:08.000
+This is cue #4207
+
+4208
+01:10:08.000 --> 01:10:09.000
+This is cue #4208
+
+4209
+01:10:09.000 --> 01:10:10.000
+This is cue #4209
+
+4210
+01:10:10.000 --> 01:10:11.000
+This is cue #4210
+
+4211
+01:10:11.000 --> 01:10:12.000
+This is cue #4211
+
+4212
+01:10:12.000 --> 01:10:13.000
+This is cue #4212
+
+4213
+01:10:13.000 --> 01:10:14.000
+This is cue #4213
+
+4214
+01:10:14.000 --> 01:10:15.000
+This is cue #4214
+
+4215
+01:10:15.000 --> 01:10:16.000
+This is cue #4215
+
+4216
+01:10:16.000 --> 01:10:17.000
+This is cue #4216
+
+4217
+01:10:17.000 --> 01:10:18.000
+This is cue #4217
+
+4218
+01:10:18.000 --> 01:10:19.000
+This is cue #4218
+
+4219
+01:10:19.000 --> 01:10:20.000
+This is cue #4219
+
+4220
+01:10:20.000 --> 01:10:21.000
+This is cue #4220
+
+4221
+01:10:21.000 --> 01:10:22.000
+This is cue #4221
+
+4222
+01:10:22.000 --> 01:10:23.000
+This is cue #4222
+
+4223
+01:10:23.000 --> 01:10:24.000
+This is cue #4223
+
+4224
+01:10:24.000 --> 01:10:25.000
+This is cue #4224
+
+4225
+01:10:25.000 --> 01:10:26.000
+This is cue #4225
+
+4226
+01:10:26.000 --> 01:10:27.000
+This is cue #4226
+
+4227
+01:10:27.000 --> 01:10:28.000
+This is cue #4227
+
+4228
+01:10:28.000 --> 01:10:29.000
+This is cue #4228
+
+4229
+01:10:29.000 --> 01:10:30.000
+This is cue #4229
+
+4230
+01:10:30.000 --> 01:10:31.000
+This is cue #4230
+
+4231
+01:10:31.000 --> 01:10:32.000
+This is cue #4231
+
+4232
+01:10:32.000 --> 01:10:33.000
+This is cue #4232
+
+4233
+01:10:33.000 --> 01:10:34.000
+This is cue #4233
+
+4234
+01:10:34.000 --> 01:10:35.000
+This is cue #4234
+
+4235
+01:10:35.000 --> 01:10:36.000
+This is cue #4235
+
+4236
+01:10:36.000 --> 01:10:37.000
+This is cue #4236
+
+4237
+01:10:37.000 --> 01:10:38.000
+This is cue #4237
+
+4238
+01:10:38.000 --> 01:10:39.000
+This is cue #4238
+
+4239
+01:10:39.000 --> 01:10:40.000
+This is cue #4239
+
+4240
+01:10:40.000 --> 01:10:41.000
+This is cue #4240
+
+4241
+01:10:41.000 --> 01:10:42.000
+This is cue #4241
+
+4242
+01:10:42.000 --> 01:10:43.000
+This is cue #4242
+
+4243
+01:10:43.000 --> 01:10:44.000
+This is cue #4243
+
+4244
+01:10:44.000 --> 01:10:45.000
+This is cue #4244
+
+4245
+01:10:45.000 --> 01:10:46.000
+This is cue #4245
+
+4246
+01:10:46.000 --> 01:10:47.000
+This is cue #4246
+
+4247
+01:10:47.000 --> 01:10:48.000
+This is cue #4247
+
+4248
+01:10:48.000 --> 01:10:49.000
+This is cue #4248
+
+4249
+01:10:49.000 --> 01:10:50.000
+This is cue #4249
+
+4250
+01:10:50.000 --> 01:10:51.000
+This is cue #4250
+
+4251
+01:10:51.000 --> 01:10:52.000
+This is cue #4251
+
+4252
+01:10:52.000 --> 01:10:53.000
+This is cue #4252
+
+4253
+01:10:53.000 --> 01:10:54.000
+This is cue #4253
+
+4254
+01:10:54.000 --> 01:10:55.000
+This is cue #4254
+
+4255
+01:10:55.000 --> 01:10:56.000
+This is cue #4255
+
+4256
+01:10:56.000 --> 01:10:57.000
+This is cue #4256
+
+4257
+01:10:57.000 --> 01:10:58.000
+This is cue #4257
+
+4258
+01:10:58.000 --> 01:10:59.000
+This is cue #4258
+
+4259
+01:10:59.000 --> 01:11:00.000
+This is cue #4259
+
+4260
+01:11:00.000 --> 01:11:01.000
+This is cue #4260
+
+4261
+01:11:01.000 --> 01:11:02.000
+This is cue #4261
+
+4262
+01:11:02.000 --> 01:11:03.000
+This is cue #4262
+
+4263
+01:11:03.000 --> 01:11:04.000
+This is cue #4263
+
+4264
+01:11:04.000 --> 01:11:05.000
+This is cue #4264
+
+4265
+01:11:05.000 --> 01:11:06.000
+This is cue #4265
+
+4266
+01:11:06.000 --> 01:11:07.000
+This is cue #4266
+
+4267
+01:11:07.000 --> 01:11:08.000
+This is cue #4267
+
+4268
+01:11:08.000 --> 01:11:09.000
+This is cue #4268
+
+4269
+01:11:09.000 --> 01:11:10.000
+This is cue #4269
+
+4270
+01:11:10.000 --> 01:11:11.000
+This is cue #4270
+
+4271
+01:11:11.000 --> 01:11:12.000
+This is cue #4271
+
+4272
+01:11:12.000 --> 01:11:13.000
+This is cue #4272
+
+4273
+01:11:13.000 --> 01:11:14.000
+This is cue #4273
+
+4274
+01:11:14.000 --> 01:11:15.000
+This is cue #4274
+
+4275
+01:11:15.000 --> 01:11:16.000
+This is cue #4275
+
+4276
+01:11:16.000 --> 01:11:17.000
+This is cue #4276
+
+4277
+01:11:17.000 --> 01:11:18.000
+This is cue #4277
+
+4278
+01:11:18.000 --> 01:11:19.000
+This is cue #4278
+
+4279
+01:11:19.000 --> 01:11:20.000
+This is cue #4279
+
+4280
+01:11:20.000 --> 01:11:21.000
+This is cue #4280
+
+4281
+01:11:21.000 --> 01:11:22.000
+This is cue #4281
+
+4282
+01:11:22.000 --> 01:11:23.000
+This is cue #4282
+
+4283
+01:11:23.000 --> 01:11:24.000
+This is cue #4283
+
+4284
+01:11:24.000 --> 01:11:25.000
+This is cue #4284
+
+4285
+01:11:25.000 --> 01:11:26.000
+This is cue #4285
+
+4286
+01:11:26.000 --> 01:11:27.000
+This is cue #4286
+
+4287
+01:11:27.000 --> 01:11:28.000
+This is cue #4287
+
+4288
+01:11:28.000 --> 01:11:29.000
+This is cue #4288
+
+4289
+01:11:29.000 --> 01:11:30.000
+This is cue #4289
+
+4290
+01:11:30.000 --> 01:11:31.000
+This is cue #4290
+
+4291
+01:11:31.000 --> 01:11:32.000
+This is cue #4291
+
+4292
+01:11:32.000 --> 01:11:33.000
+This is cue #4292
+
+4293
+01:11:33.000 --> 01:11:34.000
+This is cue #4293
+
+4294
+01:11:34.000 --> 01:11:35.000
+This is cue #4294
+
+4295
+01:11:35.000 --> 01:11:36.000
+This is cue #4295
+
+4296
+01:11:36.000 --> 01:11:37.000
+This is cue #4296
+
+4297
+01:11:37.000 --> 01:11:38.000
+This is cue #4297
+
+4298
+01:11:38.000 --> 01:11:39.000
+This is cue #4298
+
+4299
+01:11:39.000 --> 01:11:40.000
+This is cue #4299
+
+4300
+01:11:40.000 --> 01:11:41.000
+This is cue #4300
+
+4301
+01:11:41.000 --> 01:11:42.000
+This is cue #4301
+
+4302
+01:11:42.000 --> 01:11:43.000
+This is cue #4302
+
+4303
+01:11:43.000 --> 01:11:44.000
+This is cue #4303
+
+4304
+01:11:44.000 --> 01:11:45.000
+This is cue #4304
+
+4305
+01:11:45.000 --> 01:11:46.000
+This is cue #4305
+
+4306
+01:11:46.000 --> 01:11:47.000
+This is cue #4306
+
+4307
+01:11:47.000 --> 01:11:48.000
+This is cue #4307
+
+4308
+01:11:48.000 --> 01:11:49.000
+This is cue #4308
+
+4309
+01:11:49.000 --> 01:11:50.000
+This is cue #4309
+
+4310
+01:11:50.000 --> 01:11:51.000
+This is cue #4310
+
+4311
+01:11:51.000 --> 01:11:52.000
+This is cue #4311
+
+4312
+01:11:52.000 --> 01:11:53.000
+This is cue #4312
+
+4313
+01:11:53.000 --> 01:11:54.000
+This is cue #4313
+
+4314
+01:11:54.000 --> 01:11:55.000
+This is cue #4314
+
+4315
+01:11:55.000 --> 01:11:56.000
+This is cue #4315
+
+4316
+01:11:56.000 --> 01:11:57.000
+This is cue #4316
+
+4317
+01:11:57.000 --> 01:11:58.000
+This is cue #4317
+
+4318
+01:11:58.000 --> 01:11:59.000
+This is cue #4318
+
+4319
+01:11:59.000 --> 01:12:00.000
+This is cue #4319
+
+4320
+01:12:00.000 --> 01:12:01.000
+This is cue #4320
+
+4321
+01:12:01.000 --> 01:12:02.000
+This is cue #4321
+
+4322
+01:12:02.000 --> 01:12:03.000
+This is cue #4322
+
+4323
+01:12:03.000 --> 01:12:04.000
+This is cue #4323
+
+4324
+01:12:04.000 --> 01:12:05.000
+This is cue #4324
+
+4325
+01:12:05.000 --> 01:12:06.000
+This is cue #4325
+
+4326
+01:12:06.000 --> 01:12:07.000
+This is cue #4326
+
+4327
+01:12:07.000 --> 01:12:08.000
+This is cue #4327
+
+4328
+01:12:08.000 --> 01:12:09.000
+This is cue #4328
+
+4329
+01:12:09.000 --> 01:12:10.000
+This is cue #4329
+
+4330
+01:12:10.000 --> 01:12:11.000
+This is cue #4330
+
+4331
+01:12:11.000 --> 01:12:12.000
+This is cue #4331
+
+4332
+01:12:12.000 --> 01:12:13.000
+This is cue #4332
+
+4333
+01:12:13.000 --> 01:12:14.000
+This is cue #4333
+
+4334
+01:12:14.000 --> 01:12:15.000
+This is cue #4334
+
+4335
+01:12:15.000 --> 01:12:16.000
+This is cue #4335
+
+4336
+01:12:16.000 --> 01:12:17.000
+This is cue #4336
+
+4337
+01:12:17.000 --> 01:12:18.000
+This is cue #4337
+
+4338
+01:12:18.000 --> 01:12:19.000
+This is cue #4338
+
+4339
+01:12:19.000 --> 01:12:20.000
+This is cue #4339
+
+4340
+01:12:20.000 --> 01:12:21.000
+This is cue #4340
+
+4341
+01:12:21.000 --> 01:12:22.000
+This is cue #4341
+
+4342
+01:12:22.000 --> 01:12:23.000
+This is cue #4342
+
+4343
+01:12:23.000 --> 01:12:24.000
+This is cue #4343
+
+4344
+01:12:24.000 --> 01:12:25.000
+This is cue #4344
+
+4345
+01:12:25.000 --> 01:12:26.000
+This is cue #4345
+
+4346
+01:12:26.000 --> 01:12:27.000
+This is cue #4346
+
+4347
+01:12:27.000 --> 01:12:28.000
+This is cue #4347
+
+4348
+01:12:28.000 --> 01:12:29.000
+This is cue #4348
+
+4349
+01:12:29.000 --> 01:12:30.000
+This is cue #4349
+
+4350
+01:12:30.000 --> 01:12:31.000
+This is cue #4350
+
+4351
+01:12:31.000 --> 01:12:32.000
+This is cue #4351
+
+4352
+01:12:32.000 --> 01:12:33.000
+This is cue #4352
+
+4353
+01:12:33.000 --> 01:12:34.000
+This is cue #4353
+
+4354
+01:12:34.000 --> 01:12:35.000
+This is cue #4354
+
+4355
+01:12:35.000 --> 01:12:36.000
+This is cue #4355
+
+4356
+01:12:36.000 --> 01:12:37.000
+This is cue #4356
+
+4357
+01:12:37.000 --> 01:12:38.000
+This is cue #4357
+
+4358
+01:12:38.000 --> 01:12:39.000
+This is cue #4358
+
+4359
+01:12:39.000 --> 01:12:40.000
+This is cue #4359
+
+4360
+01:12:40.000 --> 01:12:41.000
+This is cue #4360
+
+4361
+01:12:41.000 --> 01:12:42.000
+This is cue #4361
+
+4362
+01:12:42.000 --> 01:12:43.000
+This is cue #4362
+
+4363
+01:12:43.000 --> 01:12:44.000
+This is cue #4363
+
+4364
+01:12:44.000 --> 01:12:45.000
+This is cue #4364
+
+4365
+01:12:45.000 --> 01:12:46.000
+This is cue #4365
+
+4366
+01:12:46.000 --> 01:12:47.000
+This is cue #4366
+
+4367
+01:12:47.000 --> 01:12:48.000
+This is cue #4367
+
+4368
+01:12:48.000 --> 01:12:49.000
+This is cue #4368
+
+4369
+01:12:49.000 --> 01:12:50.000
+This is cue #4369
+
+4370
+01:12:50.000 --> 01:12:51.000
+This is cue #4370
+
+4371
+01:12:51.000 --> 01:12:52.000
+This is cue #4371
+
+4372
+01:12:52.000 --> 01:12:53.000
+This is cue #4372
+
+4373
+01:12:53.000 --> 01:12:54.000
+This is cue #4373
+
+4374
+01:12:54.000 --> 01:12:55.000
+This is cue #4374
+
+4375
+01:12:55.000 --> 01:12:56.000
+This is cue #4375
+
+4376
+01:12:56.000 --> 01:12:57.000
+This is cue #4376
+
+4377
+01:12:57.000 --> 01:12:58.000
+This is cue #4377
+
+4378
+01:12:58.000 --> 01:12:59.000
+This is cue #4378
+
+4379
+01:12:59.000 --> 01:13:00.000
+This is cue #4379
+
+4380
+01:13:00.000 --> 01:13:01.000
+This is cue #4380
+
+4381
+01:13:01.000 --> 01:13:02.000
+This is cue #4381
+
+4382
+01:13:02.000 --> 01:13:03.000
+This is cue #4382
+
+4383
+01:13:03.000 --> 01:13:04.000
+This is cue #4383
+
+4384
+01:13:04.000 --> 01:13:05.000
+This is cue #4384
+
+4385
+01:13:05.000 --> 01:13:06.000
+This is cue #4385
+
+4386
+01:13:06.000 --> 01:13:07.000
+This is cue #4386
+
+4387
+01:13:07.000 --> 01:13:08.000
+This is cue #4387
+
+4388
+01:13:08.000 --> 01:13:09.000
+This is cue #4388
+
+4389
+01:13:09.000 --> 01:13:10.000
+This is cue #4389
+
+4390
+01:13:10.000 --> 01:13:11.000
+This is cue #4390
+
+4391
+01:13:11.000 --> 01:13:12.000
+This is cue #4391
+
+4392
+01:13:12.000 --> 01:13:13.000
+This is cue #4392
+
+4393
+01:13:13.000 --> 01:13:14.000
+This is cue #4393
+
+4394
+01:13:14.000 --> 01:13:15.000
+This is cue #4394
+
+4395
+01:13:15.000 --> 01:13:16.000
+This is cue #4395
+
+4396
+01:13:16.000 --> 01:13:17.000
+This is cue #4396
+
+4397
+01:13:17.000 --> 01:13:18.000
+This is cue #4397
+
+4398
+01:13:18.000 --> 01:13:19.000
+This is cue #4398
+
+4399
+01:13:19.000 --> 01:13:20.000
+This is cue #4399
+
+4400
+01:13:20.000 --> 01:13:21.000
+This is cue #4400
+
+4401
+01:13:21.000 --> 01:13:22.000
+This is cue #4401
+
+4402
+01:13:22.000 --> 01:13:23.000
+This is cue #4402
+
+4403
+01:13:23.000 --> 01:13:24.000
+This is cue #4403
+
+4404
+01:13:24.000 --> 01:13:25.000
+This is cue #4404
+
+4405
+01:13:25.000 --> 01:13:26.000
+This is cue #4405
+
+4406
+01:13:26.000 --> 01:13:27.000
+This is cue #4406
+
+4407
+01:13:27.000 --> 01:13:28.000
+This is cue #4407
+
+4408
+01:13:28.000 --> 01:13:29.000
+This is cue #4408
+
+4409
+01:13:29.000 --> 01:13:30.000
+This is cue #4409
+
+4410
+01:13:30.000 --> 01:13:31.000
+This is cue #4410
+
+4411
+01:13:31.000 --> 01:13:32.000
+This is cue #4411
+
+4412
+01:13:32.000 --> 01:13:33.000
+This is cue #4412
+
+4413
+01:13:33.000 --> 01:13:34.000
+This is cue #4413
+
+4414
+01:13:34.000 --> 01:13:35.000
+This is cue #4414
+
+4415
+01:13:35.000 --> 01:13:36.000
+This is cue #4415
+
+4416
+01:13:36.000 --> 01:13:37.000
+This is cue #4416
+
+4417
+01:13:37.000 --> 01:13:38.000
+This is cue #4417
+
+4418
+01:13:38.000 --> 01:13:39.000
+This is cue #4418
+
+4419
+01:13:39.000 --> 01:13:40.000
+This is cue #4419
+
+4420
+01:13:40.000 --> 01:13:41.000
+This is cue #4420
+
+4421
+01:13:41.000 --> 01:13:42.000
+This is cue #4421
+
+4422
+01:13:42.000 --> 01:13:43.000
+This is cue #4422
+
+4423
+01:13:43.000 --> 01:13:44.000
+This is cue #4423
+
+4424
+01:13:44.000 --> 01:13:45.000
+This is cue #4424
+
+4425
+01:13:45.000 --> 01:13:46.000
+This is cue #4425
+
+4426
+01:13:46.000 --> 01:13:47.000
+This is cue #4426
+
+4427
+01:13:47.000 --> 01:13:48.000
+This is cue #4427
+
+4428
+01:13:48.000 --> 01:13:49.000
+This is cue #4428
+
+4429
+01:13:49.000 --> 01:13:50.000
+This is cue #4429
+
+4430
+01:13:50.000 --> 01:13:51.000
+This is cue #4430
+
+4431
+01:13:51.000 --> 01:13:52.000
+This is cue #4431
+
+4432
+01:13:52.000 --> 01:13:53.000
+This is cue #4432
+
+4433
+01:13:53.000 --> 01:13:54.000
+This is cue #4433
+
+4434
+01:13:54.000 --> 01:13:55.000
+This is cue #4434
+
+4435
+01:13:55.000 --> 01:13:56.000
+This is cue #4435
+
+4436
+01:13:56.000 --> 01:13:57.000
+This is cue #4436
+
+4437
+01:13:57.000 --> 01:13:58.000
+This is cue #4437
+
+4438
+01:13:58.000 --> 01:13:59.000
+This is cue #4438
+
+4439
+01:13:59.000 --> 01:14:00.000
+This is cue #4439
+
+4440
+01:14:00.000 --> 01:14:01.000
+This is cue #4440
+
+4441
+01:14:01.000 --> 01:14:02.000
+This is cue #4441
+
+4442
+01:14:02.000 --> 01:14:03.000
+This is cue #4442
+
+4443
+01:14:03.000 --> 01:14:04.000
+This is cue #4443
+
+4444
+01:14:04.000 --> 01:14:05.000
+This is cue #4444
+
+4445
+01:14:05.000 --> 01:14:06.000
+This is cue #4445
+
+4446
+01:14:06.000 --> 01:14:07.000
+This is cue #4446
+
+4447
+01:14:07.000 --> 01:14:08.000
+This is cue #4447
+
+4448
+01:14:08.000 --> 01:14:09.000
+This is cue #4448
+
+4449
+01:14:09.000 --> 01:14:10.000
+This is cue #4449
+
+4450
+01:14:10.000 --> 01:14:11.000
+This is cue #4450
+
+4451
+01:14:11.000 --> 01:14:12.000
+This is cue #4451
+
+4452
+01:14:12.000 --> 01:14:13.000
+This is cue #4452
+
+4453
+01:14:13.000 --> 01:14:14.000
+This is cue #4453
+
+4454
+01:14:14.000 --> 01:14:15.000
+This is cue #4454
+
+4455
+01:14:15.000 --> 01:14:16.000
+This is cue #4455
+
+4456
+01:14:16.000 --> 01:14:17.000
+This is cue #4456
+
+4457
+01:14:17.000 --> 01:14:18.000
+This is cue #4457
+
+4458
+01:14:18.000 --> 01:14:19.000
+This is cue #4458
+
+4459
+01:14:19.000 --> 01:14:20.000
+This is cue #4459
+
+4460
+01:14:20.000 --> 01:14:21.000
+This is cue #4460
+
+4461
+01:14:21.000 --> 01:14:22.000
+This is cue #4461
+
+4462
+01:14:22.000 --> 01:14:23.000
+This is cue #4462
+
+4463
+01:14:23.000 --> 01:14:24.000
+This is cue #4463
+
+4464
+01:14:24.000 --> 01:14:25.000
+This is cue #4464
+
+4465
+01:14:25.000 --> 01:14:26.000
+This is cue #4465
+
+4466
+01:14:26.000 --> 01:14:27.000
+This is cue #4466
+
+4467
+01:14:27.000 --> 01:14:28.000
+This is cue #4467
+
+4468
+01:14:28.000 --> 01:14:29.000
+This is cue #4468
+
+4469
+01:14:29.000 --> 01:14:30.000
+This is cue #4469
+
+4470
+01:14:30.000 --> 01:14:31.000
+This is cue #4470
+
+4471
+01:14:31.000 --> 01:14:32.000
+This is cue #4471
+
+4472
+01:14:32.000 --> 01:14:33.000
+This is cue #4472
+
+4473
+01:14:33.000 --> 01:14:34.000
+This is cue #4473
+
+4474
+01:14:34.000 --> 01:14:35.000
+This is cue #4474
+
+4475
+01:14:35.000 --> 01:14:36.000
+This is cue #4475
+
+4476
+01:14:36.000 --> 01:14:37.000
+This is cue #4476
+
+4477
+01:14:37.000 --> 01:14:38.000
+This is cue #4477
+
+4478
+01:14:38.000 --> 01:14:39.000
+This is cue #4478
+
+4479
+01:14:39.000 --> 01:14:40.000
+This is cue #4479
+
+4480
+01:14:40.000 --> 01:14:41.000
+This is cue #4480
+
+4481
+01:14:41.000 --> 01:14:42.000
+This is cue #4481
+
+4482
+01:14:42.000 --> 01:14:43.000
+This is cue #4482
+
+4483
+01:14:43.000 --> 01:14:44.000
+This is cue #4483
+
+4484
+01:14:44.000 --> 01:14:45.000
+This is cue #4484
+
+4485
+01:14:45.000 --> 01:14:46.000
+This is cue #4485
+
+4486
+01:14:46.000 --> 01:14:47.000
+This is cue #4486
+
+4487
+01:14:47.000 --> 01:14:48.000
+This is cue #4487
+
+4488
+01:14:48.000 --> 01:14:49.000
+This is cue #4488
+
+4489
+01:14:49.000 --> 01:14:50.000
+This is cue #4489
+
+4490
+01:14:50.000 --> 01:14:51.000
+This is cue #4490
+
+4491
+01:14:51.000 --> 01:14:52.000
+This is cue #4491
+
+4492
+01:14:52.000 --> 01:14:53.000
+This is cue #4492
+
+4493
+01:14:53.000 --> 01:14:54.000
+This is cue #4493
+
+4494
+01:14:54.000 --> 01:14:55.000
+This is cue #4494
+
+4495
+01:14:55.000 --> 01:14:56.000
+This is cue #4495
+
+4496
+01:14:56.000 --> 01:14:57.000
+This is cue #4496
+
+4497
+01:14:57.000 --> 01:14:58.000
+This is cue #4497
+
+4498
+01:14:58.000 --> 01:14:59.000
+This is cue #4498
+
+4499
+01:14:59.000 --> 01:15:00.000
+This is cue #4499
+
+4500
+01:15:00.000 --> 01:15:01.000
+This is cue #4500
+
+4501
+01:15:01.000 --> 01:15:02.000
+This is cue #4501
+
+4502
+01:15:02.000 --> 01:15:03.000
+This is cue #4502
+
+4503
+01:15:03.000 --> 01:15:04.000
+This is cue #4503
+
+4504
+01:15:04.000 --> 01:15:05.000
+This is cue #4504
+
+4505
+01:15:05.000 --> 01:15:06.000
+This is cue #4505
+
+4506
+01:15:06.000 --> 01:15:07.000
+This is cue #4506
+
+4507
+01:15:07.000 --> 01:15:08.000
+This is cue #4507
+
+4508
+01:15:08.000 --> 01:15:09.000
+This is cue #4508
+
+4509
+01:15:09.000 --> 01:15:10.000
+This is cue #4509
+
+4510
+01:15:10.000 --> 01:15:11.000
+This is cue #4510
+
+4511
+01:15:11.000 --> 01:15:12.000
+This is cue #4511
+
+4512
+01:15:12.000 --> 01:15:13.000
+This is cue #4512
+
+4513
+01:15:13.000 --> 01:15:14.000
+This is cue #4513
+
+4514
+01:15:14.000 --> 01:15:15.000
+This is cue #4514
+
+4515
+01:15:15.000 --> 01:15:16.000
+This is cue #4515
+
+4516
+01:15:16.000 --> 01:15:17.000
+This is cue #4516
+
+4517
+01:15:17.000 --> 01:15:18.000
+This is cue #4517
+
+4518
+01:15:18.000 --> 01:15:19.000
+This is cue #4518
+
+4519
+01:15:19.000 --> 01:15:20.000
+This is cue #4519
+
+4520
+01:15:20.000 --> 01:15:21.000
+This is cue #4520
+
+4521
+01:15:21.000 --> 01:15:22.000
+This is cue #4521
+
+4522
+01:15:22.000 --> 01:15:23.000
+This is cue #4522
+
+4523
+01:15:23.000 --> 01:15:24.000
+This is cue #4523
+
+4524
+01:15:24.000 --> 01:15:25.000
+This is cue #4524
+
+4525
+01:15:25.000 --> 01:15:26.000
+This is cue #4525
+
+4526
+01:15:26.000 --> 01:15:27.000
+This is cue #4526
+
+4527
+01:15:27.000 --> 01:15:28.000
+This is cue #4527
+
+4528
+01:15:28.000 --> 01:15:29.000
+This is cue #4528
+
+4529
+01:15:29.000 --> 01:15:30.000
+This is cue #4529
+
+4530
+01:15:30.000 --> 01:15:31.000
+This is cue #4530
+
+4531
+01:15:31.000 --> 01:15:32.000
+This is cue #4531
+
+4532
+01:15:32.000 --> 01:15:33.000
+This is cue #4532
+
+4533
+01:15:33.000 --> 01:15:34.000
+This is cue #4533
+
+4534
+01:15:34.000 --> 01:15:35.000
+This is cue #4534
+
+4535
+01:15:35.000 --> 01:15:36.000
+This is cue #4535
+
+4536
+01:15:36.000 --> 01:15:37.000
+This is cue #4536
+
+4537
+01:15:37.000 --> 01:15:38.000
+This is cue #4537
+
+4538
+01:15:38.000 --> 01:15:39.000
+This is cue #4538
+
+4539
+01:15:39.000 --> 01:15:40.000
+This is cue #4539
+
+4540
+01:15:40.000 --> 01:15:41.000
+This is cue #4540
+
+4541
+01:15:41.000 --> 01:15:42.000
+This is cue #4541
+
+4542
+01:15:42.000 --> 01:15:43.000
+This is cue #4542
+
+4543
+01:15:43.000 --> 01:15:44.000
+This is cue #4543
+
+4544
+01:15:44.000 --> 01:15:45.000
+This is cue #4544
+
+4545
+01:15:45.000 --> 01:15:46.000
+This is cue #4545
+
+4546
+01:15:46.000 --> 01:15:47.000
+This is cue #4546
+
+4547
+01:15:47.000 --> 01:15:48.000
+This is cue #4547
+
+4548
+01:15:48.000 --> 01:15:49.000
+This is cue #4548
+
+4549
+01:15:49.000 --> 01:15:50.000
+This is cue #4549
+
+4550
+01:15:50.000 --> 01:15:51.000
+This is cue #4550
+
+4551
+01:15:51.000 --> 01:15:52.000
+This is cue #4551
+
+4552
+01:15:52.000 --> 01:15:53.000
+This is cue #4552
+
+4553
+01:15:53.000 --> 01:15:54.000
+This is cue #4553
+
+4554
+01:15:54.000 --> 01:15:55.000
+This is cue #4554
+
+4555
+01:15:55.000 --> 01:15:56.000
+This is cue #4555
+
+4556
+01:15:56.000 --> 01:15:57.000
+This is cue #4556
+
+4557
+01:15:57.000 --> 01:15:58.000
+This is cue #4557
+
+4558
+01:15:58.000 --> 01:15:59.000
+This is cue #4558
+
+4559
+01:15:59.000 --> 01:16:00.000
+This is cue #4559
+
+4560
+01:16:00.000 --> 01:16:01.000
+This is cue #4560
+
+4561
+01:16:01.000 --> 01:16:02.000
+This is cue #4561
+
+4562
+01:16:02.000 --> 01:16:03.000
+This is cue #4562
+
+4563
+01:16:03.000 --> 01:16:04.000
+This is cue #4563
+
+4564
+01:16:04.000 --> 01:16:05.000
+This is cue #4564
+
+4565
+01:16:05.000 --> 01:16:06.000
+This is cue #4565
+
+4566
+01:16:06.000 --> 01:16:07.000
+This is cue #4566
+
+4567
+01:16:07.000 --> 01:16:08.000
+This is cue #4567
+
+4568
+01:16:08.000 --> 01:16:09.000
+This is cue #4568
+
+4569
+01:16:09.000 --> 01:16:10.000
+This is cue #4569
+
+4570
+01:16:10.000 --> 01:16:11.000
+This is cue #4570
+
+4571
+01:16:11.000 --> 01:16:12.000
+This is cue #4571
+
+4572
+01:16:12.000 --> 01:16:13.000
+This is cue #4572
+
+4573
+01:16:13.000 --> 01:16:14.000
+This is cue #4573
+
+4574
+01:16:14.000 --> 01:16:15.000
+This is cue #4574
+
+4575
+01:16:15.000 --> 01:16:16.000
+This is cue #4575
+
+4576
+01:16:16.000 --> 01:16:17.000
+This is cue #4576
+
+4577
+01:16:17.000 --> 01:16:18.000
+This is cue #4577
+
+4578
+01:16:18.000 --> 01:16:19.000
+This is cue #4578
+
+4579
+01:16:19.000 --> 01:16:20.000
+This is cue #4579
+
+4580
+01:16:20.000 --> 01:16:21.000
+This is cue #4580
+
+4581
+01:16:21.000 --> 01:16:22.000
+This is cue #4581
+
+4582
+01:16:22.000 --> 01:16:23.000
+This is cue #4582
+
+4583
+01:16:23.000 --> 01:16:24.000
+This is cue #4583
+
+4584
+01:16:24.000 --> 01:16:25.000
+This is cue #4584
+
+4585
+01:16:25.000 --> 01:16:26.000
+This is cue #4585
+
+4586
+01:16:26.000 --> 01:16:27.000
+This is cue #4586
+
+4587
+01:16:27.000 --> 01:16:28.000
+This is cue #4587
+
+4588
+01:16:28.000 --> 01:16:29.000
+This is cue #4588
+
+4589
+01:16:29.000 --> 01:16:30.000
+This is cue #4589
+
+4590
+01:16:30.000 --> 01:16:31.000
+This is cue #4590
+
+4591
+01:16:31.000 --> 01:16:32.000
+This is cue #4591
+
+4592
+01:16:32.000 --> 01:16:33.000
+This is cue #4592
+
+4593
+01:16:33.000 --> 01:16:34.000
+This is cue #4593
+
+4594
+01:16:34.000 --> 01:16:35.000
+This is cue #4594
+
+4595
+01:16:35.000 --> 01:16:36.000
+This is cue #4595
+
+4596
+01:16:36.000 --> 01:16:37.000
+This is cue #4596
+
+4597
+01:16:37.000 --> 01:16:38.000
+This is cue #4597
+
+4598
+01:16:38.000 --> 01:16:39.000
+This is cue #4598
+
+4599
+01:16:39.000 --> 01:16:40.000
+This is cue #4599
+
+4600
+01:16:40.000 --> 01:16:41.000
+This is cue #4600
+
+4601
+01:16:41.000 --> 01:16:42.000
+This is cue #4601
+
+4602
+01:16:42.000 --> 01:16:43.000
+This is cue #4602
+
+4603
+01:16:43.000 --> 01:16:44.000
+This is cue #4603
+
+4604
+01:16:44.000 --> 01:16:45.000
+This is cue #4604
+
+4605
+01:16:45.000 --> 01:16:46.000
+This is cue #4605
+
+4606
+01:16:46.000 --> 01:16:47.000
+This is cue #4606
+
+4607
+01:16:47.000 --> 01:16:48.000
+This is cue #4607
+
+4608
+01:16:48.000 --> 01:16:49.000
+This is cue #4608
+
+4609
+01:16:49.000 --> 01:16:50.000
+This is cue #4609
+
+4610
+01:16:50.000 --> 01:16:51.000
+This is cue #4610
+
+4611
+01:16:51.000 --> 01:16:52.000
+This is cue #4611
+
+4612
+01:16:52.000 --> 01:16:53.000
+This is cue #4612
+
+4613
+01:16:53.000 --> 01:16:54.000
+This is cue #4613
+
+4614
+01:16:54.000 --> 01:16:55.000
+This is cue #4614
+
+4615
+01:16:55.000 --> 01:16:56.000
+This is cue #4615
+
+4616
+01:16:56.000 --> 01:16:57.000
+This is cue #4616
+
+4617
+01:16:57.000 --> 01:16:58.000
+This is cue #4617
+
+4618
+01:16:58.000 --> 01:16:59.000
+This is cue #4618
+
+4619
+01:16:59.000 --> 01:17:00.000
+This is cue #4619
+
+4620
+01:17:00.000 --> 01:17:01.000
+This is cue #4620
+
+4621
+01:17:01.000 --> 01:17:02.000
+This is cue #4621
+
+4622
+01:17:02.000 --> 01:17:03.000
+This is cue #4622
+
+4623
+01:17:03.000 --> 01:17:04.000
+This is cue #4623
+
+4624
+01:17:04.000 --> 01:17:05.000
+This is cue #4624
+
+4625
+01:17:05.000 --> 01:17:06.000
+This is cue #4625
+
+4626
+01:17:06.000 --> 01:17:07.000
+This is cue #4626
+
+4627
+01:17:07.000 --> 01:17:08.000
+This is cue #4627
+
+4628
+01:17:08.000 --> 01:17:09.000
+This is cue #4628
+
+4629
+01:17:09.000 --> 01:17:10.000
+This is cue #4629
+
+4630
+01:17:10.000 --> 01:17:11.000
+This is cue #4630
+
+4631
+01:17:11.000 --> 01:17:12.000
+This is cue #4631
+
+4632
+01:17:12.000 --> 01:17:13.000
+This is cue #4632
+
+4633
+01:17:13.000 --> 01:17:14.000
+This is cue #4633
+
+4634
+01:17:14.000 --> 01:17:15.000
+This is cue #4634
+
+4635
+01:17:15.000 --> 01:17:16.000
+This is cue #4635
+
+4636
+01:17:16.000 --> 01:17:17.000
+This is cue #4636
+
+4637
+01:17:17.000 --> 01:17:18.000
+This is cue #4637
+
+4638
+01:17:18.000 --> 01:17:19.000
+This is cue #4638
+
+4639
+01:17:19.000 --> 01:17:20.000
+This is cue #4639
+
+4640
+01:17:20.000 --> 01:17:21.000
+This is cue #4640
+
+4641
+01:17:21.000 --> 01:17:22.000
+This is cue #4641
+
+4642
+01:17:22.000 --> 01:17:23.000
+This is cue #4642
+
+4643
+01:17:23.000 --> 01:17:24.000
+This is cue #4643
+
+4644
+01:17:24.000 --> 01:17:25.000
+This is cue #4644
+
+4645
+01:17:25.000 --> 01:17:26.000
+This is cue #4645
+
+4646
+01:17:26.000 --> 01:17:27.000
+This is cue #4646
+
+4647
+01:17:27.000 --> 01:17:28.000
+This is cue #4647
+
+4648
+01:17:28.000 --> 01:17:29.000
+This is cue #4648
+
+4649
+01:17:29.000 --> 01:17:30.000
+This is cue #4649
+
+4650
+01:17:30.000 --> 01:17:31.000
+This is cue #4650
+
+4651
+01:17:31.000 --> 01:17:32.000
+This is cue #4651
+
+4652
+01:17:32.000 --> 01:17:33.000
+This is cue #4652
+
+4653
+01:17:33.000 --> 01:17:34.000
+This is cue #4653
+
+4654
+01:17:34.000 --> 01:17:35.000
+This is cue #4654
+
+4655
+01:17:35.000 --> 01:17:36.000
+This is cue #4655
+
+4656
+01:17:36.000 --> 01:17:37.000
+This is cue #4656
+
+4657
+01:17:37.000 --> 01:17:38.000
+This is cue #4657
+
+4658
+01:17:38.000 --> 01:17:39.000
+This is cue #4658
+
+4659
+01:17:39.000 --> 01:17:40.000
+This is cue #4659
+
+4660
+01:17:40.000 --> 01:17:41.000
+This is cue #4660
+
+4661
+01:17:41.000 --> 01:17:42.000
+This is cue #4661
+
+4662
+01:17:42.000 --> 01:17:43.000
+This is cue #4662
+
+4663
+01:17:43.000 --> 01:17:44.000
+This is cue #4663
+
+4664
+01:17:44.000 --> 01:17:45.000
+This is cue #4664
+
+4665
+01:17:45.000 --> 01:17:46.000
+This is cue #4665
+
+4666
+01:17:46.000 --> 01:17:47.000
+This is cue #4666
+
+4667
+01:17:47.000 --> 01:17:48.000
+This is cue #4667
+
+4668
+01:17:48.000 --> 01:17:49.000
+This is cue #4668
+
+4669
+01:17:49.000 --> 01:17:50.000
+This is cue #4669
+
+4670
+01:17:50.000 --> 01:17:51.000
+This is cue #4670
+
+4671
+01:17:51.000 --> 01:17:52.000
+This is cue #4671
+
+4672
+01:17:52.000 --> 01:17:53.000
+This is cue #4672
+
+4673
+01:17:53.000 --> 01:17:54.000
+This is cue #4673
+
+4674
+01:17:54.000 --> 01:17:55.000
+This is cue #4674
+
+4675
+01:17:55.000 --> 01:17:56.000
+This is cue #4675
+
+4676
+01:17:56.000 --> 01:17:57.000
+This is cue #4676
+
+4677
+01:17:57.000 --> 01:17:58.000
+This is cue #4677
+
+4678
+01:17:58.000 --> 01:17:59.000
+This is cue #4678
+
+4679
+01:17:59.000 --> 01:18:00.000
+This is cue #4679
+
+4680
+01:18:00.000 --> 01:18:01.000
+This is cue #4680
+
+4681
+01:18:01.000 --> 01:18:02.000
+This is cue #4681
+
+4682
+01:18:02.000 --> 01:18:03.000
+This is cue #4682
+
+4683
+01:18:03.000 --> 01:18:04.000
+This is cue #4683
+
+4684
+01:18:04.000 --> 01:18:05.000
+This is cue #4684
+
+4685
+01:18:05.000 --> 01:18:06.000
+This is cue #4685
+
+4686
+01:18:06.000 --> 01:18:07.000
+This is cue #4686
+
+4687
+01:18:07.000 --> 01:18:08.000
+This is cue #4687
+
+4688
+01:18:08.000 --> 01:18:09.000
+This is cue #4688
+
+4689
+01:18:09.000 --> 01:18:10.000
+This is cue #4689
+
+4690
+01:18:10.000 --> 01:18:11.000
+This is cue #4690
+
+4691
+01:18:11.000 --> 01:18:12.000
+This is cue #4691
+
+4692
+01:18:12.000 --> 01:18:13.000
+This is cue #4692
+
+4693
+01:18:13.000 --> 01:18:14.000
+This is cue #4693
+
+4694
+01:18:14.000 --> 01:18:15.000
+This is cue #4694
+
+4695
+01:18:15.000 --> 01:18:16.000
+This is cue #4695
+
+4696
+01:18:16.000 --> 01:18:17.000
+This is cue #4696
+
+4697
+01:18:17.000 --> 01:18:18.000
+This is cue #4697
+
+4698
+01:18:18.000 --> 01:18:19.000
+This is cue #4698
+
+4699
+01:18:19.000 --> 01:18:20.000
+This is cue #4699
+
+4700
+01:18:20.000 --> 01:18:21.000
+This is cue #4700
+
+4701
+01:18:21.000 --> 01:18:22.000
+This is cue #4701
+
+4702
+01:18:22.000 --> 01:18:23.000
+This is cue #4702
+
+4703
+01:18:23.000 --> 01:18:24.000
+This is cue #4703
+
+4704
+01:18:24.000 --> 01:18:25.000
+This is cue #4704
+
+4705
+01:18:25.000 --> 01:18:26.000
+This is cue #4705
+
+4706
+01:18:26.000 --> 01:18:27.000
+This is cue #4706
+
+4707
+01:18:27.000 --> 01:18:28.000
+This is cue #4707
+
+4708
+01:18:28.000 --> 01:18:29.000
+This is cue #4708
+
+4709
+01:18:29.000 --> 01:18:30.000
+This is cue #4709
+
+4710
+01:18:30.000 --> 01:18:31.000
+This is cue #4710
+
+4711
+01:18:31.000 --> 01:18:32.000
+This is cue #4711
+
+4712
+01:18:32.000 --> 01:18:33.000
+This is cue #4712
+
+4713
+01:18:33.000 --> 01:18:34.000
+This is cue #4713
+
+4714
+01:18:34.000 --> 01:18:35.000
+This is cue #4714
+
+4715
+01:18:35.000 --> 01:18:36.000
+This is cue #4715
+
+4716
+01:18:36.000 --> 01:18:37.000
+This is cue #4716
+
+4717
+01:18:37.000 --> 01:18:38.000
+This is cue #4717
+
+4718
+01:18:38.000 --> 01:18:39.000
+This is cue #4718
+
+4719
+01:18:39.000 --> 01:18:40.000
+This is cue #4719
+
+4720
+01:18:40.000 --> 01:18:41.000
+This is cue #4720
+
+4721
+01:18:41.000 --> 01:18:42.000
+This is cue #4721
+
+4722
+01:18:42.000 --> 01:18:43.000
+This is cue #4722
+
+4723
+01:18:43.000 --> 01:18:44.000
+This is cue #4723
+
+4724
+01:18:44.000 --> 01:18:45.000
+This is cue #4724
+
+4725
+01:18:45.000 --> 01:18:46.000
+This is cue #4725
+
+4726
+01:18:46.000 --> 01:18:47.000
+This is cue #4726
+
+4727
+01:18:47.000 --> 01:18:48.000
+This is cue #4727
+
+4728
+01:18:48.000 --> 01:18:49.000
+This is cue #4728
+
+4729
+01:18:49.000 --> 01:18:50.000
+This is cue #4729
+
+4730
+01:18:50.000 --> 01:18:51.000
+This is cue #4730
+
+4731
+01:18:51.000 --> 01:18:52.000
+This is cue #4731
+
+4732
+01:18:52.000 --> 01:18:53.000
+This is cue #4732
+
+4733
+01:18:53.000 --> 01:18:54.000
+This is cue #4733
+
+4734
+01:18:54.000 --> 01:18:55.000
+This is cue #4734
+
+4735
+01:18:55.000 --> 01:18:56.000
+This is cue #4735
+
+4736
+01:18:56.000 --> 01:18:57.000
+This is cue #4736
+
+4737
+01:18:57.000 --> 01:18:58.000
+This is cue #4737
+
+4738
+01:18:58.000 --> 01:18:59.000
+This is cue #4738
+
+4739
+01:18:59.000 --> 01:19:00.000
+This is cue #4739
+
+4740
+01:19:00.000 --> 01:19:01.000
+This is cue #4740
+
+4741
+01:19:01.000 --> 01:19:02.000
+This is cue #4741
+
+4742
+01:19:02.000 --> 01:19:03.000
+This is cue #4742
+
+4743
+01:19:03.000 --> 01:19:04.000
+This is cue #4743
+
+4744
+01:19:04.000 --> 01:19:05.000
+This is cue #4744
+
+4745
+01:19:05.000 --> 01:19:06.000
+This is cue #4745
+
+4746
+01:19:06.000 --> 01:19:07.000
+This is cue #4746
+
+4747
+01:19:07.000 --> 01:19:08.000
+This is cue #4747
+
+4748
+01:19:08.000 --> 01:19:09.000
+This is cue #4748
+
+4749
+01:19:09.000 --> 01:19:10.000
+This is cue #4749
+
+4750
+01:19:10.000 --> 01:19:11.000
+This is cue #4750
+
+4751
+01:19:11.000 --> 01:19:12.000
+This is cue #4751
+
+4752
+01:19:12.000 --> 01:19:13.000
+This is cue #4752
+
+4753
+01:19:13.000 --> 01:19:14.000
+This is cue #4753
+
+4754
+01:19:14.000 --> 01:19:15.000
+This is cue #4754
+
+4755
+01:19:15.000 --> 01:19:16.000
+This is cue #4755
+
+4756
+01:19:16.000 --> 01:19:17.000
+This is cue #4756
+
+4757
+01:19:17.000 --> 01:19:18.000
+This is cue #4757
+
+4758
+01:19:18.000 --> 01:19:19.000
+This is cue #4758
+
+4759
+01:19:19.000 --> 01:19:20.000
+This is cue #4759
+
+4760
+01:19:20.000 --> 01:19:21.000
+This is cue #4760
+
+4761
+01:19:21.000 --> 01:19:22.000
+This is cue #4761
+
+4762
+01:19:22.000 --> 01:19:23.000
+This is cue #4762
+
+4763
+01:19:23.000 --> 01:19:24.000
+This is cue #4763
+
+4764
+01:19:24.000 --> 01:19:25.000
+This is cue #4764
+
+4765
+01:19:25.000 --> 01:19:26.000
+This is cue #4765
+
+4766
+01:19:26.000 --> 01:19:27.000
+This is cue #4766
+
+4767
+01:19:27.000 --> 01:19:28.000
+This is cue #4767
+
+4768
+01:19:28.000 --> 01:19:29.000
+This is cue #4768
+
+4769
+01:19:29.000 --> 01:19:30.000
+This is cue #4769
+
+4770
+01:19:30.000 --> 01:19:31.000
+This is cue #4770
+
+4771
+01:19:31.000 --> 01:19:32.000
+This is cue #4771
+
+4772
+01:19:32.000 --> 01:19:33.000
+This is cue #4772
+
+4773
+01:19:33.000 --> 01:19:34.000
+This is cue #4773
+
+4774
+01:19:34.000 --> 01:19:35.000
+This is cue #4774
+
+4775
+01:19:35.000 --> 01:19:36.000
+This is cue #4775
+
+4776
+01:19:36.000 --> 01:19:37.000
+This is cue #4776
+
+4777
+01:19:37.000 --> 01:19:38.000
+This is cue #4777
+
+4778
+01:19:38.000 --> 01:19:39.000
+This is cue #4778
+
+4779
+01:19:39.000 --> 01:19:40.000
+This is cue #4779
+
+4780
+01:19:40.000 --> 01:19:41.000
+This is cue #4780
+
+4781
+01:19:41.000 --> 01:19:42.000
+This is cue #4781
+
+4782
+01:19:42.000 --> 01:19:43.000
+This is cue #4782
+
+4783
+01:19:43.000 --> 01:19:44.000
+This is cue #4783
+
+4784
+01:19:44.000 --> 01:19:45.000
+This is cue #4784
+
+4785
+01:19:45.000 --> 01:19:46.000
+This is cue #4785
+
+4786
+01:19:46.000 --> 01:19:47.000
+This is cue #4786
+
+4787
+01:19:47.000 --> 01:19:48.000
+This is cue #4787
+
+4788
+01:19:48.000 --> 01:19:49.000
+This is cue #4788
+
+4789
+01:19:49.000 --> 01:19:50.000
+This is cue #4789
+
+4790
+01:19:50.000 --> 01:19:51.000
+This is cue #4790
+
+4791
+01:19:51.000 --> 01:19:52.000
+This is cue #4791
+
+4792
+01:19:52.000 --> 01:19:53.000
+This is cue #4792
+
+4793
+01:19:53.000 --> 01:19:54.000
+This is cue #4793
+
+4794
+01:19:54.000 --> 01:19:55.000
+This is cue #4794
+
+4795
+01:19:55.000 --> 01:19:56.000
+This is cue #4795
+
+4796
+01:19:56.000 --> 01:19:57.000
+This is cue #4796
+
+4797
+01:19:57.000 --> 01:19:58.000
+This is cue #4797
+
+4798
+01:19:58.000 --> 01:19:59.000
+This is cue #4798
+
+4799
+01:19:59.000 --> 01:20:00.000
+This is cue #4799
+
+4800
+01:20:00.000 --> 01:20:01.000
+This is cue #4800
+
+4801
+01:20:01.000 --> 01:20:02.000
+This is cue #4801
+
+4802
+01:20:02.000 --> 01:20:03.000
+This is cue #4802
+
+4803
+01:20:03.000 --> 01:20:04.000
+This is cue #4803
+
+4804
+01:20:04.000 --> 01:20:05.000
+This is cue #4804
+
+4805
+01:20:05.000 --> 01:20:06.000
+This is cue #4805
+
+4806
+01:20:06.000 --> 01:20:07.000
+This is cue #4806
+
+4807
+01:20:07.000 --> 01:20:08.000
+This is cue #4807
+
+4808
+01:20:08.000 --> 01:20:09.000
+This is cue #4808
+
+4809
+01:20:09.000 --> 01:20:10.000
+This is cue #4809
+
+4810
+01:20:10.000 --> 01:20:11.000
+This is cue #4810
+
+4811
+01:20:11.000 --> 01:20:12.000
+This is cue #4811
+
+4812
+01:20:12.000 --> 01:20:13.000
+This is cue #4812
+
+4813
+01:20:13.000 --> 01:20:14.000
+This is cue #4813
+
+4814
+01:20:14.000 --> 01:20:15.000
+This is cue #4814
+
+4815
+01:20:15.000 --> 01:20:16.000
+This is cue #4815
+
+4816
+01:20:16.000 --> 01:20:17.000
+This is cue #4816
+
+4817
+01:20:17.000 --> 01:20:18.000
+This is cue #4817
+
+4818
+01:20:18.000 --> 01:20:19.000
+This is cue #4818
+
+4819
+01:20:19.000 --> 01:20:20.000
+This is cue #4819
+
+4820
+01:20:20.000 --> 01:20:21.000
+This is cue #4820
+
+4821
+01:20:21.000 --> 01:20:22.000
+This is cue #4821
+
+4822
+01:20:22.000 --> 01:20:23.000
+This is cue #4822
+
+4823
+01:20:23.000 --> 01:20:24.000
+This is cue #4823
+
+4824
+01:20:24.000 --> 01:20:25.000
+This is cue #4824
+
+4825
+01:20:25.000 --> 01:20:26.000
+This is cue #4825
+
+4826
+01:20:26.000 --> 01:20:27.000
+This is cue #4826
+
+4827
+01:20:27.000 --> 01:20:28.000
+This is cue #4827
+
+4828
+01:20:28.000 --> 01:20:29.000
+This is cue #4828
+
+4829
+01:20:29.000 --> 01:20:30.000
+This is cue #4829
+
+4830
+01:20:30.000 --> 01:20:31.000
+This is cue #4830
+
+4831
+01:20:31.000 --> 01:20:32.000
+This is cue #4831
+
+4832
+01:20:32.000 --> 01:20:33.000
+This is cue #4832
+
+4833
+01:20:33.000 --> 01:20:34.000
+This is cue #4833
+
+4834
+01:20:34.000 --> 01:20:35.000
+This is cue #4834
+
+4835
+01:20:35.000 --> 01:20:36.000
+This is cue #4835
+
+4836
+01:20:36.000 --> 01:20:37.000
+This is cue #4836
+
+4837
+01:20:37.000 --> 01:20:38.000
+This is cue #4837
+
+4838
+01:20:38.000 --> 01:20:39.000
+This is cue #4838
+
+4839
+01:20:39.000 --> 01:20:40.000
+This is cue #4839
+
+4840
+01:20:40.000 --> 01:20:41.000
+This is cue #4840
+
+4841
+01:20:41.000 --> 01:20:42.000
+This is cue #4841
+
+4842
+01:20:42.000 --> 01:20:43.000
+This is cue #4842
+
+4843
+01:20:43.000 --> 01:20:44.000
+This is cue #4843
+
+4844
+01:20:44.000 --> 01:20:45.000
+This is cue #4844
+
+4845
+01:20:45.000 --> 01:20:46.000
+This is cue #4845
+
+4846
+01:20:46.000 --> 01:20:47.000
+This is cue #4846
+
+4847
+01:20:47.000 --> 01:20:48.000
+This is cue #4847
+
+4848
+01:20:48.000 --> 01:20:49.000
+This is cue #4848
+
+4849
+01:20:49.000 --> 01:20:50.000
+This is cue #4849
+
+4850
+01:20:50.000 --> 01:20:51.000
+This is cue #4850
+
+4851
+01:20:51.000 --> 01:20:52.000
+This is cue #4851
+
+4852
+01:20:52.000 --> 01:20:53.000
+This is cue #4852
+
+4853
+01:20:53.000 --> 01:20:54.000
+This is cue #4853
+
+4854
+01:20:54.000 --> 01:20:55.000
+This is cue #4854
+
+4855
+01:20:55.000 --> 01:20:56.000
+This is cue #4855
+
+4856
+01:20:56.000 --> 01:20:57.000
+This is cue #4856
+
+4857
+01:20:57.000 --> 01:20:58.000
+This is cue #4857
+
+4858
+01:20:58.000 --> 01:20:59.000
+This is cue #4858
+
+4859
+01:20:59.000 --> 01:21:00.000
+This is cue #4859
+
+4860
+01:21:00.000 --> 01:21:01.000
+This is cue #4860
+
+4861
+01:21:01.000 --> 01:21:02.000
+This is cue #4861
+
+4862
+01:21:02.000 --> 01:21:03.000
+This is cue #4862
+
+4863
+01:21:03.000 --> 01:21:04.000
+This is cue #4863
+
+4864
+01:21:04.000 --> 01:21:05.000
+This is cue #4864
+
+4865
+01:21:05.000 --> 01:21:06.000
+This is cue #4865
+
+4866
+01:21:06.000 --> 01:21:07.000
+This is cue #4866
+
+4867
+01:21:07.000 --> 01:21:08.000
+This is cue #4867
+
+4868
+01:21:08.000 --> 01:21:09.000
+This is cue #4868
+
+4869
+01:21:09.000 --> 01:21:10.000
+This is cue #4869
+
+4870
+01:21:10.000 --> 01:21:11.000
+This is cue #4870
+
+4871
+01:21:11.000 --> 01:21:12.000
+This is cue #4871
+
+4872
+01:21:12.000 --> 01:21:13.000
+This is cue #4872
+
+4873
+01:21:13.000 --> 01:21:14.000
+This is cue #4873
+
+4874
+01:21:14.000 --> 01:21:15.000
+This is cue #4874
+
+4875
+01:21:15.000 --> 01:21:16.000
+This is cue #4875
+
+4876
+01:21:16.000 --> 01:21:17.000
+This is cue #4876
+
+4877
+01:21:17.000 --> 01:21:18.000
+This is cue #4877
+
+4878
+01:21:18.000 --> 01:21:19.000
+This is cue #4878
+
+4879
+01:21:19.000 --> 01:21:20.000
+This is cue #4879
+
+4880
+01:21:20.000 --> 01:21:21.000
+This is cue #4880
+
+4881
+01:21:21.000 --> 01:21:22.000
+This is cue #4881
+
+4882
+01:21:22.000 --> 01:21:23.000
+This is cue #4882
+
+4883
+01:21:23.000 --> 01:21:24.000
+This is cue #4883
+
+4884
+01:21:24.000 --> 01:21:25.000
+This is cue #4884
+
+4885
+01:21:25.000 --> 01:21:26.000
+This is cue #4885
+
+4886
+01:21:26.000 --> 01:21:27.000
+This is cue #4886
+
+4887
+01:21:27.000 --> 01:21:28.000
+This is cue #4887
+
+4888
+01:21:28.000 --> 01:21:29.000
+This is cue #4888
+
+4889
+01:21:29.000 --> 01:21:30.000
+This is cue #4889
+
+4890
+01:21:30.000 --> 01:21:31.000
+This is cue #4890
+
+4891
+01:21:31.000 --> 01:21:32.000
+This is cue #4891
+
+4892
+01:21:32.000 --> 01:21:33.000
+This is cue #4892
+
+4893
+01:21:33.000 --> 01:21:34.000
+This is cue #4893
+
+4894
+01:21:34.000 --> 01:21:35.000
+This is cue #4894
+
+4895
+01:21:35.000 --> 01:21:36.000
+This is cue #4895
+
+4896
+01:21:36.000 --> 01:21:37.000
+This is cue #4896
+
+4897
+01:21:37.000 --> 01:21:38.000
+This is cue #4897
+
+4898
+01:21:38.000 --> 01:21:39.000
+This is cue #4898
+
+4899
+01:21:39.000 --> 01:21:40.000
+This is cue #4899
+
+4900
+01:21:40.000 --> 01:21:41.000
+This is cue #4900
+
+4901
+01:21:41.000 --> 01:21:42.000
+This is cue #4901
+
+4902
+01:21:42.000 --> 01:21:43.000
+This is cue #4902
+
+4903
+01:21:43.000 --> 01:21:44.000
+This is cue #4903
+
+4904
+01:21:44.000 --> 01:21:45.000
+This is cue #4904
+
+4905
+01:21:45.000 --> 01:21:46.000
+This is cue #4905
+
+4906
+01:21:46.000 --> 01:21:47.000
+This is cue #4906
+
+4907
+01:21:47.000 --> 01:21:48.000
+This is cue #4907
+
+4908
+01:21:48.000 --> 01:21:49.000
+This is cue #4908
+
+4909
+01:21:49.000 --> 01:21:50.000
+This is cue #4909
+
+4910
+01:21:50.000 --> 01:21:51.000
+This is cue #4910
+
+4911
+01:21:51.000 --> 01:21:52.000
+This is cue #4911
+
+4912
+01:21:52.000 --> 01:21:53.000
+This is cue #4912
+
+4913
+01:21:53.000 --> 01:21:54.000
+This is cue #4913
+
+4914
+01:21:54.000 --> 01:21:55.000
+This is cue #4914
+
+4915
+01:21:55.000 --> 01:21:56.000
+This is cue #4915
+
+4916
+01:21:56.000 --> 01:21:57.000
+This is cue #4916
+
+4917
+01:21:57.000 --> 01:21:58.000
+This is cue #4917
+
+4918
+01:21:58.000 --> 01:21:59.000
+This is cue #4918
+
+4919
+01:21:59.000 --> 01:22:00.000
+This is cue #4919
+
+4920
+01:22:00.000 --> 01:22:01.000
+This is cue #4920
+
+4921
+01:22:01.000 --> 01:22:02.000
+This is cue #4921
+
+4922
+01:22:02.000 --> 01:22:03.000
+This is cue #4922
+
+4923
+01:22:03.000 --> 01:22:04.000
+This is cue #4923
+
+4924
+01:22:04.000 --> 01:22:05.000
+This is cue #4924
+
+4925
+01:22:05.000 --> 01:22:06.000
+This is cue #4925
+
+4926
+01:22:06.000 --> 01:22:07.000
+This is cue #4926
+
+4927
+01:22:07.000 --> 01:22:08.000
+This is cue #4927
+
+4928
+01:22:08.000 --> 01:22:09.000
+This is cue #4928
+
+4929
+01:22:09.000 --> 01:22:10.000
+This is cue #4929
+
+4930
+01:22:10.000 --> 01:22:11.000
+This is cue #4930
+
+4931
+01:22:11.000 --> 01:22:12.000
+This is cue #4931
+
+4932
+01:22:12.000 --> 01:22:13.000
+This is cue #4932
+
+4933
+01:22:13.000 --> 01:22:14.000
+This is cue #4933
+
+4934
+01:22:14.000 --> 01:22:15.000
+This is cue #4934
+
+4935
+01:22:15.000 --> 01:22:16.000
+This is cue #4935
+
+4936
+01:22:16.000 --> 01:22:17.000
+This is cue #4936
+
+4937
+01:22:17.000 --> 01:22:18.000
+This is cue #4937
+
+4938
+01:22:18.000 --> 01:22:19.000
+This is cue #4938
+
+4939
+01:22:19.000 --> 01:22:20.000
+This is cue #4939
+
+4940
+01:22:20.000 --> 01:22:21.000
+This is cue #4940
+
+4941
+01:22:21.000 --> 01:22:22.000
+This is cue #4941
+
+4942
+01:22:22.000 --> 01:22:23.000
+This is cue #4942
+
+4943
+01:22:23.000 --> 01:22:24.000
+This is cue #4943
+
+4944
+01:22:24.000 --> 01:22:25.000
+This is cue #4944
+
+4945
+01:22:25.000 --> 01:22:26.000
+This is cue #4945
+
+4946
+01:22:26.000 --> 01:22:27.000
+This is cue #4946
+
+4947
+01:22:27.000 --> 01:22:28.000
+This is cue #4947
+
+4948
+01:22:28.000 --> 01:22:29.000
+This is cue #4948
+
+4949
+01:22:29.000 --> 01:22:30.000
+This is cue #4949
+
+4950
+01:22:30.000 --> 01:22:31.000
+This is cue #4950
+
+4951
+01:22:31.000 --> 01:22:32.000
+This is cue #4951
+
+4952
+01:22:32.000 --> 01:22:33.000
+This is cue #4952
+
+4953
+01:22:33.000 --> 01:22:34.000
+This is cue #4953
+
+4954
+01:22:34.000 --> 01:22:35.000
+This is cue #4954
+
+4955
+01:22:35.000 --> 01:22:36.000
+This is cue #4955
+
+4956
+01:22:36.000 --> 01:22:37.000
+This is cue #4956
+
+4957
+01:22:37.000 --> 01:22:38.000
+This is cue #4957
+
+4958
+01:22:38.000 --> 01:22:39.000
+This is cue #4958
+
+4959
+01:22:39.000 --> 01:22:40.000
+This is cue #4959
+
+4960
+01:22:40.000 --> 01:22:41.000
+This is cue #4960
+
+4961
+01:22:41.000 --> 01:22:42.000
+This is cue #4961
+
+4962
+01:22:42.000 --> 01:22:43.000
+This is cue #4962
+
+4963
+01:22:43.000 --> 01:22:44.000
+This is cue #4963
+
+4964
+01:22:44.000 --> 01:22:45.000
+This is cue #4964
+
+4965
+01:22:45.000 --> 01:22:46.000
+This is cue #4965
+
+4966
+01:22:46.000 --> 01:22:47.000
+This is cue #4966
+
+4967
+01:22:47.000 --> 01:22:48.000
+This is cue #4967
+
+4968
+01:22:48.000 --> 01:22:49.000
+This is cue #4968
+
+4969
+01:22:49.000 --> 01:22:50.000
+This is cue #4969
+
+4970
+01:22:50.000 --> 01:22:51.000
+This is cue #4970
+
+4971
+01:22:51.000 --> 01:22:52.000
+This is cue #4971
+
+4972
+01:22:52.000 --> 01:22:53.000
+This is cue #4972
+
+4973
+01:22:53.000 --> 01:22:54.000
+This is cue #4973
+
+4974
+01:22:54.000 --> 01:22:55.000
+This is cue #4974
+
+4975
+01:22:55.000 --> 01:22:56.000
+This is cue #4975
+
+4976
+01:22:56.000 --> 01:22:57.000
+This is cue #4976
+
+4977
+01:22:57.000 --> 01:22:58.000
+This is cue #4977
+
+4978
+01:22:58.000 --> 01:22:59.000
+This is cue #4978
+
+4979
+01:22:59.000 --> 01:23:00.000
+This is cue #4979
+
+4980
+01:23:00.000 --> 01:23:01.000
+This is cue #4980
+
+4981
+01:23:01.000 --> 01:23:02.000
+This is cue #4981
+
+4982
+01:23:02.000 --> 01:23:03.000
+This is cue #4982
+
+4983
+01:23:03.000 --> 01:23:04.000
+This is cue #4983
+
+4984
+01:23:04.000 --> 01:23:05.000
+This is cue #4984
+
+4985
+01:23:05.000 --> 01:23:06.000
+This is cue #4985
+
+4986
+01:23:06.000 --> 01:23:07.000
+This is cue #4986
+
+4987
+01:23:07.000 --> 01:23:08.000
+This is cue #4987
+
+4988
+01:23:08.000 --> 01:23:09.000
+This is cue #4988
+
+4989
+01:23:09.000 --> 01:23:10.000
+This is cue #4989
+
+4990
+01:23:10.000 --> 01:23:11.000
+This is cue #4990
+
+4991
+01:23:11.000 --> 01:23:12.000
+This is cue #4991
+
+4992
+01:23:12.000 --> 01:23:13.000
+This is cue #4992
+
+4993
+01:23:13.000 --> 01:23:14.000
+This is cue #4993
+
+4994
+01:23:14.000 --> 01:23:15.000
+This is cue #4994
+
+4995
+01:23:15.000 --> 01:23:16.000
+This is cue #4995
+
+4996
+01:23:16.000 --> 01:23:17.000
+This is cue #4996
+
+4997
+01:23:17.000 --> 01:23:18.000
+This is cue #4997
+
+4998
+01:23:18.000 --> 01:23:19.000
+This is cue #4998
+
+4999
+01:23:19.000 --> 01:23:20.000
+This is cue #4999
+
+5000
+01:23:20.000 --> 01:23:21.000
+This is cue #5000
+
+5001
+01:23:21.000 --> 01:23:22.000
+This is cue #5001
+
+5002
+01:23:22.000 --> 01:23:23.000
+This is cue #5002
+
+5003
+01:23:23.000 --> 01:23:24.000
+This is cue #5003
+
+5004
+01:23:24.000 --> 01:23:25.000
+This is cue #5004
+
+5005
+01:23:25.000 --> 01:23:26.000
+This is cue #5005
+
+5006
+01:23:26.000 --> 01:23:27.000
+This is cue #5006
+
+5007
+01:23:27.000 --> 01:23:28.000
+This is cue #5007
+
+5008
+01:23:28.000 --> 01:23:29.000
+This is cue #5008
+
+5009
+01:23:29.000 --> 01:23:30.000
+This is cue #5009
+
+5010
+01:23:30.000 --> 01:23:31.000
+This is cue #5010
+
+5011
+01:23:31.000 --> 01:23:32.000
+This is cue #5011
+
+5012
+01:23:32.000 --> 01:23:33.000
+This is cue #5012
+
+5013
+01:23:33.000 --> 01:23:34.000
+This is cue #5013
+
+5014
+01:23:34.000 --> 01:23:35.000
+This is cue #5014
+
+5015
+01:23:35.000 --> 01:23:36.000
+This is cue #5015
+
+5016
+01:23:36.000 --> 01:23:37.000
+This is cue #5016
+
+5017
+01:23:37.000 --> 01:23:38.000
+This is cue #5017
+
+5018
+01:23:38.000 --> 01:23:39.000
+This is cue #5018
+
+5019
+01:23:39.000 --> 01:23:40.000
+This is cue #5019
+
+5020
+01:23:40.000 --> 01:23:41.000
+This is cue #5020
+
+5021
+01:23:41.000 --> 01:23:42.000
+This is cue #5021
+
+5022
+01:23:42.000 --> 01:23:43.000
+This is cue #5022
+
+5023
+01:23:43.000 --> 01:23:44.000
+This is cue #5023
+
+5024
+01:23:44.000 --> 01:23:45.000
+This is cue #5024
+
+5025
+01:23:45.000 --> 01:23:46.000
+This is cue #5025
+
+5026
+01:23:46.000 --> 01:23:47.000
+This is cue #5026
+
+5027
+01:23:47.000 --> 01:23:48.000
+This is cue #5027
+
+5028
+01:23:48.000 --> 01:23:49.000
+This is cue #5028
+
+5029
+01:23:49.000 --> 01:23:50.000
+This is cue #5029
+
+5030
+01:23:50.000 --> 01:23:51.000
+This is cue #5030
+
+5031
+01:23:51.000 --> 01:23:52.000
+This is cue #5031
+
+5032
+01:23:52.000 --> 01:23:53.000
+This is cue #5032
+
+5033
+01:23:53.000 --> 01:23:54.000
+This is cue #5033
+
+5034
+01:23:54.000 --> 01:23:55.000
+This is cue #5034
+
+5035
+01:23:55.000 --> 01:23:56.000
+This is cue #5035
+
+5036
+01:23:56.000 --> 01:23:57.000
+This is cue #5036
+
+5037
+01:23:57.000 --> 01:23:58.000
+This is cue #5037
+
+5038
+01:23:58.000 --> 01:23:59.000
+This is cue #5038
+
+5039
+01:23:59.000 --> 01:24:00.000
+This is cue #5039
+
+5040
+01:24:00.000 --> 01:24:01.000
+This is cue #5040
+
+5041
+01:24:01.000 --> 01:24:02.000
+This is cue #5041
+
+5042
+01:24:02.000 --> 01:24:03.000
+This is cue #5042
+
+5043
+01:24:03.000 --> 01:24:04.000
+This is cue #5043
+
+5044
+01:24:04.000 --> 01:24:05.000
+This is cue #5044
+
+5045
+01:24:05.000 --> 01:24:06.000
+This is cue #5045
+
+5046
+01:24:06.000 --> 01:24:07.000
+This is cue #5046
+
+5047
+01:24:07.000 --> 01:24:08.000
+This is cue #5047
+
+5048
+01:24:08.000 --> 01:24:09.000
+This is cue #5048
+
+5049
+01:24:09.000 --> 01:24:10.000
+This is cue #5049
+
+5050
+01:24:10.000 --> 01:24:11.000
+This is cue #5050
+
+5051
+01:24:11.000 --> 01:24:12.000
+This is cue #5051
+
+5052
+01:24:12.000 --> 01:24:13.000
+This is cue #5052
+
+5053
+01:24:13.000 --> 01:24:14.000
+This is cue #5053
+
+5054
+01:24:14.000 --> 01:24:15.000
+This is cue #5054
+
+5055
+01:24:15.000 --> 01:24:16.000
+This is cue #5055
+
+5056
+01:24:16.000 --> 01:24:17.000
+This is cue #5056
+
+5057
+01:24:17.000 --> 01:24:18.000
+This is cue #5057
+
+5058
+01:24:18.000 --> 01:24:19.000
+This is cue #5058
+
+5059
+01:24:19.000 --> 01:24:20.000
+This is cue #5059
+
+5060
+01:24:20.000 --> 01:24:21.000
+This is cue #5060
+
+5061
+01:24:21.000 --> 01:24:22.000
+This is cue #5061
+
+5062
+01:24:22.000 --> 01:24:23.000
+This is cue #5062
+
+5063
+01:24:23.000 --> 01:24:24.000
+This is cue #5063
+
+5064
+01:24:24.000 --> 01:24:25.000
+This is cue #5064
+
+5065
+01:24:25.000 --> 01:24:26.000
+This is cue #5065
+
+5066
+01:24:26.000 --> 01:24:27.000
+This is cue #5066
+
+5067
+01:24:27.000 --> 01:24:28.000
+This is cue #5067
+
+5068
+01:24:28.000 --> 01:24:29.000
+This is cue #5068
+
+5069
+01:24:29.000 --> 01:24:30.000
+This is cue #5069
+
+5070
+01:24:30.000 --> 01:24:31.000
+This is cue #5070
+
+5071
+01:24:31.000 --> 01:24:32.000
+This is cue #5071
+
+5072
+01:24:32.000 --> 01:24:33.000
+This is cue #5072
+
+5073
+01:24:33.000 --> 01:24:34.000
+This is cue #5073
+
+5074
+01:24:34.000 --> 01:24:35.000
+This is cue #5074
+
+5075
+01:24:35.000 --> 01:24:36.000
+This is cue #5075
+
+5076
+01:24:36.000 --> 01:24:37.000
+This is cue #5076
+
+5077
+01:24:37.000 --> 01:24:38.000
+This is cue #5077
+
+5078
+01:24:38.000 --> 01:24:39.000
+This is cue #5078
+
+5079
+01:24:39.000 --> 01:24:40.000
+This is cue #5079
+
+5080
+01:24:40.000 --> 01:24:41.000
+This is cue #5080
+
+5081
+01:24:41.000 --> 01:24:42.000
+This is cue #5081
+
+5082
+01:24:42.000 --> 01:24:43.000
+This is cue #5082
+
+5083
+01:24:43.000 --> 01:24:44.000
+This is cue #5083
+
+5084
+01:24:44.000 --> 01:24:45.000
+This is cue #5084
+
+5085
+01:24:45.000 --> 01:24:46.000
+This is cue #5085
+
+5086
+01:24:46.000 --> 01:24:47.000
+This is cue #5086
+
+5087
+01:24:47.000 --> 01:24:48.000
+This is cue #5087
+
+5088
+01:24:48.000 --> 01:24:49.000
+This is cue #5088
+
+5089
+01:24:49.000 --> 01:24:50.000
+This is cue #5089
+
+5090
+01:24:50.000 --> 01:24:51.000
+This is cue #5090
+
+5091
+01:24:51.000 --> 01:24:52.000
+This is cue #5091
+
+5092
+01:24:52.000 --> 01:24:53.000
+This is cue #5092
+
+5093
+01:24:53.000 --> 01:24:54.000
+This is cue #5093
+
+5094
+01:24:54.000 --> 01:24:55.000
+This is cue #5094
+
+5095
+01:24:55.000 --> 01:24:56.000
+This is cue #5095
+
+5096
+01:24:56.000 --> 01:24:57.000
+This is cue #5096
+
+5097
+01:24:57.000 --> 01:24:58.000
+This is cue #5097
+
+5098
+01:24:58.000 --> 01:24:59.000
+This is cue #5098
+
+5099
+01:24:59.000 --> 01:25:00.000
+This is cue #5099
+
+5100
+01:25:00.000 --> 01:25:01.000
+This is cue #5100
+
+5101
+01:25:01.000 --> 01:25:02.000
+This is cue #5101
+
+5102
+01:25:02.000 --> 01:25:03.000
+This is cue #5102
+
+5103
+01:25:03.000 --> 01:25:04.000
+This is cue #5103
+
+5104
+01:25:04.000 --> 01:25:05.000
+This is cue #5104
+
+5105
+01:25:05.000 --> 01:25:06.000
+This is cue #5105
+
+5106
+01:25:06.000 --> 01:25:07.000
+This is cue #5106
+
+5107
+01:25:07.000 --> 01:25:08.000
+This is cue #5107
+
+5108
+01:25:08.000 --> 01:25:09.000
+This is cue #5108
+
+5109
+01:25:09.000 --> 01:25:10.000
+This is cue #5109
+
+5110
+01:25:10.000 --> 01:25:11.000
+This is cue #5110
+
+5111
+01:25:11.000 --> 01:25:12.000
+This is cue #5111
+
+5112
+01:25:12.000 --> 01:25:13.000
+This is cue #5112
+
+5113
+01:25:13.000 --> 01:25:14.000
+This is cue #5113
+
+5114
+01:25:14.000 --> 01:25:15.000
+This is cue #5114
+
+5115
+01:25:15.000 --> 01:25:16.000
+This is cue #5115
+
+5116
+01:25:16.000 --> 01:25:17.000
+This is cue #5116
+
+5117
+01:25:17.000 --> 01:25:18.000
+This is cue #5117
+
+5118
+01:25:18.000 --> 01:25:19.000
+This is cue #5118
+
+5119
+01:25:19.000 --> 01:25:20.000
+This is cue #5119
+
+5120
+01:25:20.000 --> 01:25:21.000
+This is cue #5120
+
+5121
+01:25:21.000 --> 01:25:22.000
+This is cue #5121
+
+5122
+01:25:22.000 --> 01:25:23.000
+This is cue #5122
+
+5123
+01:25:23.000 --> 01:25:24.000
+This is cue #5123
+
+5124
+01:25:24.000 --> 01:25:25.000
+This is cue #5124
+
+5125
+01:25:25.000 --> 01:25:26.000
+This is cue #5125
+
+5126
+01:25:26.000 --> 01:25:27.000
+This is cue #5126
+
+5127
+01:25:27.000 --> 01:25:28.000
+This is cue #5127
+
+5128
+01:25:28.000 --> 01:25:29.000
+This is cue #5128
+
+5129
+01:25:29.000 --> 01:25:30.000
+This is cue #5129
+
+5130
+01:25:30.000 --> 01:25:31.000
+This is cue #5130
+
+5131
+01:25:31.000 --> 01:25:32.000
+This is cue #5131
+
+5132
+01:25:32.000 --> 01:25:33.000
+This is cue #5132
+
+5133
+01:25:33.000 --> 01:25:34.000
+This is cue #5133
+
+5134
+01:25:34.000 --> 01:25:35.000
+This is cue #5134
+
+5135
+01:25:35.000 --> 01:25:36.000
+This is cue #5135
+
+5136
+01:25:36.000 --> 01:25:37.000
+This is cue #5136
+
+5137
+01:25:37.000 --> 01:25:38.000
+This is cue #5137
+
+5138
+01:25:38.000 --> 01:25:39.000
+This is cue #5138
+
+5139
+01:25:39.000 --> 01:25:40.000
+This is cue #5139
+
+5140
+01:25:40.000 --> 01:25:41.000
+This is cue #5140
+
+5141
+01:25:41.000 --> 01:25:42.000
+This is cue #5141
+
+5142
+01:25:42.000 --> 01:25:43.000
+This is cue #5142
+
+5143
+01:25:43.000 --> 01:25:44.000
+This is cue #5143
+
+5144
+01:25:44.000 --> 01:25:45.000
+This is cue #5144
+
+5145
+01:25:45.000 --> 01:25:46.000
+This is cue #5145
+
+5146
+01:25:46.000 --> 01:25:47.000
+This is cue #5146
+
+5147
+01:25:47.000 --> 01:25:48.000
+This is cue #5147
+
+5148
+01:25:48.000 --> 01:25:49.000
+This is cue #5148
+
+5149
+01:25:49.000 --> 01:25:50.000
+This is cue #5149
+
+5150
+01:25:50.000 --> 01:25:51.000
+This is cue #5150
+
+5151
+01:25:51.000 --> 01:25:52.000
+This is cue #5151
+
+5152
+01:25:52.000 --> 01:25:53.000
+This is cue #5152
+
+5153
+01:25:53.000 --> 01:25:54.000
+This is cue #5153
+
+5154
+01:25:54.000 --> 01:25:55.000
+This is cue #5154
+
+5155
+01:25:55.000 --> 01:25:56.000
+This is cue #5155
+
+5156
+01:25:56.000 --> 01:25:57.000
+This is cue #5156
+
+5157
+01:25:57.000 --> 01:25:58.000
+This is cue #5157
+
+5158
+01:25:58.000 --> 01:25:59.000
+This is cue #5158
+
+5159
+01:25:59.000 --> 01:26:00.000
+This is cue #5159
+
+5160
+01:26:00.000 --> 01:26:01.000
+This is cue #5160
+
+5161
+01:26:01.000 --> 01:26:02.000
+This is cue #5161
+
+5162
+01:26:02.000 --> 01:26:03.000
+This is cue #5162
+
+5163
+01:26:03.000 --> 01:26:04.000
+This is cue #5163
+
+5164
+01:26:04.000 --> 01:26:05.000
+This is cue #5164
+
+5165
+01:26:05.000 --> 01:26:06.000
+This is cue #5165
+
+5166
+01:26:06.000 --> 01:26:07.000
+This is cue #5166
+
+5167
+01:26:07.000 --> 01:26:08.000
+This is cue #5167
+
+5168
+01:26:08.000 --> 01:26:09.000
+This is cue #5168
+
+5169
+01:26:09.000 --> 01:26:10.000
+This is cue #5169
+
+5170
+01:26:10.000 --> 01:26:11.000
+This is cue #5170
+
+5171
+01:26:11.000 --> 01:26:12.000
+This is cue #5171
+
+5172
+01:26:12.000 --> 01:26:13.000
+This is cue #5172
+
+5173
+01:26:13.000 --> 01:26:14.000
+This is cue #5173
+
+5174
+01:26:14.000 --> 01:26:15.000
+This is cue #5174
+
+5175
+01:26:15.000 --> 01:26:16.000
+This is cue #5175
+
+5176
+01:26:16.000 --> 01:26:17.000
+This is cue #5176
+
+5177
+01:26:17.000 --> 01:26:18.000
+This is cue #5177
+
+5178
+01:26:18.000 --> 01:26:19.000
+This is cue #5178
+
+5179
+01:26:19.000 --> 01:26:20.000
+This is cue #5179
+
+5180
+01:26:20.000 --> 01:26:21.000
+This is cue #5180
+
+5181
+01:26:21.000 --> 01:26:22.000
+This is cue #5181
+
+5182
+01:26:22.000 --> 01:26:23.000
+This is cue #5182
+
+5183
+01:26:23.000 --> 01:26:24.000
+This is cue #5183
+
+5184
+01:26:24.000 --> 01:26:25.000
+This is cue #5184
+
+5185
+01:26:25.000 --> 01:26:26.000
+This is cue #5185
+
+5186
+01:26:26.000 --> 01:26:27.000
+This is cue #5186
+
+5187
+01:26:27.000 --> 01:26:28.000
+This is cue #5187
+
+5188
+01:26:28.000 --> 01:26:29.000
+This is cue #5188
+
+5189
+01:26:29.000 --> 01:26:30.000
+This is cue #5189
+
+5190
+01:26:30.000 --> 01:26:31.000
+This is cue #5190
+
+5191
+01:26:31.000 --> 01:26:32.000
+This is cue #5191
+
+5192
+01:26:32.000 --> 01:26:33.000
+This is cue #5192
+
+5193
+01:26:33.000 --> 01:26:34.000
+This is cue #5193
+
+5194
+01:26:34.000 --> 01:26:35.000
+This is cue #5194
+
+5195
+01:26:35.000 --> 01:26:36.000
+This is cue #5195
+
+5196
+01:26:36.000 --> 01:26:37.000
+This is cue #5196
+
+5197
+01:26:37.000 --> 01:26:38.000
+This is cue #5197
+
+5198
+01:26:38.000 --> 01:26:39.000
+This is cue #5198
+
+5199
+01:26:39.000 --> 01:26:40.000
+This is cue #5199
+
+5200
+01:26:40.000 --> 01:26:41.000
+This is cue #5200
+
+5201
+01:26:41.000 --> 01:26:42.000
+This is cue #5201
+
+5202
+01:26:42.000 --> 01:26:43.000
+This is cue #5202
+
+5203
+01:26:43.000 --> 01:26:44.000
+This is cue #5203
+
+5204
+01:26:44.000 --> 01:26:45.000
+This is cue #5204
+
+5205
+01:26:45.000 --> 01:26:46.000
+This is cue #5205
+
+5206
+01:26:46.000 --> 01:26:47.000
+This is cue #5206
+
+5207
+01:26:47.000 --> 01:26:48.000
+This is cue #5207
+
+5208
+01:26:48.000 --> 01:26:49.000
+This is cue #5208
+
+5209
+01:26:49.000 --> 01:26:50.000
+This is cue #5209
+
+5210
+01:26:50.000 --> 01:26:51.000
+This is cue #5210
+
+5211
+01:26:51.000 --> 01:26:52.000
+This is cue #5211
+
+5212
+01:26:52.000 --> 01:26:53.000
+This is cue #5212
+
+5213
+01:26:53.000 --> 01:26:54.000
+This is cue #5213
+
+5214
+01:26:54.000 --> 01:26:55.000
+This is cue #5214
+
+5215
+01:26:55.000 --> 01:26:56.000
+This is cue #5215
+
+5216
+01:26:56.000 --> 01:26:57.000
+This is cue #5216
+
+5217
+01:26:57.000 --> 01:26:58.000
+This is cue #5217
+
+5218
+01:26:58.000 --> 01:26:59.000
+This is cue #5218
+
+5219
+01:26:59.000 --> 01:27:00.000
+This is cue #5219
+
+5220
+01:27:00.000 --> 01:27:01.000
+This is cue #5220
+
+5221
+01:27:01.000 --> 01:27:02.000
+This is cue #5221
+
+5222
+01:27:02.000 --> 01:27:03.000
+This is cue #5222
+
+5223
+01:27:03.000 --> 01:27:04.000
+This is cue #5223
+
+5224
+01:27:04.000 --> 01:27:05.000
+This is cue #5224
+
+5225
+01:27:05.000 --> 01:27:06.000
+This is cue #5225
+
+5226
+01:27:06.000 --> 01:27:07.000
+This is cue #5226
+
+5227
+01:27:07.000 --> 01:27:08.000
+This is cue #5227
+
+5228
+01:27:08.000 --> 01:27:09.000
+This is cue #5228
+
+5229
+01:27:09.000 --> 01:27:10.000
+This is cue #5229
+
+5230
+01:27:10.000 --> 01:27:11.000
+This is cue #5230
+
+5231
+01:27:11.000 --> 01:27:12.000
+This is cue #5231
+
+5232
+01:27:12.000 --> 01:27:13.000
+This is cue #5232
+
+5233
+01:27:13.000 --> 01:27:14.000
+This is cue #5233
+
+5234
+01:27:14.000 --> 01:27:15.000
+This is cue #5234
+
+5235
+01:27:15.000 --> 01:27:16.000
+This is cue #5235
+
+5236
+01:27:16.000 --> 01:27:17.000
+This is cue #5236
+
+5237
+01:27:17.000 --> 01:27:18.000
+This is cue #5237
+
+5238
+01:27:18.000 --> 01:27:19.000
+This is cue #5238
+
+5239
+01:27:19.000 --> 01:27:20.000
+This is cue #5239
+
+5240
+01:27:20.000 --> 01:27:21.000
+This is cue #5240
+
+5241
+01:27:21.000 --> 01:27:22.000
+This is cue #5241
+
+5242
+01:27:22.000 --> 01:27:23.000
+This is cue #5242
+
+5243
+01:27:23.000 --> 01:27:24.000
+This is cue #5243
+
+5244
+01:27:24.000 --> 01:27:25.000
+This is cue #5244
+
+5245
+01:27:25.000 --> 01:27:26.000
+This is cue #5245
+
+5246
+01:27:26.000 --> 01:27:27.000
+This is cue #5246
+
+5247
+01:27:27.000 --> 01:27:28.000
+This is cue #5247
+
+5248
+01:27:28.000 --> 01:27:29.000
+This is cue #5248
+
+5249
+01:27:29.000 --> 01:27:30.000
+This is cue #5249
+
+5250
+01:27:30.000 --> 01:27:31.000
+This is cue #5250
+
+5251
+01:27:31.000 --> 01:27:32.000
+This is cue #5251
+
+5252
+01:27:32.000 --> 01:27:33.000
+This is cue #5252
+
+5253
+01:27:33.000 --> 01:27:34.000
+This is cue #5253
+
+5254
+01:27:34.000 --> 01:27:35.000
+This is cue #5254
+
+5255
+01:27:35.000 --> 01:27:36.000
+This is cue #5255
+
+5256
+01:27:36.000 --> 01:27:37.000
+This is cue #5256
+
+5257
+01:27:37.000 --> 01:27:38.000
+This is cue #5257
+
+5258
+01:27:38.000 --> 01:27:39.000
+This is cue #5258
+
+5259
+01:27:39.000 --> 01:27:40.000
+This is cue #5259
+
+5260
+01:27:40.000 --> 01:27:41.000
+This is cue #5260
+
+5261
+01:27:41.000 --> 01:27:42.000
+This is cue #5261
+
+5262
+01:27:42.000 --> 01:27:43.000
+This is cue #5262
+
+5263
+01:27:43.000 --> 01:27:44.000
+This is cue #5263
+
+5264
+01:27:44.000 --> 01:27:45.000
+This is cue #5264
+
+5265
+01:27:45.000 --> 01:27:46.000
+This is cue #5265
+
+5266
+01:27:46.000 --> 01:27:47.000
+This is cue #5266
+
+5267
+01:27:47.000 --> 01:27:48.000
+This is cue #5267
+
+5268
+01:27:48.000 --> 01:27:49.000
+This is cue #5268
+
+5269
+01:27:49.000 --> 01:27:50.000
+This is cue #5269
+
+5270
+01:27:50.000 --> 01:27:51.000
+This is cue #5270
+
+5271
+01:27:51.000 --> 01:27:52.000
+This is cue #5271
+
+5272
+01:27:52.000 --> 01:27:53.000
+This is cue #5272
+
+5273
+01:27:53.000 --> 01:27:54.000
+This is cue #5273
+
+5274
+01:27:54.000 --> 01:27:55.000
+This is cue #5274
+
+5275
+01:27:55.000 --> 01:27:56.000
+This is cue #5275
+
+5276
+01:27:56.000 --> 01:27:57.000
+This is cue #5276
+
+5277
+01:27:57.000 --> 01:27:58.000
+This is cue #5277
+
+5278
+01:27:58.000 --> 01:27:59.000
+This is cue #5278
+
+5279
+01:27:59.000 --> 01:28:00.000
+This is cue #5279
+
+5280
+01:28:00.000 --> 01:28:01.000
+This is cue #5280
+
+5281
+01:28:01.000 --> 01:28:02.000
+This is cue #5281
+
+5282
+01:28:02.000 --> 01:28:03.000
+This is cue #5282
+
+5283
+01:28:03.000 --> 01:28:04.000
+This is cue #5283
+
+5284
+01:28:04.000 --> 01:28:05.000
+This is cue #5284
+
+5285
+01:28:05.000 --> 01:28:06.000
+This is cue #5285
+
+5286
+01:28:06.000 --> 01:28:07.000
+This is cue #5286
+
+5287
+01:28:07.000 --> 01:28:08.000
+This is cue #5287
+
+5288
+01:28:08.000 --> 01:28:09.000
+This is cue #5288
+
+5289
+01:28:09.000 --> 01:28:10.000
+This is cue #5289
+
+5290
+01:28:10.000 --> 01:28:11.000
+This is cue #5290
+
+5291
+01:28:11.000 --> 01:28:12.000
+This is cue #5291
+
+5292
+01:28:12.000 --> 01:28:13.000
+This is cue #5292
+
+5293
+01:28:13.000 --> 01:28:14.000
+This is cue #5293
+
+5294
+01:28:14.000 --> 01:28:15.000
+This is cue #5294
+
+5295
+01:28:15.000 --> 01:28:16.000
+This is cue #5295
+
+5296
+01:28:16.000 --> 01:28:17.000
+This is cue #5296
+
+5297
+01:28:17.000 --> 01:28:18.000
+This is cue #5297
+
+5298
+01:28:18.000 --> 01:28:19.000
+This is cue #5298
+
+5299
+01:28:19.000 --> 01:28:20.000
+This is cue #5299
+
+5300
+01:28:20.000 --> 01:28:21.000
+This is cue #5300
+
+5301
+01:28:21.000 --> 01:28:22.000
+This is cue #5301
+
+5302
+01:28:22.000 --> 01:28:23.000
+This is cue #5302
+
+5303
+01:28:23.000 --> 01:28:24.000
+This is cue #5303
+
+5304
+01:28:24.000 --> 01:28:25.000
+This is cue #5304
+
+5305
+01:28:25.000 --> 01:28:26.000
+This is cue #5305
+
+5306
+01:28:26.000 --> 01:28:27.000
+This is cue #5306
+
+5307
+01:28:27.000 --> 01:28:28.000
+This is cue #5307
+
+5308
+01:28:28.000 --> 01:28:29.000
+This is cue #5308
+
+5309
+01:28:29.000 --> 01:28:30.000
+This is cue #5309
+
+5310
+01:28:30.000 --> 01:28:31.000
+This is cue #5310
+
+5311
+01:28:31.000 --> 01:28:32.000
+This is cue #5311
+
+5312
+01:28:32.000 --> 01:28:33.000
+This is cue #5312
+
+5313
+01:28:33.000 --> 01:28:34.000
+This is cue #5313
+
+5314
+01:28:34.000 --> 01:28:35.000
+This is cue #5314
+
+5315
+01:28:35.000 --> 01:28:36.000
+This is cue #5315
+
+5316
+01:28:36.000 --> 01:28:37.000
+This is cue #5316
+
+5317
+01:28:37.000 --> 01:28:38.000
+This is cue #5317
+
+5318
+01:28:38.000 --> 01:28:39.000
+This is cue #5318
+
+5319
+01:28:39.000 --> 01:28:40.000
+This is cue #5319
+
+5320
+01:28:40.000 --> 01:28:41.000
+This is cue #5320
+
+5321
+01:28:41.000 --> 01:28:42.000
+This is cue #5321
+
+5322
+01:28:42.000 --> 01:28:43.000
+This is cue #5322
+
+5323
+01:28:43.000 --> 01:28:44.000
+This is cue #5323
+
+5324
+01:28:44.000 --> 01:28:45.000
+This is cue #5324
+
+5325
+01:28:45.000 --> 01:28:46.000
+This is cue #5325
+
+5326
+01:28:46.000 --> 01:28:47.000
+This is cue #5326
+
+5327
+01:28:47.000 --> 01:28:48.000
+This is cue #5327
+
+5328
+01:28:48.000 --> 01:28:49.000
+This is cue #5328
+
+5329
+01:28:49.000 --> 01:28:50.000
+This is cue #5329
+
+5330
+01:28:50.000 --> 01:28:51.000
+This is cue #5330
+
+5331
+01:28:51.000 --> 01:28:52.000
+This is cue #5331
+
+5332
+01:28:52.000 --> 01:28:53.000
+This is cue #5332
+
+5333
+01:28:53.000 --> 01:28:54.000
+This is cue #5333
+
+5334
+01:28:54.000 --> 01:28:55.000
+This is cue #5334
+
+5335
+01:28:55.000 --> 01:28:56.000
+This is cue #5335
+
+5336
+01:28:56.000 --> 01:28:57.000
+This is cue #5336
+
+5337
+01:28:57.000 --> 01:28:58.000
+This is cue #5337
+
+5338
+01:28:58.000 --> 01:28:59.000
+This is cue #5338
+
+5339
+01:28:59.000 --> 01:29:00.000
+This is cue #5339
+
+5340
+01:29:00.000 --> 01:29:01.000
+This is cue #5340
+
+5341
+01:29:01.000 --> 01:29:02.000
+This is cue #5341
+
+5342
+01:29:02.000 --> 01:29:03.000
+This is cue #5342
+
+5343
+01:29:03.000 --> 01:29:04.000
+This is cue #5343
+
+5344
+01:29:04.000 --> 01:29:05.000
+This is cue #5344
+
+5345
+01:29:05.000 --> 01:29:06.000
+This is cue #5345
+
+5346
+01:29:06.000 --> 01:29:07.000
+This is cue #5346
+
+5347
+01:29:07.000 --> 01:29:08.000
+This is cue #5347
+
+5348
+01:29:08.000 --> 01:29:09.000
+This is cue #5348
+
+5349
+01:29:09.000 --> 01:29:10.000
+This is cue #5349
+
+5350
+01:29:10.000 --> 01:29:11.000
+This is cue #5350
+
+5351
+01:29:11.000 --> 01:29:12.000
+This is cue #5351
+
+5352
+01:29:12.000 --> 01:29:13.000
+This is cue #5352
+
+5353
+01:29:13.000 --> 01:29:14.000
+This is cue #5353
+
+5354
+01:29:14.000 --> 01:29:15.000
+This is cue #5354
+
+5355
+01:29:15.000 --> 01:29:16.000
+This is cue #5355
+
+5356
+01:29:16.000 --> 01:29:17.000
+This is cue #5356
+
+5357
+01:29:17.000 --> 01:29:18.000
+This is cue #5357
+
+5358
+01:29:18.000 --> 01:29:19.000
+This is cue #5358
+
+5359
+01:29:19.000 --> 01:29:20.000
+This is cue #5359
+
+5360
+01:29:20.000 --> 01:29:21.000
+This is cue #5360
+
+5361
+01:29:21.000 --> 01:29:22.000
+This is cue #5361
+
+5362
+01:29:22.000 --> 01:29:23.000
+This is cue #5362
+
+5363
+01:29:23.000 --> 01:29:24.000
+This is cue #5363
+
+5364
+01:29:24.000 --> 01:29:25.000
+This is cue #5364
+
+5365
+01:29:25.000 --> 01:29:26.000
+This is cue #5365
+
+5366
+01:29:26.000 --> 01:29:27.000
+This is cue #5366
+
+5367
+01:29:27.000 --> 01:29:28.000
+This is cue #5367
+
+5368
+01:29:28.000 --> 01:29:29.000
+This is cue #5368
+
+5369
+01:29:29.000 --> 01:29:30.000
+This is cue #5369
+
+5370
+01:29:30.000 --> 01:29:31.000
+This is cue #5370
+
+5371
+01:29:31.000 --> 01:29:32.000
+This is cue #5371
+
+5372
+01:29:32.000 --> 01:29:33.000
+This is cue #5372
+
+5373
+01:29:33.000 --> 01:29:34.000
+This is cue #5373
+
+5374
+01:29:34.000 --> 01:29:35.000
+This is cue #5374
+
+5375
+01:29:35.000 --> 01:29:36.000
+This is cue #5375
+
+5376
+01:29:36.000 --> 01:29:37.000
+This is cue #5376
+
+5377
+01:29:37.000 --> 01:29:38.000
+This is cue #5377
+
+5378
+01:29:38.000 --> 01:29:39.000
+This is cue #5378
+
+5379
+01:29:39.000 --> 01:29:40.000
+This is cue #5379
+
+5380
+01:29:40.000 --> 01:29:41.000
+This is cue #5380
+
+5381
+01:29:41.000 --> 01:29:42.000
+This is cue #5381
+
+5382
+01:29:42.000 --> 01:29:43.000
+This is cue #5382
+
+5383
+01:29:43.000 --> 01:29:44.000
+This is cue #5383
+
+5384
+01:29:44.000 --> 01:29:45.000
+This is cue #5384
+
+5385
+01:29:45.000 --> 01:29:46.000
+This is cue #5385
+
+5386
+01:29:46.000 --> 01:29:47.000
+This is cue #5386
+
+5387
+01:29:47.000 --> 01:29:48.000
+This is cue #5387
+
+5388
+01:29:48.000 --> 01:29:49.000
+This is cue #5388
+
+5389
+01:29:49.000 --> 01:29:50.000
+This is cue #5389
+
+5390
+01:29:50.000 --> 01:29:51.000
+This is cue #5390
+
+5391
+01:29:51.000 --> 01:29:52.000
+This is cue #5391
+
+5392
+01:29:52.000 --> 01:29:53.000
+This is cue #5392
+
+5393
+01:29:53.000 --> 01:29:54.000
+This is cue #5393
+
+5394
+01:29:54.000 --> 01:29:55.000
+This is cue #5394
+
+5395
+01:29:55.000 --> 01:29:56.000
+This is cue #5395
+
+5396
+01:29:56.000 --> 01:29:57.000
+This is cue #5396
+
+5397
+01:29:57.000 --> 01:29:58.000
+This is cue #5397
+
+5398
+01:29:58.000 --> 01:29:59.000
+This is cue #5398
+
+5399
+01:29:59.000 --> 01:30:00.000
+This is cue #5399
+
+5400
+01:30:00.000 --> 01:30:01.000
+This is cue #5400
+
+5401
+01:30:01.000 --> 01:30:02.000
+This is cue #5401
+
+5402
+01:30:02.000 --> 01:30:03.000
+This is cue #5402
+
+5403
+01:30:03.000 --> 01:30:04.000
+This is cue #5403
+
+5404
+01:30:04.000 --> 01:30:05.000
+This is cue #5404
+
+5405
+01:30:05.000 --> 01:30:06.000
+This is cue #5405
+
+5406
+01:30:06.000 --> 01:30:07.000
+This is cue #5406
+
+5407
+01:30:07.000 --> 01:30:08.000
+This is cue #5407
+
+5408
+01:30:08.000 --> 01:30:09.000
+This is cue #5408
+
+5409
+01:30:09.000 --> 01:30:10.000
+This is cue #5409
+
+5410
+01:30:10.000 --> 01:30:11.000
+This is cue #5410
+
+5411
+01:30:11.000 --> 01:30:12.000
+This is cue #5411
+
+5412
+01:30:12.000 --> 01:30:13.000
+This is cue #5412
+
+5413
+01:30:13.000 --> 01:30:14.000
+This is cue #5413
+
+5414
+01:30:14.000 --> 01:30:15.000
+This is cue #5414
+
+5415
+01:30:15.000 --> 01:30:16.000
+This is cue #5415
+
+5416
+01:30:16.000 --> 01:30:17.000
+This is cue #5416
+
+5417
+01:30:17.000 --> 01:30:18.000
+This is cue #5417
+
+5418
+01:30:18.000 --> 01:30:19.000
+This is cue #5418
+
+5419
+01:30:19.000 --> 01:30:20.000
+This is cue #5419
+
+5420
+01:30:20.000 --> 01:30:21.000
+This is cue #5420
+
+5421
+01:30:21.000 --> 01:30:22.000
+This is cue #5421
+
+5422
+01:30:22.000 --> 01:30:23.000
+This is cue #5422
+
+5423
+01:30:23.000 --> 01:30:24.000
+This is cue #5423
+
+5424
+01:30:24.000 --> 01:30:25.000
+This is cue #5424
+
+5425
+01:30:25.000 --> 01:30:26.000
+This is cue #5425
+
+5426
+01:30:26.000 --> 01:30:27.000
+This is cue #5426
+
+5427
+01:30:27.000 --> 01:30:28.000
+This is cue #5427
+
+5428
+01:30:28.000 --> 01:30:29.000
+This is cue #5428
+
+5429
+01:30:29.000 --> 01:30:30.000
+This is cue #5429
+
+5430
+01:30:30.000 --> 01:30:31.000
+This is cue #5430
+
+5431
+01:30:31.000 --> 01:30:32.000
+This is cue #5431
+
+5432
+01:30:32.000 --> 01:30:33.000
+This is cue #5432
+
+5433
+01:30:33.000 --> 01:30:34.000
+This is cue #5433
+
+5434
+01:30:34.000 --> 01:30:35.000
+This is cue #5434
+
+5435
+01:30:35.000 --> 01:30:36.000
+This is cue #5435
+
+5436
+01:30:36.000 --> 01:30:37.000
+This is cue #5436
+
+5437
+01:30:37.000 --> 01:30:38.000
+This is cue #5437
+
+5438
+01:30:38.000 --> 01:30:39.000
+This is cue #5438
+
+5439
+01:30:39.000 --> 01:30:40.000
+This is cue #5439
+
+5440
+01:30:40.000 --> 01:30:41.000
+This is cue #5440
+
+5441
+01:30:41.000 --> 01:30:42.000
+This is cue #5441
+
+5442
+01:30:42.000 --> 01:30:43.000
+This is cue #5442
+
+5443
+01:30:43.000 --> 01:30:44.000
+This is cue #5443
+
+5444
+01:30:44.000 --> 01:30:45.000
+This is cue #5444
+
+5445
+01:30:45.000 --> 01:30:46.000
+This is cue #5445
+
+5446
+01:30:46.000 --> 01:30:47.000
+This is cue #5446
+
+5447
+01:30:47.000 --> 01:30:48.000
+This is cue #5447
+
+5448
+01:30:48.000 --> 01:30:49.000
+This is cue #5448
+
+5449
+01:30:49.000 --> 01:30:50.000
+This is cue #5449
+
+5450
+01:30:50.000 --> 01:30:51.000
+This is cue #5450
+
+5451
+01:30:51.000 --> 01:30:52.000
+This is cue #5451
+
+5452
+01:30:52.000 --> 01:30:53.000
+This is cue #5452
+
+5453
+01:30:53.000 --> 01:30:54.000
+This is cue #5453
+
+5454
+01:30:54.000 --> 01:30:55.000
+This is cue #5454
+
+5455
+01:30:55.000 --> 01:30:56.000
+This is cue #5455
+
+5456
+01:30:56.000 --> 01:30:57.000
+This is cue #5456
+
+5457
+01:30:57.000 --> 01:30:58.000
+This is cue #5457
+
+5458
+01:30:58.000 --> 01:30:59.000
+This is cue #5458
+
+5459
+01:30:59.000 --> 01:31:00.000
+This is cue #5459
+
+5460
+01:31:00.000 --> 01:31:01.000
+This is cue #5460
+
+5461
+01:31:01.000 --> 01:31:02.000
+This is cue #5461
+
+5462
+01:31:02.000 --> 01:31:03.000
+This is cue #5462
+
+5463
+01:31:03.000 --> 01:31:04.000
+This is cue #5463
+
+5464
+01:31:04.000 --> 01:31:05.000
+This is cue #5464
+
+5465
+01:31:05.000 --> 01:31:06.000
+This is cue #5465
+
+5466
+01:31:06.000 --> 01:31:07.000
+This is cue #5466
+
+5467
+01:31:07.000 --> 01:31:08.000
+This is cue #5467
+
+5468
+01:31:08.000 --> 01:31:09.000
+This is cue #5468
+
+5469
+01:31:09.000 --> 01:31:10.000
+This is cue #5469
+
+5470
+01:31:10.000 --> 01:31:11.000
+This is cue #5470
+
+5471
+01:31:11.000 --> 01:31:12.000
+This is cue #5471
+
+5472
+01:31:12.000 --> 01:31:13.000
+This is cue #5472
+
+5473
+01:31:13.000 --> 01:31:14.000
+This is cue #5473
+
+5474
+01:31:14.000 --> 01:31:15.000
+This is cue #5474
+
+5475
+01:31:15.000 --> 01:31:16.000
+This is cue #5475
+
+5476
+01:31:16.000 --> 01:31:17.000
+This is cue #5476
+
+5477
+01:31:17.000 --> 01:31:18.000
+This is cue #5477
+
+5478
+01:31:18.000 --> 01:31:19.000
+This is cue #5478
+
+5479
+01:31:19.000 --> 01:31:20.000
+This is cue #5479
+
+5480
+01:31:20.000 --> 01:31:21.000
+This is cue #5480
+
+5481
+01:31:21.000 --> 01:31:22.000
+This is cue #5481
+
+5482
+01:31:22.000 --> 01:31:23.000
+This is cue #5482
+
+5483
+01:31:23.000 --> 01:31:24.000
+This is cue #5483
+
+5484
+01:31:24.000 --> 01:31:25.000
+This is cue #5484
+
+5485
+01:31:25.000 --> 01:31:26.000
+This is cue #5485
+
+5486
+01:31:26.000 --> 01:31:27.000
+This is cue #5486
+
+5487
+01:31:27.000 --> 01:31:28.000
+This is cue #5487
+
+5488
+01:31:28.000 --> 01:31:29.000
+This is cue #5488
+
+5489
+01:31:29.000 --> 01:31:30.000
+This is cue #5489
+
+5490
+01:31:30.000 --> 01:31:31.000
+This is cue #5490
+
+5491
+01:31:31.000 --> 01:31:32.000
+This is cue #5491
+
+5492
+01:31:32.000 --> 01:31:33.000
+This is cue #5492
+
+5493
+01:31:33.000 --> 01:31:34.000
+This is cue #5493
+
+5494
+01:31:34.000 --> 01:31:35.000
+This is cue #5494
+
+5495
+01:31:35.000 --> 01:31:36.000
+This is cue #5495
+
+5496
+01:31:36.000 --> 01:31:37.000
+This is cue #5496
+
+5497
+01:31:37.000 --> 01:31:38.000
+This is cue #5497
+
+5498
+01:31:38.000 --> 01:31:39.000
+This is cue #5498
+
+5499
+01:31:39.000 --> 01:31:40.000
+This is cue #5499
+
+5500
+01:31:40.000 --> 01:31:41.000
+This is cue #5500
+
+5501
+01:31:41.000 --> 01:31:42.000
+This is cue #5501
+
+5502
+01:31:42.000 --> 01:31:43.000
+This is cue #5502
+
+5503
+01:31:43.000 --> 01:31:44.000
+This is cue #5503
+
+5504
+01:31:44.000 --> 01:31:45.000
+This is cue #5504
+
+5505
+01:31:45.000 --> 01:31:46.000
+This is cue #5505
+
+5506
+01:31:46.000 --> 01:31:47.000
+This is cue #5506
+
+5507
+01:31:47.000 --> 01:31:48.000
+This is cue #5507
+
+5508
+01:31:48.000 --> 01:31:49.000
+This is cue #5508
+
+5509
+01:31:49.000 --> 01:31:50.000
+This is cue #5509
+
+5510
+01:31:50.000 --> 01:31:51.000
+This is cue #5510
+
+5511
+01:31:51.000 --> 01:31:52.000
+This is cue #5511
+
+5512
+01:31:52.000 --> 01:31:53.000
+This is cue #5512
+
+5513
+01:31:53.000 --> 01:31:54.000
+This is cue #5513
+
+5514
+01:31:54.000 --> 01:31:55.000
+This is cue #5514
+
+5515
+01:31:55.000 --> 01:31:56.000
+This is cue #5515
+
+5516
+01:31:56.000 --> 01:31:57.000
+This is cue #5516
+
+5517
+01:31:57.000 --> 01:31:58.000
+This is cue #5517
+
+5518
+01:31:58.000 --> 01:31:59.000
+This is cue #5518
+
+5519
+01:31:59.000 --> 01:32:00.000
+This is cue #5519
+
+5520
+01:32:00.000 --> 01:32:01.000
+This is cue #5520
+
+5521
+01:32:01.000 --> 01:32:02.000
+This is cue #5521
+
+5522
+01:32:02.000 --> 01:32:03.000
+This is cue #5522
+
+5523
+01:32:03.000 --> 01:32:04.000
+This is cue #5523
+
+5524
+01:32:04.000 --> 01:32:05.000
+This is cue #5524
+
+5525
+01:32:05.000 --> 01:32:06.000
+This is cue #5525
+
+5526
+01:32:06.000 --> 01:32:07.000
+This is cue #5526
+
+5527
+01:32:07.000 --> 01:32:08.000
+This is cue #5527
+
+5528
+01:32:08.000 --> 01:32:09.000
+This is cue #5528
+
+5529
+01:32:09.000 --> 01:32:10.000
+This is cue #5529
+
+5530
+01:32:10.000 --> 01:32:11.000
+This is cue #5530
+
+5531
+01:32:11.000 --> 01:32:12.000
+This is cue #5531
+
+5532
+01:32:12.000 --> 01:32:13.000
+This is cue #5532
+
+5533
+01:32:13.000 --> 01:32:14.000
+This is cue #5533
+
+5534
+01:32:14.000 --> 01:32:15.000
+This is cue #5534
+
+5535
+01:32:15.000 --> 01:32:16.000
+This is cue #5535
+
+5536
+01:32:16.000 --> 01:32:17.000
+This is cue #5536
+
+5537
+01:32:17.000 --> 01:32:18.000
+This is cue #5537
+
+5538
+01:32:18.000 --> 01:32:19.000
+This is cue #5538
+
+5539
+01:32:19.000 --> 01:32:20.000
+This is cue #5539
+
+5540
+01:32:20.000 --> 01:32:21.000
+This is cue #5540
+
+5541
+01:32:21.000 --> 01:32:22.000
+This is cue #5541
+
+5542
+01:32:22.000 --> 01:32:23.000
+This is cue #5542
+
+5543
+01:32:23.000 --> 01:32:24.000
+This is cue #5543
+
+5544
+01:32:24.000 --> 01:32:25.000
+This is cue #5544
+
+5545
+01:32:25.000 --> 01:32:26.000
+This is cue #5545
+
+5546
+01:32:26.000 --> 01:32:27.000
+This is cue #5546
+
+5547
+01:32:27.000 --> 01:32:28.000
+This is cue #5547
+
+5548
+01:32:28.000 --> 01:32:29.000
+This is cue #5548
+
+5549
+01:32:29.000 --> 01:32:30.000
+This is cue #5549
+
+5550
+01:32:30.000 --> 01:32:31.000
+This is cue #5550
+
+5551
+01:32:31.000 --> 01:32:32.000
+This is cue #5551
+
+5552
+01:32:32.000 --> 01:32:33.000
+This is cue #5552
+
+5553
+01:32:33.000 --> 01:32:34.000
+This is cue #5553
+
+5554
+01:32:34.000 --> 01:32:35.000
+This is cue #5554
+
+5555
+01:32:35.000 --> 01:32:36.000
+This is cue #5555
+
+5556
+01:32:36.000 --> 01:32:37.000
+This is cue #5556
+
+5557
+01:32:37.000 --> 01:32:38.000
+This is cue #5557
+
+5558
+01:32:38.000 --> 01:32:39.000
+This is cue #5558
+
+5559
+01:32:39.000 --> 01:32:40.000
+This is cue #5559
+
+5560
+01:32:40.000 --> 01:32:41.000
+This is cue #5560
+
+5561
+01:32:41.000 --> 01:32:42.000
+This is cue #5561
+
+5562
+01:32:42.000 --> 01:32:43.000
+This is cue #5562
+
+5563
+01:32:43.000 --> 01:32:44.000
+This is cue #5563
+
+5564
+01:32:44.000 --> 01:32:45.000
+This is cue #5564
+
+5565
+01:32:45.000 --> 01:32:46.000
+This is cue #5565
+
+5566
+01:32:46.000 --> 01:32:47.000
+This is cue #5566
+
+5567
+01:32:47.000 --> 01:32:48.000
+This is cue #5567
+
+5568
+01:32:48.000 --> 01:32:49.000
+This is cue #5568
+
+5569
+01:32:49.000 --> 01:32:50.000
+This is cue #5569
+
+5570
+01:32:50.000 --> 01:32:51.000
+This is cue #5570
+
+5571
+01:32:51.000 --> 01:32:52.000
+This is cue #5571
+
+5572
+01:32:52.000 --> 01:32:53.000
+This is cue #5572
+
+5573
+01:32:53.000 --> 01:32:54.000
+This is cue #5573
+
+5574
+01:32:54.000 --> 01:32:55.000
+This is cue #5574
+
+5575
+01:32:55.000 --> 01:32:56.000
+This is cue #5575
+
+5576
+01:32:56.000 --> 01:32:57.000
+This is cue #5576
+
+5577
+01:32:57.000 --> 01:32:58.000
+This is cue #5577
+
+5578
+01:32:58.000 --> 01:32:59.000
+This is cue #5578
+
+5579
+01:32:59.000 --> 01:33:00.000
+This is cue #5579
+
+5580
+01:33:00.000 --> 01:33:01.000
+This is cue #5580
+
+5581
+01:33:01.000 --> 01:33:02.000
+This is cue #5581
+
+5582
+01:33:02.000 --> 01:33:03.000
+This is cue #5582
+
+5583
+01:33:03.000 --> 01:33:04.000
+This is cue #5583
+
+5584
+01:33:04.000 --> 01:33:05.000
+This is cue #5584
+
+5585
+01:33:05.000 --> 01:33:06.000
+This is cue #5585
+
+5586
+01:33:06.000 --> 01:33:07.000
+This is cue #5586
+
+5587
+01:33:07.000 --> 01:33:08.000
+This is cue #5587
+
+5588
+01:33:08.000 --> 01:33:09.000
+This is cue #5588
+
+5589
+01:33:09.000 --> 01:33:10.000
+This is cue #5589
+
+5590
+01:33:10.000 --> 01:33:11.000
+This is cue #5590
+
+5591
+01:33:11.000 --> 01:33:12.000
+This is cue #5591
+
+5592
+01:33:12.000 --> 01:33:13.000
+This is cue #5592
+
+5593
+01:33:13.000 --> 01:33:14.000
+This is cue #5593
+
+5594
+01:33:14.000 --> 01:33:15.000
+This is cue #5594
+
+5595
+01:33:15.000 --> 01:33:16.000
+This is cue #5595
+
+5596
+01:33:16.000 --> 01:33:17.000
+This is cue #5596
+
+5597
+01:33:17.000 --> 01:33:18.000
+This is cue #5597
+
+5598
+01:33:18.000 --> 01:33:19.000
+This is cue #5598
+
+5599
+01:33:19.000 --> 01:33:20.000
+This is cue #5599
+
+5600
+01:33:20.000 --> 01:33:21.000
+This is cue #5600
+
+5601
+01:33:21.000 --> 01:33:22.000
+This is cue #5601
+
+5602
+01:33:22.000 --> 01:33:23.000
+This is cue #5602
+
+5603
+01:33:23.000 --> 01:33:24.000
+This is cue #5603
+
+5604
+01:33:24.000 --> 01:33:25.000
+This is cue #5604
+
+5605
+01:33:25.000 --> 01:33:26.000
+This is cue #5605
+
+5606
+01:33:26.000 --> 01:33:27.000
+This is cue #5606
+
+5607
+01:33:27.000 --> 01:33:28.000
+This is cue #5607
+
+5608
+01:33:28.000 --> 01:33:29.000
+This is cue #5608
+
+5609
+01:33:29.000 --> 01:33:30.000
+This is cue #5609
+
+5610
+01:33:30.000 --> 01:33:31.000
+This is cue #5610
+
+5611
+01:33:31.000 --> 01:33:32.000
+This is cue #5611
+
+5612
+01:33:32.000 --> 01:33:33.000
+This is cue #5612
+
+5613
+01:33:33.000 --> 01:33:34.000
+This is cue #5613
+
+5614
+01:33:34.000 --> 01:33:35.000
+This is cue #5614
+
+5615
+01:33:35.000 --> 01:33:36.000
+This is cue #5615
+
+5616
+01:33:36.000 --> 01:33:37.000
+This is cue #5616
+
+5617
+01:33:37.000 --> 01:33:38.000
+This is cue #5617
+
+5618
+01:33:38.000 --> 01:33:39.000
+This is cue #5618
+
+5619
+01:33:39.000 --> 01:33:40.000
+This is cue #5619
+
+5620
+01:33:40.000 --> 01:33:41.000
+This is cue #5620
+
+5621
+01:33:41.000 --> 01:33:42.000
+This is cue #5621
+
+5622
+01:33:42.000 --> 01:33:43.000
+This is cue #5622
+
+5623
+01:33:43.000 --> 01:33:44.000
+This is cue #5623
+
+5624
+01:33:44.000 --> 01:33:45.000
+This is cue #5624
+
+5625
+01:33:45.000 --> 01:33:46.000
+This is cue #5625
+
+5626
+01:33:46.000 --> 01:33:47.000
+This is cue #5626
+
+5627
+01:33:47.000 --> 01:33:48.000
+This is cue #5627
+
+5628
+01:33:48.000 --> 01:33:49.000
+This is cue #5628
+
+5629
+01:33:49.000 --> 01:33:50.000
+This is cue #5629
+
+5630
+01:33:50.000 --> 01:33:51.000
+This is cue #5630
+
+5631
+01:33:51.000 --> 01:33:52.000
+This is cue #5631
+
+5632
+01:33:52.000 --> 01:33:53.000
+This is cue #5632
+
+5633
+01:33:53.000 --> 01:33:54.000
+This is cue #5633
+
+5634
+01:33:54.000 --> 01:33:55.000
+This is cue #5634
+
+5635
+01:33:55.000 --> 01:33:56.000
+This is cue #5635
+
+5636
+01:33:56.000 --> 01:33:57.000
+This is cue #5636
+
+5637
+01:33:57.000 --> 01:33:58.000
+This is cue #5637
+
+5638
+01:33:58.000 --> 01:33:59.000
+This is cue #5638
+
+5639
+01:33:59.000 --> 01:34:00.000
+This is cue #5639
+
+5640
+01:34:00.000 --> 01:34:01.000
+This is cue #5640
+
+5641
+01:34:01.000 --> 01:34:02.000
+This is cue #5641
+
+5642
+01:34:02.000 --> 01:34:03.000
+This is cue #5642
+
+5643
+01:34:03.000 --> 01:34:04.000
+This is cue #5643
+
+5644
+01:34:04.000 --> 01:34:05.000
+This is cue #5644
+
+5645
+01:34:05.000 --> 01:34:06.000
+This is cue #5645
+
+5646
+01:34:06.000 --> 01:34:07.000
+This is cue #5646
+
+5647
+01:34:07.000 --> 01:34:08.000
+This is cue #5647
+
+5648
+01:34:08.000 --> 01:34:09.000
+This is cue #5648
+
+5649
+01:34:09.000 --> 01:34:10.000
+This is cue #5649
+
+5650
+01:34:10.000 --> 01:34:11.000
+This is cue #5650
+
+5651
+01:34:11.000 --> 01:34:12.000
+This is cue #5651
+
+5652
+01:34:12.000 --> 01:34:13.000
+This is cue #5652
+
+5653
+01:34:13.000 --> 01:34:14.000
+This is cue #5653
+
+5654
+01:34:14.000 --> 01:34:15.000
+This is cue #5654
+
+5655
+01:34:15.000 --> 01:34:16.000
+This is cue #5655
+
+5656
+01:34:16.000 --> 01:34:17.000
+This is cue #5656
+
+5657
+01:34:17.000 --> 01:34:18.000
+This is cue #5657
+
+5658
+01:34:18.000 --> 01:34:19.000
+This is cue #5658
+
+5659
+01:34:19.000 --> 01:34:20.000
+This is cue #5659
+
+5660
+01:34:20.000 --> 01:34:21.000
+This is cue #5660
+
+5661
+01:34:21.000 --> 01:34:22.000
+This is cue #5661
+
+5662
+01:34:22.000 --> 01:34:23.000
+This is cue #5662
+
+5663
+01:34:23.000 --> 01:34:24.000
+This is cue #5663
+
+5664
+01:34:24.000 --> 01:34:25.000
+This is cue #5664
+
+5665
+01:34:25.000 --> 01:34:26.000
+This is cue #5665
+
+5666
+01:34:26.000 --> 01:34:27.000
+This is cue #5666
+
+5667
+01:34:27.000 --> 01:34:28.000
+This is cue #5667
+
+5668
+01:34:28.000 --> 01:34:29.000
+This is cue #5668
+
+5669
+01:34:29.000 --> 01:34:30.000
+This is cue #5669
+
+5670
+01:34:30.000 --> 01:34:31.000
+This is cue #5670
+
+5671
+01:34:31.000 --> 01:34:32.000
+This is cue #5671
+
+5672
+01:34:32.000 --> 01:34:33.000
+This is cue #5672
+
+5673
+01:34:33.000 --> 01:34:34.000
+This is cue #5673
+
+5674
+01:34:34.000 --> 01:34:35.000
+This is cue #5674
+
+5675
+01:34:35.000 --> 01:34:36.000
+This is cue #5675
+
+5676
+01:34:36.000 --> 01:34:37.000
+This is cue #5676
+
+5677
+01:34:37.000 --> 01:34:38.000
+This is cue #5677
+
+5678
+01:34:38.000 --> 01:34:39.000
+This is cue #5678
+
+5679
+01:34:39.000 --> 01:34:40.000
+This is cue #5679
+
+5680
+01:34:40.000 --> 01:34:41.000
+This is cue #5680
+
+5681
+01:34:41.000 --> 01:34:42.000
+This is cue #5681
+
+5682
+01:34:42.000 --> 01:34:43.000
+This is cue #5682
+
+5683
+01:34:43.000 --> 01:34:44.000
+This is cue #5683
+
+5684
+01:34:44.000 --> 01:34:45.000
+This is cue #5684
+
+5685
+01:34:45.000 --> 01:34:46.000
+This is cue #5685
+
+5686
+01:34:46.000 --> 01:34:47.000
+This is cue #5686
+
+5687
+01:34:47.000 --> 01:34:48.000
+This is cue #5687
+
+5688
+01:34:48.000 --> 01:34:49.000
+This is cue #5688
+
+5689
+01:34:49.000 --> 01:34:50.000
+This is cue #5689
+
+5690
+01:34:50.000 --> 01:34:51.000
+This is cue #5690
+
+5691
+01:34:51.000 --> 01:34:52.000
+This is cue #5691
+
+5692
+01:34:52.000 --> 01:34:53.000
+This is cue #5692
+
+5693
+01:34:53.000 --> 01:34:54.000
+This is cue #5693
+
+5694
+01:34:54.000 --> 01:34:55.000
+This is cue #5694
+
+5695
+01:34:55.000 --> 01:34:56.000
+This is cue #5695
+
+5696
+01:34:56.000 --> 01:34:57.000
+This is cue #5696
+
+5697
+01:34:57.000 --> 01:34:58.000
+This is cue #5697
+
+5698
+01:34:58.000 --> 01:34:59.000
+This is cue #5698
+
+5699
+01:34:59.000 --> 01:35:00.000
+This is cue #5699
+
+5700
+01:35:00.000 --> 01:35:01.000
+This is cue #5700
+
+5701
+01:35:01.000 --> 01:35:02.000
+This is cue #5701
+
+5702
+01:35:02.000 --> 01:35:03.000
+This is cue #5702
+
+5703
+01:35:03.000 --> 01:35:04.000
+This is cue #5703
+
+5704
+01:35:04.000 --> 01:35:05.000
+This is cue #5704
+
+5705
+01:35:05.000 --> 01:35:06.000
+This is cue #5705
+
+5706
+01:35:06.000 --> 01:35:07.000
+This is cue #5706
+
+5707
+01:35:07.000 --> 01:35:08.000
+This is cue #5707
+
+5708
+01:35:08.000 --> 01:35:09.000
+This is cue #5708
+
+5709
+01:35:09.000 --> 01:35:10.000
+This is cue #5709
+
+5710
+01:35:10.000 --> 01:35:11.000
+This is cue #5710
+
+5711
+01:35:11.000 --> 01:35:12.000
+This is cue #5711
+
+5712
+01:35:12.000 --> 01:35:13.000
+This is cue #5712
+
+5713
+01:35:13.000 --> 01:35:14.000
+This is cue #5713
+
+5714
+01:35:14.000 --> 01:35:15.000
+This is cue #5714
+
+5715
+01:35:15.000 --> 01:35:16.000
+This is cue #5715
+
+5716
+01:35:16.000 --> 01:35:17.000
+This is cue #5716
+
+5717
+01:35:17.000 --> 01:35:18.000
+This is cue #5717
+
+5718
+01:35:18.000 --> 01:35:19.000
+This is cue #5718
+
+5719
+01:35:19.000 --> 01:35:20.000
+This is cue #5719
+
+5720
+01:35:20.000 --> 01:35:21.000
+This is cue #5720
+
+5721
+01:35:21.000 --> 01:35:22.000
+This is cue #5721
+
+5722
+01:35:22.000 --> 01:35:23.000
+This is cue #5722
+
+5723
+01:35:23.000 --> 01:35:24.000
+This is cue #5723
+
+5724
+01:35:24.000 --> 01:35:25.000
+This is cue #5724
+
+5725
+01:35:25.000 --> 01:35:26.000
+This is cue #5725
+
+5726
+01:35:26.000 --> 01:35:27.000
+This is cue #5726
+
+5727
+01:35:27.000 --> 01:35:28.000
+This is cue #5727
+
+5728
+01:35:28.000 --> 01:35:29.000
+This is cue #5728
+
+5729
+01:35:29.000 --> 01:35:30.000
+This is cue #5729
+
+5730
+01:35:30.000 --> 01:35:31.000
+This is cue #5730
+
+5731
+01:35:31.000 --> 01:35:32.000
+This is cue #5731
+
+5732
+01:35:32.000 --> 01:35:33.000
+This is cue #5732
+
+5733
+01:35:33.000 --> 01:35:34.000
+This is cue #5733
+
+5734
+01:35:34.000 --> 01:35:35.000
+This is cue #5734
+
+5735
+01:35:35.000 --> 01:35:36.000
+This is cue #5735
+
+5736
+01:35:36.000 --> 01:35:37.000
+This is cue #5736
+
+5737
+01:35:37.000 --> 01:35:38.000
+This is cue #5737
+
+5738
+01:35:38.000 --> 01:35:39.000
+This is cue #5738
+
+5739
+01:35:39.000 --> 01:35:40.000
+This is cue #5739
+
+5740
+01:35:40.000 --> 01:35:41.000
+This is cue #5740
+
+5741
+01:35:41.000 --> 01:35:42.000
+This is cue #5741
+
+5742
+01:35:42.000 --> 01:35:43.000
+This is cue #5742
+
+5743
+01:35:43.000 --> 01:35:44.000
+This is cue #5743
+
+5744
+01:35:44.000 --> 01:35:45.000
+This is cue #5744
+
+5745
+01:35:45.000 --> 01:35:46.000
+This is cue #5745
+
+5746
+01:35:46.000 --> 01:35:47.000
+This is cue #5746
+
+5747
+01:35:47.000 --> 01:35:48.000
+This is cue #5747
+
+5748
+01:35:48.000 --> 01:35:49.000
+This is cue #5748
+
+5749
+01:35:49.000 --> 01:35:50.000
+This is cue #5749
+
+5750
+01:35:50.000 --> 01:35:51.000
+This is cue #5750
+
+5751
+01:35:51.000 --> 01:35:52.000
+This is cue #5751
+
+5752
+01:35:52.000 --> 01:35:53.000
+This is cue #5752
+
+5753
+01:35:53.000 --> 01:35:54.000
+This is cue #5753
+
+5754
+01:35:54.000 --> 01:35:55.000
+This is cue #5754
+
+5755
+01:35:55.000 --> 01:35:56.000
+This is cue #5755
+
+5756
+01:35:56.000 --> 01:35:57.000
+This is cue #5756
+
+5757
+01:35:57.000 --> 01:35:58.000
+This is cue #5757
+
+5758
+01:35:58.000 --> 01:35:59.000
+This is cue #5758
+
+5759
+01:35:59.000 --> 01:36:00.000
+This is cue #5759
+
+5760
+01:36:00.000 --> 01:36:01.000
+This is cue #5760
+
+5761
+01:36:01.000 --> 01:36:02.000
+This is cue #5761
+
+5762
+01:36:02.000 --> 01:36:03.000
+This is cue #5762
+
+5763
+01:36:03.000 --> 01:36:04.000
+This is cue #5763
+
+5764
+01:36:04.000 --> 01:36:05.000
+This is cue #5764
+
+5765
+01:36:05.000 --> 01:36:06.000
+This is cue #5765
+
+5766
+01:36:06.000 --> 01:36:07.000
+This is cue #5766
+
+5767
+01:36:07.000 --> 01:36:08.000
+This is cue #5767
+
+5768
+01:36:08.000 --> 01:36:09.000
+This is cue #5768
+
+5769
+01:36:09.000 --> 01:36:10.000
+This is cue #5769
+
+5770
+01:36:10.000 --> 01:36:11.000
+This is cue #5770
+
+5771
+01:36:11.000 --> 01:36:12.000
+This is cue #5771
+
+5772
+01:36:12.000 --> 01:36:13.000
+This is cue #5772
+
+5773
+01:36:13.000 --> 01:36:14.000
+This is cue #5773
+
+5774
+01:36:14.000 --> 01:36:15.000
+This is cue #5774
+
+5775
+01:36:15.000 --> 01:36:16.000
+This is cue #5775
+
+5776
+01:36:16.000 --> 01:36:17.000
+This is cue #5776
+
+5777
+01:36:17.000 --> 01:36:18.000
+This is cue #5777
+
+5778
+01:36:18.000 --> 01:36:19.000
+This is cue #5778
+
+5779
+01:36:19.000 --> 01:36:20.000
+This is cue #5779
+
+5780
+01:36:20.000 --> 01:36:21.000
+This is cue #5780
+
+5781
+01:36:21.000 --> 01:36:22.000
+This is cue #5781
+
+5782
+01:36:22.000 --> 01:36:23.000
+This is cue #5782
+
+5783
+01:36:23.000 --> 01:36:24.000
+This is cue #5783
+
+5784
+01:36:24.000 --> 01:36:25.000
+This is cue #5784
+
+5785
+01:36:25.000 --> 01:36:26.000
+This is cue #5785
+
+5786
+01:36:26.000 --> 01:36:27.000
+This is cue #5786
+
+5787
+01:36:27.000 --> 01:36:28.000
+This is cue #5787
+
+5788
+01:36:28.000 --> 01:36:29.000
+This is cue #5788
+
+5789
+01:36:29.000 --> 01:36:30.000
+This is cue #5789
+
+5790
+01:36:30.000 --> 01:36:31.000
+This is cue #5790
+
+5791
+01:36:31.000 --> 01:36:32.000
+This is cue #5791
+
+5792
+01:36:32.000 --> 01:36:33.000
+This is cue #5792
+
+5793
+01:36:33.000 --> 01:36:34.000
+This is cue #5793
+
+5794
+01:36:34.000 --> 01:36:35.000
+This is cue #5794
+
+5795
+01:36:35.000 --> 01:36:36.000
+This is cue #5795
+
+5796
+01:36:36.000 --> 01:36:37.000
+This is cue #5796
+
+5797
+01:36:37.000 --> 01:36:38.000
+This is cue #5797
+
+5798
+01:36:38.000 --> 01:36:39.000
+This is cue #5798
+
+5799
+01:36:39.000 --> 01:36:40.000
+This is cue #5799
+
+5800
+01:36:40.000 --> 01:36:41.000
+This is cue #5800
+
+5801
+01:36:41.000 --> 01:36:42.000
+This is cue #5801
+
+5802
+01:36:42.000 --> 01:36:43.000
+This is cue #5802
+
+5803
+01:36:43.000 --> 01:36:44.000
+This is cue #5803
+
+5804
+01:36:44.000 --> 01:36:45.000
+This is cue #5804
+
+5805
+01:36:45.000 --> 01:36:46.000
+This is cue #5805
+
+5806
+01:36:46.000 --> 01:36:47.000
+This is cue #5806
+
+5807
+01:36:47.000 --> 01:36:48.000
+This is cue #5807
+
+5808
+01:36:48.000 --> 01:36:49.000
+This is cue #5808
+
+5809
+01:36:49.000 --> 01:36:50.000
+This is cue #5809
+
+5810
+01:36:50.000 --> 01:36:51.000
+This is cue #5810
+
+5811
+01:36:51.000 --> 01:36:52.000
+This is cue #5811
+
+5812
+01:36:52.000 --> 01:36:53.000
+This is cue #5812
+
+5813
+01:36:53.000 --> 01:36:54.000
+This is cue #5813
+
+5814
+01:36:54.000 --> 01:36:55.000
+This is cue #5814
+
+5815
+01:36:55.000 --> 01:36:56.000
+This is cue #5815
+
+5816
+01:36:56.000 --> 01:36:57.000
+This is cue #5816
+
+5817
+01:36:57.000 --> 01:36:58.000
+This is cue #5817
+
+5818
+01:36:58.000 --> 01:36:59.000
+This is cue #5818
+
+5819
+01:36:59.000 --> 01:37:00.000
+This is cue #5819
+
+5820
+01:37:00.000 --> 01:37:01.000
+This is cue #5820
+
+5821
+01:37:01.000 --> 01:37:02.000
+This is cue #5821
+
+5822
+01:37:02.000 --> 01:37:03.000
+This is cue #5822
+
+5823
+01:37:03.000 --> 01:37:04.000
+This is cue #5823
+
+5824
+01:37:04.000 --> 01:37:05.000
+This is cue #5824
+
+5825
+01:37:05.000 --> 01:37:06.000
+This is cue #5825
+
+5826
+01:37:06.000 --> 01:37:07.000
+This is cue #5826
+
+5827
+01:37:07.000 --> 01:37:08.000
+This is cue #5827
+
+5828
+01:37:08.000 --> 01:37:09.000
+This is cue #5828
+
+5829
+01:37:09.000 --> 01:37:10.000
+This is cue #5829
+
+5830
+01:37:10.000 --> 01:37:11.000
+This is cue #5830
+
+5831
+01:37:11.000 --> 01:37:12.000
+This is cue #5831
+
+5832
+01:37:12.000 --> 01:37:13.000
+This is cue #5832
+
+5833
+01:37:13.000 --> 01:37:14.000
+This is cue #5833
+
+5834
+01:37:14.000 --> 01:37:15.000
+This is cue #5834
+
+5835
+01:37:15.000 --> 01:37:16.000
+This is cue #5835
+
+5836
+01:37:16.000 --> 01:37:17.000
+This is cue #5836
+
+5837
+01:37:17.000 --> 01:37:18.000
+This is cue #5837
+
+5838
+01:37:18.000 --> 01:37:19.000
+This is cue #5838
+
+5839
+01:37:19.000 --> 01:37:20.000
+This is cue #5839
+
+5840
+01:37:20.000 --> 01:37:21.000
+This is cue #5840
+
+5841
+01:37:21.000 --> 01:37:22.000
+This is cue #5841
+
+5842
+01:37:22.000 --> 01:37:23.000
+This is cue #5842
+
+5843
+01:37:23.000 --> 01:37:24.000
+This is cue #5843
+
+5844
+01:37:24.000 --> 01:37:25.000
+This is cue #5844
+
+5845
+01:37:25.000 --> 01:37:26.000
+This is cue #5845
+
+5846
+01:37:26.000 --> 01:37:27.000
+This is cue #5846
+
+5847
+01:37:27.000 --> 01:37:28.000
+This is cue #5847
+
+5848
+01:37:28.000 --> 01:37:29.000
+This is cue #5848
+
+5849
+01:37:29.000 --> 01:37:30.000
+This is cue #5849
+
+5850
+01:37:30.000 --> 01:37:31.000
+This is cue #5850
+
+5851
+01:37:31.000 --> 01:37:32.000
+This is cue #5851
+
+5852
+01:37:32.000 --> 01:37:33.000
+This is cue #5852
+
+5853
+01:37:33.000 --> 01:37:34.000
+This is cue #5853
+
+5854
+01:37:34.000 --> 01:37:35.000
+This is cue #5854
+
+5855
+01:37:35.000 --> 01:37:36.000
+This is cue #5855
+
+5856
+01:37:36.000 --> 01:37:37.000
+This is cue #5856
+
+5857
+01:37:37.000 --> 01:37:38.000
+This is cue #5857
+
+5858
+01:37:38.000 --> 01:37:39.000
+This is cue #5858
+
+5859
+01:37:39.000 --> 01:37:40.000
+This is cue #5859
+
+5860
+01:37:40.000 --> 01:37:41.000
+This is cue #5860
+
+5861
+01:37:41.000 --> 01:37:42.000
+This is cue #5861
+
+5862
+01:37:42.000 --> 01:37:43.000
+This is cue #5862
+
+5863
+01:37:43.000 --> 01:37:44.000
+This is cue #5863
+
+5864
+01:37:44.000 --> 01:37:45.000
+This is cue #5864
+
+5865
+01:37:45.000 --> 01:37:46.000
+This is cue #5865
+
+5866
+01:37:46.000 --> 01:37:47.000
+This is cue #5866
+
+5867
+01:37:47.000 --> 01:37:48.000
+This is cue #5867
+
+5868
+01:37:48.000 --> 01:37:49.000
+This is cue #5868
+
+5869
+01:37:49.000 --> 01:37:50.000
+This is cue #5869
+
+5870
+01:37:50.000 --> 01:37:51.000
+This is cue #5870
+
+5871
+01:37:51.000 --> 01:37:52.000
+This is cue #5871
+
+5872
+01:37:52.000 --> 01:37:53.000
+This is cue #5872
+
+5873
+01:37:53.000 --> 01:37:54.000
+This is cue #5873
+
+5874
+01:37:54.000 --> 01:37:55.000
+This is cue #5874
+
+5875
+01:37:55.000 --> 01:37:56.000
+This is cue #5875
+
+5876
+01:37:56.000 --> 01:37:57.000
+This is cue #5876
+
+5877
+01:37:57.000 --> 01:37:58.000
+This is cue #5877
+
+5878
+01:37:58.000 --> 01:37:59.000
+This is cue #5878
+
+5879
+01:37:59.000 --> 01:38:00.000
+This is cue #5879
+
+5880
+01:38:00.000 --> 01:38:01.000
+This is cue #5880
+
+5881
+01:38:01.000 --> 01:38:02.000
+This is cue #5881
+
+5882
+01:38:02.000 --> 01:38:03.000
+This is cue #5882
+
+5883
+01:38:03.000 --> 01:38:04.000
+This is cue #5883
+
+5884
+01:38:04.000 --> 01:38:05.000
+This is cue #5884
+
+5885
+01:38:05.000 --> 01:38:06.000
+This is cue #5885
+
+5886
+01:38:06.000 --> 01:38:07.000
+This is cue #5886
+
+5887
+01:38:07.000 --> 01:38:08.000
+This is cue #5887
+
+5888
+01:38:08.000 --> 01:38:09.000
+This is cue #5888
+
+5889
+01:38:09.000 --> 01:38:10.000
+This is cue #5889
+
+5890
+01:38:10.000 --> 01:38:11.000
+This is cue #5890
+
+5891
+01:38:11.000 --> 01:38:12.000
+This is cue #5891
+
+5892
+01:38:12.000 --> 01:38:13.000
+This is cue #5892
+
+5893
+01:38:13.000 --> 01:38:14.000
+This is cue #5893
+
+5894
+01:38:14.000 --> 01:38:15.000
+This is cue #5894
+
+5895
+01:38:15.000 --> 01:38:16.000
+This is cue #5895
+
+5896
+01:38:16.000 --> 01:38:17.000
+This is cue #5896
+
+5897
+01:38:17.000 --> 01:38:18.000
+This is cue #5897
+
+5898
+01:38:18.000 --> 01:38:19.000
+This is cue #5898
+
+5899
+01:38:19.000 --> 01:38:20.000
+This is cue #5899
+
+5900
+01:38:20.000 --> 01:38:21.000
+This is cue #5900
+
+5901
+01:38:21.000 --> 01:38:22.000
+This is cue #5901
+
+5902
+01:38:22.000 --> 01:38:23.000
+This is cue #5902
+
+5903
+01:38:23.000 --> 01:38:24.000
+This is cue #5903
+
+5904
+01:38:24.000 --> 01:38:25.000
+This is cue #5904
+
+5905
+01:38:25.000 --> 01:38:26.000
+This is cue #5905
+
+5906
+01:38:26.000 --> 01:38:27.000
+This is cue #5906
+
+5907
+01:38:27.000 --> 01:38:28.000
+This is cue #5907
+
+5908
+01:38:28.000 --> 01:38:29.000
+This is cue #5908
+
+5909
+01:38:29.000 --> 01:38:30.000
+This is cue #5909
+
+5910
+01:38:30.000 --> 01:38:31.000
+This is cue #5910
+
+5911
+01:38:31.000 --> 01:38:32.000
+This is cue #5911
+
+5912
+01:38:32.000 --> 01:38:33.000
+This is cue #5912
+
+5913
+01:38:33.000 --> 01:38:34.000
+This is cue #5913
+
+5914
+01:38:34.000 --> 01:38:35.000
+This is cue #5914
+
+5915
+01:38:35.000 --> 01:38:36.000
+This is cue #5915
+
+5916
+01:38:36.000 --> 01:38:37.000
+This is cue #5916
+
+5917
+01:38:37.000 --> 01:38:38.000
+This is cue #5917
+
+5918
+01:38:38.000 --> 01:38:39.000
+This is cue #5918
+
+5919
+01:38:39.000 --> 01:38:40.000
+This is cue #5919
+
+5920
+01:38:40.000 --> 01:38:41.000
+This is cue #5920
+
+5921
+01:38:41.000 --> 01:38:42.000
+This is cue #5921
+
+5922
+01:38:42.000 --> 01:38:43.000
+This is cue #5922
+
+5923
+01:38:43.000 --> 01:38:44.000
+This is cue #5923
+
+5924
+01:38:44.000 --> 01:38:45.000
+This is cue #5924
+
+5925
+01:38:45.000 --> 01:38:46.000
+This is cue #5925
+
+5926
+01:38:46.000 --> 01:38:47.000
+This is cue #5926
+
+5927
+01:38:47.000 --> 01:38:48.000
+This is cue #5927
+
+5928
+01:38:48.000 --> 01:38:49.000
+This is cue #5928
+
+5929
+01:38:49.000 --> 01:38:50.000
+This is cue #5929
+
+5930
+01:38:50.000 --> 01:38:51.000
+This is cue #5930
+
+5931
+01:38:51.000 --> 01:38:52.000
+This is cue #5931
+
+5932
+01:38:52.000 --> 01:38:53.000
+This is cue #5932
+
+5933
+01:38:53.000 --> 01:38:54.000
+This is cue #5933
+
+5934
+01:38:54.000 --> 01:38:55.000
+This is cue #5934
+
+5935
+01:38:55.000 --> 01:38:56.000
+This is cue #5935
+
+5936
+01:38:56.000 --> 01:38:57.000
+This is cue #5936
+
+5937
+01:38:57.000 --> 01:38:58.000
+This is cue #5937
+
+5938
+01:38:58.000 --> 01:38:59.000
+This is cue #5938
+
+5939
+01:38:59.000 --> 01:39:00.000
+This is cue #5939
+
+5940
+01:39:00.000 --> 01:39:01.000
+This is cue #5940
+
+5941
+01:39:01.000 --> 01:39:02.000
+This is cue #5941
+
+5942
+01:39:02.000 --> 01:39:03.000
+This is cue #5942
+
+5943
+01:39:03.000 --> 01:39:04.000
+This is cue #5943
+
+5944
+01:39:04.000 --> 01:39:05.000
+This is cue #5944
+
+5945
+01:39:05.000 --> 01:39:06.000
+This is cue #5945
+
+5946
+01:39:06.000 --> 01:39:07.000
+This is cue #5946
+
+5947
+01:39:07.000 --> 01:39:08.000
+This is cue #5947
+
+5948
+01:39:08.000 --> 01:39:09.000
+This is cue #5948
+
+5949
+01:39:09.000 --> 01:39:10.000
+This is cue #5949
+
+5950
+01:39:10.000 --> 01:39:11.000
+This is cue #5950
+
+5951
+01:39:11.000 --> 01:39:12.000
+This is cue #5951
+
+5952
+01:39:12.000 --> 01:39:13.000
+This is cue #5952
+
+5953
+01:39:13.000 --> 01:39:14.000
+This is cue #5953
+
+5954
+01:39:14.000 --> 01:39:15.000
+This is cue #5954
+
+5955
+01:39:15.000 --> 01:39:16.000
+This is cue #5955
+
+5956
+01:39:16.000 --> 01:39:17.000
+This is cue #5956
+
+5957
+01:39:17.000 --> 01:39:18.000
+This is cue #5957
+
+5958
+01:39:18.000 --> 01:39:19.000
+This is cue #5958
+
+5959
+01:39:19.000 --> 01:39:20.000
+This is cue #5959
+
+5960
+01:39:20.000 --> 01:39:21.000
+This is cue #5960
+
+5961
+01:39:21.000 --> 01:39:22.000
+This is cue #5961
+
+5962
+01:39:22.000 --> 01:39:23.000
+This is cue #5962
+
+5963
+01:39:23.000 --> 01:39:24.000
+This is cue #5963
+
+5964
+01:39:24.000 --> 01:39:25.000
+This is cue #5964
+
+5965
+01:39:25.000 --> 01:39:26.000
+This is cue #5965
+
+5966
+01:39:26.000 --> 01:39:27.000
+This is cue #5966
+
+5967
+01:39:27.000 --> 01:39:28.000
+This is cue #5967
+
+5968
+01:39:28.000 --> 01:39:29.000
+This is cue #5968
+
+5969
+01:39:29.000 --> 01:39:30.000
+This is cue #5969
+
+5970
+01:39:30.000 --> 01:39:31.000
+This is cue #5970
+
+5971
+01:39:31.000 --> 01:39:32.000
+This is cue #5971
+
+5972
+01:39:32.000 --> 01:39:33.000
+This is cue #5972
+
+5973
+01:39:33.000 --> 01:39:34.000
+This is cue #5973
+
+5974
+01:39:34.000 --> 01:39:35.000
+This is cue #5974
+
+5975
+01:39:35.000 --> 01:39:36.000
+This is cue #5975
+
+5976
+01:39:36.000 --> 01:39:37.000
+This is cue #5976
+
+5977
+01:39:37.000 --> 01:39:38.000
+This is cue #5977
+
+5978
+01:39:38.000 --> 01:39:39.000
+This is cue #5978
+
+5979
+01:39:39.000 --> 01:39:40.000
+This is cue #5979
+
+5980
+01:39:40.000 --> 01:39:41.000
+This is cue #5980
+
+5981
+01:39:41.000 --> 01:39:42.000
+This is cue #5981
+
+5982
+01:39:42.000 --> 01:39:43.000
+This is cue #5982
+
+5983
+01:39:43.000 --> 01:39:44.000
+This is cue #5983
+
+5984
+01:39:44.000 --> 01:39:45.000
+This is cue #5984
+
+5985
+01:39:45.000 --> 01:39:46.000
+This is cue #5985
+
+5986
+01:39:46.000 --> 01:39:47.000
+This is cue #5986
+
+5987
+01:39:47.000 --> 01:39:48.000
+This is cue #5987
+
+5988
+01:39:48.000 --> 01:39:49.000
+This is cue #5988
+
+5989
+01:39:49.000 --> 01:39:50.000
+This is cue #5989
+
+5990
+01:39:50.000 --> 01:39:51.000
+This is cue #5990
+
+5991
+01:39:51.000 --> 01:39:52.000
+This is cue #5991
+
+5992
+01:39:52.000 --> 01:39:53.000
+This is cue #5992
+
+5993
+01:39:53.000 --> 01:39:54.000
+This is cue #5993
+
+5994
+01:39:54.000 --> 01:39:55.000
+This is cue #5994
+
+5995
+01:39:55.000 --> 01:39:56.000
+This is cue #5995
+
+5996
+01:39:56.000 --> 01:39:57.000
+This is cue #5996
+
+5997
+01:39:57.000 --> 01:39:58.000
+This is cue #5997
+
+5998
+01:39:58.000 --> 01:39:59.000
+This is cue #5998
+
+5999
+01:39:59.000 --> 01:40:00.000
+This is cue #5999
+
+6000
+01:40:00.000 --> 01:40:01.000
+This is cue #6000
+
+6001
+01:40:01.000 --> 01:40:02.000
+This is cue #6001
+
+6002
+01:40:02.000 --> 01:40:03.000
+This is cue #6002
+
+6003
+01:40:03.000 --> 01:40:04.000
+This is cue #6003
+
+6004
+01:40:04.000 --> 01:40:05.000
+This is cue #6004
+
+6005
+01:40:05.000 --> 01:40:06.000
+This is cue #6005
+
+6006
+01:40:06.000 --> 01:40:07.000
+This is cue #6006
+
+6007
+01:40:07.000 --> 01:40:08.000
+This is cue #6007
+
+6008
+01:40:08.000 --> 01:40:09.000
+This is cue #6008
+
+6009
+01:40:09.000 --> 01:40:10.000
+This is cue #6009
+
+6010
+01:40:10.000 --> 01:40:11.000
+This is cue #6010
+
+6011
+01:40:11.000 --> 01:40:12.000
+This is cue #6011
+
+6012
+01:40:12.000 --> 01:40:13.000
+This is cue #6012
+
+6013
+01:40:13.000 --> 01:40:14.000
+This is cue #6013
+
+6014
+01:40:14.000 --> 01:40:15.000
+This is cue #6014
+
+6015
+01:40:15.000 --> 01:40:16.000
+This is cue #6015
+
+6016
+01:40:16.000 --> 01:40:17.000
+This is cue #6016
+
+6017
+01:40:17.000 --> 01:40:18.000
+This is cue #6017
+
+6018
+01:40:18.000 --> 01:40:19.000
+This is cue #6018
+
+6019
+01:40:19.000 --> 01:40:20.000
+This is cue #6019
+
+6020
+01:40:20.000 --> 01:40:21.000
+This is cue #6020
+
+6021
+01:40:21.000 --> 01:40:22.000
+This is cue #6021
+
+6022
+01:40:22.000 --> 01:40:23.000
+This is cue #6022
+
+6023
+01:40:23.000 --> 01:40:24.000
+This is cue #6023
+
+6024
+01:40:24.000 --> 01:40:25.000
+This is cue #6024
+
+6025
+01:40:25.000 --> 01:40:26.000
+This is cue #6025
+
+6026
+01:40:26.000 --> 01:40:27.000
+This is cue #6026
+
+6027
+01:40:27.000 --> 01:40:28.000
+This is cue #6027
+
+6028
+01:40:28.000 --> 01:40:29.000
+This is cue #6028
+
+6029
+01:40:29.000 --> 01:40:30.000
+This is cue #6029
+
+6030
+01:40:30.000 --> 01:40:31.000
+This is cue #6030
+
+6031
+01:40:31.000 --> 01:40:32.000
+This is cue #6031
+
+6032
+01:40:32.000 --> 01:40:33.000
+This is cue #6032
+
+6033
+01:40:33.000 --> 01:40:34.000
+This is cue #6033
+
+6034
+01:40:34.000 --> 01:40:35.000
+This is cue #6034
+
+6035
+01:40:35.000 --> 01:40:36.000
+This is cue #6035
+
+6036
+01:40:36.000 --> 01:40:37.000
+This is cue #6036
+
+6037
+01:40:37.000 --> 01:40:38.000
+This is cue #6037
+
+6038
+01:40:38.000 --> 01:40:39.000
+This is cue #6038
+
+6039
+01:40:39.000 --> 01:40:40.000
+This is cue #6039
+
+6040
+01:40:40.000 --> 01:40:41.000
+This is cue #6040
+
+6041
+01:40:41.000 --> 01:40:42.000
+This is cue #6041
+
+6042
+01:40:42.000 --> 01:40:43.000
+This is cue #6042
+
+6043
+01:40:43.000 --> 01:40:44.000
+This is cue #6043
+
+6044
+01:40:44.000 --> 01:40:45.000
+This is cue #6044
+
+6045
+01:40:45.000 --> 01:40:46.000
+This is cue #6045
+
+6046
+01:40:46.000 --> 01:40:47.000
+This is cue #6046
+
+6047
+01:40:47.000 --> 01:40:48.000
+This is cue #6047
+
+6048
+01:40:48.000 --> 01:40:49.000
+This is cue #6048
+
+6049
+01:40:49.000 --> 01:40:50.000
+This is cue #6049
+
+6050
+01:40:50.000 --> 01:40:51.000
+This is cue #6050
+
+6051
+01:40:51.000 --> 01:40:52.000
+This is cue #6051
+
+6052
+01:40:52.000 --> 01:40:53.000
+This is cue #6052
+
+6053
+01:40:53.000 --> 01:40:54.000
+This is cue #6053
+
+6054
+01:40:54.000 --> 01:40:55.000
+This is cue #6054
+
+6055
+01:40:55.000 --> 01:40:56.000
+This is cue #6055
+
+6056
+01:40:56.000 --> 01:40:57.000
+This is cue #6056
+
+6057
+01:40:57.000 --> 01:40:58.000
+This is cue #6057
+
+6058
+01:40:58.000 --> 01:40:59.000
+This is cue #6058
+
+6059
+01:40:59.000 --> 01:41:00.000
+This is cue #6059
+
+6060
+01:41:00.000 --> 01:41:01.000
+This is cue #6060
+
+6061
+01:41:01.000 --> 01:41:02.000
+This is cue #6061
+
+6062
+01:41:02.000 --> 01:41:03.000
+This is cue #6062
+
+6063
+01:41:03.000 --> 01:41:04.000
+This is cue #6063
+
+6064
+01:41:04.000 --> 01:41:05.000
+This is cue #6064
+
+6065
+01:41:05.000 --> 01:41:06.000
+This is cue #6065
+
+6066
+01:41:06.000 --> 01:41:07.000
+This is cue #6066
+
+6067
+01:41:07.000 --> 01:41:08.000
+This is cue #6067
+
+6068
+01:41:08.000 --> 01:41:09.000
+This is cue #6068
+
+6069
+01:41:09.000 --> 01:41:10.000
+This is cue #6069
+
+6070
+01:41:10.000 --> 01:41:11.000
+This is cue #6070
+
+6071
+01:41:11.000 --> 01:41:12.000
+This is cue #6071
+
+6072
+01:41:12.000 --> 01:41:13.000
+This is cue #6072
+
+6073
+01:41:13.000 --> 01:41:14.000
+This is cue #6073
+
+6074
+01:41:14.000 --> 01:41:15.000
+This is cue #6074
+
+6075
+01:41:15.000 --> 01:41:16.000
+This is cue #6075
+
+6076
+01:41:16.000 --> 01:41:17.000
+This is cue #6076
+
+6077
+01:41:17.000 --> 01:41:18.000
+This is cue #6077
+
+6078
+01:41:18.000 --> 01:41:19.000
+This is cue #6078
+
+6079
+01:41:19.000 --> 01:41:20.000
+This is cue #6079
+
+6080
+01:41:20.000 --> 01:41:21.000
+This is cue #6080
+
+6081
+01:41:21.000 --> 01:41:22.000
+This is cue #6081
+
+6082
+01:41:22.000 --> 01:41:23.000
+This is cue #6082
+
+6083
+01:41:23.000 --> 01:41:24.000
+This is cue #6083
+
+6084
+01:41:24.000 --> 01:41:25.000
+This is cue #6084
+
+6085
+01:41:25.000 --> 01:41:26.000
+This is cue #6085
+
+6086
+01:41:26.000 --> 01:41:27.000
+This is cue #6086
+
+6087
+01:41:27.000 --> 01:41:28.000
+This is cue #6087
+
+6088
+01:41:28.000 --> 01:41:29.000
+This is cue #6088
+
+6089
+01:41:29.000 --> 01:41:30.000
+This is cue #6089
+
+6090
+01:41:30.000 --> 01:41:31.000
+This is cue #6090
+
+6091
+01:41:31.000 --> 01:41:32.000
+This is cue #6091
+
+6092
+01:41:32.000 --> 01:41:33.000
+This is cue #6092
+
+6093
+01:41:33.000 --> 01:41:34.000
+This is cue #6093
+
+6094
+01:41:34.000 --> 01:41:35.000
+This is cue #6094
+
+6095
+01:41:35.000 --> 01:41:36.000
+This is cue #6095
+
+6096
+01:41:36.000 --> 01:41:37.000
+This is cue #6096
+
+6097
+01:41:37.000 --> 01:41:38.000
+This is cue #6097
+
+6098
+01:41:38.000 --> 01:41:39.000
+This is cue #6098
+
+6099
+01:41:39.000 --> 01:41:40.000
+This is cue #6099
+
+6100
+01:41:40.000 --> 01:41:41.000
+This is cue #6100
+
+6101
+01:41:41.000 --> 01:41:42.000
+This is cue #6101
+
+6102
+01:41:42.000 --> 01:41:43.000
+This is cue #6102
+
+6103
+01:41:43.000 --> 01:41:44.000
+This is cue #6103
+
+6104
+01:41:44.000 --> 01:41:45.000
+This is cue #6104
+
+6105
+01:41:45.000 --> 01:41:46.000
+This is cue #6105
+
+6106
+01:41:46.000 --> 01:41:47.000
+This is cue #6106
+
+6107
+01:41:47.000 --> 01:41:48.000
+This is cue #6107
+
+6108
+01:41:48.000 --> 01:41:49.000
+This is cue #6108
+
+6109
+01:41:49.000 --> 01:41:50.000
+This is cue #6109
+
+6110
+01:41:50.000 --> 01:41:51.000
+This is cue #6110
+
+6111
+01:41:51.000 --> 01:41:52.000
+This is cue #6111
+
+6112
+01:41:52.000 --> 01:41:53.000
+This is cue #6112
+
+6113
+01:41:53.000 --> 01:41:54.000
+This is cue #6113
+
+6114
+01:41:54.000 --> 01:41:55.000
+This is cue #6114
+
+6115
+01:41:55.000 --> 01:41:56.000
+This is cue #6115
+
+6116
+01:41:56.000 --> 01:41:57.000
+This is cue #6116
+
+6117
+01:41:57.000 --> 01:41:58.000
+This is cue #6117
+
+6118
+01:41:58.000 --> 01:41:59.000
+This is cue #6118
+
+6119
+01:41:59.000 --> 01:42:00.000
+This is cue #6119
+
+6120
+01:42:00.000 --> 01:42:01.000
+This is cue #6120
+
+6121
+01:42:01.000 --> 01:42:02.000
+This is cue #6121
+
+6122
+01:42:02.000 --> 01:42:03.000
+This is cue #6122
+
+6123
+01:42:03.000 --> 01:42:04.000
+This is cue #6123
+
+6124
+01:42:04.000 --> 01:42:05.000
+This is cue #6124
+
+6125
+01:42:05.000 --> 01:42:06.000
+This is cue #6125
+
+6126
+01:42:06.000 --> 01:42:07.000
+This is cue #6126
+
+6127
+01:42:07.000 --> 01:42:08.000
+This is cue #6127
+
+6128
+01:42:08.000 --> 01:42:09.000
+This is cue #6128
+
+6129
+01:42:09.000 --> 01:42:10.000
+This is cue #6129
+
+6130
+01:42:10.000 --> 01:42:11.000
+This is cue #6130
+
+6131
+01:42:11.000 --> 01:42:12.000
+This is cue #6131
+
+6132
+01:42:12.000 --> 01:42:13.000
+This is cue #6132
+
+6133
+01:42:13.000 --> 01:42:14.000
+This is cue #6133
+
+6134
+01:42:14.000 --> 01:42:15.000
+This is cue #6134
+
+6135
+01:42:15.000 --> 01:42:16.000
+This is cue #6135
+
+6136
+01:42:16.000 --> 01:42:17.000
+This is cue #6136
+
+6137
+01:42:17.000 --> 01:42:18.000
+This is cue #6137
+
+6138
+01:42:18.000 --> 01:42:19.000
+This is cue #6138
+
+6139
+01:42:19.000 --> 01:42:20.000
+This is cue #6139
+
+6140
+01:42:20.000 --> 01:42:21.000
+This is cue #6140
+
+6141
+01:42:21.000 --> 01:42:22.000
+This is cue #6141
+
+6142
+01:42:22.000 --> 01:42:23.000
+This is cue #6142
+
+6143
+01:42:23.000 --> 01:42:24.000
+This is cue #6143
+
+6144
+01:42:24.000 --> 01:42:25.000
+This is cue #6144
+
+6145
+01:42:25.000 --> 01:42:26.000
+This is cue #6145
+
+6146
+01:42:26.000 --> 01:42:27.000
+This is cue #6146
+
+6147
+01:42:27.000 --> 01:42:28.000
+This is cue #6147
+
+6148
+01:42:28.000 --> 01:42:29.000
+This is cue #6148
+
+6149
+01:42:29.000 --> 01:42:30.000
+This is cue #6149
+
+6150
+01:42:30.000 --> 01:42:31.000
+This is cue #6150
+
+6151
+01:42:31.000 --> 01:42:32.000
+This is cue #6151
+
+6152
+01:42:32.000 --> 01:42:33.000
+This is cue #6152
+
+6153
+01:42:33.000 --> 01:42:34.000
+This is cue #6153
+
+6154
+01:42:34.000 --> 01:42:35.000
+This is cue #6154
+
+6155
+01:42:35.000 --> 01:42:36.000
+This is cue #6155
+
+6156
+01:42:36.000 --> 01:42:37.000
+This is cue #6156
+
+6157
+01:42:37.000 --> 01:42:38.000
+This is cue #6157
+
+6158
+01:42:38.000 --> 01:42:39.000
+This is cue #6158
+
+6159
+01:42:39.000 --> 01:42:40.000
+This is cue #6159
+
+6160
+01:42:40.000 --> 01:42:41.000
+This is cue #6160
+
+6161
+01:42:41.000 --> 01:42:42.000
+This is cue #6161
+
+6162
+01:42:42.000 --> 01:42:43.000
+This is cue #6162
+
+6163
+01:42:43.000 --> 01:42:44.000
+This is cue #6163
+
+6164
+01:42:44.000 --> 01:42:45.000
+This is cue #6164
+
+6165
+01:42:45.000 --> 01:42:46.000
+This is cue #6165
+
+6166
+01:42:46.000 --> 01:42:47.000
+This is cue #6166
+
+6167
+01:42:47.000 --> 01:42:48.000
+This is cue #6167
+
+6168
+01:42:48.000 --> 01:42:49.000
+This is cue #6168
+
+6169
+01:42:49.000 --> 01:42:50.000
+This is cue #6169
+
+6170
+01:42:50.000 --> 01:42:51.000
+This is cue #6170
+
+6171
+01:42:51.000 --> 01:42:52.000
+This is cue #6171
+
+6172
+01:42:52.000 --> 01:42:53.000
+This is cue #6172
+
+6173
+01:42:53.000 --> 01:42:54.000
+This is cue #6173
+
+6174
+01:42:54.000 --> 01:42:55.000
+This is cue #6174
+
+6175
+01:42:55.000 --> 01:42:56.000
+This is cue #6175
+
+6176
+01:42:56.000 --> 01:42:57.000
+This is cue #6176
+
+6177
+01:42:57.000 --> 01:42:58.000
+This is cue #6177
+
+6178
+01:42:58.000 --> 01:42:59.000
+This is cue #6178
+
+6179
+01:42:59.000 --> 01:43:00.000
+This is cue #6179
+
+6180
+01:43:00.000 --> 01:43:01.000
+This is cue #6180
+
+6181
+01:43:01.000 --> 01:43:02.000
+This is cue #6181
+
+6182
+01:43:02.000 --> 01:43:03.000
+This is cue #6182
+
+6183
+01:43:03.000 --> 01:43:04.000
+This is cue #6183
+
+6184
+01:43:04.000 --> 01:43:05.000
+This is cue #6184
+
+6185
+01:43:05.000 --> 01:43:06.000
+This is cue #6185
+
+6186
+01:43:06.000 --> 01:43:07.000
+This is cue #6186
+
+6187
+01:43:07.000 --> 01:43:08.000
+This is cue #6187
+
+6188
+01:43:08.000 --> 01:43:09.000
+This is cue #6188
+
+6189
+01:43:09.000 --> 01:43:10.000
+This is cue #6189
+
+6190
+01:43:10.000 --> 01:43:11.000
+This is cue #6190
+
+6191
+01:43:11.000 --> 01:43:12.000
+This is cue #6191
+
+6192
+01:43:12.000 --> 01:43:13.000
+This is cue #6192
+
+6193
+01:43:13.000 --> 01:43:14.000
+This is cue #6193
+
+6194
+01:43:14.000 --> 01:43:15.000
+This is cue #6194
+
+6195
+01:43:15.000 --> 01:43:16.000
+This is cue #6195
+
+6196
+01:43:16.000 --> 01:43:17.000
+This is cue #6196
+
+6197
+01:43:17.000 --> 01:43:18.000
+This is cue #6197
+
+6198
+01:43:18.000 --> 01:43:19.000
+This is cue #6198
+
+6199
+01:43:19.000 --> 01:43:20.000
+This is cue #6199
+
+6200
+01:43:20.000 --> 01:43:21.000
+This is cue #6200
+
+6201
+01:43:21.000 --> 01:43:22.000
+This is cue #6201
+
+6202
+01:43:22.000 --> 01:43:23.000
+This is cue #6202
+
+6203
+01:43:23.000 --> 01:43:24.000
+This is cue #6203
+
+6204
+01:43:24.000 --> 01:43:25.000
+This is cue #6204
+
+6205
+01:43:25.000 --> 01:43:26.000
+This is cue #6205
+
+6206
+01:43:26.000 --> 01:43:27.000
+This is cue #6206
+
+6207
+01:43:27.000 --> 01:43:28.000
+This is cue #6207
+
+6208
+01:43:28.000 --> 01:43:29.000
+This is cue #6208
+
+6209
+01:43:29.000 --> 01:43:30.000
+This is cue #6209
+
+6210
+01:43:30.000 --> 01:43:31.000
+This is cue #6210
+
+6211
+01:43:31.000 --> 01:43:32.000
+This is cue #6211
+
+6212
+01:43:32.000 --> 01:43:33.000
+This is cue #6212
+
+6213
+01:43:33.000 --> 01:43:34.000
+This is cue #6213
+
+6214
+01:43:34.000 --> 01:43:35.000
+This is cue #6214
+
+6215
+01:43:35.000 --> 01:43:36.000
+This is cue #6215
+
+6216
+01:43:36.000 --> 01:43:37.000
+This is cue #6216
+
+6217
+01:43:37.000 --> 01:43:38.000
+This is cue #6217
+
+6218
+01:43:38.000 --> 01:43:39.000
+This is cue #6218
+
+6219
+01:43:39.000 --> 01:43:40.000
+This is cue #6219
+
+6220
+01:43:40.000 --> 01:43:41.000
+This is cue #6220
+
+6221
+01:43:41.000 --> 01:43:42.000
+This is cue #6221
+
+6222
+01:43:42.000 --> 01:43:43.000
+This is cue #6222
+
+6223
+01:43:43.000 --> 01:43:44.000
+This is cue #6223
+
+6224
+01:43:44.000 --> 01:43:45.000
+This is cue #6224
+
+6225
+01:43:45.000 --> 01:43:46.000
+This is cue #6225
+
+6226
+01:43:46.000 --> 01:43:47.000
+This is cue #6226
+
+6227
+01:43:47.000 --> 01:43:48.000
+This is cue #6227
+
+6228
+01:43:48.000 --> 01:43:49.000
+This is cue #6228
+
+6229
+01:43:49.000 --> 01:43:50.000
+This is cue #6229
+
+6230
+01:43:50.000 --> 01:43:51.000
+This is cue #6230
+
+6231
+01:43:51.000 --> 01:43:52.000
+This is cue #6231
+
+6232
+01:43:52.000 --> 01:43:53.000
+This is cue #6232
+
+6233
+01:43:53.000 --> 01:43:54.000
+This is cue #6233
+
+6234
+01:43:54.000 --> 01:43:55.000
+This is cue #6234
+
+6235
+01:43:55.000 --> 01:43:56.000
+This is cue #6235
+
+6236
+01:43:56.000 --> 01:43:57.000
+This is cue #6236
+
+6237
+01:43:57.000 --> 01:43:58.000
+This is cue #6237
+
+6238
+01:43:58.000 --> 01:43:59.000
+This is cue #6238
+
+6239
+01:43:59.000 --> 01:44:00.000
+This is cue #6239
+
+6240
+01:44:00.000 --> 01:44:01.000
+This is cue #6240
+
+6241
+01:44:01.000 --> 01:44:02.000
+This is cue #6241
+
+6242
+01:44:02.000 --> 01:44:03.000
+This is cue #6242
+
+6243
+01:44:03.000 --> 01:44:04.000
+This is cue #6243
+
+6244
+01:44:04.000 --> 01:44:05.000
+This is cue #6244
+
+6245
+01:44:05.000 --> 01:44:06.000
+This is cue #6245
+
+6246
+01:44:06.000 --> 01:44:07.000
+This is cue #6246
+
+6247
+01:44:07.000 --> 01:44:08.000
+This is cue #6247
+
+6248
+01:44:08.000 --> 01:44:09.000
+This is cue #6248
+
+6249
+01:44:09.000 --> 01:44:10.000
+This is cue #6249
+
+6250
+01:44:10.000 --> 01:44:11.000
+This is cue #6250
+
+6251
+01:44:11.000 --> 01:44:12.000
+This is cue #6251
+
+6252
+01:44:12.000 --> 01:44:13.000
+This is cue #6252
+
+6253
+01:44:13.000 --> 01:44:14.000
+This is cue #6253
+
+6254
+01:44:14.000 --> 01:44:15.000
+This is cue #6254
+
+6255
+01:44:15.000 --> 01:44:16.000
+This is cue #6255
+
+6256
+01:44:16.000 --> 01:44:17.000
+This is cue #6256
+
+6257
+01:44:17.000 --> 01:44:18.000
+This is cue #6257
+
+6258
+01:44:18.000 --> 01:44:19.000
+This is cue #6258
+
+6259
+01:44:19.000 --> 01:44:20.000
+This is cue #6259
+
+6260
+01:44:20.000 --> 01:44:21.000
+This is cue #6260
+
+6261
+01:44:21.000 --> 01:44:22.000
+This is cue #6261
+
+6262
+01:44:22.000 --> 01:44:23.000
+This is cue #6262
+
+6263
+01:44:23.000 --> 01:44:24.000
+This is cue #6263
+
+6264
+01:44:24.000 --> 01:44:25.000
+This is cue #6264
+
+6265
+01:44:25.000 --> 01:44:26.000
+This is cue #6265
+
+6266
+01:44:26.000 --> 01:44:27.000
+This is cue #6266
+
+6267
+01:44:27.000 --> 01:44:28.000
+This is cue #6267
+
+6268
+01:44:28.000 --> 01:44:29.000
+This is cue #6268
+
+6269
+01:44:29.000 --> 01:44:30.000
+This is cue #6269
+
+6270
+01:44:30.000 --> 01:44:31.000
+This is cue #6270
+
+6271
+01:44:31.000 --> 01:44:32.000
+This is cue #6271
+
+6272
+01:44:32.000 --> 01:44:33.000
+This is cue #6272
+
+6273
+01:44:33.000 --> 01:44:34.000
+This is cue #6273
+
+6274
+01:44:34.000 --> 01:44:35.000
+This is cue #6274
+
+6275
+01:44:35.000 --> 01:44:36.000
+This is cue #6275
+
+6276
+01:44:36.000 --> 01:44:37.000
+This is cue #6276
+
+6277
+01:44:37.000 --> 01:44:38.000
+This is cue #6277
+
+6278
+01:44:38.000 --> 01:44:39.000
+This is cue #6278
+
+6279
+01:44:39.000 --> 01:44:40.000
+This is cue #6279
+
+6280
+01:44:40.000 --> 01:44:41.000
+This is cue #6280
+
+6281
+01:44:41.000 --> 01:44:42.000
+This is cue #6281
+
+6282
+01:44:42.000 --> 01:44:43.000
+This is cue #6282
+
+6283
+01:44:43.000 --> 01:44:44.000
+This is cue #6283
+
+6284
+01:44:44.000 --> 01:44:45.000
+This is cue #6284
+
+6285
+01:44:45.000 --> 01:44:46.000
+This is cue #6285
+
+6286
+01:44:46.000 --> 01:44:47.000
+This is cue #6286
+
+6287
+01:44:47.000 --> 01:44:48.000
+This is cue #6287
+
+6288
+01:44:48.000 --> 01:44:49.000
+This is cue #6288
+
+6289
+01:44:49.000 --> 01:44:50.000
+This is cue #6289
+
+6290
+01:44:50.000 --> 01:44:51.000
+This is cue #6290
+
+6291
+01:44:51.000 --> 01:44:52.000
+This is cue #6291
+
+6292
+01:44:52.000 --> 01:44:53.000
+This is cue #6292
+
+6293
+01:44:53.000 --> 01:44:54.000
+This is cue #6293
+
+6294
+01:44:54.000 --> 01:44:55.000
+This is cue #6294
+
+6295
+01:44:55.000 --> 01:44:56.000
+This is cue #6295
+
+6296
+01:44:56.000 --> 01:44:57.000
+This is cue #6296
+
+6297
+01:44:57.000 --> 01:44:58.000
+This is cue #6297
+
+6298
+01:44:58.000 --> 01:44:59.000
+This is cue #6298
+
+6299
+01:44:59.000 --> 01:45:00.000
+This is cue #6299
+
+6300
+01:45:00.000 --> 01:45:01.000
+This is cue #6300
+
+6301
+01:45:01.000 --> 01:45:02.000
+This is cue #6301
+
+6302
+01:45:02.000 --> 01:45:03.000
+This is cue #6302
+
+6303
+01:45:03.000 --> 01:45:04.000
+This is cue #6303
+
+6304
+01:45:04.000 --> 01:45:05.000
+This is cue #6304
+
+6305
+01:45:05.000 --> 01:45:06.000
+This is cue #6305
+
+6306
+01:45:06.000 --> 01:45:07.000
+This is cue #6306
+
+6307
+01:45:07.000 --> 01:45:08.000
+This is cue #6307
+
+6308
+01:45:08.000 --> 01:45:09.000
+This is cue #6308
+
+6309
+01:45:09.000 --> 01:45:10.000
+This is cue #6309
+
+6310
+01:45:10.000 --> 01:45:11.000
+This is cue #6310
+
+6311
+01:45:11.000 --> 01:45:12.000
+This is cue #6311
+
+6312
+01:45:12.000 --> 01:45:13.000
+This is cue #6312
+
+6313
+01:45:13.000 --> 01:45:14.000
+This is cue #6313
+
+6314
+01:45:14.000 --> 01:45:15.000
+This is cue #6314
+
+6315
+01:45:15.000 --> 01:45:16.000
+This is cue #6315
+
+6316
+01:45:16.000 --> 01:45:17.000
+This is cue #6316
+
+6317
+01:45:17.000 --> 01:45:18.000
+This is cue #6317
+
+6318
+01:45:18.000 --> 01:45:19.000
+This is cue #6318
+
+6319
+01:45:19.000 --> 01:45:20.000
+This is cue #6319
+
+6320
+01:45:20.000 --> 01:45:21.000
+This is cue #6320
+
+6321
+01:45:21.000 --> 01:45:22.000
+This is cue #6321
+
+6322
+01:45:22.000 --> 01:45:23.000
+This is cue #6322
+
+6323
+01:45:23.000 --> 01:45:24.000
+This is cue #6323
+
+6324
+01:45:24.000 --> 01:45:25.000
+This is cue #6324
+
+6325
+01:45:25.000 --> 01:45:26.000
+This is cue #6325
+
+6326
+01:45:26.000 --> 01:45:27.000
+This is cue #6326
+
+6327
+01:45:27.000 --> 01:45:28.000
+This is cue #6327
+
+6328
+01:45:28.000 --> 01:45:29.000
+This is cue #6328
+
+6329
+01:45:29.000 --> 01:45:30.000
+This is cue #6329
+
+6330
+01:45:30.000 --> 01:45:31.000
+This is cue #6330
+
+6331
+01:45:31.000 --> 01:45:32.000
+This is cue #6331
+
+6332
+01:45:32.000 --> 01:45:33.000
+This is cue #6332
+
+6333
+01:45:33.000 --> 01:45:34.000
+This is cue #6333
+
+6334
+01:45:34.000 --> 01:45:35.000
+This is cue #6334
+
+6335
+01:45:35.000 --> 01:45:36.000
+This is cue #6335
+
+6336
+01:45:36.000 --> 01:45:37.000
+This is cue #6336
+
+6337
+01:45:37.000 --> 01:45:38.000
+This is cue #6337
+
+6338
+01:45:38.000 --> 01:45:39.000
+This is cue #6338
+
+6339
+01:45:39.000 --> 01:45:40.000
+This is cue #6339
+
+6340
+01:45:40.000 --> 01:45:41.000
+This is cue #6340
+
+6341
+01:45:41.000 --> 01:45:42.000
+This is cue #6341
+
+6342
+01:45:42.000 --> 01:45:43.000
+This is cue #6342
+
+6343
+01:45:43.000 --> 01:45:44.000
+This is cue #6343
+
+6344
+01:45:44.000 --> 01:45:45.000
+This is cue #6344
+
+6345
+01:45:45.000 --> 01:45:46.000
+This is cue #6345
+
+6346
+01:45:46.000 --> 01:45:47.000
+This is cue #6346
+
+6347
+01:45:47.000 --> 01:45:48.000
+This is cue #6347
+
+6348
+01:45:48.000 --> 01:45:49.000
+This is cue #6348
+
+6349
+01:45:49.000 --> 01:45:50.000
+This is cue #6349
+
+6350
+01:45:50.000 --> 01:45:51.000
+This is cue #6350
+
+6351
+01:45:51.000 --> 01:45:52.000
+This is cue #6351
+
+6352
+01:45:52.000 --> 01:45:53.000
+This is cue #6352
+
+6353
+01:45:53.000 --> 01:45:54.000
+This is cue #6353
+
+6354
+01:45:54.000 --> 01:45:55.000
+This is cue #6354
+
+6355
+01:45:55.000 --> 01:45:56.000
+This is cue #6355
+
+6356
+01:45:56.000 --> 01:45:57.000
+This is cue #6356
+
+6357
+01:45:57.000 --> 01:45:58.000
+This is cue #6357
+
+6358
+01:45:58.000 --> 01:45:59.000
+This is cue #6358
+
+6359
+01:45:59.000 --> 01:46:00.000
+This is cue #6359
+
+6360
+01:46:00.000 --> 01:46:01.000
+This is cue #6360
+
+6361
+01:46:01.000 --> 01:46:02.000
+This is cue #6361
+
+6362
+01:46:02.000 --> 01:46:03.000
+This is cue #6362
+
+6363
+01:46:03.000 --> 01:46:04.000
+This is cue #6363
+
+6364
+01:46:04.000 --> 01:46:05.000
+This is cue #6364
+
+6365
+01:46:05.000 --> 01:46:06.000
+This is cue #6365
+
+6366
+01:46:06.000 --> 01:46:07.000
+This is cue #6366
+
+6367
+01:46:07.000 --> 01:46:08.000
+This is cue #6367
+
+6368
+01:46:08.000 --> 01:46:09.000
+This is cue #6368
+
+6369
+01:46:09.000 --> 01:46:10.000
+This is cue #6369
+
+6370
+01:46:10.000 --> 01:46:11.000
+This is cue #6370
+
+6371
+01:46:11.000 --> 01:46:12.000
+This is cue #6371
+
+6372
+01:46:12.000 --> 01:46:13.000
+This is cue #6372
+
+6373
+01:46:13.000 --> 01:46:14.000
+This is cue #6373
+
+6374
+01:46:14.000 --> 01:46:15.000
+This is cue #6374
+
+6375
+01:46:15.000 --> 01:46:16.000
+This is cue #6375
+
+6376
+01:46:16.000 --> 01:46:17.000
+This is cue #6376
+
+6377
+01:46:17.000 --> 01:46:18.000
+This is cue #6377
+
+6378
+01:46:18.000 --> 01:46:19.000
+This is cue #6378
+
+6379
+01:46:19.000 --> 01:46:20.000
+This is cue #6379
+
+6380
+01:46:20.000 --> 01:46:21.000
+This is cue #6380
+
+6381
+01:46:21.000 --> 01:46:22.000
+This is cue #6381
+
+6382
+01:46:22.000 --> 01:46:23.000
+This is cue #6382
+
+6383
+01:46:23.000 --> 01:46:24.000
+This is cue #6383
+
+6384
+01:46:24.000 --> 01:46:25.000
+This is cue #6384
+
+6385
+01:46:25.000 --> 01:46:26.000
+This is cue #6385
+
+6386
+01:46:26.000 --> 01:46:27.000
+This is cue #6386
+
+6387
+01:46:27.000 --> 01:46:28.000
+This is cue #6387
+
+6388
+01:46:28.000 --> 01:46:29.000
+This is cue #6388
+
+6389
+01:46:29.000 --> 01:46:30.000
+This is cue #6389
+
+6390
+01:46:30.000 --> 01:46:31.000
+This is cue #6390
+
+6391
+01:46:31.000 --> 01:46:32.000
+This is cue #6391
+
+6392
+01:46:32.000 --> 01:46:33.000
+This is cue #6392
+
+6393
+01:46:33.000 --> 01:46:34.000
+This is cue #6393
+
+6394
+01:46:34.000 --> 01:46:35.000
+This is cue #6394
+
+6395
+01:46:35.000 --> 01:46:36.000
+This is cue #6395
+
+6396
+01:46:36.000 --> 01:46:37.000
+This is cue #6396
+
+6397
+01:46:37.000 --> 01:46:38.000
+This is cue #6397
+
+6398
+01:46:38.000 --> 01:46:39.000
+This is cue #6398
+
+6399
+01:46:39.000 --> 01:46:40.000
+This is cue #6399
+
+6400
+01:46:40.000 --> 01:46:41.000
+This is cue #6400
+
+6401
+01:46:41.000 --> 01:46:42.000
+This is cue #6401
+
+6402
+01:46:42.000 --> 01:46:43.000
+This is cue #6402
+
+6403
+01:46:43.000 --> 01:46:44.000
+This is cue #6403
+
+6404
+01:46:44.000 --> 01:46:45.000
+This is cue #6404
+
+6405
+01:46:45.000 --> 01:46:46.000
+This is cue #6405
+
+6406
+01:46:46.000 --> 01:46:47.000
+This is cue #6406
+
+6407
+01:46:47.000 --> 01:46:48.000
+This is cue #6407
+
+6408
+01:46:48.000 --> 01:46:49.000
+This is cue #6408
+
+6409
+01:46:49.000 --> 01:46:50.000
+This is cue #6409
+
+6410
+01:46:50.000 --> 01:46:51.000
+This is cue #6410
+
+6411
+01:46:51.000 --> 01:46:52.000
+This is cue #6411
+
+6412
+01:46:52.000 --> 01:46:53.000
+This is cue #6412
+
+6413
+01:46:53.000 --> 01:46:54.000
+This is cue #6413
+
+6414
+01:46:54.000 --> 01:46:55.000
+This is cue #6414
+
+6415
+01:46:55.000 --> 01:46:56.000
+This is cue #6415
+
+6416
+01:46:56.000 --> 01:46:57.000
+This is cue #6416
+
+6417
+01:46:57.000 --> 01:46:58.000
+This is cue #6417
+
+6418
+01:46:58.000 --> 01:46:59.000
+This is cue #6418
+
+6419
+01:46:59.000 --> 01:47:00.000
+This is cue #6419
+
+6420
+01:47:00.000 --> 01:47:01.000
+This is cue #6420
+
+6421
+01:47:01.000 --> 01:47:02.000
+This is cue #6421
+
+6422
+01:47:02.000 --> 01:47:03.000
+This is cue #6422
+
+6423
+01:47:03.000 --> 01:47:04.000
+This is cue #6423
+
+6424
+01:47:04.000 --> 01:47:05.000
+This is cue #6424
+
+6425
+01:47:05.000 --> 01:47:06.000
+This is cue #6425
+
+6426
+01:47:06.000 --> 01:47:07.000
+This is cue #6426
+
+6427
+01:47:07.000 --> 01:47:08.000
+This is cue #6427
+
+6428
+01:47:08.000 --> 01:47:09.000
+This is cue #6428
+
+6429
+01:47:09.000 --> 01:47:10.000
+This is cue #6429
+
+6430
+01:47:10.000 --> 01:47:11.000
+This is cue #6430
+
+6431
+01:47:11.000 --> 01:47:12.000
+This is cue #6431
+
+6432
+01:47:12.000 --> 01:47:13.000
+This is cue #6432
+
+6433
+01:47:13.000 --> 01:47:14.000
+This is cue #6433
+
+6434
+01:47:14.000 --> 01:47:15.000
+This is cue #6434
+
+6435
+01:47:15.000 --> 01:47:16.000
+This is cue #6435
+
+6436
+01:47:16.000 --> 01:47:17.000
+This is cue #6436
+
+6437
+01:47:17.000 --> 01:47:18.000
+This is cue #6437
+
+6438
+01:47:18.000 --> 01:47:19.000
+This is cue #6438
+
+6439
+01:47:19.000 --> 01:47:20.000
+This is cue #6439
+
+6440
+01:47:20.000 --> 01:47:21.000
+This is cue #6440
+
+6441
+01:47:21.000 --> 01:47:22.000
+This is cue #6441
+
+6442
+01:47:22.000 --> 01:47:23.000
+This is cue #6442
+
+6443
+01:47:23.000 --> 01:47:24.000
+This is cue #6443
+
+6444
+01:47:24.000 --> 01:47:25.000
+This is cue #6444
+
+6445
+01:47:25.000 --> 01:47:26.000
+This is cue #6445
+
+6446
+01:47:26.000 --> 01:47:27.000
+This is cue #6446
+
+6447
+01:47:27.000 --> 01:47:28.000
+This is cue #6447
+
+6448
+01:47:28.000 --> 01:47:29.000
+This is cue #6448
+
+6449
+01:47:29.000 --> 01:47:30.000
+This is cue #6449
+
+6450
+01:47:30.000 --> 01:47:31.000
+This is cue #6450
+
+6451
+01:47:31.000 --> 01:47:32.000
+This is cue #6451
+
+6452
+01:47:32.000 --> 01:47:33.000
+This is cue #6452
+
+6453
+01:47:33.000 --> 01:47:34.000
+This is cue #6453
+
+6454
+01:47:34.000 --> 01:47:35.000
+This is cue #6454
+
+6455
+01:47:35.000 --> 01:47:36.000
+This is cue #6455
+
+6456
+01:47:36.000 --> 01:47:37.000
+This is cue #6456
+
+6457
+01:47:37.000 --> 01:47:38.000
+This is cue #6457
+
+6458
+01:47:38.000 --> 01:47:39.000
+This is cue #6458
+
+6459
+01:47:39.000 --> 01:47:40.000
+This is cue #6459
+
+6460
+01:47:40.000 --> 01:47:41.000
+This is cue #6460
+
+6461
+01:47:41.000 --> 01:47:42.000
+This is cue #6461
+
+6462
+01:47:42.000 --> 01:47:43.000
+This is cue #6462
+
+6463
+01:47:43.000 --> 01:47:44.000
+This is cue #6463
+
+6464
+01:47:44.000 --> 01:47:45.000
+This is cue #6464
+
+6465
+01:47:45.000 --> 01:47:46.000
+This is cue #6465
+
+6466
+01:47:46.000 --> 01:47:47.000
+This is cue #6466
+
+6467
+01:47:47.000 --> 01:47:48.000
+This is cue #6467
+
+6468
+01:47:48.000 --> 01:47:49.000
+This is cue #6468
+
+6469
+01:47:49.000 --> 01:47:50.000
+This is cue #6469
+
+6470
+01:47:50.000 --> 01:47:51.000
+This is cue #6470
+
+6471
+01:47:51.000 --> 01:47:52.000
+This is cue #6471
+
+6472
+01:47:52.000 --> 01:47:53.000
+This is cue #6472
+
+6473
+01:47:53.000 --> 01:47:54.000
+This is cue #6473
+
+6474
+01:47:54.000 --> 01:47:55.000
+This is cue #6474
+
+6475
+01:47:55.000 --> 01:47:56.000
+This is cue #6475
+
+6476
+01:47:56.000 --> 01:47:57.000
+This is cue #6476
+
+6477
+01:47:57.000 --> 01:47:58.000
+This is cue #6477
+
+6478
+01:47:58.000 --> 01:47:59.000
+This is cue #6478
+
+6479
+01:47:59.000 --> 01:48:00.000
+This is cue #6479
+
+6480
+01:48:00.000 --> 01:48:01.000
+This is cue #6480
+
+6481
+01:48:01.000 --> 01:48:02.000
+This is cue #6481
+
+6482
+01:48:02.000 --> 01:48:03.000
+This is cue #6482
+
+6483
+01:48:03.000 --> 01:48:04.000
+This is cue #6483
+
+6484
+01:48:04.000 --> 01:48:05.000
+This is cue #6484
+
+6485
+01:48:05.000 --> 01:48:06.000
+This is cue #6485
+
+6486
+01:48:06.000 --> 01:48:07.000
+This is cue #6486
+
+6487
+01:48:07.000 --> 01:48:08.000
+This is cue #6487
+
+6488
+01:48:08.000 --> 01:48:09.000
+This is cue #6488
+
+6489
+01:48:09.000 --> 01:48:10.000
+This is cue #6489
+
+6490
+01:48:10.000 --> 01:48:11.000
+This is cue #6490
+
+6491
+01:48:11.000 --> 01:48:12.000
+This is cue #6491
+
+6492
+01:48:12.000 --> 01:48:13.000
+This is cue #6492
+
+6493
+01:48:13.000 --> 01:48:14.000
+This is cue #6493
+
+6494
+01:48:14.000 --> 01:48:15.000
+This is cue #6494
+
+6495
+01:48:15.000 --> 01:48:16.000
+This is cue #6495
+
+6496
+01:48:16.000 --> 01:48:17.000
+This is cue #6496
+
+6497
+01:48:17.000 --> 01:48:18.000
+This is cue #6497
+
+6498
+01:48:18.000 --> 01:48:19.000
+This is cue #6498
+
+6499
+01:48:19.000 --> 01:48:20.000
+This is cue #6499
+
+6500
+01:48:20.000 --> 01:48:21.000
+This is cue #6500
+
+6501
+01:48:21.000 --> 01:48:22.000
+This is cue #6501
+
+6502
+01:48:22.000 --> 01:48:23.000
+This is cue #6502
+
+6503
+01:48:23.000 --> 01:48:24.000
+This is cue #6503
+
+6504
+01:48:24.000 --> 01:48:25.000
+This is cue #6504
+
+6505
+01:48:25.000 --> 01:48:26.000
+This is cue #6505
+
+6506
+01:48:26.000 --> 01:48:27.000
+This is cue #6506
+
+6507
+01:48:27.000 --> 01:48:28.000
+This is cue #6507
+
+6508
+01:48:28.000 --> 01:48:29.000
+This is cue #6508
+
+6509
+01:48:29.000 --> 01:48:30.000
+This is cue #6509
+
+6510
+01:48:30.000 --> 01:48:31.000
+This is cue #6510
+
+6511
+01:48:31.000 --> 01:48:32.000
+This is cue #6511
+
+6512
+01:48:32.000 --> 01:48:33.000
+This is cue #6512
+
+6513
+01:48:33.000 --> 01:48:34.000
+This is cue #6513
+
+6514
+01:48:34.000 --> 01:48:35.000
+This is cue #6514
+
+6515
+01:48:35.000 --> 01:48:36.000
+This is cue #6515
+
+6516
+01:48:36.000 --> 01:48:37.000
+This is cue #6516
+
+6517
+01:48:37.000 --> 01:48:38.000
+This is cue #6517
+
+6518
+01:48:38.000 --> 01:48:39.000
+This is cue #6518
+
+6519
+01:48:39.000 --> 01:48:40.000
+This is cue #6519
+
+6520
+01:48:40.000 --> 01:48:41.000
+This is cue #6520
+
+6521
+01:48:41.000 --> 01:48:42.000
+This is cue #6521
+
+6522
+01:48:42.000 --> 01:48:43.000
+This is cue #6522
+
+6523
+01:48:43.000 --> 01:48:44.000
+This is cue #6523
+
+6524
+01:48:44.000 --> 01:48:45.000
+This is cue #6524
+
+6525
+01:48:45.000 --> 01:48:46.000
+This is cue #6525
+
+6526
+01:48:46.000 --> 01:48:47.000
+This is cue #6526
+
+6527
+01:48:47.000 --> 01:48:48.000
+This is cue #6527
+
+6528
+01:48:48.000 --> 01:48:49.000
+This is cue #6528
+
+6529
+01:48:49.000 --> 01:48:50.000
+This is cue #6529
+
+6530
+01:48:50.000 --> 01:48:51.000
+This is cue #6530
+
+6531
+01:48:51.000 --> 01:48:52.000
+This is cue #6531
+
+6532
+01:48:52.000 --> 01:48:53.000
+This is cue #6532
+
+6533
+01:48:53.000 --> 01:48:54.000
+This is cue #6533
+
+6534
+01:48:54.000 --> 01:48:55.000
+This is cue #6534
+
+6535
+01:48:55.000 --> 01:48:56.000
+This is cue #6535
+
+6536
+01:48:56.000 --> 01:48:57.000
+This is cue #6536
+
+6537
+01:48:57.000 --> 01:48:58.000
+This is cue #6537
+
+6538
+01:48:58.000 --> 01:48:59.000
+This is cue #6538
+
+6539
+01:48:59.000 --> 01:49:00.000
+This is cue #6539
+
+6540
+01:49:00.000 --> 01:49:01.000
+This is cue #6540
+
+6541
+01:49:01.000 --> 01:49:02.000
+This is cue #6541
+
+6542
+01:49:02.000 --> 01:49:03.000
+This is cue #6542
+
+6543
+01:49:03.000 --> 01:49:04.000
+This is cue #6543
+
+6544
+01:49:04.000 --> 01:49:05.000
+This is cue #6544
+
+6545
+01:49:05.000 --> 01:49:06.000
+This is cue #6545
+
+6546
+01:49:06.000 --> 01:49:07.000
+This is cue #6546
+
+6547
+01:49:07.000 --> 01:49:08.000
+This is cue #6547
+
+6548
+01:49:08.000 --> 01:49:09.000
+This is cue #6548
+
+6549
+01:49:09.000 --> 01:49:10.000
+This is cue #6549
+
+6550
+01:49:10.000 --> 01:49:11.000
+This is cue #6550
+
+6551
+01:49:11.000 --> 01:49:12.000
+This is cue #6551
+
+6552
+01:49:12.000 --> 01:49:13.000
+This is cue #6552
+
+6553
+01:49:13.000 --> 01:49:14.000
+This is cue #6553
+
+6554
+01:49:14.000 --> 01:49:15.000
+This is cue #6554
+
+6555
+01:49:15.000 --> 01:49:16.000
+This is cue #6555
+
+6556
+01:49:16.000 --> 01:49:17.000
+This is cue #6556
+
+6557
+01:49:17.000 --> 01:49:18.000
+This is cue #6557
+
+6558
+01:49:18.000 --> 01:49:19.000
+This is cue #6558
+
+6559
+01:49:19.000 --> 01:49:20.000
+This is cue #6559
+
+6560
+01:49:20.000 --> 01:49:21.000
+This is cue #6560
+
+6561
+01:49:21.000 --> 01:49:22.000
+This is cue #6561
+
+6562
+01:49:22.000 --> 01:49:23.000
+This is cue #6562
+
+6563
+01:49:23.000 --> 01:49:24.000
+This is cue #6563
+
+6564
+01:49:24.000 --> 01:49:25.000
+This is cue #6564
+
+6565
+01:49:25.000 --> 01:49:26.000
+This is cue #6565
+
+6566
+01:49:26.000 --> 01:49:27.000
+This is cue #6566
+
+6567
+01:49:27.000 --> 01:49:28.000
+This is cue #6567
+
+6568
+01:49:28.000 --> 01:49:29.000
+This is cue #6568
+
+6569
+01:49:29.000 --> 01:49:30.000
+This is cue #6569
+
+6570
+01:49:30.000 --> 01:49:31.000
+This is cue #6570
+
+6571
+01:49:31.000 --> 01:49:32.000
+This is cue #6571
+
+6572
+01:49:32.000 --> 01:49:33.000
+This is cue #6572
+
+6573
+01:49:33.000 --> 01:49:34.000
+This is cue #6573
+
+6574
+01:49:34.000 --> 01:49:35.000
+This is cue #6574
+
+6575
+01:49:35.000 --> 01:49:36.000
+This is cue #6575
+
+6576
+01:49:36.000 --> 01:49:37.000
+This is cue #6576
+
+6577
+01:49:37.000 --> 01:49:38.000
+This is cue #6577
+
+6578
+01:49:38.000 --> 01:49:39.000
+This is cue #6578
+
+6579
+01:49:39.000 --> 01:49:40.000
+This is cue #6579
+
+6580
+01:49:40.000 --> 01:49:41.000
+This is cue #6580
+
+6581
+01:49:41.000 --> 01:49:42.000
+This is cue #6581
+
+6582
+01:49:42.000 --> 01:49:43.000
+This is cue #6582
+
+6583
+01:49:43.000 --> 01:49:44.000
+This is cue #6583
+
+6584
+01:49:44.000 --> 01:49:45.000
+This is cue #6584
+
+6585
+01:49:45.000 --> 01:49:46.000
+This is cue #6585
+
+6586
+01:49:46.000 --> 01:49:47.000
+This is cue #6586
+
+6587
+01:49:47.000 --> 01:49:48.000
+This is cue #6587
+
+6588
+01:49:48.000 --> 01:49:49.000
+This is cue #6588
+
+6589
+01:49:49.000 --> 01:49:50.000
+This is cue #6589
+
+6590
+01:49:50.000 --> 01:49:51.000
+This is cue #6590
+
+6591
+01:49:51.000 --> 01:49:52.000
+This is cue #6591
+
+6592
+01:49:52.000 --> 01:49:53.000
+This is cue #6592
+
+6593
+01:49:53.000 --> 01:49:54.000
+This is cue #6593
+
+6594
+01:49:54.000 --> 01:49:55.000
+This is cue #6594
+
+6595
+01:49:55.000 --> 01:49:56.000
+This is cue #6595
+
+6596
+01:49:56.000 --> 01:49:57.000
+This is cue #6596
+
+6597
+01:49:57.000 --> 01:49:58.000
+This is cue #6597
+
+6598
+01:49:58.000 --> 01:49:59.000
+This is cue #6598
+
+6599
+01:49:59.000 --> 01:50:00.000
+This is cue #6599
+
+6600
+01:50:00.000 --> 01:50:01.000
+This is cue #6600
+
+6601
+01:50:01.000 --> 01:50:02.000
+This is cue #6601
+
+6602
+01:50:02.000 --> 01:50:03.000
+This is cue #6602
+
+6603
+01:50:03.000 --> 01:50:04.000
+This is cue #6603
+
+6604
+01:50:04.000 --> 01:50:05.000
+This is cue #6604
+
+6605
+01:50:05.000 --> 01:50:06.000
+This is cue #6605
+
+6606
+01:50:06.000 --> 01:50:07.000
+This is cue #6606
+
+6607
+01:50:07.000 --> 01:50:08.000
+This is cue #6607
+
+6608
+01:50:08.000 --> 01:50:09.000
+This is cue #6608
+
+6609
+01:50:09.000 --> 01:50:10.000
+This is cue #6609
+
+6610
+01:50:10.000 --> 01:50:11.000
+This is cue #6610
+
+6611
+01:50:11.000 --> 01:50:12.000
+This is cue #6611
+
+6612
+01:50:12.000 --> 01:50:13.000
+This is cue #6612
+
+6613
+01:50:13.000 --> 01:50:14.000
+This is cue #6613
+
+6614
+01:50:14.000 --> 01:50:15.000
+This is cue #6614
+
+6615
+01:50:15.000 --> 01:50:16.000
+This is cue #6615
+
+6616
+01:50:16.000 --> 01:50:17.000
+This is cue #6616
+
+6617
+01:50:17.000 --> 01:50:18.000
+This is cue #6617
+
+6618
+01:50:18.000 --> 01:50:19.000
+This is cue #6618
+
+6619
+01:50:19.000 --> 01:50:20.000
+This is cue #6619
+
+6620
+01:50:20.000 --> 01:50:21.000
+This is cue #6620
+
+6621
+01:50:21.000 --> 01:50:22.000
+This is cue #6621
+
+6622
+01:50:22.000 --> 01:50:23.000
+This is cue #6622
+
+6623
+01:50:23.000 --> 01:50:24.000
+This is cue #6623
+
+6624
+01:50:24.000 --> 01:50:25.000
+This is cue #6624
+
+6625
+01:50:25.000 --> 01:50:26.000
+This is cue #6625
+
+6626
+01:50:26.000 --> 01:50:27.000
+This is cue #6626
+
+6627
+01:50:27.000 --> 01:50:28.000
+This is cue #6627
+
+6628
+01:50:28.000 --> 01:50:29.000
+This is cue #6628
+
+6629
+01:50:29.000 --> 01:50:30.000
+This is cue #6629
+
+6630
+01:50:30.000 --> 01:50:31.000
+This is cue #6630
+
+6631
+01:50:31.000 --> 01:50:32.000
+This is cue #6631
+
+6632
+01:50:32.000 --> 01:50:33.000
+This is cue #6632
+
+6633
+01:50:33.000 --> 01:50:34.000
+This is cue #6633
+
+6634
+01:50:34.000 --> 01:50:35.000
+This is cue #6634
+
+6635
+01:50:35.000 --> 01:50:36.000
+This is cue #6635
+
+6636
+01:50:36.000 --> 01:50:37.000
+This is cue #6636
+
+6637
+01:50:37.000 --> 01:50:38.000
+This is cue #6637
+
+6638
+01:50:38.000 --> 01:50:39.000
+This is cue #6638
+
+6639
+01:50:39.000 --> 01:50:40.000
+This is cue #6639
+
+6640
+01:50:40.000 --> 01:50:41.000
+This is cue #6640
+
+6641
+01:50:41.000 --> 01:50:42.000
+This is cue #6641
+
+6642
+01:50:42.000 --> 01:50:43.000
+This is cue #6642
+
+6643
+01:50:43.000 --> 01:50:44.000
+This is cue #6643
+
+6644
+01:50:44.000 --> 01:50:45.000
+This is cue #6644
+
+6645
+01:50:45.000 --> 01:50:46.000
+This is cue #6645
+
+6646
+01:50:46.000 --> 01:50:47.000
+This is cue #6646
+
+6647
+01:50:47.000 --> 01:50:48.000
+This is cue #6647
+
+6648
+01:50:48.000 --> 01:50:49.000
+This is cue #6648
+
+6649
+01:50:49.000 --> 01:50:50.000
+This is cue #6649
+
+6650
+01:50:50.000 --> 01:50:51.000
+This is cue #6650
+
+6651
+01:50:51.000 --> 01:50:52.000
+This is cue #6651
+
+6652
+01:50:52.000 --> 01:50:53.000
+This is cue #6652
+
+6653
+01:50:53.000 --> 01:50:54.000
+This is cue #6653
+
+6654
+01:50:54.000 --> 01:50:55.000
+This is cue #6654
+
+6655
+01:50:55.000 --> 01:50:56.000
+This is cue #6655
+
+6656
+01:50:56.000 --> 01:50:57.000
+This is cue #6656
+
+6657
+01:50:57.000 --> 01:50:58.000
+This is cue #6657
+
+6658
+01:50:58.000 --> 01:50:59.000
+This is cue #6658
+
+6659
+01:50:59.000 --> 01:51:00.000
+This is cue #6659
+
+6660
+01:51:00.000 --> 01:51:01.000
+This is cue #6660
+
+6661
+01:51:01.000 --> 01:51:02.000
+This is cue #6661
+
+6662
+01:51:02.000 --> 01:51:03.000
+This is cue #6662
+
+6663
+01:51:03.000 --> 01:51:04.000
+This is cue #6663
+
+6664
+01:51:04.000 --> 01:51:05.000
+This is cue #6664
+
+6665
+01:51:05.000 --> 01:51:06.000
+This is cue #6665
+
+6666
+01:51:06.000 --> 01:51:07.000
+This is cue #6666
+
+6667
+01:51:07.000 --> 01:51:08.000
+This is cue #6667
+
+6668
+01:51:08.000 --> 01:51:09.000
+This is cue #6668
+
+6669
+01:51:09.000 --> 01:51:10.000
+This is cue #6669
+
+6670
+01:51:10.000 --> 01:51:11.000
+This is cue #6670
+
+6671
+01:51:11.000 --> 01:51:12.000
+This is cue #6671
+
+6672
+01:51:12.000 --> 01:51:13.000
+This is cue #6672
+
+6673
+01:51:13.000 --> 01:51:14.000
+This is cue #6673
+
+6674
+01:51:14.000 --> 01:51:15.000
+This is cue #6674
+
+6675
+01:51:15.000 --> 01:51:16.000
+This is cue #6675
+
+6676
+01:51:16.000 --> 01:51:17.000
+This is cue #6676
+
+6677
+01:51:17.000 --> 01:51:18.000
+This is cue #6677
+
+6678
+01:51:18.000 --> 01:51:19.000
+This is cue #6678
+
+6679
+01:51:19.000 --> 01:51:20.000
+This is cue #6679
+
+6680
+01:51:20.000 --> 01:51:21.000
+This is cue #6680
+
+6681
+01:51:21.000 --> 01:51:22.000
+This is cue #6681
+
+6682
+01:51:22.000 --> 01:51:23.000
+This is cue #6682
+
+6683
+01:51:23.000 --> 01:51:24.000
+This is cue #6683
+
+6684
+01:51:24.000 --> 01:51:25.000
+This is cue #6684
+
+6685
+01:51:25.000 --> 01:51:26.000
+This is cue #6685
+
+6686
+01:51:26.000 --> 01:51:27.000
+This is cue #6686
+
+6687
+01:51:27.000 --> 01:51:28.000
+This is cue #6687
+
+6688
+01:51:28.000 --> 01:51:29.000
+This is cue #6688
+
+6689
+01:51:29.000 --> 01:51:30.000
+This is cue #6689
+
+6690
+01:51:30.000 --> 01:51:31.000
+This is cue #6690
+
+6691
+01:51:31.000 --> 01:51:32.000
+This is cue #6691
+
+6692
+01:51:32.000 --> 01:51:33.000
+This is cue #6692
+
+6693
+01:51:33.000 --> 01:51:34.000
+This is cue #6693
+
+6694
+01:51:34.000 --> 01:51:35.000
+This is cue #6694
+
+6695
+01:51:35.000 --> 01:51:36.000
+This is cue #6695
+
+6696
+01:51:36.000 --> 01:51:37.000
+This is cue #6696
+
+6697
+01:51:37.000 --> 01:51:38.000
+This is cue #6697
+
+6698
+01:51:38.000 --> 01:51:39.000
+This is cue #6698
+
+6699
+01:51:39.000 --> 01:51:40.000
+This is cue #6699
+
+6700
+01:51:40.000 --> 01:51:41.000
+This is cue #6700
+
+6701
+01:51:41.000 --> 01:51:42.000
+This is cue #6701
+
+6702
+01:51:42.000 --> 01:51:43.000
+This is cue #6702
+
+6703
+01:51:43.000 --> 01:51:44.000
+This is cue #6703
+
+6704
+01:51:44.000 --> 01:51:45.000
+This is cue #6704
+
+6705
+01:51:45.000 --> 01:51:46.000
+This is cue #6705
+
+6706
+01:51:46.000 --> 01:51:47.000
+This is cue #6706
+
+6707
+01:51:47.000 --> 01:51:48.000
+This is cue #6707
+
+6708
+01:51:48.000 --> 01:51:49.000
+This is cue #6708
+
+6709
+01:51:49.000 --> 01:51:50.000
+This is cue #6709
+
+6710
+01:51:50.000 --> 01:51:51.000
+This is cue #6710
+
+6711
+01:51:51.000 --> 01:51:52.000
+This is cue #6711
+
+6712
+01:51:52.000 --> 01:51:53.000
+This is cue #6712
+
+6713
+01:51:53.000 --> 01:51:54.000
+This is cue #6713
+
+6714
+01:51:54.000 --> 01:51:55.000
+This is cue #6714
+
+6715
+01:51:55.000 --> 01:51:56.000
+This is cue #6715
+
+6716
+01:51:56.000 --> 01:51:57.000
+This is cue #6716
+
+6717
+01:51:57.000 --> 01:51:58.000
+This is cue #6717
+
+6718
+01:51:58.000 --> 01:51:59.000
+This is cue #6718
+
+6719
+01:51:59.000 --> 01:52:00.000
+This is cue #6719
+
+6720
+01:52:00.000 --> 01:52:01.000
+This is cue #6720
+
+6721
+01:52:01.000 --> 01:52:02.000
+This is cue #6721
+
+6722
+01:52:02.000 --> 01:52:03.000
+This is cue #6722
+
+6723
+01:52:03.000 --> 01:52:04.000
+This is cue #6723
+
+6724
+01:52:04.000 --> 01:52:05.000
+This is cue #6724
+
+6725
+01:52:05.000 --> 01:52:06.000
+This is cue #6725
+
+6726
+01:52:06.000 --> 01:52:07.000
+This is cue #6726
+
+6727
+01:52:07.000 --> 01:52:08.000
+This is cue #6727
+
+6728
+01:52:08.000 --> 01:52:09.000
+This is cue #6728
+
+6729
+01:52:09.000 --> 01:52:10.000
+This is cue #6729
+
+6730
+01:52:10.000 --> 01:52:11.000
+This is cue #6730
+
+6731
+01:52:11.000 --> 01:52:12.000
+This is cue #6731
+
+6732
+01:52:12.000 --> 01:52:13.000
+This is cue #6732
+
+6733
+01:52:13.000 --> 01:52:14.000
+This is cue #6733
+
+6734
+01:52:14.000 --> 01:52:15.000
+This is cue #6734
+
+6735
+01:52:15.000 --> 01:52:16.000
+This is cue #6735
+
+6736
+01:52:16.000 --> 01:52:17.000
+This is cue #6736
+
+6737
+01:52:17.000 --> 01:52:18.000
+This is cue #6737
+
+6738
+01:52:18.000 --> 01:52:19.000
+This is cue #6738
+
+6739
+01:52:19.000 --> 01:52:20.000
+This is cue #6739
+
+6740
+01:52:20.000 --> 01:52:21.000
+This is cue #6740
+
+6741
+01:52:21.000 --> 01:52:22.000
+This is cue #6741
+
+6742
+01:52:22.000 --> 01:52:23.000
+This is cue #6742
+
+6743
+01:52:23.000 --> 01:52:24.000
+This is cue #6743
+
+6744
+01:52:24.000 --> 01:52:25.000
+This is cue #6744
+
+6745
+01:52:25.000 --> 01:52:26.000
+This is cue #6745
+
+6746
+01:52:26.000 --> 01:52:27.000
+This is cue #6746
+
+6747
+01:52:27.000 --> 01:52:28.000
+This is cue #6747
+
+6748
+01:52:28.000 --> 01:52:29.000
+This is cue #6748
+
+6749
+01:52:29.000 --> 01:52:30.000
+This is cue #6749
+
+6750
+01:52:30.000 --> 01:52:31.000
+This is cue #6750
+
+6751
+01:52:31.000 --> 01:52:32.000
+This is cue #6751
+
+6752
+01:52:32.000 --> 01:52:33.000
+This is cue #6752
+
+6753
+01:52:33.000 --> 01:52:34.000
+This is cue #6753
+
+6754
+01:52:34.000 --> 01:52:35.000
+This is cue #6754
+
+6755
+01:52:35.000 --> 01:52:36.000
+This is cue #6755
+
+6756
+01:52:36.000 --> 01:52:37.000
+This is cue #6756
+
+6757
+01:52:37.000 --> 01:52:38.000
+This is cue #6757
+
+6758
+01:52:38.000 --> 01:52:39.000
+This is cue #6758
+
+6759
+01:52:39.000 --> 01:52:40.000
+This is cue #6759
+
+6760
+01:52:40.000 --> 01:52:41.000
+This is cue #6760
+
+6761
+01:52:41.000 --> 01:52:42.000
+This is cue #6761
+
+6762
+01:52:42.000 --> 01:52:43.000
+This is cue #6762
+
+6763
+01:52:43.000 --> 01:52:44.000
+This is cue #6763
+
+6764
+01:52:44.000 --> 01:52:45.000
+This is cue #6764
+
+6765
+01:52:45.000 --> 01:52:46.000
+This is cue #6765
+
+6766
+01:52:46.000 --> 01:52:47.000
+This is cue #6766
+
+6767
+01:52:47.000 --> 01:52:48.000
+This is cue #6767
+
+6768
+01:52:48.000 --> 01:52:49.000
+This is cue #6768
+
+6769
+01:52:49.000 --> 01:52:50.000
+This is cue #6769
+
+6770
+01:52:50.000 --> 01:52:51.000
+This is cue #6770
+
+6771
+01:52:51.000 --> 01:52:52.000
+This is cue #6771
+
+6772
+01:52:52.000 --> 01:52:53.000
+This is cue #6772
+
+6773
+01:52:53.000 --> 01:52:54.000
+This is cue #6773
+
+6774
+01:52:54.000 --> 01:52:55.000
+This is cue #6774
+
+6775
+01:52:55.000 --> 01:52:56.000
+This is cue #6775
+
+6776
+01:52:56.000 --> 01:52:57.000
+This is cue #6776
+
+6777
+01:52:57.000 --> 01:52:58.000
+This is cue #6777
+
+6778
+01:52:58.000 --> 01:52:59.000
+This is cue #6778
+
+6779
+01:52:59.000 --> 01:53:00.000
+This is cue #6779
+
+6780
+01:53:00.000 --> 01:53:01.000
+This is cue #6780
+
+6781
+01:53:01.000 --> 01:53:02.000
+This is cue #6781
+
+6782
+01:53:02.000 --> 01:53:03.000
+This is cue #6782
+
+6783
+01:53:03.000 --> 01:53:04.000
+This is cue #6783
+
+6784
+01:53:04.000 --> 01:53:05.000
+This is cue #6784
+
+6785
+01:53:05.000 --> 01:53:06.000
+This is cue #6785
+
+6786
+01:53:06.000 --> 01:53:07.000
+This is cue #6786
+
+6787
+01:53:07.000 --> 01:53:08.000
+This is cue #6787
+
+6788
+01:53:08.000 --> 01:53:09.000
+This is cue #6788
+
+6789
+01:53:09.000 --> 01:53:10.000
+This is cue #6789
+
+6790
+01:53:10.000 --> 01:53:11.000
+This is cue #6790
+
+6791
+01:53:11.000 --> 01:53:12.000
+This is cue #6791
+
+6792
+01:53:12.000 --> 01:53:13.000
+This is cue #6792
+
+6793
+01:53:13.000 --> 01:53:14.000
+This is cue #6793
+
+6794
+01:53:14.000 --> 01:53:15.000
+This is cue #6794
+
+6795
+01:53:15.000 --> 01:53:16.000
+This is cue #6795
+
+6796
+01:53:16.000 --> 01:53:17.000
+This is cue #6796
+
+6797
+01:53:17.000 --> 01:53:18.000
+This is cue #6797
+
+6798
+01:53:18.000 --> 01:53:19.000
+This is cue #6798
+
+6799
+01:53:19.000 --> 01:53:20.000
+This is cue #6799
+
+6800
+01:53:20.000 --> 01:53:21.000
+This is cue #6800
+
+6801
+01:53:21.000 --> 01:53:22.000
+This is cue #6801
+
+6802
+01:53:22.000 --> 01:53:23.000
+This is cue #6802
+
+6803
+01:53:23.000 --> 01:53:24.000
+This is cue #6803
+
+6804
+01:53:24.000 --> 01:53:25.000
+This is cue #6804
+
+6805
+01:53:25.000 --> 01:53:26.000
+This is cue #6805
+
+6806
+01:53:26.000 --> 01:53:27.000
+This is cue #6806
+
+6807
+01:53:27.000 --> 01:53:28.000
+This is cue #6807
+
+6808
+01:53:28.000 --> 01:53:29.000
+This is cue #6808
+
+6809
+01:53:29.000 --> 01:53:30.000
+This is cue #6809
+
+6810
+01:53:30.000 --> 01:53:31.000
+This is cue #6810
+
+6811
+01:53:31.000 --> 01:53:32.000
+This is cue #6811
+
+6812
+01:53:32.000 --> 01:53:33.000
+This is cue #6812
+
+6813
+01:53:33.000 --> 01:53:34.000
+This is cue #6813
+
+6814
+01:53:34.000 --> 01:53:35.000
+This is cue #6814
+
+6815
+01:53:35.000 --> 01:53:36.000
+This is cue #6815
+
+6816
+01:53:36.000 --> 01:53:37.000
+This is cue #6816
+
+6817
+01:53:37.000 --> 01:53:38.000
+This is cue #6817
+
+6818
+01:53:38.000 --> 01:53:39.000
+This is cue #6818
+
+6819
+01:53:39.000 --> 01:53:40.000
+This is cue #6819
+
+6820
+01:53:40.000 --> 01:53:41.000
+This is cue #6820
+
+6821
+01:53:41.000 --> 01:53:42.000
+This is cue #6821
+
+6822
+01:53:42.000 --> 01:53:43.000
+This is cue #6822
+
+6823
+01:53:43.000 --> 01:53:44.000
+This is cue #6823
+
+6824
+01:53:44.000 --> 01:53:45.000
+This is cue #6824
+
+6825
+01:53:45.000 --> 01:53:46.000
+This is cue #6825
+
+6826
+01:53:46.000 --> 01:53:47.000
+This is cue #6826
+
+6827
+01:53:47.000 --> 01:53:48.000
+This is cue #6827
+
+6828
+01:53:48.000 --> 01:53:49.000
+This is cue #6828
+
+6829
+01:53:49.000 --> 01:53:50.000
+This is cue #6829
+
+6830
+01:53:50.000 --> 01:53:51.000
+This is cue #6830
+
+6831
+01:53:51.000 --> 01:53:52.000
+This is cue #6831
+
+6832
+01:53:52.000 --> 01:53:53.000
+This is cue #6832
+
+6833
+01:53:53.000 --> 01:53:54.000
+This is cue #6833
+
+6834
+01:53:54.000 --> 01:53:55.000
+This is cue #6834
+
+6835
+01:53:55.000 --> 01:53:56.000
+This is cue #6835
+
+6836
+01:53:56.000 --> 01:53:57.000
+This is cue #6836
+
+6837
+01:53:57.000 --> 01:53:58.000
+This is cue #6837
+
+6838
+01:53:58.000 --> 01:53:59.000
+This is cue #6838
+
+6839
+01:53:59.000 --> 01:54:00.000
+This is cue #6839
+
+6840
+01:54:00.000 --> 01:54:01.000
+This is cue #6840
+
+6841
+01:54:01.000 --> 01:54:02.000
+This is cue #6841
+
+6842
+01:54:02.000 --> 01:54:03.000
+This is cue #6842
+
+6843
+01:54:03.000 --> 01:54:04.000
+This is cue #6843
+
+6844
+01:54:04.000 --> 01:54:05.000
+This is cue #6844
+
+6845
+01:54:05.000 --> 01:54:06.000
+This is cue #6845
+
+6846
+01:54:06.000 --> 01:54:07.000
+This is cue #6846
+
+6847
+01:54:07.000 --> 01:54:08.000
+This is cue #6847
+
+6848
+01:54:08.000 --> 01:54:09.000
+This is cue #6848
+
+6849
+01:54:09.000 --> 01:54:10.000
+This is cue #6849
+
+6850
+01:54:10.000 --> 01:54:11.000
+This is cue #6850
+
+6851
+01:54:11.000 --> 01:54:12.000
+This is cue #6851
+
+6852
+01:54:12.000 --> 01:54:13.000
+This is cue #6852
+
+6853
+01:54:13.000 --> 01:54:14.000
+This is cue #6853
+
+6854
+01:54:14.000 --> 01:54:15.000
+This is cue #6854
+
+6855
+01:54:15.000 --> 01:54:16.000
+This is cue #6855
+
+6856
+01:54:16.000 --> 01:54:17.000
+This is cue #6856
+
+6857
+01:54:17.000 --> 01:54:18.000
+This is cue #6857
+
+6858
+01:54:18.000 --> 01:54:19.000
+This is cue #6858
+
+6859
+01:54:19.000 --> 01:54:20.000
+This is cue #6859
+
+6860
+01:54:20.000 --> 01:54:21.000
+This is cue #6860
+
+6861
+01:54:21.000 --> 01:54:22.000
+This is cue #6861
+
+6862
+01:54:22.000 --> 01:54:23.000
+This is cue #6862
+
+6863
+01:54:23.000 --> 01:54:24.000
+This is cue #6863
+
+6864
+01:54:24.000 --> 01:54:25.000
+This is cue #6864
+
+6865
+01:54:25.000 --> 01:54:26.000
+This is cue #6865
+
+6866
+01:54:26.000 --> 01:54:27.000
+This is cue #6866
+
+6867
+01:54:27.000 --> 01:54:28.000
+This is cue #6867
+
+6868
+01:54:28.000 --> 01:54:29.000
+This is cue #6868
+
+6869
+01:54:29.000 --> 01:54:30.000
+This is cue #6869
+
+6870
+01:54:30.000 --> 01:54:31.000
+This is cue #6870
+
+6871
+01:54:31.000 --> 01:54:32.000
+This is cue #6871
+
+6872
+01:54:32.000 --> 01:54:33.000
+This is cue #6872
+
+6873
+01:54:33.000 --> 01:54:34.000
+This is cue #6873
+
+6874
+01:54:34.000 --> 01:54:35.000
+This is cue #6874
+
+6875
+01:54:35.000 --> 01:54:36.000
+This is cue #6875
+
+6876
+01:54:36.000 --> 01:54:37.000
+This is cue #6876
+
+6877
+01:54:37.000 --> 01:54:38.000
+This is cue #6877
+
+6878
+01:54:38.000 --> 01:54:39.000
+This is cue #6878
+
+6879
+01:54:39.000 --> 01:54:40.000
+This is cue #6879
+
+6880
+01:54:40.000 --> 01:54:41.000
+This is cue #6880
+
+6881
+01:54:41.000 --> 01:54:42.000
+This is cue #6881
+
+6882
+01:54:42.000 --> 01:54:43.000
+This is cue #6882
+
+6883
+01:54:43.000 --> 01:54:44.000
+This is cue #6883
+
+6884
+01:54:44.000 --> 01:54:45.000
+This is cue #6884
+
+6885
+01:54:45.000 --> 01:54:46.000
+This is cue #6885
+
+6886
+01:54:46.000 --> 01:54:47.000
+This is cue #6886
+
+6887
+01:54:47.000 --> 01:54:48.000
+This is cue #6887
+
+6888
+01:54:48.000 --> 01:54:49.000
+This is cue #6888
+
+6889
+01:54:49.000 --> 01:54:50.000
+This is cue #6889
+
+6890
+01:54:50.000 --> 01:54:51.000
+This is cue #6890
+
+6891
+01:54:51.000 --> 01:54:52.000
+This is cue #6891
+
+6892
+01:54:52.000 --> 01:54:53.000
+This is cue #6892
+
+6893
+01:54:53.000 --> 01:54:54.000
+This is cue #6893
+
+6894
+01:54:54.000 --> 01:54:55.000
+This is cue #6894
+
+6895
+01:54:55.000 --> 01:54:56.000
+This is cue #6895
+
+6896
+01:54:56.000 --> 01:54:57.000
+This is cue #6896
+
+6897
+01:54:57.000 --> 01:54:58.000
+This is cue #6897
+
+6898
+01:54:58.000 --> 01:54:59.000
+This is cue #6898
+
+6899
+01:54:59.000 --> 01:55:00.000
+This is cue #6899
+
+6900
+01:55:00.000 --> 01:55:01.000
+This is cue #6900
+
+6901
+01:55:01.000 --> 01:55:02.000
+This is cue #6901
+
+6902
+01:55:02.000 --> 01:55:03.000
+This is cue #6902
+
+6903
+01:55:03.000 --> 01:55:04.000
+This is cue #6903
+
+6904
+01:55:04.000 --> 01:55:05.000
+This is cue #6904
+
+6905
+01:55:05.000 --> 01:55:06.000
+This is cue #6905
+
+6906
+01:55:06.000 --> 01:55:07.000
+This is cue #6906
+
+6907
+01:55:07.000 --> 01:55:08.000
+This is cue #6907
+
+6908
+01:55:08.000 --> 01:55:09.000
+This is cue #6908
+
+6909
+01:55:09.000 --> 01:55:10.000
+This is cue #6909
+
+6910
+01:55:10.000 --> 01:55:11.000
+This is cue #6910
+
+6911
+01:55:11.000 --> 01:55:12.000
+This is cue #6911
+
+6912
+01:55:12.000 --> 01:55:13.000
+This is cue #6912
+
+6913
+01:55:13.000 --> 01:55:14.000
+This is cue #6913
+
+6914
+01:55:14.000 --> 01:55:15.000
+This is cue #6914
+
+6915
+01:55:15.000 --> 01:55:16.000
+This is cue #6915
+
+6916
+01:55:16.000 --> 01:55:17.000
+This is cue #6916
+
+6917
+01:55:17.000 --> 01:55:18.000
+This is cue #6917
+
+6918
+01:55:18.000 --> 01:55:19.000
+This is cue #6918
+
+6919
+01:55:19.000 --> 01:55:20.000
+This is cue #6919
+
+6920
+01:55:20.000 --> 01:55:21.000
+This is cue #6920
+
+6921
+01:55:21.000 --> 01:55:22.000
+This is cue #6921
+
+6922
+01:55:22.000 --> 01:55:23.000
+This is cue #6922
+
+6923
+01:55:23.000 --> 01:55:24.000
+This is cue #6923
+
+6924
+01:55:24.000 --> 01:55:25.000
+This is cue #6924
+
+6925
+01:55:25.000 --> 01:55:26.000
+This is cue #6925
+
+6926
+01:55:26.000 --> 01:55:27.000
+This is cue #6926
+
+6927
+01:55:27.000 --> 01:55:28.000
+This is cue #6927
+
+6928
+01:55:28.000 --> 01:55:29.000
+This is cue #6928
+
+6929
+01:55:29.000 --> 01:55:30.000
+This is cue #6929
+
+6930
+01:55:30.000 --> 01:55:31.000
+This is cue #6930
+
+6931
+01:55:31.000 --> 01:55:32.000
+This is cue #6931
+
+6932
+01:55:32.000 --> 01:55:33.000
+This is cue #6932
+
+6933
+01:55:33.000 --> 01:55:34.000
+This is cue #6933
+
+6934
+01:55:34.000 --> 01:55:35.000
+This is cue #6934
+
+6935
+01:55:35.000 --> 01:55:36.000
+This is cue #6935
+
+6936
+01:55:36.000 --> 01:55:37.000
+This is cue #6936
+
+6937
+01:55:37.000 --> 01:55:38.000
+This is cue #6937
+
+6938
+01:55:38.000 --> 01:55:39.000
+This is cue #6938
+
+6939
+01:55:39.000 --> 01:55:40.000
+This is cue #6939
+
+6940
+01:55:40.000 --> 01:55:41.000
+This is cue #6940
+
+6941
+01:55:41.000 --> 01:55:42.000
+This is cue #6941
+
+6942
+01:55:42.000 --> 01:55:43.000
+This is cue #6942
+
+6943
+01:55:43.000 --> 01:55:44.000
+This is cue #6943
+
+6944
+01:55:44.000 --> 01:55:45.000
+This is cue #6944
+
+6945
+01:55:45.000 --> 01:55:46.000
+This is cue #6945
+
+6946
+01:55:46.000 --> 01:55:47.000
+This is cue #6946
+
+6947
+01:55:47.000 --> 01:55:48.000
+This is cue #6947
+
+6948
+01:55:48.000 --> 01:55:49.000
+This is cue #6948
+
+6949
+01:55:49.000 --> 01:55:50.000
+This is cue #6949
+
+6950
+01:55:50.000 --> 01:55:51.000
+This is cue #6950
+
+6951
+01:55:51.000 --> 01:55:52.000
+This is cue #6951
+
+6952
+01:55:52.000 --> 01:55:53.000
+This is cue #6952
+
+6953
+01:55:53.000 --> 01:55:54.000
+This is cue #6953
+
+6954
+01:55:54.000 --> 01:55:55.000
+This is cue #6954
+
+6955
+01:55:55.000 --> 01:55:56.000
+This is cue #6955
+
+6956
+01:55:56.000 --> 01:55:57.000
+This is cue #6956
+
+6957
+01:55:57.000 --> 01:55:58.000
+This is cue #6957
+
+6958
+01:55:58.000 --> 01:55:59.000
+This is cue #6958
+
+6959
+01:55:59.000 --> 01:56:00.000
+This is cue #6959
+
+6960
+01:56:00.000 --> 01:56:01.000
+This is cue #6960
+
+6961
+01:56:01.000 --> 01:56:02.000
+This is cue #6961
+
+6962
+01:56:02.000 --> 01:56:03.000
+This is cue #6962
+
+6963
+01:56:03.000 --> 01:56:04.000
+This is cue #6963
+
+6964
+01:56:04.000 --> 01:56:05.000
+This is cue #6964
+
+6965
+01:56:05.000 --> 01:56:06.000
+This is cue #6965
+
+6966
+01:56:06.000 --> 01:56:07.000
+This is cue #6966
+
+6967
+01:56:07.000 --> 01:56:08.000
+This is cue #6967
+
+6968
+01:56:08.000 --> 01:56:09.000
+This is cue #6968
+
+6969
+01:56:09.000 --> 01:56:10.000
+This is cue #6969
+
+6970
+01:56:10.000 --> 01:56:11.000
+This is cue #6970
+
+6971
+01:56:11.000 --> 01:56:12.000
+This is cue #6971
+
+6972
+01:56:12.000 --> 01:56:13.000
+This is cue #6972
+
+6973
+01:56:13.000 --> 01:56:14.000
+This is cue #6973
+
+6974
+01:56:14.000 --> 01:56:15.000
+This is cue #6974
+
+6975
+01:56:15.000 --> 01:56:16.000
+This is cue #6975
+
+6976
+01:56:16.000 --> 01:56:17.000
+This is cue #6976
+
+6977
+01:56:17.000 --> 01:56:18.000
+This is cue #6977
+
+6978
+01:56:18.000 --> 01:56:19.000
+This is cue #6978
+
+6979
+01:56:19.000 --> 01:56:20.000
+This is cue #6979
+
+6980
+01:56:20.000 --> 01:56:21.000
+This is cue #6980
+
+6981
+01:56:21.000 --> 01:56:22.000
+This is cue #6981
+
+6982
+01:56:22.000 --> 01:56:23.000
+This is cue #6982
+
+6983
+01:56:23.000 --> 01:56:24.000
+This is cue #6983
+
+6984
+01:56:24.000 --> 01:56:25.000
+This is cue #6984
+
+6985
+01:56:25.000 --> 01:56:26.000
+This is cue #6985
+
+6986
+01:56:26.000 --> 01:56:27.000
+This is cue #6986
+
+6987
+01:56:27.000 --> 01:56:28.000
+This is cue #6987
+
+6988
+01:56:28.000 --> 01:56:29.000
+This is cue #6988
+
+6989
+01:56:29.000 --> 01:56:30.000
+This is cue #6989
+
+6990
+01:56:30.000 --> 01:56:31.000
+This is cue #6990
+
+6991
+01:56:31.000 --> 01:56:32.000
+This is cue #6991
+
+6992
+01:56:32.000 --> 01:56:33.000
+This is cue #6992
+
+6993
+01:56:33.000 --> 01:56:34.000
+This is cue #6993
+
+6994
+01:56:34.000 --> 01:56:35.000
+This is cue #6994
+
+6995
+01:56:35.000 --> 01:56:36.000
+This is cue #6995
+
+6996
+01:56:36.000 --> 01:56:37.000
+This is cue #6996
+
+6997
+01:56:37.000 --> 01:56:38.000
+This is cue #6997
+
+6998
+01:56:38.000 --> 01:56:39.000
+This is cue #6998
+
+6999
+01:56:39.000 --> 01:56:40.000
+This is cue #6999
+
+7000
+01:56:40.000 --> 01:56:41.000
+This is cue #7000
+
+7001
+01:56:41.000 --> 01:56:42.000
+This is cue #7001
+
+7002
+01:56:42.000 --> 01:56:43.000
+This is cue #7002
+
+7003
+01:56:43.000 --> 01:56:44.000
+This is cue #7003
+
+7004
+01:56:44.000 --> 01:56:45.000
+This is cue #7004
+
+7005
+01:56:45.000 --> 01:56:46.000
+This is cue #7005
+
+7006
+01:56:46.000 --> 01:56:47.000
+This is cue #7006
+
+7007
+01:56:47.000 --> 01:56:48.000
+This is cue #7007
+
+7008
+01:56:48.000 --> 01:56:49.000
+This is cue #7008
+
+7009
+01:56:49.000 --> 01:56:50.000
+This is cue #7009
+
+7010
+01:56:50.000 --> 01:56:51.000
+This is cue #7010
+
+7011
+01:56:51.000 --> 01:56:52.000
+This is cue #7011
+
+7012
+01:56:52.000 --> 01:56:53.000
+This is cue #7012
+
+7013
+01:56:53.000 --> 01:56:54.000
+This is cue #7013
+
+7014
+01:56:54.000 --> 01:56:55.000
+This is cue #7014
+
+7015
+01:56:55.000 --> 01:56:56.000
+This is cue #7015
+
+7016
+01:56:56.000 --> 01:56:57.000
+This is cue #7016
+
+7017
+01:56:57.000 --> 01:56:58.000
+This is cue #7017
+
+7018
+01:56:58.000 --> 01:56:59.000
+This is cue #7018
+
+7019
+01:56:59.000 --> 01:57:00.000
+This is cue #7019
+
+7020
+01:57:00.000 --> 01:57:01.000
+This is cue #7020
+
+7021
+01:57:01.000 --> 01:57:02.000
+This is cue #7021
+
+7022
+01:57:02.000 --> 01:57:03.000
+This is cue #7022
+
+7023
+01:57:03.000 --> 01:57:04.000
+This is cue #7023
+
+7024
+01:57:04.000 --> 01:57:05.000
+This is cue #7024
+
+7025
+01:57:05.000 --> 01:57:06.000
+This is cue #7025
+
+7026
+01:57:06.000 --> 01:57:07.000
+This is cue #7026
+
+7027
+01:57:07.000 --> 01:57:08.000
+This is cue #7027
+
+7028
+01:57:08.000 --> 01:57:09.000
+This is cue #7028
+
+7029
+01:57:09.000 --> 01:57:10.000
+This is cue #7029
+
+7030
+01:57:10.000 --> 01:57:11.000
+This is cue #7030
+
+7031
+01:57:11.000 --> 01:57:12.000
+This is cue #7031
+
+7032
+01:57:12.000 --> 01:57:13.000
+This is cue #7032
+
+7033
+01:57:13.000 --> 01:57:14.000
+This is cue #7033
+
+7034
+01:57:14.000 --> 01:57:15.000
+This is cue #7034
+
+7035
+01:57:15.000 --> 01:57:16.000
+This is cue #7035
+
+7036
+01:57:16.000 --> 01:57:17.000
+This is cue #7036
+
+7037
+01:57:17.000 --> 01:57:18.000
+This is cue #7037
+
+7038
+01:57:18.000 --> 01:57:19.000
+This is cue #7038
+
+7039
+01:57:19.000 --> 01:57:20.000
+This is cue #7039
+
+7040
+01:57:20.000 --> 01:57:21.000
+This is cue #7040
+
+7041
+01:57:21.000 --> 01:57:22.000
+This is cue #7041
+
+7042
+01:57:22.000 --> 01:57:23.000
+This is cue #7042
+
+7043
+01:57:23.000 --> 01:57:24.000
+This is cue #7043
+
+7044
+01:57:24.000 --> 01:57:25.000
+This is cue #7044
+
+7045
+01:57:25.000 --> 01:57:26.000
+This is cue #7045
+
+7046
+01:57:26.000 --> 01:57:27.000
+This is cue #7046
+
+7047
+01:57:27.000 --> 01:57:28.000
+This is cue #7047
+
+7048
+01:57:28.000 --> 01:57:29.000
+This is cue #7048
+
+7049
+01:57:29.000 --> 01:57:30.000
+This is cue #7049
+
+7050
+01:57:30.000 --> 01:57:31.000
+This is cue #7050
+
+7051
+01:57:31.000 --> 01:57:32.000
+This is cue #7051
+
+7052
+01:57:32.000 --> 01:57:33.000
+This is cue #7052
+
+7053
+01:57:33.000 --> 01:57:34.000
+This is cue #7053
+
+7054
+01:57:34.000 --> 01:57:35.000
+This is cue #7054
+
+7055
+01:57:35.000 --> 01:57:36.000
+This is cue #7055
+
+7056
+01:57:36.000 --> 01:57:37.000
+This is cue #7056
+
+7057
+01:57:37.000 --> 01:57:38.000
+This is cue #7057
+
+7058
+01:57:38.000 --> 01:57:39.000
+This is cue #7058
+
+7059
+01:57:39.000 --> 01:57:40.000
+This is cue #7059
+
+7060
+01:57:40.000 --> 01:57:41.000
+This is cue #7060
+
+7061
+01:57:41.000 --> 01:57:42.000
+This is cue #7061
+
+7062
+01:57:42.000 --> 01:57:43.000
+This is cue #7062
+
+7063
+01:57:43.000 --> 01:57:44.000
+This is cue #7063
+
+7064
+01:57:44.000 --> 01:57:45.000
+This is cue #7064
+
+7065
+01:57:45.000 --> 01:57:46.000
+This is cue #7065
+
+7066
+01:57:46.000 --> 01:57:47.000
+This is cue #7066
+
+7067
+01:57:47.000 --> 01:57:48.000
+This is cue #7067
+
+7068
+01:57:48.000 --> 01:57:49.000
+This is cue #7068
+
+7069
+01:57:49.000 --> 01:57:50.000
+This is cue #7069
+
+7070
+01:57:50.000 --> 01:57:51.000
+This is cue #7070
+
+7071
+01:57:51.000 --> 01:57:52.000
+This is cue #7071
+
+7072
+01:57:52.000 --> 01:57:53.000
+This is cue #7072
+
+7073
+01:57:53.000 --> 01:57:54.000
+This is cue #7073
+
+7074
+01:57:54.000 --> 01:57:55.000
+This is cue #7074
+
+7075
+01:57:55.000 --> 01:57:56.000
+This is cue #7075
+
+7076
+01:57:56.000 --> 01:57:57.000
+This is cue #7076
+
+7077
+01:57:57.000 --> 01:57:58.000
+This is cue #7077
+
+7078
+01:57:58.000 --> 01:57:59.000
+This is cue #7078
+
+7079
+01:57:59.000 --> 01:58:00.000
+This is cue #7079
+
+7080
+01:58:00.000 --> 01:58:01.000
+This is cue #7080
+
+7081
+01:58:01.000 --> 01:58:02.000
+This is cue #7081
+
+7082
+01:58:02.000 --> 01:58:03.000
+This is cue #7082
+
+7083
+01:58:03.000 --> 01:58:04.000
+This is cue #7083
+
+7084
+01:58:04.000 --> 01:58:05.000
+This is cue #7084
+
+7085
+01:58:05.000 --> 01:58:06.000
+This is cue #7085
+
+7086
+01:58:06.000 --> 01:58:07.000
+This is cue #7086
+
+7087
+01:58:07.000 --> 01:58:08.000
+This is cue #7087
+
+7088
+01:58:08.000 --> 01:58:09.000
+This is cue #7088
+
+7089
+01:58:09.000 --> 01:58:10.000
+This is cue #7089
+
+7090
+01:58:10.000 --> 01:58:11.000
+This is cue #7090
+
+7091
+01:58:11.000 --> 01:58:12.000
+This is cue #7091
+
+7092
+01:58:12.000 --> 01:58:13.000
+This is cue #7092
+
+7093
+01:58:13.000 --> 01:58:14.000
+This is cue #7093
+
+7094
+01:58:14.000 --> 01:58:15.000
+This is cue #7094
+
+7095
+01:58:15.000 --> 01:58:16.000
+This is cue #7095
+
+7096
+01:58:16.000 --> 01:58:17.000
+This is cue #7096
+
+7097
+01:58:17.000 --> 01:58:18.000
+This is cue #7097
+
+7098
+01:58:18.000 --> 01:58:19.000
+This is cue #7098
+
+7099
+01:58:19.000 --> 01:58:20.000
+This is cue #7099
+
+7100
+01:58:20.000 --> 01:58:21.000
+This is cue #7100
+
+7101
+01:58:21.000 --> 01:58:22.000
+This is cue #7101
+
+7102
+01:58:22.000 --> 01:58:23.000
+This is cue #7102
+
+7103
+01:58:23.000 --> 01:58:24.000
+This is cue #7103
+
+7104
+01:58:24.000 --> 01:58:25.000
+This is cue #7104
+
+7105
+01:58:25.000 --> 01:58:26.000
+This is cue #7105
+
+7106
+01:58:26.000 --> 01:58:27.000
+This is cue #7106
+
+7107
+01:58:27.000 --> 01:58:28.000
+This is cue #7107
+
+7108
+01:58:28.000 --> 01:58:29.000
+This is cue #7108
+
+7109
+01:58:29.000 --> 01:58:30.000
+This is cue #7109
+
+7110
+01:58:30.000 --> 01:58:31.000
+This is cue #7110
+
+7111
+01:58:31.000 --> 01:58:32.000
+This is cue #7111
+
+7112
+01:58:32.000 --> 01:58:33.000
+This is cue #7112
+
+7113
+01:58:33.000 --> 01:58:34.000
+This is cue #7113
+
+7114
+01:58:34.000 --> 01:58:35.000
+This is cue #7114
+
+7115
+01:58:35.000 --> 01:58:36.000
+This is cue #7115
+
+7116
+01:58:36.000 --> 01:58:37.000
+This is cue #7116
+
+7117
+01:58:37.000 --> 01:58:38.000
+This is cue #7117
+
+7118
+01:58:38.000 --> 01:58:39.000
+This is cue #7118
+
+7119
+01:58:39.000 --> 01:58:40.000
+This is cue #7119
+
+7120
+01:58:40.000 --> 01:58:41.000
+This is cue #7120
+
+7121
+01:58:41.000 --> 01:58:42.000
+This is cue #7121
+
+7122
+01:58:42.000 --> 01:58:43.000
+This is cue #7122
+
+7123
+01:58:43.000 --> 01:58:44.000
+This is cue #7123
+
+7124
+01:58:44.000 --> 01:58:45.000
+This is cue #7124
+
+7125
+01:58:45.000 --> 01:58:46.000
+This is cue #7125
+
+7126
+01:58:46.000 --> 01:58:47.000
+This is cue #7126
+
+7127
+01:58:47.000 --> 01:58:48.000
+This is cue #7127
+
+7128
+01:58:48.000 --> 01:58:49.000
+This is cue #7128
+
+7129
+01:58:49.000 --> 01:58:50.000
+This is cue #7129
+
+7130
+01:58:50.000 --> 01:58:51.000
+This is cue #7130
+
+7131
+01:58:51.000 --> 01:58:52.000
+This is cue #7131
+
+7132
+01:58:52.000 --> 01:58:53.000
+This is cue #7132
+
+7133
+01:58:53.000 --> 01:58:54.000
+This is cue #7133
+
+7134
+01:58:54.000 --> 01:58:55.000
+This is cue #7134
+
+7135
+01:58:55.000 --> 01:58:56.000
+This is cue #7135
+
+7136
+01:58:56.000 --> 01:58:57.000
+This is cue #7136
+
+7137
+01:58:57.000 --> 01:58:58.000
+This is cue #7137
+
+7138
+01:58:58.000 --> 01:58:59.000
+This is cue #7138
+
+7139
+01:58:59.000 --> 01:59:00.000
+This is cue #7139
+
+7140
+01:59:00.000 --> 01:59:01.000
+This is cue #7140
+
+7141
+01:59:01.000 --> 01:59:02.000
+This is cue #7141
+
+7142
+01:59:02.000 --> 01:59:03.000
+This is cue #7142
+
+7143
+01:59:03.000 --> 01:59:04.000
+This is cue #7143
+
+7144
+01:59:04.000 --> 01:59:05.000
+This is cue #7144
+
+7145
+01:59:05.000 --> 01:59:06.000
+This is cue #7145
+
+7146
+01:59:06.000 --> 01:59:07.000
+This is cue #7146
+
+7147
+01:59:07.000 --> 01:59:08.000
+This is cue #7147
+
+7148
+01:59:08.000 --> 01:59:09.000
+This is cue #7148
+
+7149
+01:59:09.000 --> 01:59:10.000
+This is cue #7149
+
+7150
+01:59:10.000 --> 01:59:11.000
+This is cue #7150
+
+7151
+01:59:11.000 --> 01:59:12.000
+This is cue #7151
+
+7152
+01:59:12.000 --> 01:59:13.000
+This is cue #7152
+
+7153
+01:59:13.000 --> 01:59:14.000
+This is cue #7153
+
+7154
+01:59:14.000 --> 01:59:15.000
+This is cue #7154
+
+7155
+01:59:15.000 --> 01:59:16.000
+This is cue #7155
+
+7156
+01:59:16.000 --> 01:59:17.000
+This is cue #7156
+
+7157
+01:59:17.000 --> 01:59:18.000
+This is cue #7157
+
+7158
+01:59:18.000 --> 01:59:19.000
+This is cue #7158
+
+7159
+01:59:19.000 --> 01:59:20.000
+This is cue #7159
+
+7160
+01:59:20.000 --> 01:59:21.000
+This is cue #7160
+
+7161
+01:59:21.000 --> 01:59:22.000
+This is cue #7161
+
+7162
+01:59:22.000 --> 01:59:23.000
+This is cue #7162
+
+7163
+01:59:23.000 --> 01:59:24.000
+This is cue #7163
+
+7164
+01:59:24.000 --> 01:59:25.000
+This is cue #7164
+
+7165
+01:59:25.000 --> 01:59:26.000
+This is cue #7165
+
+7166
+01:59:26.000 --> 01:59:27.000
+This is cue #7166
+
+7167
+01:59:27.000 --> 01:59:28.000
+This is cue #7167
+
+7168
+01:59:28.000 --> 01:59:29.000
+This is cue #7168
+
+7169
+01:59:29.000 --> 01:59:30.000
+This is cue #7169
+
+7170
+01:59:30.000 --> 01:59:31.000
+This is cue #7170
+
+7171
+01:59:31.000 --> 01:59:32.000
+This is cue #7171
+
+7172
+01:59:32.000 --> 01:59:33.000
+This is cue #7172
+
+7173
+01:59:33.000 --> 01:59:34.000
+This is cue #7173
+
+7174
+01:59:34.000 --> 01:59:35.000
+This is cue #7174
+
+7175
+01:59:35.000 --> 01:59:36.000
+This is cue #7175
+
+7176
+01:59:36.000 --> 01:59:37.000
+This is cue #7176
+
+7177
+01:59:37.000 --> 01:59:38.000
+This is cue #7177
+
+7178
+01:59:38.000 --> 01:59:39.000
+This is cue #7178
+
+7179
+01:59:39.000 --> 01:59:40.000
+This is cue #7179
+
+7180
+01:59:40.000 --> 01:59:41.000
+This is cue #7180
+
+7181
+01:59:41.000 --> 01:59:42.000
+This is cue #7181
+
+7182
+01:59:42.000 --> 01:59:43.000
+This is cue #7182
+
+7183
+01:59:43.000 --> 01:59:44.000
+This is cue #7183
+
+7184
+01:59:44.000 --> 01:59:45.000
+This is cue #7184
+
+7185
+01:59:45.000 --> 01:59:46.000
+This is cue #7185
+
+7186
+01:59:46.000 --> 01:59:47.000
+This is cue #7186
+
+7187
+01:59:47.000 --> 01:59:48.000
+This is cue #7187
+
+7188
+01:59:48.000 --> 01:59:49.000
+This is cue #7188
+
+7189
+01:59:49.000 --> 01:59:50.000
+This is cue #7189
+
+7190
+01:59:50.000 --> 01:59:51.000
+This is cue #7190
+
+7191
+01:59:51.000 --> 01:59:52.000
+This is cue #7191
+
+7192
+01:59:52.000 --> 01:59:53.000
+This is cue #7192
+
+7193
+01:59:53.000 --> 01:59:54.000
+This is cue #7193
+
+7194
+01:59:54.000 --> 01:59:55.000
+This is cue #7194
+
+7195
+01:59:55.000 --> 01:59:56.000
+This is cue #7195
+
+7196
+01:59:56.000 --> 01:59:57.000
+This is cue #7196
+
+7197
+01:59:57.000 --> 01:59:58.000
+This is cue #7197
+
+7198
+01:59:58.000 --> 01:59:59.000
+This is cue #7198
+
+7199
+01:59:59.000 --> 02:00:00.000
+This is cue #7199
+
+7200
+02:00:00.000 --> 02:00:01.000
+This is cue #7200
+
+7201
+02:00:01.000 --> 02:00:02.000
+This is cue #7201
+
+7202
+02:00:02.000 --> 02:00:03.000
+This is cue #7202
+
+7203
+02:00:03.000 --> 02:00:04.000
+This is cue #7203
+
+7204
+02:00:04.000 --> 02:00:05.000
+This is cue #7204
+
+7205
+02:00:05.000 --> 02:00:06.000
+This is cue #7205
+
+7206
+02:00:06.000 --> 02:00:07.000
+This is cue #7206
+
+7207
+02:00:07.000 --> 02:00:08.000
+This is cue #7207
+
+7208
+02:00:08.000 --> 02:00:09.000
+This is cue #7208
+
+7209
+02:00:09.000 --> 02:00:10.000
+This is cue #7209
+
+7210
+02:00:10.000 --> 02:00:11.000
+This is cue #7210
+
+7211
+02:00:11.000 --> 02:00:12.000
+This is cue #7211
+
+7212
+02:00:12.000 --> 02:00:13.000
+This is cue #7212
+
+7213
+02:00:13.000 --> 02:00:14.000
+This is cue #7213
+
+7214
+02:00:14.000 --> 02:00:15.000
+This is cue #7214
+
+7215
+02:00:15.000 --> 02:00:16.000
+This is cue #7215
+
+7216
+02:00:16.000 --> 02:00:17.000
+This is cue #7216
+
+7217
+02:00:17.000 --> 02:00:18.000
+This is cue #7217
+
+7218
+02:00:18.000 --> 02:00:19.000
+This is cue #7218
+
+7219
+02:00:19.000 --> 02:00:20.000
+This is cue #7219
+
+7220
+02:00:20.000 --> 02:00:21.000
+This is cue #7220
+
+7221
+02:00:21.000 --> 02:00:22.000
+This is cue #7221
+
+7222
+02:00:22.000 --> 02:00:23.000
+This is cue #7222
+
+7223
+02:00:23.000 --> 02:00:24.000
+This is cue #7223
+
+7224
+02:00:24.000 --> 02:00:25.000
+This is cue #7224
+
+7225
+02:00:25.000 --> 02:00:26.000
+This is cue #7225
+
+7226
+02:00:26.000 --> 02:00:27.000
+This is cue #7226
+
+7227
+02:00:27.000 --> 02:00:28.000
+This is cue #7227
+
+7228
+02:00:28.000 --> 02:00:29.000
+This is cue #7228
+
+7229
+02:00:29.000 --> 02:00:30.000
+This is cue #7229
+
+7230
+02:00:30.000 --> 02:00:31.000
+This is cue #7230
+
+7231
+02:00:31.000 --> 02:00:32.000
+This is cue #7231
+
+7232
+02:00:32.000 --> 02:00:33.000
+This is cue #7232
+
+7233
+02:00:33.000 --> 02:00:34.000
+This is cue #7233
+
+7234
+02:00:34.000 --> 02:00:35.000
+This is cue #7234
+
+7235
+02:00:35.000 --> 02:00:36.000
+This is cue #7235
+
+7236
+02:00:36.000 --> 02:00:37.000
+This is cue #7236
+
+7237
+02:00:37.000 --> 02:00:38.000
+This is cue #7237
+
+7238
+02:00:38.000 --> 02:00:39.000
+This is cue #7238
+
+7239
+02:00:39.000 --> 02:00:40.000
+This is cue #7239
+
+7240
+02:00:40.000 --> 02:00:41.000
+This is cue #7240
+
+7241
+02:00:41.000 --> 02:00:42.000
+This is cue #7241
+
+7242
+02:00:42.000 --> 02:00:43.000
+This is cue #7242
+
+7243
+02:00:43.000 --> 02:00:44.000
+This is cue #7243
+
+7244
+02:00:44.000 --> 02:00:45.000
+This is cue #7244
+
+7245
+02:00:45.000 --> 02:00:46.000
+This is cue #7245
+
+7246
+02:00:46.000 --> 02:00:47.000
+This is cue #7246
+
+7247
+02:00:47.000 --> 02:00:48.000
+This is cue #7247
+
+7248
+02:00:48.000 --> 02:00:49.000
+This is cue #7248
+
+7249
+02:00:49.000 --> 02:00:50.000
+This is cue #7249
+
+7250
+02:00:50.000 --> 02:00:51.000
+This is cue #7250
+
+7251
+02:00:51.000 --> 02:00:52.000
+This is cue #7251
+
+7252
+02:00:52.000 --> 02:00:53.000
+This is cue #7252
+
+7253
+02:00:53.000 --> 02:00:54.000
+This is cue #7253
+
+7254
+02:00:54.000 --> 02:00:55.000
+This is cue #7254
+
+7255
+02:00:55.000 --> 02:00:56.000
+This is cue #7255
+
+7256
+02:00:56.000 --> 02:00:57.000
+This is cue #7256
+
+7257
+02:00:57.000 --> 02:00:58.000
+This is cue #7257
+
+7258
+02:00:58.000 --> 02:00:59.000
+This is cue #7258
+
+7259
+02:00:59.000 --> 02:01:00.000
+This is cue #7259
+
+7260
+02:01:00.000 --> 02:01:01.000
+This is cue #7260
+
+7261
+02:01:01.000 --> 02:01:02.000
+This is cue #7261
+
+7262
+02:01:02.000 --> 02:01:03.000
+This is cue #7262
+
+7263
+02:01:03.000 --> 02:01:04.000
+This is cue #7263
+
+7264
+02:01:04.000 --> 02:01:05.000
+This is cue #7264
+
+7265
+02:01:05.000 --> 02:01:06.000
+This is cue #7265
+
+7266
+02:01:06.000 --> 02:01:07.000
+This is cue #7266
+
+7267
+02:01:07.000 --> 02:01:08.000
+This is cue #7267
+
+7268
+02:01:08.000 --> 02:01:09.000
+This is cue #7268
+
+7269
+02:01:09.000 --> 02:01:10.000
+This is cue #7269
+
+7270
+02:01:10.000 --> 02:01:11.000
+This is cue #7270
+
+7271
+02:01:11.000 --> 02:01:12.000
+This is cue #7271
+
+7272
+02:01:12.000 --> 02:01:13.000
+This is cue #7272
+
+7273
+02:01:13.000 --> 02:01:14.000
+This is cue #7273
+
+7274
+02:01:14.000 --> 02:01:15.000
+This is cue #7274
+
+7275
+02:01:15.000 --> 02:01:16.000
+This is cue #7275
+
+7276
+02:01:16.000 --> 02:01:17.000
+This is cue #7276
+
+7277
+02:01:17.000 --> 02:01:18.000
+This is cue #7277
+
+7278
+02:01:18.000 --> 02:01:19.000
+This is cue #7278
+
+7279
+02:01:19.000 --> 02:01:20.000
+This is cue #7279
+
+7280
+02:01:20.000 --> 02:01:21.000
+This is cue #7280
+
+7281
+02:01:21.000 --> 02:01:22.000
+This is cue #7281
+
+7282
+02:01:22.000 --> 02:01:23.000
+This is cue #7282
+
+7283
+02:01:23.000 --> 02:01:24.000
+This is cue #7283
+
+7284
+02:01:24.000 --> 02:01:25.000
+This is cue #7284
+
+7285
+02:01:25.000 --> 02:01:26.000
+This is cue #7285
+
+7286
+02:01:26.000 --> 02:01:27.000
+This is cue #7286
+
+7287
+02:01:27.000 --> 02:01:28.000
+This is cue #7287
+
+7288
+02:01:28.000 --> 02:01:29.000
+This is cue #7288
+
+7289
+02:01:29.000 --> 02:01:30.000
+This is cue #7289
+
+7290
+02:01:30.000 --> 02:01:31.000
+This is cue #7290
+
+7291
+02:01:31.000 --> 02:01:32.000
+This is cue #7291
+
+7292
+02:01:32.000 --> 02:01:33.000
+This is cue #7292
+
+7293
+02:01:33.000 --> 02:01:34.000
+This is cue #7293
+
+7294
+02:01:34.000 --> 02:01:35.000
+This is cue #7294
+
+7295
+02:01:35.000 --> 02:01:36.000
+This is cue #7295
+
+7296
+02:01:36.000 --> 02:01:37.000
+This is cue #7296
+
+7297
+02:01:37.000 --> 02:01:38.000
+This is cue #7297
+
+7298
+02:01:38.000 --> 02:01:39.000
+This is cue #7298
+
+7299
+02:01:39.000 --> 02:01:40.000
+This is cue #7299
+
+7300
+02:01:40.000 --> 02:01:41.000
+This is cue #7300
+
+7301
+02:01:41.000 --> 02:01:42.000
+This is cue #7301
+
+7302
+02:01:42.000 --> 02:01:43.000
+This is cue #7302
+
+7303
+02:01:43.000 --> 02:01:44.000
+This is cue #7303
+
+7304
+02:01:44.000 --> 02:01:45.000
+This is cue #7304
+
+7305
+02:01:45.000 --> 02:01:46.000
+This is cue #7305
+
+7306
+02:01:46.000 --> 02:01:47.000
+This is cue #7306
+
+7307
+02:01:47.000 --> 02:01:48.000
+This is cue #7307
+
+7308
+02:01:48.000 --> 02:01:49.000
+This is cue #7308
+
+7309
+02:01:49.000 --> 02:01:50.000
+This is cue #7309
+
+7310
+02:01:50.000 --> 02:01:51.000
+This is cue #7310
+
+7311
+02:01:51.000 --> 02:01:52.000
+This is cue #7311
+
+7312
+02:01:52.000 --> 02:01:53.000
+This is cue #7312
+
+7313
+02:01:53.000 --> 02:01:54.000
+This is cue #7313
+
+7314
+02:01:54.000 --> 02:01:55.000
+This is cue #7314
+
+7315
+02:01:55.000 --> 02:01:56.000
+This is cue #7315
+
+7316
+02:01:56.000 --> 02:01:57.000
+This is cue #7316
+
+7317
+02:01:57.000 --> 02:01:58.000
+This is cue #7317
+
+7318
+02:01:58.000 --> 02:01:59.000
+This is cue #7318
+
+7319
+02:01:59.000 --> 02:02:00.000
+This is cue #7319
+
+7320
+02:02:00.000 --> 02:02:01.000
+This is cue #7320
+
+7321
+02:02:01.000 --> 02:02:02.000
+This is cue #7321
+
+7322
+02:02:02.000 --> 02:02:03.000
+This is cue #7322
+
+7323
+02:02:03.000 --> 02:02:04.000
+This is cue #7323
+
+7324
+02:02:04.000 --> 02:02:05.000
+This is cue #7324
+
+7325
+02:02:05.000 --> 02:02:06.000
+This is cue #7325
+
+7326
+02:02:06.000 --> 02:02:07.000
+This is cue #7326
+
+7327
+02:02:07.000 --> 02:02:08.000
+This is cue #7327
+
+7328
+02:02:08.000 --> 02:02:09.000
+This is cue #7328
+
+7329
+02:02:09.000 --> 02:02:10.000
+This is cue #7329
+
+7330
+02:02:10.000 --> 02:02:11.000
+This is cue #7330
+
+7331
+02:02:11.000 --> 02:02:12.000
+This is cue #7331
+
+7332
+02:02:12.000 --> 02:02:13.000
+This is cue #7332
+
+7333
+02:02:13.000 --> 02:02:14.000
+This is cue #7333
+
+7334
+02:02:14.000 --> 02:02:15.000
+This is cue #7334
+
+7335
+02:02:15.000 --> 02:02:16.000
+This is cue #7335
+
+7336
+02:02:16.000 --> 02:02:17.000
+This is cue #7336
+
+7337
+02:02:17.000 --> 02:02:18.000
+This is cue #7337
+
+7338
+02:02:18.000 --> 02:02:19.000
+This is cue #7338
+
+7339
+02:02:19.000 --> 02:02:20.000
+This is cue #7339
+
+7340
+02:02:20.000 --> 02:02:21.000
+This is cue #7340
+
+7341
+02:02:21.000 --> 02:02:22.000
+This is cue #7341
+
+7342
+02:02:22.000 --> 02:02:23.000
+This is cue #7342
+
+7343
+02:02:23.000 --> 02:02:24.000
+This is cue #7343
+
+7344
+02:02:24.000 --> 02:02:25.000
+This is cue #7344
+
+7345
+02:02:25.000 --> 02:02:26.000
+This is cue #7345
+
+7346
+02:02:26.000 --> 02:02:27.000
+This is cue #7346
+
+7347
+02:02:27.000 --> 02:02:28.000
+This is cue #7347
+
+7348
+02:02:28.000 --> 02:02:29.000
+This is cue #7348
+
+7349
+02:02:29.000 --> 02:02:30.000
+This is cue #7349
+
+7350
+02:02:30.000 --> 02:02:31.000
+This is cue #7350
+
+7351
+02:02:31.000 --> 02:02:32.000
+This is cue #7351
+
+7352
+02:02:32.000 --> 02:02:33.000
+This is cue #7352
+
+7353
+02:02:33.000 --> 02:02:34.000
+This is cue #7353
+
+7354
+02:02:34.000 --> 02:02:35.000
+This is cue #7354
+
+7355
+02:02:35.000 --> 02:02:36.000
+This is cue #7355
+
+7356
+02:02:36.000 --> 02:02:37.000
+This is cue #7356
+
+7357
+02:02:37.000 --> 02:02:38.000
+This is cue #7357
+
+7358
+02:02:38.000 --> 02:02:39.000
+This is cue #7358
+
+7359
+02:02:39.000 --> 02:02:40.000
+This is cue #7359
+
+7360
+02:02:40.000 --> 02:02:41.000
+This is cue #7360
+
+7361
+02:02:41.000 --> 02:02:42.000
+This is cue #7361
+
+7362
+02:02:42.000 --> 02:02:43.000
+This is cue #7362
+
+7363
+02:02:43.000 --> 02:02:44.000
+This is cue #7363
+
+7364
+02:02:44.000 --> 02:02:45.000
+This is cue #7364
+
+7365
+02:02:45.000 --> 02:02:46.000
+This is cue #7365
+
+7366
+02:02:46.000 --> 02:02:47.000
+This is cue #7366
+
+7367
+02:02:47.000 --> 02:02:48.000
+This is cue #7367
+
+7368
+02:02:48.000 --> 02:02:49.000
+This is cue #7368
+
+7369
+02:02:49.000 --> 02:02:50.000
+This is cue #7369
+
+7370
+02:02:50.000 --> 02:02:51.000
+This is cue #7370
+
+7371
+02:02:51.000 --> 02:02:52.000
+This is cue #7371
+
+7372
+02:02:52.000 --> 02:02:53.000
+This is cue #7372
+
+7373
+02:02:53.000 --> 02:02:54.000
+This is cue #7373
+
+7374
+02:02:54.000 --> 02:02:55.000
+This is cue #7374
+
+7375
+02:02:55.000 --> 02:02:56.000
+This is cue #7375
+
+7376
+02:02:56.000 --> 02:02:57.000
+This is cue #7376
+
+7377
+02:02:57.000 --> 02:02:58.000
+This is cue #7377
+
+7378
+02:02:58.000 --> 02:02:59.000
+This is cue #7378
+
+7379
+02:02:59.000 --> 02:03:00.000
+This is cue #7379
+
+7380
+02:03:00.000 --> 02:03:01.000
+This is cue #7380
+
+7381
+02:03:01.000 --> 02:03:02.000
+This is cue #7381
+
+7382
+02:03:02.000 --> 02:03:03.000
+This is cue #7382
+
+7383
+02:03:03.000 --> 02:03:04.000
+This is cue #7383
+
+7384
+02:03:04.000 --> 02:03:05.000
+This is cue #7384
+
+7385
+02:03:05.000 --> 02:03:06.000
+This is cue #7385
+
+7386
+02:03:06.000 --> 02:03:07.000
+This is cue #7386
+
+7387
+02:03:07.000 --> 02:03:08.000
+This is cue #7387
+
+7388
+02:03:08.000 --> 02:03:09.000
+This is cue #7388
+
+7389
+02:03:09.000 --> 02:03:10.000
+This is cue #7389
+
+7390
+02:03:10.000 --> 02:03:11.000
+This is cue #7390
+
+7391
+02:03:11.000 --> 02:03:12.000
+This is cue #7391
+
+7392
+02:03:12.000 --> 02:03:13.000
+This is cue #7392
+
+7393
+02:03:13.000 --> 02:03:14.000
+This is cue #7393
+
+7394
+02:03:14.000 --> 02:03:15.000
+This is cue #7394
+
+7395
+02:03:15.000 --> 02:03:16.000
+This is cue #7395
+
+7396
+02:03:16.000 --> 02:03:17.000
+This is cue #7396
+
+7397
+02:03:17.000 --> 02:03:18.000
+This is cue #7397
+
+7398
+02:03:18.000 --> 02:03:19.000
+This is cue #7398
+
+7399
+02:03:19.000 --> 02:03:20.000
+This is cue #7399
+
+7400
+02:03:20.000 --> 02:03:21.000
+This is cue #7400
+
+7401
+02:03:21.000 --> 02:03:22.000
+This is cue #7401
+
+7402
+02:03:22.000 --> 02:03:23.000
+This is cue #7402
+
+7403
+02:03:23.000 --> 02:03:24.000
+This is cue #7403
+
+7404
+02:03:24.000 --> 02:03:25.000
+This is cue #7404
+
+7405
+02:03:25.000 --> 02:03:26.000
+This is cue #7405
+
+7406
+02:03:26.000 --> 02:03:27.000
+This is cue #7406
+
+7407
+02:03:27.000 --> 02:03:28.000
+This is cue #7407
+
+7408
+02:03:28.000 --> 02:03:29.000
+This is cue #7408
+
+7409
+02:03:29.000 --> 02:03:30.000
+This is cue #7409
+
+7410
+02:03:30.000 --> 02:03:31.000
+This is cue #7410
+
+7411
+02:03:31.000 --> 02:03:32.000
+This is cue #7411
+
+7412
+02:03:32.000 --> 02:03:33.000
+This is cue #7412
+
+7413
+02:03:33.000 --> 02:03:34.000
+This is cue #7413
+
+7414
+02:03:34.000 --> 02:03:35.000
+This is cue #7414
+
+7415
+02:03:35.000 --> 02:03:36.000
+This is cue #7415
+
+7416
+02:03:36.000 --> 02:03:37.000
+This is cue #7416
+
+7417
+02:03:37.000 --> 02:03:38.000
+This is cue #7417
+
+7418
+02:03:38.000 --> 02:03:39.000
+This is cue #7418
+
+7419
+02:03:39.000 --> 02:03:40.000
+This is cue #7419
+
+7420
+02:03:40.000 --> 02:03:41.000
+This is cue #7420
+
+7421
+02:03:41.000 --> 02:03:42.000
+This is cue #7421
+
+7422
+02:03:42.000 --> 02:03:43.000
+This is cue #7422
+
+7423
+02:03:43.000 --> 02:03:44.000
+This is cue #7423
+
+7424
+02:03:44.000 --> 02:03:45.000
+This is cue #7424
+
+7425
+02:03:45.000 --> 02:03:46.000
+This is cue #7425
+
+7426
+02:03:46.000 --> 02:03:47.000
+This is cue #7426
+
+7427
+02:03:47.000 --> 02:03:48.000
+This is cue #7427
+
+7428
+02:03:48.000 --> 02:03:49.000
+This is cue #7428
+
+7429
+02:03:49.000 --> 02:03:50.000
+This is cue #7429
+
+7430
+02:03:50.000 --> 02:03:51.000
+This is cue #7430
+
+7431
+02:03:51.000 --> 02:03:52.000
+This is cue #7431
+
+7432
+02:03:52.000 --> 02:03:53.000
+This is cue #7432
+
+7433
+02:03:53.000 --> 02:03:54.000
+This is cue #7433
+
+7434
+02:03:54.000 --> 02:03:55.000
+This is cue #7434
+
+7435
+02:03:55.000 --> 02:03:56.000
+This is cue #7435
+
+7436
+02:03:56.000 --> 02:03:57.000
+This is cue #7436
+
+7437
+02:03:57.000 --> 02:03:58.000
+This is cue #7437
+
+7438
+02:03:58.000 --> 02:03:59.000
+This is cue #7438
+
+7439
+02:03:59.000 --> 02:04:00.000
+This is cue #7439
+
+7440
+02:04:00.000 --> 02:04:01.000
+This is cue #7440
+
+7441
+02:04:01.000 --> 02:04:02.000
+This is cue #7441
+
+7442
+02:04:02.000 --> 02:04:03.000
+This is cue #7442
+
+7443
+02:04:03.000 --> 02:04:04.000
+This is cue #7443
+
+7444
+02:04:04.000 --> 02:04:05.000
+This is cue #7444
+
+7445
+02:04:05.000 --> 02:04:06.000
+This is cue #7445
+
+7446
+02:04:06.000 --> 02:04:07.000
+This is cue #7446
+
+7447
+02:04:07.000 --> 02:04:08.000
+This is cue #7447
+
+7448
+02:04:08.000 --> 02:04:09.000
+This is cue #7448
+
+7449
+02:04:09.000 --> 02:04:10.000
+This is cue #7449
+
+7450
+02:04:10.000 --> 02:04:11.000
+This is cue #7450
+
+7451
+02:04:11.000 --> 02:04:12.000
+This is cue #7451
+
+7452
+02:04:12.000 --> 02:04:13.000
+This is cue #7452
+
+7453
+02:04:13.000 --> 02:04:14.000
+This is cue #7453
+
+7454
+02:04:14.000 --> 02:04:15.000
+This is cue #7454
+
+7455
+02:04:15.000 --> 02:04:16.000
+This is cue #7455
+
+7456
+02:04:16.000 --> 02:04:17.000
+This is cue #7456
+
+7457
+02:04:17.000 --> 02:04:18.000
+This is cue #7457
+
+7458
+02:04:18.000 --> 02:04:19.000
+This is cue #7458
+
+7459
+02:04:19.000 --> 02:04:20.000
+This is cue #7459
+
+7460
+02:04:20.000 --> 02:04:21.000
+This is cue #7460
+
+7461
+02:04:21.000 --> 02:04:22.000
+This is cue #7461
+
+7462
+02:04:22.000 --> 02:04:23.000
+This is cue #7462
+
+7463
+02:04:23.000 --> 02:04:24.000
+This is cue #7463
+
+7464
+02:04:24.000 --> 02:04:25.000
+This is cue #7464
+
+7465
+02:04:25.000 --> 02:04:26.000
+This is cue #7465
+
+7466
+02:04:26.000 --> 02:04:27.000
+This is cue #7466
+
+7467
+02:04:27.000 --> 02:04:28.000
+This is cue #7467
+
+7468
+02:04:28.000 --> 02:04:29.000
+This is cue #7468
+
+7469
+02:04:29.000 --> 02:04:30.000
+This is cue #7469
+
+7470
+02:04:30.000 --> 02:04:31.000
+This is cue #7470
+
+7471
+02:04:31.000 --> 02:04:32.000
+This is cue #7471
+
+7472
+02:04:32.000 --> 02:04:33.000
+This is cue #7472
+
+7473
+02:04:33.000 --> 02:04:34.000
+This is cue #7473
+
+7474
+02:04:34.000 --> 02:04:35.000
+This is cue #7474
+
+7475
+02:04:35.000 --> 02:04:36.000
+This is cue #7475
+
+7476
+02:04:36.000 --> 02:04:37.000
+This is cue #7476
+
+7477
+02:04:37.000 --> 02:04:38.000
+This is cue #7477
+
+7478
+02:04:38.000 --> 02:04:39.000
+This is cue #7478
+
+7479
+02:04:39.000 --> 02:04:40.000
+This is cue #7479
+
+7480
+02:04:40.000 --> 02:04:41.000
+This is cue #7480
+
+7481
+02:04:41.000 --> 02:04:42.000
+This is cue #7481
+
+7482
+02:04:42.000 --> 02:04:43.000
+This is cue #7482
+
+7483
+02:04:43.000 --> 02:04:44.000
+This is cue #7483
+
+7484
+02:04:44.000 --> 02:04:45.000
+This is cue #7484
+
+7485
+02:04:45.000 --> 02:04:46.000
+This is cue #7485
+
+7486
+02:04:46.000 --> 02:04:47.000
+This is cue #7486
+
+7487
+02:04:47.000 --> 02:04:48.000
+This is cue #7487
+
+7488
+02:04:48.000 --> 02:04:49.000
+This is cue #7488
+
+7489
+02:04:49.000 --> 02:04:50.000
+This is cue #7489
+
+7490
+02:04:50.000 --> 02:04:51.000
+This is cue #7490
+
+7491
+02:04:51.000 --> 02:04:52.000
+This is cue #7491
+
+7492
+02:04:52.000 --> 02:04:53.000
+This is cue #7492
+
+7493
+02:04:53.000 --> 02:04:54.000
+This is cue #7493
+
+7494
+02:04:54.000 --> 02:04:55.000
+This is cue #7494
+
+7495
+02:04:55.000 --> 02:04:56.000
+This is cue #7495
+
+7496
+02:04:56.000 --> 02:04:57.000
+This is cue #7496
+
+7497
+02:04:57.000 --> 02:04:58.000
+This is cue #7497
+
+7498
+02:04:58.000 --> 02:04:59.000
+This is cue #7498
+
+7499
+02:04:59.000 --> 02:05:00.000
+This is cue #7499
+
+7500
+02:05:00.000 --> 02:05:01.000
+This is cue #7500
+
+7501
+02:05:01.000 --> 02:05:02.000
+This is cue #7501
+
+7502
+02:05:02.000 --> 02:05:03.000
+This is cue #7502
+
+7503
+02:05:03.000 --> 02:05:04.000
+This is cue #7503
+
+7504
+02:05:04.000 --> 02:05:05.000
+This is cue #7504
+
+7505
+02:05:05.000 --> 02:05:06.000
+This is cue #7505
+
+7506
+02:05:06.000 --> 02:05:07.000
+This is cue #7506
+
+7507
+02:05:07.000 --> 02:05:08.000
+This is cue #7507
+
+7508
+02:05:08.000 --> 02:05:09.000
+This is cue #7508
+
+7509
+02:05:09.000 --> 02:05:10.000
+This is cue #7509
+
+7510
+02:05:10.000 --> 02:05:11.000
+This is cue #7510
+
+7511
+02:05:11.000 --> 02:05:12.000
+This is cue #7511
+
+7512
+02:05:12.000 --> 02:05:13.000
+This is cue #7512
+
+7513
+02:05:13.000 --> 02:05:14.000
+This is cue #7513
+
+7514
+02:05:14.000 --> 02:05:15.000
+This is cue #7514
+
+7515
+02:05:15.000 --> 02:05:16.000
+This is cue #7515
+
+7516
+02:05:16.000 --> 02:05:17.000
+This is cue #7516
+
+7517
+02:05:17.000 --> 02:05:18.000
+This is cue #7517
+
+7518
+02:05:18.000 --> 02:05:19.000
+This is cue #7518
+
+7519
+02:05:19.000 --> 02:05:20.000
+This is cue #7519
+
+7520
+02:05:20.000 --> 02:05:21.000
+This is cue #7520
+
+7521
+02:05:21.000 --> 02:05:22.000
+This is cue #7521
+
+7522
+02:05:22.000 --> 02:05:23.000
+This is cue #7522
+
+7523
+02:05:23.000 --> 02:05:24.000
+This is cue #7523
+
+7524
+02:05:24.000 --> 02:05:25.000
+This is cue #7524
+
+7525
+02:05:25.000 --> 02:05:26.000
+This is cue #7525
+
+7526
+02:05:26.000 --> 02:05:27.000
+This is cue #7526
+
+7527
+02:05:27.000 --> 02:05:28.000
+This is cue #7527
+
+7528
+02:05:28.000 --> 02:05:29.000
+This is cue #7528
+
+7529
+02:05:29.000 --> 02:05:30.000
+This is cue #7529
+
+7530
+02:05:30.000 --> 02:05:31.000
+This is cue #7530
+
+7531
+02:05:31.000 --> 02:05:32.000
+This is cue #7531
+
+7532
+02:05:32.000 --> 02:05:33.000
+This is cue #7532
+
+7533
+02:05:33.000 --> 02:05:34.000
+This is cue #7533
+
+7534
+02:05:34.000 --> 02:05:35.000
+This is cue #7534
+
+7535
+02:05:35.000 --> 02:05:36.000
+This is cue #7535
+
+7536
+02:05:36.000 --> 02:05:37.000
+This is cue #7536
+
+7537
+02:05:37.000 --> 02:05:38.000
+This is cue #7537
+
+7538
+02:05:38.000 --> 02:05:39.000
+This is cue #7538
+
+7539
+02:05:39.000 --> 02:05:40.000
+This is cue #7539
+
+7540
+02:05:40.000 --> 02:05:41.000
+This is cue #7540
+
+7541
+02:05:41.000 --> 02:05:42.000
+This is cue #7541
+
+7542
+02:05:42.000 --> 02:05:43.000
+This is cue #7542
+
+7543
+02:05:43.000 --> 02:05:44.000
+This is cue #7543
+
+7544
+02:05:44.000 --> 02:05:45.000
+This is cue #7544
+
+7545
+02:05:45.000 --> 02:05:46.000
+This is cue #7545
+
+7546
+02:05:46.000 --> 02:05:47.000
+This is cue #7546
+
+7547
+02:05:47.000 --> 02:05:48.000
+This is cue #7547
+
+7548
+02:05:48.000 --> 02:05:49.000
+This is cue #7548
+
+7549
+02:05:49.000 --> 02:05:50.000
+This is cue #7549
+
+7550
+02:05:50.000 --> 02:05:51.000
+This is cue #7550
+
+7551
+02:05:51.000 --> 02:05:52.000
+This is cue #7551
+
+7552
+02:05:52.000 --> 02:05:53.000
+This is cue #7552
+
+7553
+02:05:53.000 --> 02:05:54.000
+This is cue #7553
+
+7554
+02:05:54.000 --> 02:05:55.000
+This is cue #7554
+
+7555
+02:05:55.000 --> 02:05:56.000
+This is cue #7555
+
+7556
+02:05:56.000 --> 02:05:57.000
+This is cue #7556
+
+7557
+02:05:57.000 --> 02:05:58.000
+This is cue #7557
+
+7558
+02:05:58.000 --> 02:05:59.000
+This is cue #7558
+
+7559
+02:05:59.000 --> 02:06:00.000
+This is cue #7559
+
+7560
+02:06:00.000 --> 02:06:01.000
+This is cue #7560
+
+7561
+02:06:01.000 --> 02:06:02.000
+This is cue #7561
+
+7562
+02:06:02.000 --> 02:06:03.000
+This is cue #7562
+
+7563
+02:06:03.000 --> 02:06:04.000
+This is cue #7563
+
+7564
+02:06:04.000 --> 02:06:05.000
+This is cue #7564
+
+7565
+02:06:05.000 --> 02:06:06.000
+This is cue #7565
+
+7566
+02:06:06.000 --> 02:06:07.000
+This is cue #7566
+
+7567
+02:06:07.000 --> 02:06:08.000
+This is cue #7567
+
+7568
+02:06:08.000 --> 02:06:09.000
+This is cue #7568
+
+7569
+02:06:09.000 --> 02:06:10.000
+This is cue #7569
+
+7570
+02:06:10.000 --> 02:06:11.000
+This is cue #7570
+
+7571
+02:06:11.000 --> 02:06:12.000
+This is cue #7571
+
+7572
+02:06:12.000 --> 02:06:13.000
+This is cue #7572
+
+7573
+02:06:13.000 --> 02:06:14.000
+This is cue #7573
+
+7574
+02:06:14.000 --> 02:06:15.000
+This is cue #7574
+
+7575
+02:06:15.000 --> 02:06:16.000
+This is cue #7575
+
+7576
+02:06:16.000 --> 02:06:17.000
+This is cue #7576
+
+7577
+02:06:17.000 --> 02:06:18.000
+This is cue #7577
+
+7578
+02:06:18.000 --> 02:06:19.000
+This is cue #7578
+
+7579
+02:06:19.000 --> 02:06:20.000
+This is cue #7579
+
+7580
+02:06:20.000 --> 02:06:21.000
+This is cue #7580
+
+7581
+02:06:21.000 --> 02:06:22.000
+This is cue #7581
+
+7582
+02:06:22.000 --> 02:06:23.000
+This is cue #7582
+
+7583
+02:06:23.000 --> 02:06:24.000
+This is cue #7583
+
+7584
+02:06:24.000 --> 02:06:25.000
+This is cue #7584
+
+7585
+02:06:25.000 --> 02:06:26.000
+This is cue #7585
+
+7586
+02:06:26.000 --> 02:06:27.000
+This is cue #7586
+
+7587
+02:06:27.000 --> 02:06:28.000
+This is cue #7587
+
+7588
+02:06:28.000 --> 02:06:29.000
+This is cue #7588
+
+7589
+02:06:29.000 --> 02:06:30.000
+This is cue #7589
+
+7590
+02:06:30.000 --> 02:06:31.000
+This is cue #7590
+
+7591
+02:06:31.000 --> 02:06:32.000
+This is cue #7591
+
+7592
+02:06:32.000 --> 02:06:33.000
+This is cue #7592
+
+7593
+02:06:33.000 --> 02:06:34.000
+This is cue #7593
+
+7594
+02:06:34.000 --> 02:06:35.000
+This is cue #7594
+
+7595
+02:06:35.000 --> 02:06:36.000
+This is cue #7595
+
+7596
+02:06:36.000 --> 02:06:37.000
+This is cue #7596
+
+7597
+02:06:37.000 --> 02:06:38.000
+This is cue #7597
+
+7598
+02:06:38.000 --> 02:06:39.000
+This is cue #7598
+
+7599
+02:06:39.000 --> 02:06:40.000
+This is cue #7599
+
+7600
+02:06:40.000 --> 02:06:41.000
+This is cue #7600
+
+7601
+02:06:41.000 --> 02:06:42.000
+This is cue #7601
+
+7602
+02:06:42.000 --> 02:06:43.000
+This is cue #7602
+
+7603
+02:06:43.000 --> 02:06:44.000
+This is cue #7603
+
+7604
+02:06:44.000 --> 02:06:45.000
+This is cue #7604
+
+7605
+02:06:45.000 --> 02:06:46.000
+This is cue #7605
+
+7606
+02:06:46.000 --> 02:06:47.000
+This is cue #7606
+
+7607
+02:06:47.000 --> 02:06:48.000
+This is cue #7607
+
+7608
+02:06:48.000 --> 02:06:49.000
+This is cue #7608
+
+7609
+02:06:49.000 --> 02:06:50.000
+This is cue #7609
+
+7610
+02:06:50.000 --> 02:06:51.000
+This is cue #7610
+
+7611
+02:06:51.000 --> 02:06:52.000
+This is cue #7611
+
+7612
+02:06:52.000 --> 02:06:53.000
+This is cue #7612
+
+7613
+02:06:53.000 --> 02:06:54.000
+This is cue #7613
+
+7614
+02:06:54.000 --> 02:06:55.000
+This is cue #7614
+
+7615
+02:06:55.000 --> 02:06:56.000
+This is cue #7615
+
+7616
+02:06:56.000 --> 02:06:57.000
+This is cue #7616
+
+7617
+02:06:57.000 --> 02:06:58.000
+This is cue #7617
+
+7618
+02:06:58.000 --> 02:06:59.000
+This is cue #7618
+
+7619
+02:06:59.000 --> 02:07:00.000
+This is cue #7619
+
+7620
+02:07:00.000 --> 02:07:01.000
+This is cue #7620
+
+7621
+02:07:01.000 --> 02:07:02.000
+This is cue #7621
+
+7622
+02:07:02.000 --> 02:07:03.000
+This is cue #7622
+
+7623
+02:07:03.000 --> 02:07:04.000
+This is cue #7623
+
+7624
+02:07:04.000 --> 02:07:05.000
+This is cue #7624
+
+7625
+02:07:05.000 --> 02:07:06.000
+This is cue #7625
+
+7626
+02:07:06.000 --> 02:07:07.000
+This is cue #7626
+
+7627
+02:07:07.000 --> 02:07:08.000
+This is cue #7627
+
+7628
+02:07:08.000 --> 02:07:09.000
+This is cue #7628
+
+7629
+02:07:09.000 --> 02:07:10.000
+This is cue #7629
+
+7630
+02:07:10.000 --> 02:07:11.000
+This is cue #7630
+
+7631
+02:07:11.000 --> 02:07:12.000
+This is cue #7631
+
+7632
+02:07:12.000 --> 02:07:13.000
+This is cue #7632
+
+7633
+02:07:13.000 --> 02:07:14.000
+This is cue #7633
+
+7634
+02:07:14.000 --> 02:07:15.000
+This is cue #7634
+
+7635
+02:07:15.000 --> 02:07:16.000
+This is cue #7635
+
+7636
+02:07:16.000 --> 02:07:17.000
+This is cue #7636
+
+7637
+02:07:17.000 --> 02:07:18.000
+This is cue #7637
+
+7638
+02:07:18.000 --> 02:07:19.000
+This is cue #7638
+
+7639
+02:07:19.000 --> 02:07:20.000
+This is cue #7639
+
+7640
+02:07:20.000 --> 02:07:21.000
+This is cue #7640
+
+7641
+02:07:21.000 --> 02:07:22.000
+This is cue #7641
+
+7642
+02:07:22.000 --> 02:07:23.000
+This is cue #7642
+
+7643
+02:07:23.000 --> 02:07:24.000
+This is cue #7643
+
+7644
+02:07:24.000 --> 02:07:25.000
+This is cue #7644
+
+7645
+02:07:25.000 --> 02:07:26.000
+This is cue #7645
+
+7646
+02:07:26.000 --> 02:07:27.000
+This is cue #7646
+
+7647
+02:07:27.000 --> 02:07:28.000
+This is cue #7647
+
+7648
+02:07:28.000 --> 02:07:29.000
+This is cue #7648
+
+7649
+02:07:29.000 --> 02:07:30.000
+This is cue #7649
+
+7650
+02:07:30.000 --> 02:07:31.000
+This is cue #7650
+
+7651
+02:07:31.000 --> 02:07:32.000
+This is cue #7651
+
+7652
+02:07:32.000 --> 02:07:33.000
+This is cue #7652
+
+7653
+02:07:33.000 --> 02:07:34.000
+This is cue #7653
+
+7654
+02:07:34.000 --> 02:07:35.000
+This is cue #7654
+
+7655
+02:07:35.000 --> 02:07:36.000
+This is cue #7655
+
+7656
+02:07:36.000 --> 02:07:37.000
+This is cue #7656
+
+7657
+02:07:37.000 --> 02:07:38.000
+This is cue #7657
+
+7658
+02:07:38.000 --> 02:07:39.000
+This is cue #7658
+
+7659
+02:07:39.000 --> 02:07:40.000
+This is cue #7659
+
+7660
+02:07:40.000 --> 02:07:41.000
+This is cue #7660
+
+7661
+02:07:41.000 --> 02:07:42.000
+This is cue #7661
+
+7662
+02:07:42.000 --> 02:07:43.000
+This is cue #7662
+
+7663
+02:07:43.000 --> 02:07:44.000
+This is cue #7663
+
+7664
+02:07:44.000 --> 02:07:45.000
+This is cue #7664
+
+7665
+02:07:45.000 --> 02:07:46.000
+This is cue #7665
+
+7666
+02:07:46.000 --> 02:07:47.000
+This is cue #7666
+
+7667
+02:07:47.000 --> 02:07:48.000
+This is cue #7667
+
+7668
+02:07:48.000 --> 02:07:49.000
+This is cue #7668
+
+7669
+02:07:49.000 --> 02:07:50.000
+This is cue #7669
+
+7670
+02:07:50.000 --> 02:07:51.000
+This is cue #7670
+
+7671
+02:07:51.000 --> 02:07:52.000
+This is cue #7671
+
+7672
+02:07:52.000 --> 02:07:53.000
+This is cue #7672
+
+7673
+02:07:53.000 --> 02:07:54.000
+This is cue #7673
+
+7674
+02:07:54.000 --> 02:07:55.000
+This is cue #7674
+
+7675
+02:07:55.000 --> 02:07:56.000
+This is cue #7675
+
+7676
+02:07:56.000 --> 02:07:57.000
+This is cue #7676
+
+7677
+02:07:57.000 --> 02:07:58.000
+This is cue #7677
+
+7678
+02:07:58.000 --> 02:07:59.000
+This is cue #7678
+
+7679
+02:07:59.000 --> 02:08:00.000
+This is cue #7679
+
+7680
+02:08:00.000 --> 02:08:01.000
+This is cue #7680
+
+7681
+02:08:01.000 --> 02:08:02.000
+This is cue #7681
+
+7682
+02:08:02.000 --> 02:08:03.000
+This is cue #7682
+
+7683
+02:08:03.000 --> 02:08:04.000
+This is cue #7683
+
+7684
+02:08:04.000 --> 02:08:05.000
+This is cue #7684
+
+7685
+02:08:05.000 --> 02:08:06.000
+This is cue #7685
+
+7686
+02:08:06.000 --> 02:08:07.000
+This is cue #7686
+
+7687
+02:08:07.000 --> 02:08:08.000
+This is cue #7687
+
+7688
+02:08:08.000 --> 02:08:09.000
+This is cue #7688
+
+7689
+02:08:09.000 --> 02:08:10.000
+This is cue #7689
+
+7690
+02:08:10.000 --> 02:08:11.000
+This is cue #7690
+
+7691
+02:08:11.000 --> 02:08:12.000
+This is cue #7691
+
+7692
+02:08:12.000 --> 02:08:13.000
+This is cue #7692
+
+7693
+02:08:13.000 --> 02:08:14.000
+This is cue #7693
+
+7694
+02:08:14.000 --> 02:08:15.000
+This is cue #7694
+
+7695
+02:08:15.000 --> 02:08:16.000
+This is cue #7695
+
+7696
+02:08:16.000 --> 02:08:17.000
+This is cue #7696
+
+7697
+02:08:17.000 --> 02:08:18.000
+This is cue #7697
+
+7698
+02:08:18.000 --> 02:08:19.000
+This is cue #7698
+
+7699
+02:08:19.000 --> 02:08:20.000
+This is cue #7699
+
+7700
+02:08:20.000 --> 02:08:21.000
+This is cue #7700
+
+7701
+02:08:21.000 --> 02:08:22.000
+This is cue #7701
+
+7702
+02:08:22.000 --> 02:08:23.000
+This is cue #7702
+
+7703
+02:08:23.000 --> 02:08:24.000
+This is cue #7703
+
+7704
+02:08:24.000 --> 02:08:25.000
+This is cue #7704
+
+7705
+02:08:25.000 --> 02:08:26.000
+This is cue #7705
+
+7706
+02:08:26.000 --> 02:08:27.000
+This is cue #7706
+
+7707
+02:08:27.000 --> 02:08:28.000
+This is cue #7707
+
+7708
+02:08:28.000 --> 02:08:29.000
+This is cue #7708
+
+7709
+02:08:29.000 --> 02:08:30.000
+This is cue #7709
+
+7710
+02:08:30.000 --> 02:08:31.000
+This is cue #7710
+
+7711
+02:08:31.000 --> 02:08:32.000
+This is cue #7711
+
+7712
+02:08:32.000 --> 02:08:33.000
+This is cue #7712
+
+7713
+02:08:33.000 --> 02:08:34.000
+This is cue #7713
+
+7714
+02:08:34.000 --> 02:08:35.000
+This is cue #7714
+
+7715
+02:08:35.000 --> 02:08:36.000
+This is cue #7715
+
+7716
+02:08:36.000 --> 02:08:37.000
+This is cue #7716
+
+7717
+02:08:37.000 --> 02:08:38.000
+This is cue #7717
+
+7718
+02:08:38.000 --> 02:08:39.000
+This is cue #7718
+
+7719
+02:08:39.000 --> 02:08:40.000
+This is cue #7719
+
+7720
+02:08:40.000 --> 02:08:41.000
+This is cue #7720
+
+7721
+02:08:41.000 --> 02:08:42.000
+This is cue #7721
+
+7722
+02:08:42.000 --> 02:08:43.000
+This is cue #7722
+
+7723
+02:08:43.000 --> 02:08:44.000
+This is cue #7723
+
+7724
+02:08:44.000 --> 02:08:45.000
+This is cue #7724
+
+7725
+02:08:45.000 --> 02:08:46.000
+This is cue #7725
+
+7726
+02:08:46.000 --> 02:08:47.000
+This is cue #7726
+
+7727
+02:08:47.000 --> 02:08:48.000
+This is cue #7727
+
+7728
+02:08:48.000 --> 02:08:49.000
+This is cue #7728
+
+7729
+02:08:49.000 --> 02:08:50.000
+This is cue #7729
+
+7730
+02:08:50.000 --> 02:08:51.000
+This is cue #7730
+
+7731
+02:08:51.000 --> 02:08:52.000
+This is cue #7731
+
+7732
+02:08:52.000 --> 02:08:53.000
+This is cue #7732
+
+7733
+02:08:53.000 --> 02:08:54.000
+This is cue #7733
+
+7734
+02:08:54.000 --> 02:08:55.000
+This is cue #7734
+
+7735
+02:08:55.000 --> 02:08:56.000
+This is cue #7735
+
+7736
+02:08:56.000 --> 02:08:57.000
+This is cue #7736
+
+7737
+02:08:57.000 --> 02:08:58.000
+This is cue #7737
+
+7738
+02:08:58.000 --> 02:08:59.000
+This is cue #7738
+
+7739
+02:08:59.000 --> 02:09:00.000
+This is cue #7739
+
+7740
+02:09:00.000 --> 02:09:01.000
+This is cue #7740
+
+7741
+02:09:01.000 --> 02:09:02.000
+This is cue #7741
+
+7742
+02:09:02.000 --> 02:09:03.000
+This is cue #7742
+
+7743
+02:09:03.000 --> 02:09:04.000
+This is cue #7743
+
+7744
+02:09:04.000 --> 02:09:05.000
+This is cue #7744
+
+7745
+02:09:05.000 --> 02:09:06.000
+This is cue #7745
+
+7746
+02:09:06.000 --> 02:09:07.000
+This is cue #7746
+
+7747
+02:09:07.000 --> 02:09:08.000
+This is cue #7747
+
+7748
+02:09:08.000 --> 02:09:09.000
+This is cue #7748
+
+7749
+02:09:09.000 --> 02:09:10.000
+This is cue #7749
+
+7750
+02:09:10.000 --> 02:09:11.000
+This is cue #7750
+
+7751
+02:09:11.000 --> 02:09:12.000
+This is cue #7751
+
+7752
+02:09:12.000 --> 02:09:13.000
+This is cue #7752
+
+7753
+02:09:13.000 --> 02:09:14.000
+This is cue #7753
+
+7754
+02:09:14.000 --> 02:09:15.000
+This is cue #7754
+
+7755
+02:09:15.000 --> 02:09:16.000
+This is cue #7755
+
+7756
+02:09:16.000 --> 02:09:17.000
+This is cue #7756
+
+7757
+02:09:17.000 --> 02:09:18.000
+This is cue #7757
+
+7758
+02:09:18.000 --> 02:09:19.000
+This is cue #7758
+
+7759
+02:09:19.000 --> 02:09:20.000
+This is cue #7759
+
+7760
+02:09:20.000 --> 02:09:21.000
+This is cue #7760
+
+7761
+02:09:21.000 --> 02:09:22.000
+This is cue #7761
+
+7762
+02:09:22.000 --> 02:09:23.000
+This is cue #7762
+
+7763
+02:09:23.000 --> 02:09:24.000
+This is cue #7763
+
+7764
+02:09:24.000 --> 02:09:25.000
+This is cue #7764
+
+7765
+02:09:25.000 --> 02:09:26.000
+This is cue #7765
+
+7766
+02:09:26.000 --> 02:09:27.000
+This is cue #7766
+
+7767
+02:09:27.000 --> 02:09:28.000
+This is cue #7767
+
+7768
+02:09:28.000 --> 02:09:29.000
+This is cue #7768
+
+7769
+02:09:29.000 --> 02:09:30.000
+This is cue #7769
+
+7770
+02:09:30.000 --> 02:09:31.000
+This is cue #7770
+
+7771
+02:09:31.000 --> 02:09:32.000
+This is cue #7771
+
+7772
+02:09:32.000 --> 02:09:33.000
+This is cue #7772
+
+7773
+02:09:33.000 --> 02:09:34.000
+This is cue #7773
+
+7774
+02:09:34.000 --> 02:09:35.000
+This is cue #7774
+
+7775
+02:09:35.000 --> 02:09:36.000
+This is cue #7775
+
+7776
+02:09:36.000 --> 02:09:37.000
+This is cue #7776
+
+7777
+02:09:37.000 --> 02:09:38.000
+This is cue #7777
+
+7778
+02:09:38.000 --> 02:09:39.000
+This is cue #7778
+
+7779
+02:09:39.000 --> 02:09:40.000
+This is cue #7779
+
+7780
+02:09:40.000 --> 02:09:41.000
+This is cue #7780
+
+7781
+02:09:41.000 --> 02:09:42.000
+This is cue #7781
+
+7782
+02:09:42.000 --> 02:09:43.000
+This is cue #7782
+
+7783
+02:09:43.000 --> 02:09:44.000
+This is cue #7783
+
+7784
+02:09:44.000 --> 02:09:45.000
+This is cue #7784
+
+7785
+02:09:45.000 --> 02:09:46.000
+This is cue #7785
+
+7786
+02:09:46.000 --> 02:09:47.000
+This is cue #7786
+
+7787
+02:09:47.000 --> 02:09:48.000
+This is cue #7787
+
+7788
+02:09:48.000 --> 02:09:49.000
+This is cue #7788
+
+7789
+02:09:49.000 --> 02:09:50.000
+This is cue #7789
+
+7790
+02:09:50.000 --> 02:09:51.000
+This is cue #7790
+
+7791
+02:09:51.000 --> 02:09:52.000
+This is cue #7791
+
+7792
+02:09:52.000 --> 02:09:53.000
+This is cue #7792
+
+7793
+02:09:53.000 --> 02:09:54.000
+This is cue #7793
+
+7794
+02:09:54.000 --> 02:09:55.000
+This is cue #7794
+
+7795
+02:09:55.000 --> 02:09:56.000
+This is cue #7795
+
+7796
+02:09:56.000 --> 02:09:57.000
+This is cue #7796
+
+7797
+02:09:57.000 --> 02:09:58.000
+This is cue #7797
+
+7798
+02:09:58.000 --> 02:09:59.000
+This is cue #7798
+
+7799
+02:09:59.000 --> 02:10:00.000
+This is cue #7799
+
+7800
+02:10:00.000 --> 02:10:01.000
+This is cue #7800
+
+7801
+02:10:01.000 --> 02:10:02.000
+This is cue #7801
+
+7802
+02:10:02.000 --> 02:10:03.000
+This is cue #7802
+
+7803
+02:10:03.000 --> 02:10:04.000
+This is cue #7803
+
+7804
+02:10:04.000 --> 02:10:05.000
+This is cue #7804
+
+7805
+02:10:05.000 --> 02:10:06.000
+This is cue #7805
+
+7806
+02:10:06.000 --> 02:10:07.000
+This is cue #7806
+
+7807
+02:10:07.000 --> 02:10:08.000
+This is cue #7807
+
+7808
+02:10:08.000 --> 02:10:09.000
+This is cue #7808
+
+7809
+02:10:09.000 --> 02:10:10.000
+This is cue #7809
+
+7810
+02:10:10.000 --> 02:10:11.000
+This is cue #7810
+
+7811
+02:10:11.000 --> 02:10:12.000
+This is cue #7811
+
+7812
+02:10:12.000 --> 02:10:13.000
+This is cue #7812
+
+7813
+02:10:13.000 --> 02:10:14.000
+This is cue #7813
+
+7814
+02:10:14.000 --> 02:10:15.000
+This is cue #7814
+
+7815
+02:10:15.000 --> 02:10:16.000
+This is cue #7815
+
+7816
+02:10:16.000 --> 02:10:17.000
+This is cue #7816
+
+7817
+02:10:17.000 --> 02:10:18.000
+This is cue #7817
+
+7818
+02:10:18.000 --> 02:10:19.000
+This is cue #7818
+
+7819
+02:10:19.000 --> 02:10:20.000
+This is cue #7819
+
+7820
+02:10:20.000 --> 02:10:21.000
+This is cue #7820
+
+7821
+02:10:21.000 --> 02:10:22.000
+This is cue #7821
+
+7822
+02:10:22.000 --> 02:10:23.000
+This is cue #7822
+
+7823
+02:10:23.000 --> 02:10:24.000
+This is cue #7823
+
+7824
+02:10:24.000 --> 02:10:25.000
+This is cue #7824
+
+7825
+02:10:25.000 --> 02:10:26.000
+This is cue #7825
+
+7826
+02:10:26.000 --> 02:10:27.000
+This is cue #7826
+
+7827
+02:10:27.000 --> 02:10:28.000
+This is cue #7827
+
+7828
+02:10:28.000 --> 02:10:29.000
+This is cue #7828
+
+7829
+02:10:29.000 --> 02:10:30.000
+This is cue #7829
+
+7830
+02:10:30.000 --> 02:10:31.000
+This is cue #7830
+
+7831
+02:10:31.000 --> 02:10:32.000
+This is cue #7831
+
+7832
+02:10:32.000 --> 02:10:33.000
+This is cue #7832
+
+7833
+02:10:33.000 --> 02:10:34.000
+This is cue #7833
+
+7834
+02:10:34.000 --> 02:10:35.000
+This is cue #7834
+
+7835
+02:10:35.000 --> 02:10:36.000
+This is cue #7835
+
+7836
+02:10:36.000 --> 02:10:37.000
+This is cue #7836
+
+7837
+02:10:37.000 --> 02:10:38.000
+This is cue #7837
+
+7838
+02:10:38.000 --> 02:10:39.000
+This is cue #7838
+
+7839
+02:10:39.000 --> 02:10:40.000
+This is cue #7839
+
+7840
+02:10:40.000 --> 02:10:41.000
+This is cue #7840
+
+7841
+02:10:41.000 --> 02:10:42.000
+This is cue #7841
+
+7842
+02:10:42.000 --> 02:10:43.000
+This is cue #7842
+
+7843
+02:10:43.000 --> 02:10:44.000
+This is cue #7843
+
+7844
+02:10:44.000 --> 02:10:45.000
+This is cue #7844
+
+7845
+02:10:45.000 --> 02:10:46.000
+This is cue #7845
+
+7846
+02:10:46.000 --> 02:10:47.000
+This is cue #7846
+
+7847
+02:10:47.000 --> 02:10:48.000
+This is cue #7847
+
+7848
+02:10:48.000 --> 02:10:49.000
+This is cue #7848
+
+7849
+02:10:49.000 --> 02:10:50.000
+This is cue #7849
+
+7850
+02:10:50.000 --> 02:10:51.000
+This is cue #7850
+
+7851
+02:10:51.000 --> 02:10:52.000
+This is cue #7851
+
+7852
+02:10:52.000 --> 02:10:53.000
+This is cue #7852
+
+7853
+02:10:53.000 --> 02:10:54.000
+This is cue #7853
+
+7854
+02:10:54.000 --> 02:10:55.000
+This is cue #7854
+
+7855
+02:10:55.000 --> 02:10:56.000
+This is cue #7855
+
+7856
+02:10:56.000 --> 02:10:57.000
+This is cue #7856
+
+7857
+02:10:57.000 --> 02:10:58.000
+This is cue #7857
+
+7858
+02:10:58.000 --> 02:10:59.000
+This is cue #7858
+
+7859
+02:10:59.000 --> 02:11:00.000
+This is cue #7859
+
+7860
+02:11:00.000 --> 02:11:01.000
+This is cue #7860
+
+7861
+02:11:01.000 --> 02:11:02.000
+This is cue #7861
+
+7862
+02:11:02.000 --> 02:11:03.000
+This is cue #7862
+
+7863
+02:11:03.000 --> 02:11:04.000
+This is cue #7863
+
+7864
+02:11:04.000 --> 02:11:05.000
+This is cue #7864
+
+7865
+02:11:05.000 --> 02:11:06.000
+This is cue #7865
+
+7866
+02:11:06.000 --> 02:11:07.000
+This is cue #7866
+
+7867
+02:11:07.000 --> 02:11:08.000
+This is cue #7867
+
+7868
+02:11:08.000 --> 02:11:09.000
+This is cue #7868
+
+7869
+02:11:09.000 --> 02:11:10.000
+This is cue #7869
+
+7870
+02:11:10.000 --> 02:11:11.000
+This is cue #7870
+
+7871
+02:11:11.000 --> 02:11:12.000
+This is cue #7871
+
+7872
+02:11:12.000 --> 02:11:13.000
+This is cue #7872
+
+7873
+02:11:13.000 --> 02:11:14.000
+This is cue #7873
+
+7874
+02:11:14.000 --> 02:11:15.000
+This is cue #7874
+
+7875
+02:11:15.000 --> 02:11:16.000
+This is cue #7875
+
+7876
+02:11:16.000 --> 02:11:17.000
+This is cue #7876
+
+7877
+02:11:17.000 --> 02:11:18.000
+This is cue #7877
+
+7878
+02:11:18.000 --> 02:11:19.000
+This is cue #7878
+
+7879
+02:11:19.000 --> 02:11:20.000
+This is cue #7879
+
+7880
+02:11:20.000 --> 02:11:21.000
+This is cue #7880
+
+7881
+02:11:21.000 --> 02:11:22.000
+This is cue #7881
+
+7882
+02:11:22.000 --> 02:11:23.000
+This is cue #7882
+
+7883
+02:11:23.000 --> 02:11:24.000
+This is cue #7883
+
+7884
+02:11:24.000 --> 02:11:25.000
+This is cue #7884
+
+7885
+02:11:25.000 --> 02:11:26.000
+This is cue #7885
+
+7886
+02:11:26.000 --> 02:11:27.000
+This is cue #7886
+
+7887
+02:11:27.000 --> 02:11:28.000
+This is cue #7887
+
+7888
+02:11:28.000 --> 02:11:29.000
+This is cue #7888
+
+7889
+02:11:29.000 --> 02:11:30.000
+This is cue #7889
+
+7890
+02:11:30.000 --> 02:11:31.000
+This is cue #7890
+
+7891
+02:11:31.000 --> 02:11:32.000
+This is cue #7891
+
+7892
+02:11:32.000 --> 02:11:33.000
+This is cue #7892
+
+7893
+02:11:33.000 --> 02:11:34.000
+This is cue #7893
+
+7894
+02:11:34.000 --> 02:11:35.000
+This is cue #7894
+
+7895
+02:11:35.000 --> 02:11:36.000
+This is cue #7895
+
+7896
+02:11:36.000 --> 02:11:37.000
+This is cue #7896
+
+7897
+02:11:37.000 --> 02:11:38.000
+This is cue #7897
+
+7898
+02:11:38.000 --> 02:11:39.000
+This is cue #7898
+
+7899
+02:11:39.000 --> 02:11:40.000
+This is cue #7899
+
+7900
+02:11:40.000 --> 02:11:41.000
+This is cue #7900
+
+7901
+02:11:41.000 --> 02:11:42.000
+This is cue #7901
+
+7902
+02:11:42.000 --> 02:11:43.000
+This is cue #7902
+
+7903
+02:11:43.000 --> 02:11:44.000
+This is cue #7903
+
+7904
+02:11:44.000 --> 02:11:45.000
+This is cue #7904
+
+7905
+02:11:45.000 --> 02:11:46.000
+This is cue #7905
+
+7906
+02:11:46.000 --> 02:11:47.000
+This is cue #7906
+
+7907
+02:11:47.000 --> 02:11:48.000
+This is cue #7907
+
+7908
+02:11:48.000 --> 02:11:49.000
+This is cue #7908
+
+7909
+02:11:49.000 --> 02:11:50.000
+This is cue #7909
+
+7910
+02:11:50.000 --> 02:11:51.000
+This is cue #7910
+
+7911
+02:11:51.000 --> 02:11:52.000
+This is cue #7911
+
+7912
+02:11:52.000 --> 02:11:53.000
+This is cue #7912
+
+7913
+02:11:53.000 --> 02:11:54.000
+This is cue #7913
+
+7914
+02:11:54.000 --> 02:11:55.000
+This is cue #7914
+
+7915
+02:11:55.000 --> 02:11:56.000
+This is cue #7915
+
+7916
+02:11:56.000 --> 02:11:57.000
+This is cue #7916
+
+7917
+02:11:57.000 --> 02:11:58.000
+This is cue #7917
+
+7918
+02:11:58.000 --> 02:11:59.000
+This is cue #7918
+
+7919
+02:11:59.000 --> 02:12:00.000
+This is cue #7919
+
+7920
+02:12:00.000 --> 02:12:01.000
+This is cue #7920
+
+7921
+02:12:01.000 --> 02:12:02.000
+This is cue #7921
+
+7922
+02:12:02.000 --> 02:12:03.000
+This is cue #7922
+
+7923
+02:12:03.000 --> 02:12:04.000
+This is cue #7923
+
+7924
+02:12:04.000 --> 02:12:05.000
+This is cue #7924
+
+7925
+02:12:05.000 --> 02:12:06.000
+This is cue #7925
+
+7926
+02:12:06.000 --> 02:12:07.000
+This is cue #7926
+
+7927
+02:12:07.000 --> 02:12:08.000
+This is cue #7927
+
+7928
+02:12:08.000 --> 02:12:09.000
+This is cue #7928
+
+7929
+02:12:09.000 --> 02:12:10.000
+This is cue #7929
+
+7930
+02:12:10.000 --> 02:12:11.000
+This is cue #7930
+
+7931
+02:12:11.000 --> 02:12:12.000
+This is cue #7931
+
+7932
+02:12:12.000 --> 02:12:13.000
+This is cue #7932
+
+7933
+02:12:13.000 --> 02:12:14.000
+This is cue #7933
+
+7934
+02:12:14.000 --> 02:12:15.000
+This is cue #7934
+
+7935
+02:12:15.000 --> 02:12:16.000
+This is cue #7935
+
+7936
+02:12:16.000 --> 02:12:17.000
+This is cue #7936
+
+7937
+02:12:17.000 --> 02:12:18.000
+This is cue #7937
+
+7938
+02:12:18.000 --> 02:12:19.000
+This is cue #7938
+
+7939
+02:12:19.000 --> 02:12:20.000
+This is cue #7939
+
+7940
+02:12:20.000 --> 02:12:21.000
+This is cue #7940
+
+7941
+02:12:21.000 --> 02:12:22.000
+This is cue #7941
+
+7942
+02:12:22.000 --> 02:12:23.000
+This is cue #7942
+
+7943
+02:12:23.000 --> 02:12:24.000
+This is cue #7943
+
+7944
+02:12:24.000 --> 02:12:25.000
+This is cue #7944
+
+7945
+02:12:25.000 --> 02:12:26.000
+This is cue #7945
+
+7946
+02:12:26.000 --> 02:12:27.000
+This is cue #7946
+
+7947
+02:12:27.000 --> 02:12:28.000
+This is cue #7947
+
+7948
+02:12:28.000 --> 02:12:29.000
+This is cue #7948
+
+7949
+02:12:29.000 --> 02:12:30.000
+This is cue #7949
+
+7950
+02:12:30.000 --> 02:12:31.000
+This is cue #7950
+
+7951
+02:12:31.000 --> 02:12:32.000
+This is cue #7951
+
+7952
+02:12:32.000 --> 02:12:33.000
+This is cue #7952
+
+7953
+02:12:33.000 --> 02:12:34.000
+This is cue #7953
+
+7954
+02:12:34.000 --> 02:12:35.000
+This is cue #7954
+
+7955
+02:12:35.000 --> 02:12:36.000
+This is cue #7955
+
+7956
+02:12:36.000 --> 02:12:37.000
+This is cue #7956
+
+7957
+02:12:37.000 --> 02:12:38.000
+This is cue #7957
+
+7958
+02:12:38.000 --> 02:12:39.000
+This is cue #7958
+
+7959
+02:12:39.000 --> 02:12:40.000
+This is cue #7959
+
+7960
+02:12:40.000 --> 02:12:41.000
+This is cue #7960
+
+7961
+02:12:41.000 --> 02:12:42.000
+This is cue #7961
+
+7962
+02:12:42.000 --> 02:12:43.000
+This is cue #7962
+
+7963
+02:12:43.000 --> 02:12:44.000
+This is cue #7963
+
+7964
+02:12:44.000 --> 02:12:45.000
+This is cue #7964
+
+7965
+02:12:45.000 --> 02:12:46.000
+This is cue #7965
+
+7966
+02:12:46.000 --> 02:12:47.000
+This is cue #7966
+
+7967
+02:12:47.000 --> 02:12:48.000
+This is cue #7967
+
+7968
+02:12:48.000 --> 02:12:49.000
+This is cue #7968
+
+7969
+02:12:49.000 --> 02:12:50.000
+This is cue #7969
+
+7970
+02:12:50.000 --> 02:12:51.000
+This is cue #7970
+
+7971
+02:12:51.000 --> 02:12:52.000
+This is cue #7971
+
+7972
+02:12:52.000 --> 02:12:53.000
+This is cue #7972
+
+7973
+02:12:53.000 --> 02:12:54.000
+This is cue #7973
+
+7974
+02:12:54.000 --> 02:12:55.000
+This is cue #7974
+
+7975
+02:12:55.000 --> 02:12:56.000
+This is cue #7975
+
+7976
+02:12:56.000 --> 02:12:57.000
+This is cue #7976
+
+7977
+02:12:57.000 --> 02:12:58.000
+This is cue #7977
+
+7978
+02:12:58.000 --> 02:12:59.000
+This is cue #7978
+
+7979
+02:12:59.000 --> 02:13:00.000
+This is cue #7979
+
+7980
+02:13:00.000 --> 02:13:01.000
+This is cue #7980
+
+7981
+02:13:01.000 --> 02:13:02.000
+This is cue #7981
+
+7982
+02:13:02.000 --> 02:13:03.000
+This is cue #7982
+
+7983
+02:13:03.000 --> 02:13:04.000
+This is cue #7983
+
+7984
+02:13:04.000 --> 02:13:05.000
+This is cue #7984
+
+7985
+02:13:05.000 --> 02:13:06.000
+This is cue #7985
+
+7986
+02:13:06.000 --> 02:13:07.000
+This is cue #7986
+
+7987
+02:13:07.000 --> 02:13:08.000
+This is cue #7987
+
+7988
+02:13:08.000 --> 02:13:09.000
+This is cue #7988
+
+7989
+02:13:09.000 --> 02:13:10.000
+This is cue #7989
+
+7990
+02:13:10.000 --> 02:13:11.000
+This is cue #7990
+
+7991
+02:13:11.000 --> 02:13:12.000
+This is cue #7991
+
+7992
+02:13:12.000 --> 02:13:13.000
+This is cue #7992
+
+7993
+02:13:13.000 --> 02:13:14.000
+This is cue #7993
+
+7994
+02:13:14.000 --> 02:13:15.000
+This is cue #7994
+
+7995
+02:13:15.000 --> 02:13:16.000
+This is cue #7995
+
+7996
+02:13:16.000 --> 02:13:17.000
+This is cue #7996
+
+7997
+02:13:17.000 --> 02:13:18.000
+This is cue #7997
+
+7998
+02:13:18.000 --> 02:13:19.000
+This is cue #7998
+
+7999
+02:13:19.000 --> 02:13:20.000
+This is cue #7999
+
+8000
+02:13:20.000 --> 02:13:21.000
+This is cue #8000
+
+8001
+02:13:21.000 --> 02:13:22.000
+This is cue #8001
+
+8002
+02:13:22.000 --> 02:13:23.000
+This is cue #8002
+
+8003
+02:13:23.000 --> 02:13:24.000
+This is cue #8003
+
+8004
+02:13:24.000 --> 02:13:25.000
+This is cue #8004
+
+8005
+02:13:25.000 --> 02:13:26.000
+This is cue #8005
+
+8006
+02:13:26.000 --> 02:13:27.000
+This is cue #8006
+
+8007
+02:13:27.000 --> 02:13:28.000
+This is cue #8007
+
+8008
+02:13:28.000 --> 02:13:29.000
+This is cue #8008
+
+8009
+02:13:29.000 --> 02:13:30.000
+This is cue #8009
+
+8010
+02:13:30.000 --> 02:13:31.000
+This is cue #8010
+
+8011
+02:13:31.000 --> 02:13:32.000
+This is cue #8011
+
+8012
+02:13:32.000 --> 02:13:33.000
+This is cue #8012
+
+8013
+02:13:33.000 --> 02:13:34.000
+This is cue #8013
+
+8014
+02:13:34.000 --> 02:13:35.000
+This is cue #8014
+
+8015
+02:13:35.000 --> 02:13:36.000
+This is cue #8015
+
+8016
+02:13:36.000 --> 02:13:37.000
+This is cue #8016
+
+8017
+02:13:37.000 --> 02:13:38.000
+This is cue #8017
+
+8018
+02:13:38.000 --> 02:13:39.000
+This is cue #8018
+
+8019
+02:13:39.000 --> 02:13:40.000
+This is cue #8019
+
+8020
+02:13:40.000 --> 02:13:41.000
+This is cue #8020
+
+8021
+02:13:41.000 --> 02:13:42.000
+This is cue #8021
+
+8022
+02:13:42.000 --> 02:13:43.000
+This is cue #8022
+
+8023
+02:13:43.000 --> 02:13:44.000
+This is cue #8023
+
+8024
+02:13:44.000 --> 02:13:45.000
+This is cue #8024
+
+8025
+02:13:45.000 --> 02:13:46.000
+This is cue #8025
+
+8026
+02:13:46.000 --> 02:13:47.000
+This is cue #8026
+
+8027
+02:13:47.000 --> 02:13:48.000
+This is cue #8027
+
+8028
+02:13:48.000 --> 02:13:49.000
+This is cue #8028
+
+8029
+02:13:49.000 --> 02:13:50.000
+This is cue #8029
+
+8030
+02:13:50.000 --> 02:13:51.000
+This is cue #8030
+
+8031
+02:13:51.000 --> 02:13:52.000
+This is cue #8031
+
+8032
+02:13:52.000 --> 02:13:53.000
+This is cue #8032
+
+8033
+02:13:53.000 --> 02:13:54.000
+This is cue #8033
+
+8034
+02:13:54.000 --> 02:13:55.000
+This is cue #8034
+
+8035
+02:13:55.000 --> 02:13:56.000
+This is cue #8035
+
+8036
+02:13:56.000 --> 02:13:57.000
+This is cue #8036
+
+8037
+02:13:57.000 --> 02:13:58.000
+This is cue #8037
+
+8038
+02:13:58.000 --> 02:13:59.000
+This is cue #8038
+
+8039
+02:13:59.000 --> 02:14:00.000
+This is cue #8039
+
+8040
+02:14:00.000 --> 02:14:01.000
+This is cue #8040
+
+8041
+02:14:01.000 --> 02:14:02.000
+This is cue #8041
+
+8042
+02:14:02.000 --> 02:14:03.000
+This is cue #8042
+
+8043
+02:14:03.000 --> 02:14:04.000
+This is cue #8043
+
+8044
+02:14:04.000 --> 02:14:05.000
+This is cue #8044
+
+8045
+02:14:05.000 --> 02:14:06.000
+This is cue #8045
+
+8046
+02:14:06.000 --> 02:14:07.000
+This is cue #8046
+
+8047
+02:14:07.000 --> 02:14:08.000
+This is cue #8047
+
+8048
+02:14:08.000 --> 02:14:09.000
+This is cue #8048
+
+8049
+02:14:09.000 --> 02:14:10.000
+This is cue #8049
+
+8050
+02:14:10.000 --> 02:14:11.000
+This is cue #8050
+
+8051
+02:14:11.000 --> 02:14:12.000
+This is cue #8051
+
+8052
+02:14:12.000 --> 02:14:13.000
+This is cue #8052
+
+8053
+02:14:13.000 --> 02:14:14.000
+This is cue #8053
+
+8054
+02:14:14.000 --> 02:14:15.000
+This is cue #8054
+
+8055
+02:14:15.000 --> 02:14:16.000
+This is cue #8055
+
+8056
+02:14:16.000 --> 02:14:17.000
+This is cue #8056
+
+8057
+02:14:17.000 --> 02:14:18.000
+This is cue #8057
+
+8058
+02:14:18.000 --> 02:14:19.000
+This is cue #8058
+
+8059
+02:14:19.000 --> 02:14:20.000
+This is cue #8059
+
+8060
+02:14:20.000 --> 02:14:21.000
+This is cue #8060
+
+8061
+02:14:21.000 --> 02:14:22.000
+This is cue #8061
+
+8062
+02:14:22.000 --> 02:14:23.000
+This is cue #8062
+
+8063
+02:14:23.000 --> 02:14:24.000
+This is cue #8063
+
+8064
+02:14:24.000 --> 02:14:25.000
+This is cue #8064
+
+8065
+02:14:25.000 --> 02:14:26.000
+This is cue #8065
+
+8066
+02:14:26.000 --> 02:14:27.000
+This is cue #8066
+
+8067
+02:14:27.000 --> 02:14:28.000
+This is cue #8067
+
+8068
+02:14:28.000 --> 02:14:29.000
+This is cue #8068
+
+8069
+02:14:29.000 --> 02:14:30.000
+This is cue #8069
+
+8070
+02:14:30.000 --> 02:14:31.000
+This is cue #8070
+
+8071
+02:14:31.000 --> 02:14:32.000
+This is cue #8071
+
+8072
+02:14:32.000 --> 02:14:33.000
+This is cue #8072
+
+8073
+02:14:33.000 --> 02:14:34.000
+This is cue #8073
+
+8074
+02:14:34.000 --> 02:14:35.000
+This is cue #8074
+
+8075
+02:14:35.000 --> 02:14:36.000
+This is cue #8075
+
+8076
+02:14:36.000 --> 02:14:37.000
+This is cue #8076
+
+8077
+02:14:37.000 --> 02:14:38.000
+This is cue #8077
+
+8078
+02:14:38.000 --> 02:14:39.000
+This is cue #8078
+
+8079
+02:14:39.000 --> 02:14:40.000
+This is cue #8079
+
+8080
+02:14:40.000 --> 02:14:41.000
+This is cue #8080
+
+8081
+02:14:41.000 --> 02:14:42.000
+This is cue #8081
+
+8082
+02:14:42.000 --> 02:14:43.000
+This is cue #8082
+
+8083
+02:14:43.000 --> 02:14:44.000
+This is cue #8083
+
+8084
+02:14:44.000 --> 02:14:45.000
+This is cue #8084
+
+8085
+02:14:45.000 --> 02:14:46.000
+This is cue #8085
+
+8086
+02:14:46.000 --> 02:14:47.000
+This is cue #8086
+
+8087
+02:14:47.000 --> 02:14:48.000
+This is cue #8087
+
+8088
+02:14:48.000 --> 02:14:49.000
+This is cue #8088
+
+8089
+02:14:49.000 --> 02:14:50.000
+This is cue #8089
+
+8090
+02:14:50.000 --> 02:14:51.000
+This is cue #8090
+
+8091
+02:14:51.000 --> 02:14:52.000
+This is cue #8091
+
+8092
+02:14:52.000 --> 02:14:53.000
+This is cue #8092
+
+8093
+02:14:53.000 --> 02:14:54.000
+This is cue #8093
+
+8094
+02:14:54.000 --> 02:14:55.000
+This is cue #8094
+
+8095
+02:14:55.000 --> 02:14:56.000
+This is cue #8095
+
+8096
+02:14:56.000 --> 02:14:57.000
+This is cue #8096
+
+8097
+02:14:57.000 --> 02:14:58.000
+This is cue #8097
+
+8098
+02:14:58.000 --> 02:14:59.000
+This is cue #8098
+
+8099
+02:14:59.000 --> 02:15:00.000
+This is cue #8099
+
+8100
+02:15:00.000 --> 02:15:01.000
+This is cue #8100
+
+8101
+02:15:01.000 --> 02:15:02.000
+This is cue #8101
+
+8102
+02:15:02.000 --> 02:15:03.000
+This is cue #8102
+
+8103
+02:15:03.000 --> 02:15:04.000
+This is cue #8103
+
+8104
+02:15:04.000 --> 02:15:05.000
+This is cue #8104
+
+8105
+02:15:05.000 --> 02:15:06.000
+This is cue #8105
+
+8106
+02:15:06.000 --> 02:15:07.000
+This is cue #8106
+
+8107
+02:15:07.000 --> 02:15:08.000
+This is cue #8107
+
+8108
+02:15:08.000 --> 02:15:09.000
+This is cue #8108
+
+8109
+02:15:09.000 --> 02:15:10.000
+This is cue #8109
+
+8110
+02:15:10.000 --> 02:15:11.000
+This is cue #8110
+
+8111
+02:15:11.000 --> 02:15:12.000
+This is cue #8111
+
+8112
+02:15:12.000 --> 02:15:13.000
+This is cue #8112
+
+8113
+02:15:13.000 --> 02:15:14.000
+This is cue #8113
+
+8114
+02:15:14.000 --> 02:15:15.000
+This is cue #8114
+
+8115
+02:15:15.000 --> 02:15:16.000
+This is cue #8115
+
+8116
+02:15:16.000 --> 02:15:17.000
+This is cue #8116
+
+8117
+02:15:17.000 --> 02:15:18.000
+This is cue #8117
+
+8118
+02:15:18.000 --> 02:15:19.000
+This is cue #8118
+
+8119
+02:15:19.000 --> 02:15:20.000
+This is cue #8119
+
+8120
+02:15:20.000 --> 02:15:21.000
+This is cue #8120
+
+8121
+02:15:21.000 --> 02:15:22.000
+This is cue #8121
+
+8122
+02:15:22.000 --> 02:15:23.000
+This is cue #8122
+
+8123
+02:15:23.000 --> 02:15:24.000
+This is cue #8123
+
+8124
+02:15:24.000 --> 02:15:25.000
+This is cue #8124
+
+8125
+02:15:25.000 --> 02:15:26.000
+This is cue #8125
+
+8126
+02:15:26.000 --> 02:15:27.000
+This is cue #8126
+
+8127
+02:15:27.000 --> 02:15:28.000
+This is cue #8127
+
+8128
+02:15:28.000 --> 02:15:29.000
+This is cue #8128
+
+8129
+02:15:29.000 --> 02:15:30.000
+This is cue #8129
+
+8130
+02:15:30.000 --> 02:15:31.000
+This is cue #8130
+
+8131
+02:15:31.000 --> 02:15:32.000
+This is cue #8131
+
+8132
+02:15:32.000 --> 02:15:33.000
+This is cue #8132
+
+8133
+02:15:33.000 --> 02:15:34.000
+This is cue #8133
+
+8134
+02:15:34.000 --> 02:15:35.000
+This is cue #8134
+
+8135
+02:15:35.000 --> 02:15:36.000
+This is cue #8135
+
+8136
+02:15:36.000 --> 02:15:37.000
+This is cue #8136
+
+8137
+02:15:37.000 --> 02:15:38.000
+This is cue #8137
+
+8138
+02:15:38.000 --> 02:15:39.000
+This is cue #8138
+
+8139
+02:15:39.000 --> 02:15:40.000
+This is cue #8139
+
+8140
+02:15:40.000 --> 02:15:41.000
+This is cue #8140
+
+8141
+02:15:41.000 --> 02:15:42.000
+This is cue #8141
+
+8142
+02:15:42.000 --> 02:15:43.000
+This is cue #8142
+
+8143
+02:15:43.000 --> 02:15:44.000
+This is cue #8143
+
+8144
+02:15:44.000 --> 02:15:45.000
+This is cue #8144
+
+8145
+02:15:45.000 --> 02:15:46.000
+This is cue #8145
+
+8146
+02:15:46.000 --> 02:15:47.000
+This is cue #8146
+
+8147
+02:15:47.000 --> 02:15:48.000
+This is cue #8147
+
+8148
+02:15:48.000 --> 02:15:49.000
+This is cue #8148
+
+8149
+02:15:49.000 --> 02:15:50.000
+This is cue #8149
+
+8150
+02:15:50.000 --> 02:15:51.000
+This is cue #8150
+
+8151
+02:15:51.000 --> 02:15:52.000
+This is cue #8151
+
+8152
+02:15:52.000 --> 02:15:53.000
+This is cue #8152
+
+8153
+02:15:53.000 --> 02:15:54.000
+This is cue #8153
+
+8154
+02:15:54.000 --> 02:15:55.000
+This is cue #8154
+
+8155
+02:15:55.000 --> 02:15:56.000
+This is cue #8155
+
+8156
+02:15:56.000 --> 02:15:57.000
+This is cue #8156
+
+8157
+02:15:57.000 --> 02:15:58.000
+This is cue #8157
+
+8158
+02:15:58.000 --> 02:15:59.000
+This is cue #8158
+
+8159
+02:15:59.000 --> 02:16:00.000
+This is cue #8159
+
+8160
+02:16:00.000 --> 02:16:01.000
+This is cue #8160
+
+8161
+02:16:01.000 --> 02:16:02.000
+This is cue #8161
+
+8162
+02:16:02.000 --> 02:16:03.000
+This is cue #8162
+
+8163
+02:16:03.000 --> 02:16:04.000
+This is cue #8163
+
+8164
+02:16:04.000 --> 02:16:05.000
+This is cue #8164
+
+8165
+02:16:05.000 --> 02:16:06.000
+This is cue #8165
+
+8166
+02:16:06.000 --> 02:16:07.000
+This is cue #8166
+
+8167
+02:16:07.000 --> 02:16:08.000
+This is cue #8167
+
+8168
+02:16:08.000 --> 02:16:09.000
+This is cue #8168
+
+8169
+02:16:09.000 --> 02:16:10.000
+This is cue #8169
+
+8170
+02:16:10.000 --> 02:16:11.000
+This is cue #8170
+
+8171
+02:16:11.000 --> 02:16:12.000
+This is cue #8171
+
+8172
+02:16:12.000 --> 02:16:13.000
+This is cue #8172
+
+8173
+02:16:13.000 --> 02:16:14.000
+This is cue #8173
+
+8174
+02:16:14.000 --> 02:16:15.000
+This is cue #8174
+
+8175
+02:16:15.000 --> 02:16:16.000
+This is cue #8175
+
+8176
+02:16:16.000 --> 02:16:17.000
+This is cue #8176
+
+8177
+02:16:17.000 --> 02:16:18.000
+This is cue #8177
+
+8178
+02:16:18.000 --> 02:16:19.000
+This is cue #8178
+
+8179
+02:16:19.000 --> 02:16:20.000
+This is cue #8179
+
+8180
+02:16:20.000 --> 02:16:21.000
+This is cue #8180
+
+8181
+02:16:21.000 --> 02:16:22.000
+This is cue #8181
+
+8182
+02:16:22.000 --> 02:16:23.000
+This is cue #8182
+
+8183
+02:16:23.000 --> 02:16:24.000
+This is cue #8183
+
+8184
+02:16:24.000 --> 02:16:25.000
+This is cue #8184
+
+8185
+02:16:25.000 --> 02:16:26.000
+This is cue #8185
+
+8186
+02:16:26.000 --> 02:16:27.000
+This is cue #8186
+
+8187
+02:16:27.000 --> 02:16:28.000
+This is cue #8187
+
+8188
+02:16:28.000 --> 02:16:29.000
+This is cue #8188
+
+8189
+02:16:29.000 --> 02:16:30.000
+This is cue #8189
+
+8190
+02:16:30.000 --> 02:16:31.000
+This is cue #8190
+
+8191
+02:16:31.000 --> 02:16:32.000
+This is cue #8191
+
+8192
+02:16:32.000 --> 02:16:33.000
+This is cue #8192
+
+8193
+02:16:33.000 --> 02:16:34.000
+This is cue #8193
+
+8194
+02:16:34.000 --> 02:16:35.000
+This is cue #8194
+
+8195
+02:16:35.000 --> 02:16:36.000
+This is cue #8195
+
+8196
+02:16:36.000 --> 02:16:37.000
+This is cue #8196
+
+8197
+02:16:37.000 --> 02:16:38.000
+This is cue #8197
+
+8198
+02:16:38.000 --> 02:16:39.000
+This is cue #8198
+
+8199
+02:16:39.000 --> 02:16:40.000
+This is cue #8199
+
+8200
+02:16:40.000 --> 02:16:41.000
+This is cue #8200
+
+8201
+02:16:41.000 --> 02:16:42.000
+This is cue #8201
+
+8202
+02:16:42.000 --> 02:16:43.000
+This is cue #8202
+
+8203
+02:16:43.000 --> 02:16:44.000
+This is cue #8203
+
+8204
+02:16:44.000 --> 02:16:45.000
+This is cue #8204
+
+8205
+02:16:45.000 --> 02:16:46.000
+This is cue #8205
+
+8206
+02:16:46.000 --> 02:16:47.000
+This is cue #8206
+
+8207
+02:16:47.000 --> 02:16:48.000
+This is cue #8207
+
+8208
+02:16:48.000 --> 02:16:49.000
+This is cue #8208
+
+8209
+02:16:49.000 --> 02:16:50.000
+This is cue #8209
+
+8210
+02:16:50.000 --> 02:16:51.000
+This is cue #8210
+
+8211
+02:16:51.000 --> 02:16:52.000
+This is cue #8211
+
+8212
+02:16:52.000 --> 02:16:53.000
+This is cue #8212
+
+8213
+02:16:53.000 --> 02:16:54.000
+This is cue #8213
+
+8214
+02:16:54.000 --> 02:16:55.000
+This is cue #8214
+
+8215
+02:16:55.000 --> 02:16:56.000
+This is cue #8215
+
+8216
+02:16:56.000 --> 02:16:57.000
+This is cue #8216
+
+8217
+02:16:57.000 --> 02:16:58.000
+This is cue #8217
+
+8218
+02:16:58.000 --> 02:16:59.000
+This is cue #8218
+
+8219
+02:16:59.000 --> 02:17:00.000
+This is cue #8219
+
+8220
+02:17:00.000 --> 02:17:01.000
+This is cue #8220
+
+8221
+02:17:01.000 --> 02:17:02.000
+This is cue #8221
+
+8222
+02:17:02.000 --> 02:17:03.000
+This is cue #8222
+
+8223
+02:17:03.000 --> 02:17:04.000
+This is cue #8223
+
+8224
+02:17:04.000 --> 02:17:05.000
+This is cue #8224
+
+8225
+02:17:05.000 --> 02:17:06.000
+This is cue #8225
+
+8226
+02:17:06.000 --> 02:17:07.000
+This is cue #8226
+
+8227
+02:17:07.000 --> 02:17:08.000
+This is cue #8227
+
+8228
+02:17:08.000 --> 02:17:09.000
+This is cue #8228
+
+8229
+02:17:09.000 --> 02:17:10.000
+This is cue #8229
+
+8230
+02:17:10.000 --> 02:17:11.000
+This is cue #8230
+
+8231
+02:17:11.000 --> 02:17:12.000
+This is cue #8231
+
+8232
+02:17:12.000 --> 02:17:13.000
+This is cue #8232
+
+8233
+02:17:13.000 --> 02:17:14.000
+This is cue #8233
+
+8234
+02:17:14.000 --> 02:17:15.000
+This is cue #8234
+
+8235
+02:17:15.000 --> 02:17:16.000
+This is cue #8235
+
+8236
+02:17:16.000 --> 02:17:17.000
+This is cue #8236
+
+8237
+02:17:17.000 --> 02:17:18.000
+This is cue #8237
+
+8238
+02:17:18.000 --> 02:17:19.000
+This is cue #8238
+
+8239
+02:17:19.000 --> 02:17:20.000
+This is cue #8239
+
+8240
+02:17:20.000 --> 02:17:21.000
+This is cue #8240
+
+8241
+02:17:21.000 --> 02:17:22.000
+This is cue #8241
+
+8242
+02:17:22.000 --> 02:17:23.000
+This is cue #8242
+
+8243
+02:17:23.000 --> 02:17:24.000
+This is cue #8243
+
+8244
+02:17:24.000 --> 02:17:25.000
+This is cue #8244
+
+8245
+02:17:25.000 --> 02:17:26.000
+This is cue #8245
+
+8246
+02:17:26.000 --> 02:17:27.000
+This is cue #8246
+
+8247
+02:17:27.000 --> 02:17:28.000
+This is cue #8247
+
+8248
+02:17:28.000 --> 02:17:29.000
+This is cue #8248
+
+8249
+02:17:29.000 --> 02:17:30.000
+This is cue #8249
+
+8250
+02:17:30.000 --> 02:17:31.000
+This is cue #8250
+
+8251
+02:17:31.000 --> 02:17:32.000
+This is cue #8251
+
+8252
+02:17:32.000 --> 02:17:33.000
+This is cue #8252
+
+8253
+02:17:33.000 --> 02:17:34.000
+This is cue #8253
+
+8254
+02:17:34.000 --> 02:17:35.000
+This is cue #8254
+
+8255
+02:17:35.000 --> 02:17:36.000
+This is cue #8255
+
+8256
+02:17:36.000 --> 02:17:37.000
+This is cue #8256
+
+8257
+02:17:37.000 --> 02:17:38.000
+This is cue #8257
+
+8258
+02:17:38.000 --> 02:17:39.000
+This is cue #8258
+
+8259
+02:17:39.000 --> 02:17:40.000
+This is cue #8259
+
+8260
+02:17:40.000 --> 02:17:41.000
+This is cue #8260
+
+8261
+02:17:41.000 --> 02:17:42.000
+This is cue #8261
+
+8262
+02:17:42.000 --> 02:17:43.000
+This is cue #8262
+
+8263
+02:17:43.000 --> 02:17:44.000
+This is cue #8263
+
+8264
+02:17:44.000 --> 02:17:45.000
+This is cue #8264
+
+8265
+02:17:45.000 --> 02:17:46.000
+This is cue #8265
+
+8266
+02:17:46.000 --> 02:17:47.000
+This is cue #8266
+
+8267
+02:17:47.000 --> 02:17:48.000
+This is cue #8267
+
+8268
+02:17:48.000 --> 02:17:49.000
+This is cue #8268
+
+8269
+02:17:49.000 --> 02:17:50.000
+This is cue #8269
+
+8270
+02:17:50.000 --> 02:17:51.000
+This is cue #8270
+
+8271
+02:17:51.000 --> 02:17:52.000
+This is cue #8271
+
+8272
+02:17:52.000 --> 02:17:53.000
+This is cue #8272
+
+8273
+02:17:53.000 --> 02:17:54.000
+This is cue #8273
+
+8274
+02:17:54.000 --> 02:17:55.000
+This is cue #8274
+
+8275
+02:17:55.000 --> 02:17:56.000
+This is cue #8275
+
+8276
+02:17:56.000 --> 02:17:57.000
+This is cue #8276
+
+8277
+02:17:57.000 --> 02:17:58.000
+This is cue #8277
+
+8278
+02:17:58.000 --> 02:17:59.000
+This is cue #8278
+
+8279
+02:17:59.000 --> 02:18:00.000
+This is cue #8279
+
+8280
+02:18:00.000 --> 02:18:01.000
+This is cue #8280
+
+8281
+02:18:01.000 --> 02:18:02.000
+This is cue #8281
+
+8282
+02:18:02.000 --> 02:18:03.000
+This is cue #8282
+
+8283
+02:18:03.000 --> 02:18:04.000
+This is cue #8283
+
+8284
+02:18:04.000 --> 02:18:05.000
+This is cue #8284
+
+8285
+02:18:05.000 --> 02:18:06.000
+This is cue #8285
+
+8286
+02:18:06.000 --> 02:18:07.000
+This is cue #8286
+
+8287
+02:18:07.000 --> 02:18:08.000
+This is cue #8287
+
+8288
+02:18:08.000 --> 02:18:09.000
+This is cue #8288
+
+8289
+02:18:09.000 --> 02:18:10.000
+This is cue #8289
+
+8290
+02:18:10.000 --> 02:18:11.000
+This is cue #8290
+
+8291
+02:18:11.000 --> 02:18:12.000
+This is cue #8291
+
+8292
+02:18:12.000 --> 02:18:13.000
+This is cue #8292
+
+8293
+02:18:13.000 --> 02:18:14.000
+This is cue #8293
+
+8294
+02:18:14.000 --> 02:18:15.000
+This is cue #8294
+
+8295
+02:18:15.000 --> 02:18:16.000
+This is cue #8295
+
+8296
+02:18:16.000 --> 02:18:17.000
+This is cue #8296
+
+8297
+02:18:17.000 --> 02:18:18.000
+This is cue #8297
+
+8298
+02:18:18.000 --> 02:18:19.000
+This is cue #8298
+
+8299
+02:18:19.000 --> 02:18:20.000
+This is cue #8299
+
+8300
+02:18:20.000 --> 02:18:21.000
+This is cue #8300
+
+8301
+02:18:21.000 --> 02:18:22.000
+This is cue #8301
+
+8302
+02:18:22.000 --> 02:18:23.000
+This is cue #8302
+
+8303
+02:18:23.000 --> 02:18:24.000
+This is cue #8303
+
+8304
+02:18:24.000 --> 02:18:25.000
+This is cue #8304
+
+8305
+02:18:25.000 --> 02:18:26.000
+This is cue #8305
+
+8306
+02:18:26.000 --> 02:18:27.000
+This is cue #8306
+
+8307
+02:18:27.000 --> 02:18:28.000
+This is cue #8307
+
+8308
+02:18:28.000 --> 02:18:29.000
+This is cue #8308
+
+8309
+02:18:29.000 --> 02:18:30.000
+This is cue #8309
+
+8310
+02:18:30.000 --> 02:18:31.000
+This is cue #8310
+
+8311
+02:18:31.000 --> 02:18:32.000
+This is cue #8311
+
+8312
+02:18:32.000 --> 02:18:33.000
+This is cue #8312
+
+8313
+02:18:33.000 --> 02:18:34.000
+This is cue #8313
+
+8314
+02:18:34.000 --> 02:18:35.000
+This is cue #8314
+
+8315
+02:18:35.000 --> 02:18:36.000
+This is cue #8315
+
+8316
+02:18:36.000 --> 02:18:37.000
+This is cue #8316
+
+8317
+02:18:37.000 --> 02:18:38.000
+This is cue #8317
+
+8318
+02:18:38.000 --> 02:18:39.000
+This is cue #8318
+
+8319
+02:18:39.000 --> 02:18:40.000
+This is cue #8319
+
+8320
+02:18:40.000 --> 02:18:41.000
+This is cue #8320
+
+8321
+02:18:41.000 --> 02:18:42.000
+This is cue #8321
+
+8322
+02:18:42.000 --> 02:18:43.000
+This is cue #8322
+
+8323
+02:18:43.000 --> 02:18:44.000
+This is cue #8323
+
+8324
+02:18:44.000 --> 02:18:45.000
+This is cue #8324
+
+8325
+02:18:45.000 --> 02:18:46.000
+This is cue #8325
+
+8326
+02:18:46.000 --> 02:18:47.000
+This is cue #8326
+
+8327
+02:18:47.000 --> 02:18:48.000
+This is cue #8327
+
+8328
+02:18:48.000 --> 02:18:49.000
+This is cue #8328
+
+8329
+02:18:49.000 --> 02:18:50.000
+This is cue #8329
+
+8330
+02:18:50.000 --> 02:18:51.000
+This is cue #8330
+
+8331
+02:18:51.000 --> 02:18:52.000
+This is cue #8331
+
+8332
+02:18:52.000 --> 02:18:53.000
+This is cue #8332
+
+8333
+02:18:53.000 --> 02:18:54.000
+This is cue #8333
+
+8334
+02:18:54.000 --> 02:18:55.000
+This is cue #8334
+
+8335
+02:18:55.000 --> 02:18:56.000
+This is cue #8335
+
+8336
+02:18:56.000 --> 02:18:57.000
+This is cue #8336
+
+8337
+02:18:57.000 --> 02:18:58.000
+This is cue #8337
+
+8338
+02:18:58.000 --> 02:18:59.000
+This is cue #8338
+
+8339
+02:18:59.000 --> 02:19:00.000
+This is cue #8339
+
+8340
+02:19:00.000 --> 02:19:01.000
+This is cue #8340
+
+8341
+02:19:01.000 --> 02:19:02.000
+This is cue #8341
+
+8342
+02:19:02.000 --> 02:19:03.000
+This is cue #8342
+
+8343
+02:19:03.000 --> 02:19:04.000
+This is cue #8343
+
+8344
+02:19:04.000 --> 02:19:05.000
+This is cue #8344
+
+8345
+02:19:05.000 --> 02:19:06.000
+This is cue #8345
+
+8346
+02:19:06.000 --> 02:19:07.000
+This is cue #8346
+
+8347
+02:19:07.000 --> 02:19:08.000
+This is cue #8347
+
+8348
+02:19:08.000 --> 02:19:09.000
+This is cue #8348
+
+8349
+02:19:09.000 --> 02:19:10.000
+This is cue #8349
+
+8350
+02:19:10.000 --> 02:19:11.000
+This is cue #8350
+
+8351
+02:19:11.000 --> 02:19:12.000
+This is cue #8351
+
+8352
+02:19:12.000 --> 02:19:13.000
+This is cue #8352
+
+8353
+02:19:13.000 --> 02:19:14.000
+This is cue #8353
+
+8354
+02:19:14.000 --> 02:19:15.000
+This is cue #8354
+
+8355
+02:19:15.000 --> 02:19:16.000
+This is cue #8355
+
+8356
+02:19:16.000 --> 02:19:17.000
+This is cue #8356
+
+8357
+02:19:17.000 --> 02:19:18.000
+This is cue #8357
+
+8358
+02:19:18.000 --> 02:19:19.000
+This is cue #8358
+
+8359
+02:19:19.000 --> 02:19:20.000
+This is cue #8359
+
+8360
+02:19:20.000 --> 02:19:21.000
+This is cue #8360
+
+8361
+02:19:21.000 --> 02:19:22.000
+This is cue #8361
+
+8362
+02:19:22.000 --> 02:19:23.000
+This is cue #8362
+
+8363
+02:19:23.000 --> 02:19:24.000
+This is cue #8363
+
+8364
+02:19:24.000 --> 02:19:25.000
+This is cue #8364
+
+8365
+02:19:25.000 --> 02:19:26.000
+This is cue #8365
+
+8366
+02:19:26.000 --> 02:19:27.000
+This is cue #8366
+
+8367
+02:19:27.000 --> 02:19:28.000
+This is cue #8367
+
+8368
+02:19:28.000 --> 02:19:29.000
+This is cue #8368
+
+8369
+02:19:29.000 --> 02:19:30.000
+This is cue #8369
+
+8370
+02:19:30.000 --> 02:19:31.000
+This is cue #8370
+
+8371
+02:19:31.000 --> 02:19:32.000
+This is cue #8371
+
+8372
+02:19:32.000 --> 02:19:33.000
+This is cue #8372
+
+8373
+02:19:33.000 --> 02:19:34.000
+This is cue #8373
+
+8374
+02:19:34.000 --> 02:19:35.000
+This is cue #8374
+
+8375
+02:19:35.000 --> 02:19:36.000
+This is cue #8375
+
+8376
+02:19:36.000 --> 02:19:37.000
+This is cue #8376
+
+8377
+02:19:37.000 --> 02:19:38.000
+This is cue #8377
+
+8378
+02:19:38.000 --> 02:19:39.000
+This is cue #8378
+
+8379
+02:19:39.000 --> 02:19:40.000
+This is cue #8379
+
+8380
+02:19:40.000 --> 02:19:41.000
+This is cue #8380
+
+8381
+02:19:41.000 --> 02:19:42.000
+This is cue #8381
+
+8382
+02:19:42.000 --> 02:19:43.000
+This is cue #8382
+
+8383
+02:19:43.000 --> 02:19:44.000
+This is cue #8383
+
+8384
+02:19:44.000 --> 02:19:45.000
+This is cue #8384
+
+8385
+02:19:45.000 --> 02:19:46.000
+This is cue #8385
+
+8386
+02:19:46.000 --> 02:19:47.000
+This is cue #8386
+
+8387
+02:19:47.000 --> 02:19:48.000
+This is cue #8387
+
+8388
+02:19:48.000 --> 02:19:49.000
+This is cue #8388
+
+8389
+02:19:49.000 --> 02:19:50.000
+This is cue #8389
+
+8390
+02:19:50.000 --> 02:19:51.000
+This is cue #8390
+
+8391
+02:19:51.000 --> 02:19:52.000
+This is cue #8391
+
+8392
+02:19:52.000 --> 02:19:53.000
+This is cue #8392
+
+8393
+02:19:53.000 --> 02:19:54.000
+This is cue #8393
+
+8394
+02:19:54.000 --> 02:19:55.000
+This is cue #8394
+
+8395
+02:19:55.000 --> 02:19:56.000
+This is cue #8395
+
+8396
+02:19:56.000 --> 02:19:57.000
+This is cue #8396
+
+8397
+02:19:57.000 --> 02:19:58.000
+This is cue #8397
+
+8398
+02:19:58.000 --> 02:19:59.000
+This is cue #8398
+
+8399
+02:19:59.000 --> 02:20:00.000
+This is cue #8399
+
+8400
+02:20:00.000 --> 02:20:01.000
+This is cue #8400
+
+8401
+02:20:01.000 --> 02:20:02.000
+This is cue #8401
+
+8402
+02:20:02.000 --> 02:20:03.000
+This is cue #8402
+
+8403
+02:20:03.000 --> 02:20:04.000
+This is cue #8403
+
+8404
+02:20:04.000 --> 02:20:05.000
+This is cue #8404
+
+8405
+02:20:05.000 --> 02:20:06.000
+This is cue #8405
+
+8406
+02:20:06.000 --> 02:20:07.000
+This is cue #8406
+
+8407
+02:20:07.000 --> 02:20:08.000
+This is cue #8407
+
+8408
+02:20:08.000 --> 02:20:09.000
+This is cue #8408
+
+8409
+02:20:09.000 --> 02:20:10.000
+This is cue #8409
+
+8410
+02:20:10.000 --> 02:20:11.000
+This is cue #8410
+
+8411
+02:20:11.000 --> 02:20:12.000
+This is cue #8411
+
+8412
+02:20:12.000 --> 02:20:13.000
+This is cue #8412
+
+8413
+02:20:13.000 --> 02:20:14.000
+This is cue #8413
+
+8414
+02:20:14.000 --> 02:20:15.000
+This is cue #8414
+
+8415
+02:20:15.000 --> 02:20:16.000
+This is cue #8415
+
+8416
+02:20:16.000 --> 02:20:17.000
+This is cue #8416
+
+8417
+02:20:17.000 --> 02:20:18.000
+This is cue #8417
+
+8418
+02:20:18.000 --> 02:20:19.000
+This is cue #8418
+
+8419
+02:20:19.000 --> 02:20:20.000
+This is cue #8419
+
+8420
+02:20:20.000 --> 02:20:21.000
+This is cue #8420
+
+8421
+02:20:21.000 --> 02:20:22.000
+This is cue #8421
+
+8422
+02:20:22.000 --> 02:20:23.000
+This is cue #8422
+
+8423
+02:20:23.000 --> 02:20:24.000
+This is cue #8423
+
+8424
+02:20:24.000 --> 02:20:25.000
+This is cue #8424
+
+8425
+02:20:25.000 --> 02:20:26.000
+This is cue #8425
+
+8426
+02:20:26.000 --> 02:20:27.000
+This is cue #8426
+
+8427
+02:20:27.000 --> 02:20:28.000
+This is cue #8427
+
+8428
+02:20:28.000 --> 02:20:29.000
+This is cue #8428
+
+8429
+02:20:29.000 --> 02:20:30.000
+This is cue #8429
+
+8430
+02:20:30.000 --> 02:20:31.000
+This is cue #8430
+
+8431
+02:20:31.000 --> 02:20:32.000
+This is cue #8431
+
+8432
+02:20:32.000 --> 02:20:33.000
+This is cue #8432
+
+8433
+02:20:33.000 --> 02:20:34.000
+This is cue #8433
+
+8434
+02:20:34.000 --> 02:20:35.000
+This is cue #8434
+
+8435
+02:20:35.000 --> 02:20:36.000
+This is cue #8435
+
+8436
+02:20:36.000 --> 02:20:37.000
+This is cue #8436
+
+8437
+02:20:37.000 --> 02:20:38.000
+This is cue #8437
+
+8438
+02:20:38.000 --> 02:20:39.000
+This is cue #8438
+
+8439
+02:20:39.000 --> 02:20:40.000
+This is cue #8439
+
+8440
+02:20:40.000 --> 02:20:41.000
+This is cue #8440
+
+8441
+02:20:41.000 --> 02:20:42.000
+This is cue #8441
+
+8442
+02:20:42.000 --> 02:20:43.000
+This is cue #8442
+
+8443
+02:20:43.000 --> 02:20:44.000
+This is cue #8443
+
+8444
+02:20:44.000 --> 02:20:45.000
+This is cue #8444
+
+8445
+02:20:45.000 --> 02:20:46.000
+This is cue #8445
+
+8446
+02:20:46.000 --> 02:20:47.000
+This is cue #8446
+
+8447
+02:20:47.000 --> 02:20:48.000
+This is cue #8447
+
+8448
+02:20:48.000 --> 02:20:49.000
+This is cue #8448
+
+8449
+02:20:49.000 --> 02:20:50.000
+This is cue #8449
+
+8450
+02:20:50.000 --> 02:20:51.000
+This is cue #8450
+
+8451
+02:20:51.000 --> 02:20:52.000
+This is cue #8451
+
+8452
+02:20:52.000 --> 02:20:53.000
+This is cue #8452
+
+8453
+02:20:53.000 --> 02:20:54.000
+This is cue #8453
+
+8454
+02:20:54.000 --> 02:20:55.000
+This is cue #8454
+
+8455
+02:20:55.000 --> 02:20:56.000
+This is cue #8455
+
+8456
+02:20:56.000 --> 02:20:57.000
+This is cue #8456
+
+8457
+02:20:57.000 --> 02:20:58.000
+This is cue #8457
+
+8458
+02:20:58.000 --> 02:20:59.000
+This is cue #8458
+
+8459
+02:20:59.000 --> 02:21:00.000
+This is cue #8459
+
+8460
+02:21:00.000 --> 02:21:01.000
+This is cue #8460
+
+8461
+02:21:01.000 --> 02:21:02.000
+This is cue #8461
+
+8462
+02:21:02.000 --> 02:21:03.000
+This is cue #8462
+
+8463
+02:21:03.000 --> 02:21:04.000
+This is cue #8463
+
+8464
+02:21:04.000 --> 02:21:05.000
+This is cue #8464
+
+8465
+02:21:05.000 --> 02:21:06.000
+This is cue #8465
+
+8466
+02:21:06.000 --> 02:21:07.000
+This is cue #8466
+
+8467
+02:21:07.000 --> 02:21:08.000
+This is cue #8467
+
+8468
+02:21:08.000 --> 02:21:09.000
+This is cue #8468
+
+8469
+02:21:09.000 --> 02:21:10.000
+This is cue #8469
+
+8470
+02:21:10.000 --> 02:21:11.000
+This is cue #8470
+
+8471
+02:21:11.000 --> 02:21:12.000
+This is cue #8471
+
+8472
+02:21:12.000 --> 02:21:13.000
+This is cue #8472
+
+8473
+02:21:13.000 --> 02:21:14.000
+This is cue #8473
+
+8474
+02:21:14.000 --> 02:21:15.000
+This is cue #8474
+
+8475
+02:21:15.000 --> 02:21:16.000
+This is cue #8475
+
+8476
+02:21:16.000 --> 02:21:17.000
+This is cue #8476
+
+8477
+02:21:17.000 --> 02:21:18.000
+This is cue #8477
+
+8478
+02:21:18.000 --> 02:21:19.000
+This is cue #8478
+
+8479
+02:21:19.000 --> 02:21:20.000
+This is cue #8479
+
+8480
+02:21:20.000 --> 02:21:21.000
+This is cue #8480
+
+8481
+02:21:21.000 --> 02:21:22.000
+This is cue #8481
+
+8482
+02:21:22.000 --> 02:21:23.000
+This is cue #8482
+
+8483
+02:21:23.000 --> 02:21:24.000
+This is cue #8483
+
+8484
+02:21:24.000 --> 02:21:25.000
+This is cue #8484
+
+8485
+02:21:25.000 --> 02:21:26.000
+This is cue #8485
+
+8486
+02:21:26.000 --> 02:21:27.000
+This is cue #8486
+
+8487
+02:21:27.000 --> 02:21:28.000
+This is cue #8487
+
+8488
+02:21:28.000 --> 02:21:29.000
+This is cue #8488
+
+8489
+02:21:29.000 --> 02:21:30.000
+This is cue #8489
+
+8490
+02:21:30.000 --> 02:21:31.000
+This is cue #8490
+
+8491
+02:21:31.000 --> 02:21:32.000
+This is cue #8491
+
+8492
+02:21:32.000 --> 02:21:33.000
+This is cue #8492
+
+8493
+02:21:33.000 --> 02:21:34.000
+This is cue #8493
+
+8494
+02:21:34.000 --> 02:21:35.000
+This is cue #8494
+
+8495
+02:21:35.000 --> 02:21:36.000
+This is cue #8495
+
+8496
+02:21:36.000 --> 02:21:37.000
+This is cue #8496
+
+8497
+02:21:37.000 --> 02:21:38.000
+This is cue #8497
+
+8498
+02:21:38.000 --> 02:21:39.000
+This is cue #8498
+
+8499
+02:21:39.000 --> 02:21:40.000
+This is cue #8499
+
+8500
+02:21:40.000 --> 02:21:41.000
+This is cue #8500
+
+8501
+02:21:41.000 --> 02:21:42.000
+This is cue #8501
+
+8502
+02:21:42.000 --> 02:21:43.000
+This is cue #8502
+
+8503
+02:21:43.000 --> 02:21:44.000
+This is cue #8503
+
+8504
+02:21:44.000 --> 02:21:45.000
+This is cue #8504
+
+8505
+02:21:45.000 --> 02:21:46.000
+This is cue #8505
+
+8506
+02:21:46.000 --> 02:21:47.000
+This is cue #8506
+
+8507
+02:21:47.000 --> 02:21:48.000
+This is cue #8507
+
+8508
+02:21:48.000 --> 02:21:49.000
+This is cue #8508
+
+8509
+02:21:49.000 --> 02:21:50.000
+This is cue #8509
+
+8510
+02:21:50.000 --> 02:21:51.000
+This is cue #8510
+
+8511
+02:21:51.000 --> 02:21:52.000
+This is cue #8511
+
+8512
+02:21:52.000 --> 02:21:53.000
+This is cue #8512
+
+8513
+02:21:53.000 --> 02:21:54.000
+This is cue #8513
+
+8514
+02:21:54.000 --> 02:21:55.000
+This is cue #8514
+
+8515
+02:21:55.000 --> 02:21:56.000
+This is cue #8515
+
+8516
+02:21:56.000 --> 02:21:57.000
+This is cue #8516
+
+8517
+02:21:57.000 --> 02:21:58.000
+This is cue #8517
+
+8518
+02:21:58.000 --> 02:21:59.000
+This is cue #8518
+
+8519
+02:21:59.000 --> 02:22:00.000
+This is cue #8519
+
+8520
+02:22:00.000 --> 02:22:01.000
+This is cue #8520
+
+8521
+02:22:01.000 --> 02:22:02.000
+This is cue #8521
+
+8522
+02:22:02.000 --> 02:22:03.000
+This is cue #8522
+
+8523
+02:22:03.000 --> 02:22:04.000
+This is cue #8523
+
+8524
+02:22:04.000 --> 02:22:05.000
+This is cue #8524
+
+8525
+02:22:05.000 --> 02:22:06.000
+This is cue #8525
+
+8526
+02:22:06.000 --> 02:22:07.000
+This is cue #8526
+
+8527
+02:22:07.000 --> 02:22:08.000
+This is cue #8527
+
+8528
+02:22:08.000 --> 02:22:09.000
+This is cue #8528
+
+8529
+02:22:09.000 --> 02:22:10.000
+This is cue #8529
+
+8530
+02:22:10.000 --> 02:22:11.000
+This is cue #8530
+
+8531
+02:22:11.000 --> 02:22:12.000
+This is cue #8531
+
+8532
+02:22:12.000 --> 02:22:13.000
+This is cue #8532
+
+8533
+02:22:13.000 --> 02:22:14.000
+This is cue #8533
+
+8534
+02:22:14.000 --> 02:22:15.000
+This is cue #8534
+
+8535
+02:22:15.000 --> 02:22:16.000
+This is cue #8535
+
+8536
+02:22:16.000 --> 02:22:17.000
+This is cue #8536
+
+8537
+02:22:17.000 --> 02:22:18.000
+This is cue #8537
+
+8538
+02:22:18.000 --> 02:22:19.000
+This is cue #8538
+
+8539
+02:22:19.000 --> 02:22:20.000
+This is cue #8539
+
+8540
+02:22:20.000 --> 02:22:21.000
+This is cue #8540
+
+8541
+02:22:21.000 --> 02:22:22.000
+This is cue #8541
+
+8542
+02:22:22.000 --> 02:22:23.000
+This is cue #8542
+
+8543
+02:22:23.000 --> 02:22:24.000
+This is cue #8543
+
+8544
+02:22:24.000 --> 02:22:25.000
+This is cue #8544
+
+8545
+02:22:25.000 --> 02:22:26.000
+This is cue #8545
+
+8546
+02:22:26.000 --> 02:22:27.000
+This is cue #8546
+
+8547
+02:22:27.000 --> 02:22:28.000
+This is cue #8547
+
+8548
+02:22:28.000 --> 02:22:29.000
+This is cue #8548
+
+8549
+02:22:29.000 --> 02:22:30.000
+This is cue #8549
+
+8550
+02:22:30.000 --> 02:22:31.000
+This is cue #8550
+
+8551
+02:22:31.000 --> 02:22:32.000
+This is cue #8551
+
+8552
+02:22:32.000 --> 02:22:33.000
+This is cue #8552
+
+8553
+02:22:33.000 --> 02:22:34.000
+This is cue #8553
+
+8554
+02:22:34.000 --> 02:22:35.000
+This is cue #8554
+
+8555
+02:22:35.000 --> 02:22:36.000
+This is cue #8555
+
+8556
+02:22:36.000 --> 02:22:37.000
+This is cue #8556
+
+8557
+02:22:37.000 --> 02:22:38.000
+This is cue #8557
+
+8558
+02:22:38.000 --> 02:22:39.000
+This is cue #8558
+
+8559
+02:22:39.000 --> 02:22:40.000
+This is cue #8559
+
+8560
+02:22:40.000 --> 02:22:41.000
+This is cue #8560
+
+8561
+02:22:41.000 --> 02:22:42.000
+This is cue #8561
+
+8562
+02:22:42.000 --> 02:22:43.000
+This is cue #8562
+
+8563
+02:22:43.000 --> 02:22:44.000
+This is cue #8563
+
+8564
+02:22:44.000 --> 02:22:45.000
+This is cue #8564
+
+8565
+02:22:45.000 --> 02:22:46.000
+This is cue #8565
+
+8566
+02:22:46.000 --> 02:22:47.000
+This is cue #8566
+
+8567
+02:22:47.000 --> 02:22:48.000
+This is cue #8567
+
+8568
+02:22:48.000 --> 02:22:49.000
+This is cue #8568
+
+8569
+02:22:49.000 --> 02:22:50.000
+This is cue #8569
+
+8570
+02:22:50.000 --> 02:22:51.000
+This is cue #8570
+
+8571
+02:22:51.000 --> 02:22:52.000
+This is cue #8571
+
+8572
+02:22:52.000 --> 02:22:53.000
+This is cue #8572
+
+8573
+02:22:53.000 --> 02:22:54.000
+This is cue #8573
+
+8574
+02:22:54.000 --> 02:22:55.000
+This is cue #8574
+
+8575
+02:22:55.000 --> 02:22:56.000
+This is cue #8575
+
+8576
+02:22:56.000 --> 02:22:57.000
+This is cue #8576
+
+8577
+02:22:57.000 --> 02:22:58.000
+This is cue #8577
+
+8578
+02:22:58.000 --> 02:22:59.000
+This is cue #8578
+
+8579
+02:22:59.000 --> 02:23:00.000
+This is cue #8579
+
+8580
+02:23:00.000 --> 02:23:01.000
+This is cue #8580
+
+8581
+02:23:01.000 --> 02:23:02.000
+This is cue #8581
+
+8582
+02:23:02.000 --> 02:23:03.000
+This is cue #8582
+
+8583
+02:23:03.000 --> 02:23:04.000
+This is cue #8583
+
+8584
+02:23:04.000 --> 02:23:05.000
+This is cue #8584
+
+8585
+02:23:05.000 --> 02:23:06.000
+This is cue #8585
+
+8586
+02:23:06.000 --> 02:23:07.000
+This is cue #8586
+
+8587
+02:23:07.000 --> 02:23:08.000
+This is cue #8587
+
+8588
+02:23:08.000 --> 02:23:09.000
+This is cue #8588
+
+8589
+02:23:09.000 --> 02:23:10.000
+This is cue #8589
+
+8590
+02:23:10.000 --> 02:23:11.000
+This is cue #8590
+
+8591
+02:23:11.000 --> 02:23:12.000
+This is cue #8591
+
+8592
+02:23:12.000 --> 02:23:13.000
+This is cue #8592
+
+8593
+02:23:13.000 --> 02:23:14.000
+This is cue #8593
+
+8594
+02:23:14.000 --> 02:23:15.000
+This is cue #8594
+
+8595
+02:23:15.000 --> 02:23:16.000
+This is cue #8595
+
+8596
+02:23:16.000 --> 02:23:17.000
+This is cue #8596
+
+8597
+02:23:17.000 --> 02:23:18.000
+This is cue #8597
+
+8598
+02:23:18.000 --> 02:23:19.000
+This is cue #8598
+
+8599
+02:23:19.000 --> 02:23:20.000
+This is cue #8599
+
+8600
+02:23:20.000 --> 02:23:21.000
+This is cue #8600
+
+8601
+02:23:21.000 --> 02:23:22.000
+This is cue #8601
+
+8602
+02:23:22.000 --> 02:23:23.000
+This is cue #8602
+
+8603
+02:23:23.000 --> 02:23:24.000
+This is cue #8603
+
+8604
+02:23:24.000 --> 02:23:25.000
+This is cue #8604
+
+8605
+02:23:25.000 --> 02:23:26.000
+This is cue #8605
+
+8606
+02:23:26.000 --> 02:23:27.000
+This is cue #8606
+
+8607
+02:23:27.000 --> 02:23:28.000
+This is cue #8607
+
+8608
+02:23:28.000 --> 02:23:29.000
+This is cue #8608
+
+8609
+02:23:29.000 --> 02:23:30.000
+This is cue #8609
+
+8610
+02:23:30.000 --> 02:23:31.000
+This is cue #8610
+
+8611
+02:23:31.000 --> 02:23:32.000
+This is cue #8611
+
+8612
+02:23:32.000 --> 02:23:33.000
+This is cue #8612
+
+8613
+02:23:33.000 --> 02:23:34.000
+This is cue #8613
+
+8614
+02:23:34.000 --> 02:23:35.000
+This is cue #8614
+
+8615
+02:23:35.000 --> 02:23:36.000
+This is cue #8615
+
+8616
+02:23:36.000 --> 02:23:37.000
+This is cue #8616
+
+8617
+02:23:37.000 --> 02:23:38.000
+This is cue #8617
+
+8618
+02:23:38.000 --> 02:23:39.000
+This is cue #8618
+
+8619
+02:23:39.000 --> 02:23:40.000
+This is cue #8619
+
+8620
+02:23:40.000 --> 02:23:41.000
+This is cue #8620
+
+8621
+02:23:41.000 --> 02:23:42.000
+This is cue #8621
+
+8622
+02:23:42.000 --> 02:23:43.000
+This is cue #8622
+
+8623
+02:23:43.000 --> 02:23:44.000
+This is cue #8623
+
+8624
+02:23:44.000 --> 02:23:45.000
+This is cue #8624
+
+8625
+02:23:45.000 --> 02:23:46.000
+This is cue #8625
+
+8626
+02:23:46.000 --> 02:23:47.000
+This is cue #8626
+
+8627
+02:23:47.000 --> 02:23:48.000
+This is cue #8627
+
+8628
+02:23:48.000 --> 02:23:49.000
+This is cue #8628
+
+8629
+02:23:49.000 --> 02:23:50.000
+This is cue #8629
+
+8630
+02:23:50.000 --> 02:23:51.000
+This is cue #8630
+
+8631
+02:23:51.000 --> 02:23:52.000
+This is cue #8631
+
+8632
+02:23:52.000 --> 02:23:53.000
+This is cue #8632
+
+8633
+02:23:53.000 --> 02:23:54.000
+This is cue #8633
+
+8634
+02:23:54.000 --> 02:23:55.000
+This is cue #8634
+
+8635
+02:23:55.000 --> 02:23:56.000
+This is cue #8635
+
+8636
+02:23:56.000 --> 02:23:57.000
+This is cue #8636
+
+8637
+02:23:57.000 --> 02:23:58.000
+This is cue #8637
+
+8638
+02:23:58.000 --> 02:23:59.000
+This is cue #8638
+
+8639
+02:23:59.000 --> 02:24:00.000
+This is cue #8639
+
+8640
+02:24:00.000 --> 02:24:01.000
+This is cue #8640
+
+8641
+02:24:01.000 --> 02:24:02.000
+This is cue #8641
+
+8642
+02:24:02.000 --> 02:24:03.000
+This is cue #8642
+
+8643
+02:24:03.000 --> 02:24:04.000
+This is cue #8643
+
+8644
+02:24:04.000 --> 02:24:05.000
+This is cue #8644
+
+8645
+02:24:05.000 --> 02:24:06.000
+This is cue #8645
+
+8646
+02:24:06.000 --> 02:24:07.000
+This is cue #8646
+
+8647
+02:24:07.000 --> 02:24:08.000
+This is cue #8647
+
+8648
+02:24:08.000 --> 02:24:09.000
+This is cue #8648
+
+8649
+02:24:09.000 --> 02:24:10.000
+This is cue #8649
+
+8650
+02:24:10.000 --> 02:24:11.000
+This is cue #8650
+
+8651
+02:24:11.000 --> 02:24:12.000
+This is cue #8651
+
+8652
+02:24:12.000 --> 02:24:13.000
+This is cue #8652
+
+8653
+02:24:13.000 --> 02:24:14.000
+This is cue #8653
+
+8654
+02:24:14.000 --> 02:24:15.000
+This is cue #8654
+
+8655
+02:24:15.000 --> 02:24:16.000
+This is cue #8655
+
+8656
+02:24:16.000 --> 02:24:17.000
+This is cue #8656
+
+8657
+02:24:17.000 --> 02:24:18.000
+This is cue #8657
+
+8658
+02:24:18.000 --> 02:24:19.000
+This is cue #8658
+
+8659
+02:24:19.000 --> 02:24:20.000
+This is cue #8659
+
+8660
+02:24:20.000 --> 02:24:21.000
+This is cue #8660
+
+8661
+02:24:21.000 --> 02:24:22.000
+This is cue #8661
+
+8662
+02:24:22.000 --> 02:24:23.000
+This is cue #8662
+
+8663
+02:24:23.000 --> 02:24:24.000
+This is cue #8663
+
+8664
+02:24:24.000 --> 02:24:25.000
+This is cue #8664
+
+8665
+02:24:25.000 --> 02:24:26.000
+This is cue #8665
+
+8666
+02:24:26.000 --> 02:24:27.000
+This is cue #8666
+
+8667
+02:24:27.000 --> 02:24:28.000
+This is cue #8667
+
+8668
+02:24:28.000 --> 02:24:29.000
+This is cue #8668
+
+8669
+02:24:29.000 --> 02:24:30.000
+This is cue #8669
+
+8670
+02:24:30.000 --> 02:24:31.000
+This is cue #8670
+
+8671
+02:24:31.000 --> 02:24:32.000
+This is cue #8671
+
+8672
+02:24:32.000 --> 02:24:33.000
+This is cue #8672
+
+8673
+02:24:33.000 --> 02:24:34.000
+This is cue #8673
+
+8674
+02:24:34.000 --> 02:24:35.000
+This is cue #8674
+
+8675
+02:24:35.000 --> 02:24:36.000
+This is cue #8675
+
+8676
+02:24:36.000 --> 02:24:37.000
+This is cue #8676
+
+8677
+02:24:37.000 --> 02:24:38.000
+This is cue #8677
+
+8678
+02:24:38.000 --> 02:24:39.000
+This is cue #8678
+
+8679
+02:24:39.000 --> 02:24:40.000
+This is cue #8679
+
+8680
+02:24:40.000 --> 02:24:41.000
+This is cue #8680
+
+8681
+02:24:41.000 --> 02:24:42.000
+This is cue #8681
+
+8682
+02:24:42.000 --> 02:24:43.000
+This is cue #8682
+
+8683
+02:24:43.000 --> 02:24:44.000
+This is cue #8683
+
+8684
+02:24:44.000 --> 02:24:45.000
+This is cue #8684
+
+8685
+02:24:45.000 --> 02:24:46.000
+This is cue #8685
+
+8686
+02:24:46.000 --> 02:24:47.000
+This is cue #8686
+
+8687
+02:24:47.000 --> 02:24:48.000
+This is cue #8687
+
+8688
+02:24:48.000 --> 02:24:49.000
+This is cue #8688
+
+8689
+02:24:49.000 --> 02:24:50.000
+This is cue #8689
+
+8690
+02:24:50.000 --> 02:24:51.000
+This is cue #8690
+
+8691
+02:24:51.000 --> 02:24:52.000
+This is cue #8691
+
+8692
+02:24:52.000 --> 02:24:53.000
+This is cue #8692
+
+8693
+02:24:53.000 --> 02:24:54.000
+This is cue #8693
+
+8694
+02:24:54.000 --> 02:24:55.000
+This is cue #8694
+
+8695
+02:24:55.000 --> 02:24:56.000
+This is cue #8695
+
+8696
+02:24:56.000 --> 02:24:57.000
+This is cue #8696
+
+8697
+02:24:57.000 --> 02:24:58.000
+This is cue #8697
+
+8698
+02:24:58.000 --> 02:24:59.000
+This is cue #8698
+
+8699
+02:24:59.000 --> 02:25:00.000
+This is cue #8699
+
+8700
+02:25:00.000 --> 02:25:01.000
+This is cue #8700
+
+8701
+02:25:01.000 --> 02:25:02.000
+This is cue #8701
+
+8702
+02:25:02.000 --> 02:25:03.000
+This is cue #8702
+
+8703
+02:25:03.000 --> 02:25:04.000
+This is cue #8703
+
+8704
+02:25:04.000 --> 02:25:05.000
+This is cue #8704
+
+8705
+02:25:05.000 --> 02:25:06.000
+This is cue #8705
+
+8706
+02:25:06.000 --> 02:25:07.000
+This is cue #8706
+
+8707
+02:25:07.000 --> 02:25:08.000
+This is cue #8707
+
+8708
+02:25:08.000 --> 02:25:09.000
+This is cue #8708
+
+8709
+02:25:09.000 --> 02:25:10.000
+This is cue #8709
+
+8710
+02:25:10.000 --> 02:25:11.000
+This is cue #8710
+
+8711
+02:25:11.000 --> 02:25:12.000
+This is cue #8711
+
+8712
+02:25:12.000 --> 02:25:13.000
+This is cue #8712
+
+8713
+02:25:13.000 --> 02:25:14.000
+This is cue #8713
+
+8714
+02:25:14.000 --> 02:25:15.000
+This is cue #8714
+
+8715
+02:25:15.000 --> 02:25:16.000
+This is cue #8715
+
+8716
+02:25:16.000 --> 02:25:17.000
+This is cue #8716
+
+8717
+02:25:17.000 --> 02:25:18.000
+This is cue #8717
+
+8718
+02:25:18.000 --> 02:25:19.000
+This is cue #8718
+
+8719
+02:25:19.000 --> 02:25:20.000
+This is cue #8719
+
+8720
+02:25:20.000 --> 02:25:21.000
+This is cue #8720
+
+8721
+02:25:21.000 --> 02:25:22.000
+This is cue #8721
+
+8722
+02:25:22.000 --> 02:25:23.000
+This is cue #8722
+
+8723
+02:25:23.000 --> 02:25:24.000
+This is cue #8723
+
+8724
+02:25:24.000 --> 02:25:25.000
+This is cue #8724
+
+8725
+02:25:25.000 --> 02:25:26.000
+This is cue #8725
+
+8726
+02:25:26.000 --> 02:25:27.000
+This is cue #8726
+
+8727
+02:25:27.000 --> 02:25:28.000
+This is cue #8727
+
+8728
+02:25:28.000 --> 02:25:29.000
+This is cue #8728
+
+8729
+02:25:29.000 --> 02:25:30.000
+This is cue #8729
+
+8730
+02:25:30.000 --> 02:25:31.000
+This is cue #8730
+
+8731
+02:25:31.000 --> 02:25:32.000
+This is cue #8731
+
+8732
+02:25:32.000 --> 02:25:33.000
+This is cue #8732
+
+8733
+02:25:33.000 --> 02:25:34.000
+This is cue #8733
+
+8734
+02:25:34.000 --> 02:25:35.000
+This is cue #8734
+
+8735
+02:25:35.000 --> 02:25:36.000
+This is cue #8735
+
+8736
+02:25:36.000 --> 02:25:37.000
+This is cue #8736
+
+8737
+02:25:37.000 --> 02:25:38.000
+This is cue #8737
+
+8738
+02:25:38.000 --> 02:25:39.000
+This is cue #8738
+
+8739
+02:25:39.000 --> 02:25:40.000
+This is cue #8739
+
+8740
+02:25:40.000 --> 02:25:41.000
+This is cue #8740
+
+8741
+02:25:41.000 --> 02:25:42.000
+This is cue #8741
+
+8742
+02:25:42.000 --> 02:25:43.000
+This is cue #8742
+
+8743
+02:25:43.000 --> 02:25:44.000
+This is cue #8743
+
+8744
+02:25:44.000 --> 02:25:45.000
+This is cue #8744
+
+8745
+02:25:45.000 --> 02:25:46.000
+This is cue #8745
+
+8746
+02:25:46.000 --> 02:25:47.000
+This is cue #8746
+
+8747
+02:25:47.000 --> 02:25:48.000
+This is cue #8747
+
+8748
+02:25:48.000 --> 02:25:49.000
+This is cue #8748
+
+8749
+02:25:49.000 --> 02:25:50.000
+This is cue #8749
+
+8750
+02:25:50.000 --> 02:25:51.000
+This is cue #8750
+
+8751
+02:25:51.000 --> 02:25:52.000
+This is cue #8751
+
+8752
+02:25:52.000 --> 02:25:53.000
+This is cue #8752
+
+8753
+02:25:53.000 --> 02:25:54.000
+This is cue #8753
+
+8754
+02:25:54.000 --> 02:25:55.000
+This is cue #8754
+
+8755
+02:25:55.000 --> 02:25:56.000
+This is cue #8755
+
+8756
+02:25:56.000 --> 02:25:57.000
+This is cue #8756
+
+8757
+02:25:57.000 --> 02:25:58.000
+This is cue #8757
+
+8758
+02:25:58.000 --> 02:25:59.000
+This is cue #8758
+
+8759
+02:25:59.000 --> 02:26:00.000
+This is cue #8759
+
+8760
+02:26:00.000 --> 02:26:01.000
+This is cue #8760
+
+8761
+02:26:01.000 --> 02:26:02.000
+This is cue #8761
+
+8762
+02:26:02.000 --> 02:26:03.000
+This is cue #8762
+
+8763
+02:26:03.000 --> 02:26:04.000
+This is cue #8763
+
+8764
+02:26:04.000 --> 02:26:05.000
+This is cue #8764
+
+8765
+02:26:05.000 --> 02:26:06.000
+This is cue #8765
+
+8766
+02:26:06.000 --> 02:26:07.000
+This is cue #8766
+
+8767
+02:26:07.000 --> 02:26:08.000
+This is cue #8767
+
+8768
+02:26:08.000 --> 02:26:09.000
+This is cue #8768
+
+8769
+02:26:09.000 --> 02:26:10.000
+This is cue #8769
+
+8770
+02:26:10.000 --> 02:26:11.000
+This is cue #8770
+
+8771
+02:26:11.000 --> 02:26:12.000
+This is cue #8771
+
+8772
+02:26:12.000 --> 02:26:13.000
+This is cue #8772
+
+8773
+02:26:13.000 --> 02:26:14.000
+This is cue #8773
+
+8774
+02:26:14.000 --> 02:26:15.000
+This is cue #8774
+
+8775
+02:26:15.000 --> 02:26:16.000
+This is cue #8775
+
+8776
+02:26:16.000 --> 02:26:17.000
+This is cue #8776
+
+8777
+02:26:17.000 --> 02:26:18.000
+This is cue #8777
+
+8778
+02:26:18.000 --> 02:26:19.000
+This is cue #8778
+
+8779
+02:26:19.000 --> 02:26:20.000
+This is cue #8779
+
+8780
+02:26:20.000 --> 02:26:21.000
+This is cue #8780
+
+8781
+02:26:21.000 --> 02:26:22.000
+This is cue #8781
+
+8782
+02:26:22.000 --> 02:26:23.000
+This is cue #8782
+
+8783
+02:26:23.000 --> 02:26:24.000
+This is cue #8783
+
+8784
+02:26:24.000 --> 02:26:25.000
+This is cue #8784
+
+8785
+02:26:25.000 --> 02:26:26.000
+This is cue #8785
+
+8786
+02:26:26.000 --> 02:26:27.000
+This is cue #8786
+
+8787
+02:26:27.000 --> 02:26:28.000
+This is cue #8787
+
+8788
+02:26:28.000 --> 02:26:29.000
+This is cue #8788
+
+8789
+02:26:29.000 --> 02:26:30.000
+This is cue #8789
+
+8790
+02:26:30.000 --> 02:26:31.000
+This is cue #8790
+
+8791
+02:26:31.000 --> 02:26:32.000
+This is cue #8791
+
+8792
+02:26:32.000 --> 02:26:33.000
+This is cue #8792
+
+8793
+02:26:33.000 --> 02:26:34.000
+This is cue #8793
+
+8794
+02:26:34.000 --> 02:26:35.000
+This is cue #8794
+
+8795
+02:26:35.000 --> 02:26:36.000
+This is cue #8795
+
+8796
+02:26:36.000 --> 02:26:37.000
+This is cue #8796
+
+8797
+02:26:37.000 --> 02:26:38.000
+This is cue #8797
+
+8798
+02:26:38.000 --> 02:26:39.000
+This is cue #8798
+
+8799
+02:26:39.000 --> 02:26:40.000
+This is cue #8799
+
+8800
+02:26:40.000 --> 02:26:41.000
+This is cue #8800
+
+8801
+02:26:41.000 --> 02:26:42.000
+This is cue #8801
+
+8802
+02:26:42.000 --> 02:26:43.000
+This is cue #8802
+
+8803
+02:26:43.000 --> 02:26:44.000
+This is cue #8803
+
+8804
+02:26:44.000 --> 02:26:45.000
+This is cue #8804
+
+8805
+02:26:45.000 --> 02:26:46.000
+This is cue #8805
+
+8806
+02:26:46.000 --> 02:26:47.000
+This is cue #8806
+
+8807
+02:26:47.000 --> 02:26:48.000
+This is cue #8807
+
+8808
+02:26:48.000 --> 02:26:49.000
+This is cue #8808
+
+8809
+02:26:49.000 --> 02:26:50.000
+This is cue #8809
+
+8810
+02:26:50.000 --> 02:26:51.000
+This is cue #8810
+
+8811
+02:26:51.000 --> 02:26:52.000
+This is cue #8811
+
+8812
+02:26:52.000 --> 02:26:53.000
+This is cue #8812
+
+8813
+02:26:53.000 --> 02:26:54.000
+This is cue #8813
+
+8814
+02:26:54.000 --> 02:26:55.000
+This is cue #8814
+
+8815
+02:26:55.000 --> 02:26:56.000
+This is cue #8815
+
+8816
+02:26:56.000 --> 02:26:57.000
+This is cue #8816
+
+8817
+02:26:57.000 --> 02:26:58.000
+This is cue #8817
+
+8818
+02:26:58.000 --> 02:26:59.000
+This is cue #8818
+
+8819
+02:26:59.000 --> 02:27:00.000
+This is cue #8819
+
+8820
+02:27:00.000 --> 02:27:01.000
+This is cue #8820
+
+8821
+02:27:01.000 --> 02:27:02.000
+This is cue #8821
+
+8822
+02:27:02.000 --> 02:27:03.000
+This is cue #8822
+
+8823
+02:27:03.000 --> 02:27:04.000
+This is cue #8823
+
+8824
+02:27:04.000 --> 02:27:05.000
+This is cue #8824
+
+8825
+02:27:05.000 --> 02:27:06.000
+This is cue #8825
+
+8826
+02:27:06.000 --> 02:27:07.000
+This is cue #8826
+
+8827
+02:27:07.000 --> 02:27:08.000
+This is cue #8827
+
+8828
+02:27:08.000 --> 02:27:09.000
+This is cue #8828
+
+8829
+02:27:09.000 --> 02:27:10.000
+This is cue #8829
+
+8830
+02:27:10.000 --> 02:27:11.000
+This is cue #8830
+
+8831
+02:27:11.000 --> 02:27:12.000
+This is cue #8831
+
+8832
+02:27:12.000 --> 02:27:13.000
+This is cue #8832
+
+8833
+02:27:13.000 --> 02:27:14.000
+This is cue #8833
+
+8834
+02:27:14.000 --> 02:27:15.000
+This is cue #8834
+
+8835
+02:27:15.000 --> 02:27:16.000
+This is cue #8835
+
+8836
+02:27:16.000 --> 02:27:17.000
+This is cue #8836
+
+8837
+02:27:17.000 --> 02:27:18.000
+This is cue #8837
+
+8838
+02:27:18.000 --> 02:27:19.000
+This is cue #8838
+
+8839
+02:27:19.000 --> 02:27:20.000
+This is cue #8839
+
+8840
+02:27:20.000 --> 02:27:21.000
+This is cue #8840
+
+8841
+02:27:21.000 --> 02:27:22.000
+This is cue #8841
+
+8842
+02:27:22.000 --> 02:27:23.000
+This is cue #8842
+
+8843
+02:27:23.000 --> 02:27:24.000
+This is cue #8843
+
+8844
+02:27:24.000 --> 02:27:25.000
+This is cue #8844
+
+8845
+02:27:25.000 --> 02:27:26.000
+This is cue #8845
+
+8846
+02:27:26.000 --> 02:27:27.000
+This is cue #8846
+
+8847
+02:27:27.000 --> 02:27:28.000
+This is cue #8847
+
+8848
+02:27:28.000 --> 02:27:29.000
+This is cue #8848
+
+8849
+02:27:29.000 --> 02:27:30.000
+This is cue #8849
+
+8850
+02:27:30.000 --> 02:27:31.000
+This is cue #8850
+
+8851
+02:27:31.000 --> 02:27:32.000
+This is cue #8851
+
+8852
+02:27:32.000 --> 02:27:33.000
+This is cue #8852
+
+8853
+02:27:33.000 --> 02:27:34.000
+This is cue #8853
+
+8854
+02:27:34.000 --> 02:27:35.000
+This is cue #8854
+
+8855
+02:27:35.000 --> 02:27:36.000
+This is cue #8855
+
+8856
+02:27:36.000 --> 02:27:37.000
+This is cue #8856
+
+8857
+02:27:37.000 --> 02:27:38.000
+This is cue #8857
+
+8858
+02:27:38.000 --> 02:27:39.000
+This is cue #8858
+
+8859
+02:27:39.000 --> 02:27:40.000
+This is cue #8859
+
+8860
+02:27:40.000 --> 02:27:41.000
+This is cue #8860
+
+8861
+02:27:41.000 --> 02:27:42.000
+This is cue #8861
+
+8862
+02:27:42.000 --> 02:27:43.000
+This is cue #8862
+
+8863
+02:27:43.000 --> 02:27:44.000
+This is cue #8863
+
+8864
+02:27:44.000 --> 02:27:45.000
+This is cue #8864
+
+8865
+02:27:45.000 --> 02:27:46.000
+This is cue #8865
+
+8866
+02:27:46.000 --> 02:27:47.000
+This is cue #8866
+
+8867
+02:27:47.000 --> 02:27:48.000
+This is cue #8867
+
+8868
+02:27:48.000 --> 02:27:49.000
+This is cue #8868
+
+8869
+02:27:49.000 --> 02:27:50.000
+This is cue #8869
+
+8870
+02:27:50.000 --> 02:27:51.000
+This is cue #8870
+
+8871
+02:27:51.000 --> 02:27:52.000
+This is cue #8871
+
+8872
+02:27:52.000 --> 02:27:53.000
+This is cue #8872
+
+8873
+02:27:53.000 --> 02:27:54.000
+This is cue #8873
+
+8874
+02:27:54.000 --> 02:27:55.000
+This is cue #8874
+
+8875
+02:27:55.000 --> 02:27:56.000
+This is cue #8875
+
+8876
+02:27:56.000 --> 02:27:57.000
+This is cue #8876
+
+8877
+02:27:57.000 --> 02:27:58.000
+This is cue #8877
+
+8878
+02:27:58.000 --> 02:27:59.000
+This is cue #8878
+
+8879
+02:27:59.000 --> 02:28:00.000
+This is cue #8879
+
+8880
+02:28:00.000 --> 02:28:01.000
+This is cue #8880
+
+8881
+02:28:01.000 --> 02:28:02.000
+This is cue #8881
+
+8882
+02:28:02.000 --> 02:28:03.000
+This is cue #8882
+
+8883
+02:28:03.000 --> 02:28:04.000
+This is cue #8883
+
+8884
+02:28:04.000 --> 02:28:05.000
+This is cue #8884
+
+8885
+02:28:05.000 --> 02:28:06.000
+This is cue #8885
+
+8886
+02:28:06.000 --> 02:28:07.000
+This is cue #8886
+
+8887
+02:28:07.000 --> 02:28:08.000
+This is cue #8887
+
+8888
+02:28:08.000 --> 02:28:09.000
+This is cue #8888
+
+8889
+02:28:09.000 --> 02:28:10.000
+This is cue #8889
+
+8890
+02:28:10.000 --> 02:28:11.000
+This is cue #8890
+
+8891
+02:28:11.000 --> 02:28:12.000
+This is cue #8891
+
+8892
+02:28:12.000 --> 02:28:13.000
+This is cue #8892
+
+8893
+02:28:13.000 --> 02:28:14.000
+This is cue #8893
+
+8894
+02:28:14.000 --> 02:28:15.000
+This is cue #8894
+
+8895
+02:28:15.000 --> 02:28:16.000
+This is cue #8895
+
+8896
+02:28:16.000 --> 02:28:17.000
+This is cue #8896
+
+8897
+02:28:17.000 --> 02:28:18.000
+This is cue #8897
+
+8898
+02:28:18.000 --> 02:28:19.000
+This is cue #8898
+
+8899
+02:28:19.000 --> 02:28:20.000
+This is cue #8899
+
+8900
+02:28:20.000 --> 02:28:21.000
+This is cue #8900
+
+8901
+02:28:21.000 --> 02:28:22.000
+This is cue #8901
+
+8902
+02:28:22.000 --> 02:28:23.000
+This is cue #8902
+
+8903
+02:28:23.000 --> 02:28:24.000
+This is cue #8903
+
+8904
+02:28:24.000 --> 02:28:25.000
+This is cue #8904
+
+8905
+02:28:25.000 --> 02:28:26.000
+This is cue #8905
+
+8906
+02:28:26.000 --> 02:28:27.000
+This is cue #8906
+
+8907
+02:28:27.000 --> 02:28:28.000
+This is cue #8907
+
+8908
+02:28:28.000 --> 02:28:29.000
+This is cue #8908
+
+8909
+02:28:29.000 --> 02:28:30.000
+This is cue #8909
+
+8910
+02:28:30.000 --> 02:28:31.000
+This is cue #8910
+
+8911
+02:28:31.000 --> 02:28:32.000
+This is cue #8911
+
+8912
+02:28:32.000 --> 02:28:33.000
+This is cue #8912
+
+8913
+02:28:33.000 --> 02:28:34.000
+This is cue #8913
+
+8914
+02:28:34.000 --> 02:28:35.000
+This is cue #8914
+
+8915
+02:28:35.000 --> 02:28:36.000
+This is cue #8915
+
+8916
+02:28:36.000 --> 02:28:37.000
+This is cue #8916
+
+8917
+02:28:37.000 --> 02:28:38.000
+This is cue #8917
+
+8918
+02:28:38.000 --> 02:28:39.000
+This is cue #8918
+
+8919
+02:28:39.000 --> 02:28:40.000
+This is cue #8919
+
+8920
+02:28:40.000 --> 02:28:41.000
+This is cue #8920
+
+8921
+02:28:41.000 --> 02:28:42.000
+This is cue #8921
+
+8922
+02:28:42.000 --> 02:28:43.000
+This is cue #8922
+
+8923
+02:28:43.000 --> 02:28:44.000
+This is cue #8923
+
+8924
+02:28:44.000 --> 02:28:45.000
+This is cue #8924
+
+8925
+02:28:45.000 --> 02:28:46.000
+This is cue #8925
+
+8926
+02:28:46.000 --> 02:28:47.000
+This is cue #8926
+
+8927
+02:28:47.000 --> 02:28:48.000
+This is cue #8927
+
+8928
+02:28:48.000 --> 02:28:49.000
+This is cue #8928
+
+8929
+02:28:49.000 --> 02:28:50.000
+This is cue #8929
+
+8930
+02:28:50.000 --> 02:28:51.000
+This is cue #8930
+
+8931
+02:28:51.000 --> 02:28:52.000
+This is cue #8931
+
+8932
+02:28:52.000 --> 02:28:53.000
+This is cue #8932
+
+8933
+02:28:53.000 --> 02:28:54.000
+This is cue #8933
+
+8934
+02:28:54.000 --> 02:28:55.000
+This is cue #8934
+
+8935
+02:28:55.000 --> 02:28:56.000
+This is cue #8935
+
+8936
+02:28:56.000 --> 02:28:57.000
+This is cue #8936
+
+8937
+02:28:57.000 --> 02:28:58.000
+This is cue #8937
+
+8938
+02:28:58.000 --> 02:28:59.000
+This is cue #8938
+
+8939
+02:28:59.000 --> 02:29:00.000
+This is cue #8939
+
+8940
+02:29:00.000 --> 02:29:01.000
+This is cue #8940
+
+8941
+02:29:01.000 --> 02:29:02.000
+This is cue #8941
+
+8942
+02:29:02.000 --> 02:29:03.000
+This is cue #8942
+
+8943
+02:29:03.000 --> 02:29:04.000
+This is cue #8943
+
+8944
+02:29:04.000 --> 02:29:05.000
+This is cue #8944
+
+8945
+02:29:05.000 --> 02:29:06.000
+This is cue #8945
+
+8946
+02:29:06.000 --> 02:29:07.000
+This is cue #8946
+
+8947
+02:29:07.000 --> 02:29:08.000
+This is cue #8947
+
+8948
+02:29:08.000 --> 02:29:09.000
+This is cue #8948
+
+8949
+02:29:09.000 --> 02:29:10.000
+This is cue #8949
+
+8950
+02:29:10.000 --> 02:29:11.000
+This is cue #8950
+
+8951
+02:29:11.000 --> 02:29:12.000
+This is cue #8951
+
+8952
+02:29:12.000 --> 02:29:13.000
+This is cue #8952
+
+8953
+02:29:13.000 --> 02:29:14.000
+This is cue #8953
+
+8954
+02:29:14.000 --> 02:29:15.000
+This is cue #8954
+
+8955
+02:29:15.000 --> 02:29:16.000
+This is cue #8955
+
+8956
+02:29:16.000 --> 02:29:17.000
+This is cue #8956
+
+8957
+02:29:17.000 --> 02:29:18.000
+This is cue #8957
+
+8958
+02:29:18.000 --> 02:29:19.000
+This is cue #8958
+
+8959
+02:29:19.000 --> 02:29:20.000
+This is cue #8959
+
+8960
+02:29:20.000 --> 02:29:21.000
+This is cue #8960
+
+8961
+02:29:21.000 --> 02:29:22.000
+This is cue #8961
+
+8962
+02:29:22.000 --> 02:29:23.000
+This is cue #8962
+
+8963
+02:29:23.000 --> 02:29:24.000
+This is cue #8963
+
+8964
+02:29:24.000 --> 02:29:25.000
+This is cue #8964
+
+8965
+02:29:25.000 --> 02:29:26.000
+This is cue #8965
+
+8966
+02:29:26.000 --> 02:29:27.000
+This is cue #8966
+
+8967
+02:29:27.000 --> 02:29:28.000
+This is cue #8967
+
+8968
+02:29:28.000 --> 02:29:29.000
+This is cue #8968
+
+8969
+02:29:29.000 --> 02:29:30.000
+This is cue #8969
+
+8970
+02:29:30.000 --> 02:29:31.000
+This is cue #8970
+
+8971
+02:29:31.000 --> 02:29:32.000
+This is cue #8971
+
+8972
+02:29:32.000 --> 02:29:33.000
+This is cue #8972
+
+8973
+02:29:33.000 --> 02:29:34.000
+This is cue #8973
+
+8974
+02:29:34.000 --> 02:29:35.000
+This is cue #8974
+
+8975
+02:29:35.000 --> 02:29:36.000
+This is cue #8975
+
+8976
+02:29:36.000 --> 02:29:37.000
+This is cue #8976
+
+8977
+02:29:37.000 --> 02:29:38.000
+This is cue #8977
+
+8978
+02:29:38.000 --> 02:29:39.000
+This is cue #8978
+
+8979
+02:29:39.000 --> 02:29:40.000
+This is cue #8979
+
+8980
+02:29:40.000 --> 02:29:41.000
+This is cue #8980
+
+8981
+02:29:41.000 --> 02:29:42.000
+This is cue #8981
+
+8982
+02:29:42.000 --> 02:29:43.000
+This is cue #8982
+
+8983
+02:29:43.000 --> 02:29:44.000
+This is cue #8983
+
+8984
+02:29:44.000 --> 02:29:45.000
+This is cue #8984
+
+8985
+02:29:45.000 --> 02:29:46.000
+This is cue #8985
+
+8986
+02:29:46.000 --> 02:29:47.000
+This is cue #8986
+
+8987
+02:29:47.000 --> 02:29:48.000
+This is cue #8987
+
+8988
+02:29:48.000 --> 02:29:49.000
+This is cue #8988
+
+8989
+02:29:49.000 --> 02:29:50.000
+This is cue #8989
+
+8990
+02:29:50.000 --> 02:29:51.000
+This is cue #8990
+
+8991
+02:29:51.000 --> 02:29:52.000
+This is cue #8991
+
+8992
+02:29:52.000 --> 02:29:53.000
+This is cue #8992
+
+8993
+02:29:53.000 --> 02:29:54.000
+This is cue #8993
+
+8994
+02:29:54.000 --> 02:29:55.000
+This is cue #8994
+
+8995
+02:29:55.000 --> 02:29:56.000
+This is cue #8995
+
+8996
+02:29:56.000 --> 02:29:57.000
+This is cue #8996
+
+8997
+02:29:57.000 --> 02:29:58.000
+This is cue #8997
+
+8998
+02:29:58.000 --> 02:29:59.000
+This is cue #8998
+
+8999
+02:29:59.000 --> 02:30:00.000
+This is cue #8999
+
+9000
+02:30:00.000 --> 02:30:01.000
+This is cue #9000
+
+9001
+02:30:01.000 --> 02:30:02.000
+This is cue #9001
+
+9002
+02:30:02.000 --> 02:30:03.000
+This is cue #9002
+
+9003
+02:30:03.000 --> 02:30:04.000
+This is cue #9003
+
+9004
+02:30:04.000 --> 02:30:05.000
+This is cue #9004
+
+9005
+02:30:05.000 --> 02:30:06.000
+This is cue #9005
+
+9006
+02:30:06.000 --> 02:30:07.000
+This is cue #9006
+
+9007
+02:30:07.000 --> 02:30:08.000
+This is cue #9007
+
+9008
+02:30:08.000 --> 02:30:09.000
+This is cue #9008
+
+9009
+02:30:09.000 --> 02:30:10.000
+This is cue #9009
+
+9010
+02:30:10.000 --> 02:30:11.000
+This is cue #9010
+
+9011
+02:30:11.000 --> 02:30:12.000
+This is cue #9011
+
+9012
+02:30:12.000 --> 02:30:13.000
+This is cue #9012
+
+9013
+02:30:13.000 --> 02:30:14.000
+This is cue #9013
+
+9014
+02:30:14.000 --> 02:30:15.000
+This is cue #9014
+
+9015
+02:30:15.000 --> 02:30:16.000
+This is cue #9015
+
+9016
+02:30:16.000 --> 02:30:17.000
+This is cue #9016
+
+9017
+02:30:17.000 --> 02:30:18.000
+This is cue #9017
+
+9018
+02:30:18.000 --> 02:30:19.000
+This is cue #9018
+
+9019
+02:30:19.000 --> 02:30:20.000
+This is cue #9019
+
+9020
+02:30:20.000 --> 02:30:21.000
+This is cue #9020
+
+9021
+02:30:21.000 --> 02:30:22.000
+This is cue #9021
+
+9022
+02:30:22.000 --> 02:30:23.000
+This is cue #9022
+
+9023
+02:30:23.000 --> 02:30:24.000
+This is cue #9023
+
+9024
+02:30:24.000 --> 02:30:25.000
+This is cue #9024
+
+9025
+02:30:25.000 --> 02:30:26.000
+This is cue #9025
+
+9026
+02:30:26.000 --> 02:30:27.000
+This is cue #9026
+
+9027
+02:30:27.000 --> 02:30:28.000
+This is cue #9027
+
+9028
+02:30:28.000 --> 02:30:29.000
+This is cue #9028
+
+9029
+02:30:29.000 --> 02:30:30.000
+This is cue #9029
+
+9030
+02:30:30.000 --> 02:30:31.000
+This is cue #9030
+
+9031
+02:30:31.000 --> 02:30:32.000
+This is cue #9031
+
+9032
+02:30:32.000 --> 02:30:33.000
+This is cue #9032
+
+9033
+02:30:33.000 --> 02:30:34.000
+This is cue #9033
+
+9034
+02:30:34.000 --> 02:30:35.000
+This is cue #9034
+
+9035
+02:30:35.000 --> 02:30:36.000
+This is cue #9035
+
+9036
+02:30:36.000 --> 02:30:37.000
+This is cue #9036
+
+9037
+02:30:37.000 --> 02:30:38.000
+This is cue #9037
+
+9038
+02:30:38.000 --> 02:30:39.000
+This is cue #9038
+
+9039
+02:30:39.000 --> 02:30:40.000
+This is cue #9039
+
+9040
+02:30:40.000 --> 02:30:41.000
+This is cue #9040
+
+9041
+02:30:41.000 --> 02:30:42.000
+This is cue #9041
+
+9042
+02:30:42.000 --> 02:30:43.000
+This is cue #9042
+
+9043
+02:30:43.000 --> 02:30:44.000
+This is cue #9043
+
+9044
+02:30:44.000 --> 02:30:45.000
+This is cue #9044
+
+9045
+02:30:45.000 --> 02:30:46.000
+This is cue #9045
+
+9046
+02:30:46.000 --> 02:30:47.000
+This is cue #9046
+
+9047
+02:30:47.000 --> 02:30:48.000
+This is cue #9047
+
+9048
+02:30:48.000 --> 02:30:49.000
+This is cue #9048
+
+9049
+02:30:49.000 --> 02:30:50.000
+This is cue #9049
+
+9050
+02:30:50.000 --> 02:30:51.000
+This is cue #9050
+
+9051
+02:30:51.000 --> 02:30:52.000
+This is cue #9051
+
+9052
+02:30:52.000 --> 02:30:53.000
+This is cue #9052
+
+9053
+02:30:53.000 --> 02:30:54.000
+This is cue #9053
+
+9054
+02:30:54.000 --> 02:30:55.000
+This is cue #9054
+
+9055
+02:30:55.000 --> 02:30:56.000
+This is cue #9055
+
+9056
+02:30:56.000 --> 02:30:57.000
+This is cue #9056
+
+9057
+02:30:57.000 --> 02:30:58.000
+This is cue #9057
+
+9058
+02:30:58.000 --> 02:30:59.000
+This is cue #9058
+
+9059
+02:30:59.000 --> 02:31:00.000
+This is cue #9059
+
+9060
+02:31:00.000 --> 02:31:01.000
+This is cue #9060
+
+9061
+02:31:01.000 --> 02:31:02.000
+This is cue #9061
+
+9062
+02:31:02.000 --> 02:31:03.000
+This is cue #9062
+
+9063
+02:31:03.000 --> 02:31:04.000
+This is cue #9063
+
+9064
+02:31:04.000 --> 02:31:05.000
+This is cue #9064
+
+9065
+02:31:05.000 --> 02:31:06.000
+This is cue #9065
+
+9066
+02:31:06.000 --> 02:31:07.000
+This is cue #9066
+
+9067
+02:31:07.000 --> 02:31:08.000
+This is cue #9067
+
+9068
+02:31:08.000 --> 02:31:09.000
+This is cue #9068
+
+9069
+02:31:09.000 --> 02:31:10.000
+This is cue #9069
+
+9070
+02:31:10.000 --> 02:31:11.000
+This is cue #9070
+
+9071
+02:31:11.000 --> 02:31:12.000
+This is cue #9071
+
+9072
+02:31:12.000 --> 02:31:13.000
+This is cue #9072
+
+9073
+02:31:13.000 --> 02:31:14.000
+This is cue #9073
+
+9074
+02:31:14.000 --> 02:31:15.000
+This is cue #9074
+
+9075
+02:31:15.000 --> 02:31:16.000
+This is cue #9075
+
+9076
+02:31:16.000 --> 02:31:17.000
+This is cue #9076
+
+9077
+02:31:17.000 --> 02:31:18.000
+This is cue #9077
+
+9078
+02:31:18.000 --> 02:31:19.000
+This is cue #9078
+
+9079
+02:31:19.000 --> 02:31:20.000
+This is cue #9079
+
+9080
+02:31:20.000 --> 02:31:21.000
+This is cue #9080
+
+9081
+02:31:21.000 --> 02:31:22.000
+This is cue #9081
+
+9082
+02:31:22.000 --> 02:31:23.000
+This is cue #9082
+
+9083
+02:31:23.000 --> 02:31:24.000
+This is cue #9083
+
+9084
+02:31:24.000 --> 02:31:25.000
+This is cue #9084
+
+9085
+02:31:25.000 --> 02:31:26.000
+This is cue #9085
+
+9086
+02:31:26.000 --> 02:31:27.000
+This is cue #9086
+
+9087
+02:31:27.000 --> 02:31:28.000
+This is cue #9087
+
+9088
+02:31:28.000 --> 02:31:29.000
+This is cue #9088
+
+9089
+02:31:29.000 --> 02:31:30.000
+This is cue #9089
+
+9090
+02:31:30.000 --> 02:31:31.000
+This is cue #9090
+
+9091
+02:31:31.000 --> 02:31:32.000
+This is cue #9091
+
+9092
+02:31:32.000 --> 02:31:33.000
+This is cue #9092
+
+9093
+02:31:33.000 --> 02:31:34.000
+This is cue #9093
+
+9094
+02:31:34.000 --> 02:31:35.000
+This is cue #9094
+
+9095
+02:31:35.000 --> 02:31:36.000
+This is cue #9095
+
+9096
+02:31:36.000 --> 02:31:37.000
+This is cue #9096
+
+9097
+02:31:37.000 --> 02:31:38.000
+This is cue #9097
+
+9098
+02:31:38.000 --> 02:31:39.000
+This is cue #9098
+
+9099
+02:31:39.000 --> 02:31:40.000
+This is cue #9099
+
+9100
+02:31:40.000 --> 02:31:41.000
+This is cue #9100
+
+9101
+02:31:41.000 --> 02:31:42.000
+This is cue #9101
+
+9102
+02:31:42.000 --> 02:31:43.000
+This is cue #9102
+
+9103
+02:31:43.000 --> 02:31:44.000
+This is cue #9103
+
+9104
+02:31:44.000 --> 02:31:45.000
+This is cue #9104
+
+9105
+02:31:45.000 --> 02:31:46.000
+This is cue #9105
+
+9106
+02:31:46.000 --> 02:31:47.000
+This is cue #9106
+
+9107
+02:31:47.000 --> 02:31:48.000
+This is cue #9107
+
+9108
+02:31:48.000 --> 02:31:49.000
+This is cue #9108
+
+9109
+02:31:49.000 --> 02:31:50.000
+This is cue #9109
+
+9110
+02:31:50.000 --> 02:31:51.000
+This is cue #9110
+
+9111
+02:31:51.000 --> 02:31:52.000
+This is cue #9111
+
+9112
+02:31:52.000 --> 02:31:53.000
+This is cue #9112
+
+9113
+02:31:53.000 --> 02:31:54.000
+This is cue #9113
+
+9114
+02:31:54.000 --> 02:31:55.000
+This is cue #9114
+
+9115
+02:31:55.000 --> 02:31:56.000
+This is cue #9115
+
+9116
+02:31:56.000 --> 02:31:57.000
+This is cue #9116
+
+9117
+02:31:57.000 --> 02:31:58.000
+This is cue #9117
+
+9118
+02:31:58.000 --> 02:31:59.000
+This is cue #9118
+
+9119
+02:31:59.000 --> 02:32:00.000
+This is cue #9119
+
+9120
+02:32:00.000 --> 02:32:01.000
+This is cue #9120
+
+9121
+02:32:01.000 --> 02:32:02.000
+This is cue #9121
+
+9122
+02:32:02.000 --> 02:32:03.000
+This is cue #9122
+
+9123
+02:32:03.000 --> 02:32:04.000
+This is cue #9123
+
+9124
+02:32:04.000 --> 02:32:05.000
+This is cue #9124
+
+9125
+02:32:05.000 --> 02:32:06.000
+This is cue #9125
+
+9126
+02:32:06.000 --> 02:32:07.000
+This is cue #9126
+
+9127
+02:32:07.000 --> 02:32:08.000
+This is cue #9127
+
+9128
+02:32:08.000 --> 02:32:09.000
+This is cue #9128
+
+9129
+02:32:09.000 --> 02:32:10.000
+This is cue #9129
+
+9130
+02:32:10.000 --> 02:32:11.000
+This is cue #9130
+
+9131
+02:32:11.000 --> 02:32:12.000
+This is cue #9131
+
+9132
+02:32:12.000 --> 02:32:13.000
+This is cue #9132
+
+9133
+02:32:13.000 --> 02:32:14.000
+This is cue #9133
+
+9134
+02:32:14.000 --> 02:32:15.000
+This is cue #9134
+
+9135
+02:32:15.000 --> 02:32:16.000
+This is cue #9135
+
+9136
+02:32:16.000 --> 02:32:17.000
+This is cue #9136
+
+9137
+02:32:17.000 --> 02:32:18.000
+This is cue #9137
+
+9138
+02:32:18.000 --> 02:32:19.000
+This is cue #9138
+
+9139
+02:32:19.000 --> 02:32:20.000
+This is cue #9139
+
+9140
+02:32:20.000 --> 02:32:21.000
+This is cue #9140
+
+9141
+02:32:21.000 --> 02:32:22.000
+This is cue #9141
+
+9142
+02:32:22.000 --> 02:32:23.000
+This is cue #9142
+
+9143
+02:32:23.000 --> 02:32:24.000
+This is cue #9143
+
+9144
+02:32:24.000 --> 02:32:25.000
+This is cue #9144
+
+9145
+02:32:25.000 --> 02:32:26.000
+This is cue #9145
+
+9146
+02:32:26.000 --> 02:32:27.000
+This is cue #9146
+
+9147
+02:32:27.000 --> 02:32:28.000
+This is cue #9147
+
+9148
+02:32:28.000 --> 02:32:29.000
+This is cue #9148
+
+9149
+02:32:29.000 --> 02:32:30.000
+This is cue #9149
+
+9150
+02:32:30.000 --> 02:32:31.000
+This is cue #9150
+
+9151
+02:32:31.000 --> 02:32:32.000
+This is cue #9151
+
+9152
+02:32:32.000 --> 02:32:33.000
+This is cue #9152
+
+9153
+02:32:33.000 --> 02:32:34.000
+This is cue #9153
+
+9154
+02:32:34.000 --> 02:32:35.000
+This is cue #9154
+
+9155
+02:32:35.000 --> 02:32:36.000
+This is cue #9155
+
+9156
+02:32:36.000 --> 02:32:37.000
+This is cue #9156
+
+9157
+02:32:37.000 --> 02:32:38.000
+This is cue #9157
+
+9158
+02:32:38.000 --> 02:32:39.000
+This is cue #9158
+
+9159
+02:32:39.000 --> 02:32:40.000
+This is cue #9159
+
+9160
+02:32:40.000 --> 02:32:41.000
+This is cue #9160
+
+9161
+02:32:41.000 --> 02:32:42.000
+This is cue #9161
+
+9162
+02:32:42.000 --> 02:32:43.000
+This is cue #9162
+
+9163
+02:32:43.000 --> 02:32:44.000
+This is cue #9163
+
+9164
+02:32:44.000 --> 02:32:45.000
+This is cue #9164
+
+9165
+02:32:45.000 --> 02:32:46.000
+This is cue #9165
+
+9166
+02:32:46.000 --> 02:32:47.000
+This is cue #9166
+
+9167
+02:32:47.000 --> 02:32:48.000
+This is cue #9167
+
+9168
+02:32:48.000 --> 02:32:49.000
+This is cue #9168
+
+9169
+02:32:49.000 --> 02:32:50.000
+This is cue #9169
+
+9170
+02:32:50.000 --> 02:32:51.000
+This is cue #9170
+
+9171
+02:32:51.000 --> 02:32:52.000
+This is cue #9171
+
+9172
+02:32:52.000 --> 02:32:53.000
+This is cue #9172
+
+9173
+02:32:53.000 --> 02:32:54.000
+This is cue #9173
+
+9174
+02:32:54.000 --> 02:32:55.000
+This is cue #9174
+
+9175
+02:32:55.000 --> 02:32:56.000
+This is cue #9175
+
+9176
+02:32:56.000 --> 02:32:57.000
+This is cue #9176
+
+9177
+02:32:57.000 --> 02:32:58.000
+This is cue #9177
+
+9178
+02:32:58.000 --> 02:32:59.000
+This is cue #9178
+
+9179
+02:32:59.000 --> 02:33:00.000
+This is cue #9179
+
+9180
+02:33:00.000 --> 02:33:01.000
+This is cue #9180
+
+9181
+02:33:01.000 --> 02:33:02.000
+This is cue #9181
+
+9182
+02:33:02.000 --> 02:33:03.000
+This is cue #9182
+
+9183
+02:33:03.000 --> 02:33:04.000
+This is cue #9183
+
+9184
+02:33:04.000 --> 02:33:05.000
+This is cue #9184
+
+9185
+02:33:05.000 --> 02:33:06.000
+This is cue #9185
+
+9186
+02:33:06.000 --> 02:33:07.000
+This is cue #9186
+
+9187
+02:33:07.000 --> 02:33:08.000
+This is cue #9187
+
+9188
+02:33:08.000 --> 02:33:09.000
+This is cue #9188
+
+9189
+02:33:09.000 --> 02:33:10.000
+This is cue #9189
+
+9190
+02:33:10.000 --> 02:33:11.000
+This is cue #9190
+
+9191
+02:33:11.000 --> 02:33:12.000
+This is cue #9191
+
+9192
+02:33:12.000 --> 02:33:13.000
+This is cue #9192
+
+9193
+02:33:13.000 --> 02:33:14.000
+This is cue #9193
+
+9194
+02:33:14.000 --> 02:33:15.000
+This is cue #9194
+
+9195
+02:33:15.000 --> 02:33:16.000
+This is cue #9195
+
+9196
+02:33:16.000 --> 02:33:17.000
+This is cue #9196
+
+9197
+02:33:17.000 --> 02:33:18.000
+This is cue #9197
+
+9198
+02:33:18.000 --> 02:33:19.000
+This is cue #9198
+
+9199
+02:33:19.000 --> 02:33:20.000
+This is cue #9199
+
+9200
+02:33:20.000 --> 02:33:21.000
+This is cue #9200
+
+9201
+02:33:21.000 --> 02:33:22.000
+This is cue #9201
+
+9202
+02:33:22.000 --> 02:33:23.000
+This is cue #9202
+
+9203
+02:33:23.000 --> 02:33:24.000
+This is cue #9203
+
+9204
+02:33:24.000 --> 02:33:25.000
+This is cue #9204
+
+9205
+02:33:25.000 --> 02:33:26.000
+This is cue #9205
+
+9206
+02:33:26.000 --> 02:33:27.000
+This is cue #9206
+
+9207
+02:33:27.000 --> 02:33:28.000
+This is cue #9207
+
+9208
+02:33:28.000 --> 02:33:29.000
+This is cue #9208
+
+9209
+02:33:29.000 --> 02:33:30.000
+This is cue #9209
+
+9210
+02:33:30.000 --> 02:33:31.000
+This is cue #9210
+
+9211
+02:33:31.000 --> 02:33:32.000
+This is cue #9211
+
+9212
+02:33:32.000 --> 02:33:33.000
+This is cue #9212
+
+9213
+02:33:33.000 --> 02:33:34.000
+This is cue #9213
+
+9214
+02:33:34.000 --> 02:33:35.000
+This is cue #9214
+
+9215
+02:33:35.000 --> 02:33:36.000
+This is cue #9215
+
+9216
+02:33:36.000 --> 02:33:37.000
+This is cue #9216
+
+9217
+02:33:37.000 --> 02:33:38.000
+This is cue #9217
+
+9218
+02:33:38.000 --> 02:33:39.000
+This is cue #9218
+
+9219
+02:33:39.000 --> 02:33:40.000
+This is cue #9219
+
+9220
+02:33:40.000 --> 02:33:41.000
+This is cue #9220
+
+9221
+02:33:41.000 --> 02:33:42.000
+This is cue #9221
+
+9222
+02:33:42.000 --> 02:33:43.000
+This is cue #9222
+
+9223
+02:33:43.000 --> 02:33:44.000
+This is cue #9223
+
+9224
+02:33:44.000 --> 02:33:45.000
+This is cue #9224
+
+9225
+02:33:45.000 --> 02:33:46.000
+This is cue #9225
+
+9226
+02:33:46.000 --> 02:33:47.000
+This is cue #9226
+
+9227
+02:33:47.000 --> 02:33:48.000
+This is cue #9227
+
+9228
+02:33:48.000 --> 02:33:49.000
+This is cue #9228
+
+9229
+02:33:49.000 --> 02:33:50.000
+This is cue #9229
+
+9230
+02:33:50.000 --> 02:33:51.000
+This is cue #9230
+
+9231
+02:33:51.000 --> 02:33:52.000
+This is cue #9231
+
+9232
+02:33:52.000 --> 02:33:53.000
+This is cue #9232
+
+9233
+02:33:53.000 --> 02:33:54.000
+This is cue #9233
+
+9234
+02:33:54.000 --> 02:33:55.000
+This is cue #9234
+
+9235
+02:33:55.000 --> 02:33:56.000
+This is cue #9235
+
+9236
+02:33:56.000 --> 02:33:57.000
+This is cue #9236
+
+9237
+02:33:57.000 --> 02:33:58.000
+This is cue #9237
+
+9238
+02:33:58.000 --> 02:33:59.000
+This is cue #9238
+
+9239
+02:33:59.000 --> 02:34:00.000
+This is cue #9239
+
+9240
+02:34:00.000 --> 02:34:01.000
+This is cue #9240
+
+9241
+02:34:01.000 --> 02:34:02.000
+This is cue #9241
+
+9242
+02:34:02.000 --> 02:34:03.000
+This is cue #9242
+
+9243
+02:34:03.000 --> 02:34:04.000
+This is cue #9243
+
+9244
+02:34:04.000 --> 02:34:05.000
+This is cue #9244
+
+9245
+02:34:05.000 --> 02:34:06.000
+This is cue #9245
+
+9246
+02:34:06.000 --> 02:34:07.000
+This is cue #9246
+
+9247
+02:34:07.000 --> 02:34:08.000
+This is cue #9247
+
+9248
+02:34:08.000 --> 02:34:09.000
+This is cue #9248
+
+9249
+02:34:09.000 --> 02:34:10.000
+This is cue #9249
+
+9250
+02:34:10.000 --> 02:34:11.000
+This is cue #9250
+
+9251
+02:34:11.000 --> 02:34:12.000
+This is cue #9251
+
+9252
+02:34:12.000 --> 02:34:13.000
+This is cue #9252
+
+9253
+02:34:13.000 --> 02:34:14.000
+This is cue #9253
+
+9254
+02:34:14.000 --> 02:34:15.000
+This is cue #9254
+
+9255
+02:34:15.000 --> 02:34:16.000
+This is cue #9255
+
+9256
+02:34:16.000 --> 02:34:17.000
+This is cue #9256
+
+9257
+02:34:17.000 --> 02:34:18.000
+This is cue #9257
+
+9258
+02:34:18.000 --> 02:34:19.000
+This is cue #9258
+
+9259
+02:34:19.000 --> 02:34:20.000
+This is cue #9259
+
+9260
+02:34:20.000 --> 02:34:21.000
+This is cue #9260
+
+9261
+02:34:21.000 --> 02:34:22.000
+This is cue #9261
+
+9262
+02:34:22.000 --> 02:34:23.000
+This is cue #9262
+
+9263
+02:34:23.000 --> 02:34:24.000
+This is cue #9263
+
+9264
+02:34:24.000 --> 02:34:25.000
+This is cue #9264
+
+9265
+02:34:25.000 --> 02:34:26.000
+This is cue #9265
+
+9266
+02:34:26.000 --> 02:34:27.000
+This is cue #9266
+
+9267
+02:34:27.000 --> 02:34:28.000
+This is cue #9267
+
+9268
+02:34:28.000 --> 02:34:29.000
+This is cue #9268
+
+9269
+02:34:29.000 --> 02:34:30.000
+This is cue #9269
+
+9270
+02:34:30.000 --> 02:34:31.000
+This is cue #9270
+
+9271
+02:34:31.000 --> 02:34:32.000
+This is cue #9271
+
+9272
+02:34:32.000 --> 02:34:33.000
+This is cue #9272
+
+9273
+02:34:33.000 --> 02:34:34.000
+This is cue #9273
+
+9274
+02:34:34.000 --> 02:34:35.000
+This is cue #9274
+
+9275
+02:34:35.000 --> 02:34:36.000
+This is cue #9275
+
+9276
+02:34:36.000 --> 02:34:37.000
+This is cue #9276
+
+9277
+02:34:37.000 --> 02:34:38.000
+This is cue #9277
+
+9278
+02:34:38.000 --> 02:34:39.000
+This is cue #9278
+
+9279
+02:34:39.000 --> 02:34:40.000
+This is cue #9279
+
+9280
+02:34:40.000 --> 02:34:41.000
+This is cue #9280
+
+9281
+02:34:41.000 --> 02:34:42.000
+This is cue #9281
+
+9282
+02:34:42.000 --> 02:34:43.000
+This is cue #9282
+
+9283
+02:34:43.000 --> 02:34:44.000
+This is cue #9283
+
+9284
+02:34:44.000 --> 02:34:45.000
+This is cue #9284
+
+9285
+02:34:45.000 --> 02:34:46.000
+This is cue #9285
+
+9286
+02:34:46.000 --> 02:34:47.000
+This is cue #9286
+
+9287
+02:34:47.000 --> 02:34:48.000
+This is cue #9287
+
+9288
+02:34:48.000 --> 02:34:49.000
+This is cue #9288
+
+9289
+02:34:49.000 --> 02:34:50.000
+This is cue #9289
+
+9290
+02:34:50.000 --> 02:34:51.000
+This is cue #9290
+
+9291
+02:34:51.000 --> 02:34:52.000
+This is cue #9291
+
+9292
+02:34:52.000 --> 02:34:53.000
+This is cue #9292
+
+9293
+02:34:53.000 --> 02:34:54.000
+This is cue #9293
+
+9294
+02:34:54.000 --> 02:34:55.000
+This is cue #9294
+
+9295
+02:34:55.000 --> 02:34:56.000
+This is cue #9295
+
+9296
+02:34:56.000 --> 02:34:57.000
+This is cue #9296
+
+9297
+02:34:57.000 --> 02:34:58.000
+This is cue #9297
+
+9298
+02:34:58.000 --> 02:34:59.000
+This is cue #9298
+
+9299
+02:34:59.000 --> 02:35:00.000
+This is cue #9299
+
+9300
+02:35:00.000 --> 02:35:01.000
+This is cue #9300
+
+9301
+02:35:01.000 --> 02:35:02.000
+This is cue #9301
+
+9302
+02:35:02.000 --> 02:35:03.000
+This is cue #9302
+
+9303
+02:35:03.000 --> 02:35:04.000
+This is cue #9303
+
+9304
+02:35:04.000 --> 02:35:05.000
+This is cue #9304
+
+9305
+02:35:05.000 --> 02:35:06.000
+This is cue #9305
+
+9306
+02:35:06.000 --> 02:35:07.000
+This is cue #9306
+
+9307
+02:35:07.000 --> 02:35:08.000
+This is cue #9307
+
+9308
+02:35:08.000 --> 02:35:09.000
+This is cue #9308
+
+9309
+02:35:09.000 --> 02:35:10.000
+This is cue #9309
+
+9310
+02:35:10.000 --> 02:35:11.000
+This is cue #9310
+
+9311
+02:35:11.000 --> 02:35:12.000
+This is cue #9311
+
+9312
+02:35:12.000 --> 02:35:13.000
+This is cue #9312
+
+9313
+02:35:13.000 --> 02:35:14.000
+This is cue #9313
+
+9314
+02:35:14.000 --> 02:35:15.000
+This is cue #9314
+
+9315
+02:35:15.000 --> 02:35:16.000
+This is cue #9315
+
+9316
+02:35:16.000 --> 02:35:17.000
+This is cue #9316
+
+9317
+02:35:17.000 --> 02:35:18.000
+This is cue #9317
+
+9318
+02:35:18.000 --> 02:35:19.000
+This is cue #9318
+
+9319
+02:35:19.000 --> 02:35:20.000
+This is cue #9319
+
+9320
+02:35:20.000 --> 02:35:21.000
+This is cue #9320
+
+9321
+02:35:21.000 --> 02:35:22.000
+This is cue #9321
+
+9322
+02:35:22.000 --> 02:35:23.000
+This is cue #9322
+
+9323
+02:35:23.000 --> 02:35:24.000
+This is cue #9323
+
+9324
+02:35:24.000 --> 02:35:25.000
+This is cue #9324
+
+9325
+02:35:25.000 --> 02:35:26.000
+This is cue #9325
+
+9326
+02:35:26.000 --> 02:35:27.000
+This is cue #9326
+
+9327
+02:35:27.000 --> 02:35:28.000
+This is cue #9327
+
+9328
+02:35:28.000 --> 02:35:29.000
+This is cue #9328
+
+9329
+02:35:29.000 --> 02:35:30.000
+This is cue #9329
+
+9330
+02:35:30.000 --> 02:35:31.000
+This is cue #9330
+
+9331
+02:35:31.000 --> 02:35:32.000
+This is cue #9331
+
+9332
+02:35:32.000 --> 02:35:33.000
+This is cue #9332
+
+9333
+02:35:33.000 --> 02:35:34.000
+This is cue #9333
+
+9334
+02:35:34.000 --> 02:35:35.000
+This is cue #9334
+
+9335
+02:35:35.000 --> 02:35:36.000
+This is cue #9335
+
+9336
+02:35:36.000 --> 02:35:37.000
+This is cue #9336
+
+9337
+02:35:37.000 --> 02:35:38.000
+This is cue #9337
+
+9338
+02:35:38.000 --> 02:35:39.000
+This is cue #9338
+
+9339
+02:35:39.000 --> 02:35:40.000
+This is cue #9339
+
+9340
+02:35:40.000 --> 02:35:41.000
+This is cue #9340
+
+9341
+02:35:41.000 --> 02:35:42.000
+This is cue #9341
+
+9342
+02:35:42.000 --> 02:35:43.000
+This is cue #9342
+
+9343
+02:35:43.000 --> 02:35:44.000
+This is cue #9343
+
+9344
+02:35:44.000 --> 02:35:45.000
+This is cue #9344
+
+9345
+02:35:45.000 --> 02:35:46.000
+This is cue #9345
+
+9346
+02:35:46.000 --> 02:35:47.000
+This is cue #9346
+
+9347
+02:35:47.000 --> 02:35:48.000
+This is cue #9347
+
+9348
+02:35:48.000 --> 02:35:49.000
+This is cue #9348
+
+9349
+02:35:49.000 --> 02:35:50.000
+This is cue #9349
+
+9350
+02:35:50.000 --> 02:35:51.000
+This is cue #9350
+
+9351
+02:35:51.000 --> 02:35:52.000
+This is cue #9351
+
+9352
+02:35:52.000 --> 02:35:53.000
+This is cue #9352
+
+9353
+02:35:53.000 --> 02:35:54.000
+This is cue #9353
+
+9354
+02:35:54.000 --> 02:35:55.000
+This is cue #9354
+
+9355
+02:35:55.000 --> 02:35:56.000
+This is cue #9355
+
+9356
+02:35:56.000 --> 02:35:57.000
+This is cue #9356
+
+9357
+02:35:57.000 --> 02:35:58.000
+This is cue #9357
+
+9358
+02:35:58.000 --> 02:35:59.000
+This is cue #9358
+
+9359
+02:35:59.000 --> 02:36:00.000
+This is cue #9359
+
+9360
+02:36:00.000 --> 02:36:01.000
+This is cue #9360
+
+9361
+02:36:01.000 --> 02:36:02.000
+This is cue #9361
+
+9362
+02:36:02.000 --> 02:36:03.000
+This is cue #9362
+
+9363
+02:36:03.000 --> 02:36:04.000
+This is cue #9363
+
+9364
+02:36:04.000 --> 02:36:05.000
+This is cue #9364
+
+9365
+02:36:05.000 --> 02:36:06.000
+This is cue #9365
+
+9366
+02:36:06.000 --> 02:36:07.000
+This is cue #9366
+
+9367
+02:36:07.000 --> 02:36:08.000
+This is cue #9367
+
+9368
+02:36:08.000 --> 02:36:09.000
+This is cue #9368
+
+9369
+02:36:09.000 --> 02:36:10.000
+This is cue #9369
+
+9370
+02:36:10.000 --> 02:36:11.000
+This is cue #9370
+
+9371
+02:36:11.000 --> 02:36:12.000
+This is cue #9371
+
+9372
+02:36:12.000 --> 02:36:13.000
+This is cue #9372
+
+9373
+02:36:13.000 --> 02:36:14.000
+This is cue #9373
+
+9374
+02:36:14.000 --> 02:36:15.000
+This is cue #9374
+
+9375
+02:36:15.000 --> 02:36:16.000
+This is cue #9375
+
+9376
+02:36:16.000 --> 02:36:17.000
+This is cue #9376
+
+9377
+02:36:17.000 --> 02:36:18.000
+This is cue #9377
+
+9378
+02:36:18.000 --> 02:36:19.000
+This is cue #9378
+
+9379
+02:36:19.000 --> 02:36:20.000
+This is cue #9379
+
+9380
+02:36:20.000 --> 02:36:21.000
+This is cue #9380
+
+9381
+02:36:21.000 --> 02:36:22.000
+This is cue #9381
+
+9382
+02:36:22.000 --> 02:36:23.000
+This is cue #9382
+
+9383
+02:36:23.000 --> 02:36:24.000
+This is cue #9383
+
+9384
+02:36:24.000 --> 02:36:25.000
+This is cue #9384
+
+9385
+02:36:25.000 --> 02:36:26.000
+This is cue #9385
+
+9386
+02:36:26.000 --> 02:36:27.000
+This is cue #9386
+
+9387
+02:36:27.000 --> 02:36:28.000
+This is cue #9387
+
+9388
+02:36:28.000 --> 02:36:29.000
+This is cue #9388
+
+9389
+02:36:29.000 --> 02:36:30.000
+This is cue #9389
+
+9390
+02:36:30.000 --> 02:36:31.000
+This is cue #9390
+
+9391
+02:36:31.000 --> 02:36:32.000
+This is cue #9391
+
+9392
+02:36:32.000 --> 02:36:33.000
+This is cue #9392
+
+9393
+02:36:33.000 --> 02:36:34.000
+This is cue #9393
+
+9394
+02:36:34.000 --> 02:36:35.000
+This is cue #9394
+
+9395
+02:36:35.000 --> 02:36:36.000
+This is cue #9395
+
+9396
+02:36:36.000 --> 02:36:37.000
+This is cue #9396
+
+9397
+02:36:37.000 --> 02:36:38.000
+This is cue #9397
+
+9398
+02:36:38.000 --> 02:36:39.000
+This is cue #9398
+
+9399
+02:36:39.000 --> 02:36:40.000
+This is cue #9399
+
+9400
+02:36:40.000 --> 02:36:41.000
+This is cue #9400
+
+9401
+02:36:41.000 --> 02:36:42.000
+This is cue #9401
+
+9402
+02:36:42.000 --> 02:36:43.000
+This is cue #9402
+
+9403
+02:36:43.000 --> 02:36:44.000
+This is cue #9403
+
+9404
+02:36:44.000 --> 02:36:45.000
+This is cue #9404
+
+9405
+02:36:45.000 --> 02:36:46.000
+This is cue #9405
+
+9406
+02:36:46.000 --> 02:36:47.000
+This is cue #9406
+
+9407
+02:36:47.000 --> 02:36:48.000
+This is cue #9407
+
+9408
+02:36:48.000 --> 02:36:49.000
+This is cue #9408
+
+9409
+02:36:49.000 --> 02:36:50.000
+This is cue #9409
+
+9410
+02:36:50.000 --> 02:36:51.000
+This is cue #9410
+
+9411
+02:36:51.000 --> 02:36:52.000
+This is cue #9411
+
+9412
+02:36:52.000 --> 02:36:53.000
+This is cue #9412
+
+9413
+02:36:53.000 --> 02:36:54.000
+This is cue #9413
+
+9414
+02:36:54.000 --> 02:36:55.000
+This is cue #9414
+
+9415
+02:36:55.000 --> 02:36:56.000
+This is cue #9415
+
+9416
+02:36:56.000 --> 02:36:57.000
+This is cue #9416
+
+9417
+02:36:57.000 --> 02:36:58.000
+This is cue #9417
+
+9418
+02:36:58.000 --> 02:36:59.000
+This is cue #9418
+
+9419
+02:36:59.000 --> 02:37:00.000
+This is cue #9419
+
+9420
+02:37:00.000 --> 02:37:01.000
+This is cue #9420
+
+9421
+02:37:01.000 --> 02:37:02.000
+This is cue #9421
+
+9422
+02:37:02.000 --> 02:37:03.000
+This is cue #9422
+
+9423
+02:37:03.000 --> 02:37:04.000
+This is cue #9423
+
+9424
+02:37:04.000 --> 02:37:05.000
+This is cue #9424
+
+9425
+02:37:05.000 --> 02:37:06.000
+This is cue #9425
+
+9426
+02:37:06.000 --> 02:37:07.000
+This is cue #9426
+
+9427
+02:37:07.000 --> 02:37:08.000
+This is cue #9427
+
+9428
+02:37:08.000 --> 02:37:09.000
+This is cue #9428
+
+9429
+02:37:09.000 --> 02:37:10.000
+This is cue #9429
+
+9430
+02:37:10.000 --> 02:37:11.000
+This is cue #9430
+
+9431
+02:37:11.000 --> 02:37:12.000
+This is cue #9431
+
+9432
+02:37:12.000 --> 02:37:13.000
+This is cue #9432
+
+9433
+02:37:13.000 --> 02:37:14.000
+This is cue #9433
+
+9434
+02:37:14.000 --> 02:37:15.000
+This is cue #9434
+
+9435
+02:37:15.000 --> 02:37:16.000
+This is cue #9435
+
+9436
+02:37:16.000 --> 02:37:17.000
+This is cue #9436
+
+9437
+02:37:17.000 --> 02:37:18.000
+This is cue #9437
+
+9438
+02:37:18.000 --> 02:37:19.000
+This is cue #9438
+
+9439
+02:37:19.000 --> 02:37:20.000
+This is cue #9439
+
+9440
+02:37:20.000 --> 02:37:21.000
+This is cue #9440
+
+9441
+02:37:21.000 --> 02:37:22.000
+This is cue #9441
+
+9442
+02:37:22.000 --> 02:37:23.000
+This is cue #9442
+
+9443
+02:37:23.000 --> 02:37:24.000
+This is cue #9443
+
+9444
+02:37:24.000 --> 02:37:25.000
+This is cue #9444
+
+9445
+02:37:25.000 --> 02:37:26.000
+This is cue #9445
+
+9446
+02:37:26.000 --> 02:37:27.000
+This is cue #9446
+
+9447
+02:37:27.000 --> 02:37:28.000
+This is cue #9447
+
+9448
+02:37:28.000 --> 02:37:29.000
+This is cue #9448
+
+9449
+02:37:29.000 --> 02:37:30.000
+This is cue #9449
+
+9450
+02:37:30.000 --> 02:37:31.000
+This is cue #9450
+
+9451
+02:37:31.000 --> 02:37:32.000
+This is cue #9451
+
+9452
+02:37:32.000 --> 02:37:33.000
+This is cue #9452
+
+9453
+02:37:33.000 --> 02:37:34.000
+This is cue #9453
+
+9454
+02:37:34.000 --> 02:37:35.000
+This is cue #9454
+
+9455
+02:37:35.000 --> 02:37:36.000
+This is cue #9455
+
+9456
+02:37:36.000 --> 02:37:37.000
+This is cue #9456
+
+9457
+02:37:37.000 --> 02:37:38.000
+This is cue #9457
+
+9458
+02:37:38.000 --> 02:37:39.000
+This is cue #9458
+
+9459
+02:37:39.000 --> 02:37:40.000
+This is cue #9459
+
+9460
+02:37:40.000 --> 02:37:41.000
+This is cue #9460
+
+9461
+02:37:41.000 --> 02:37:42.000
+This is cue #9461
+
+9462
+02:37:42.000 --> 02:37:43.000
+This is cue #9462
+
+9463
+02:37:43.000 --> 02:37:44.000
+This is cue #9463
+
+9464
+02:37:44.000 --> 02:37:45.000
+This is cue #9464
+
+9465
+02:37:45.000 --> 02:37:46.000
+This is cue #9465
+
+9466
+02:37:46.000 --> 02:37:47.000
+This is cue #9466
+
+9467
+02:37:47.000 --> 02:37:48.000
+This is cue #9467
+
+9468
+02:37:48.000 --> 02:37:49.000
+This is cue #9468
+
+9469
+02:37:49.000 --> 02:37:50.000
+This is cue #9469
+
+9470
+02:37:50.000 --> 02:37:51.000
+This is cue #9470
+
+9471
+02:37:51.000 --> 02:37:52.000
+This is cue #9471
+
+9472
+02:37:52.000 --> 02:37:53.000
+This is cue #9472
+
+9473
+02:37:53.000 --> 02:37:54.000
+This is cue #9473
+
+9474
+02:37:54.000 --> 02:37:55.000
+This is cue #9474
+
+9475
+02:37:55.000 --> 02:37:56.000
+This is cue #9475
+
+9476
+02:37:56.000 --> 02:37:57.000
+This is cue #9476
+
+9477
+02:37:57.000 --> 02:37:58.000
+This is cue #9477
+
+9478
+02:37:58.000 --> 02:37:59.000
+This is cue #9478
+
+9479
+02:37:59.000 --> 02:38:00.000
+This is cue #9479
+
+9480
+02:38:00.000 --> 02:38:01.000
+This is cue #9480
+
+9481
+02:38:01.000 --> 02:38:02.000
+This is cue #9481
+
+9482
+02:38:02.000 --> 02:38:03.000
+This is cue #9482
+
+9483
+02:38:03.000 --> 02:38:04.000
+This is cue #9483
+
+9484
+02:38:04.000 --> 02:38:05.000
+This is cue #9484
+
+9485
+02:38:05.000 --> 02:38:06.000
+This is cue #9485
+
+9486
+02:38:06.000 --> 02:38:07.000
+This is cue #9486
+
+9487
+02:38:07.000 --> 02:38:08.000
+This is cue #9487
+
+9488
+02:38:08.000 --> 02:38:09.000
+This is cue #9488
+
+9489
+02:38:09.000 --> 02:38:10.000
+This is cue #9489
+
+9490
+02:38:10.000 --> 02:38:11.000
+This is cue #9490
+
+9491
+02:38:11.000 --> 02:38:12.000
+This is cue #9491
+
+9492
+02:38:12.000 --> 02:38:13.000
+This is cue #9492
+
+9493
+02:38:13.000 --> 02:38:14.000
+This is cue #9493
+
+9494
+02:38:14.000 --> 02:38:15.000
+This is cue #9494
+
+9495
+02:38:15.000 --> 02:38:16.000
+This is cue #9495
+
+9496
+02:38:16.000 --> 02:38:17.000
+This is cue #9496
+
+9497
+02:38:17.000 --> 02:38:18.000
+This is cue #9497
+
+9498
+02:38:18.000 --> 02:38:19.000
+This is cue #9498
+
+9499
+02:38:19.000 --> 02:38:20.000
+This is cue #9499
+
+9500
+02:38:20.000 --> 02:38:21.000
+This is cue #9500
+
+9501
+02:38:21.000 --> 02:38:22.000
+This is cue #9501
+
+9502
+02:38:22.000 --> 02:38:23.000
+This is cue #9502
+
+9503
+02:38:23.000 --> 02:38:24.000
+This is cue #9503
+
+9504
+02:38:24.000 --> 02:38:25.000
+This is cue #9504
+
+9505
+02:38:25.000 --> 02:38:26.000
+This is cue #9505
+
+9506
+02:38:26.000 --> 02:38:27.000
+This is cue #9506
+
+9507
+02:38:27.000 --> 02:38:28.000
+This is cue #9507
+
+9508
+02:38:28.000 --> 02:38:29.000
+This is cue #9508
+
+9509
+02:38:29.000 --> 02:38:30.000
+This is cue #9509
+
+9510
+02:38:30.000 --> 02:38:31.000
+This is cue #9510
+
+9511
+02:38:31.000 --> 02:38:32.000
+This is cue #9511
+
+9512
+02:38:32.000 --> 02:38:33.000
+This is cue #9512
+
+9513
+02:38:33.000 --> 02:38:34.000
+This is cue #9513
+
+9514
+02:38:34.000 --> 02:38:35.000
+This is cue #9514
+
+9515
+02:38:35.000 --> 02:38:36.000
+This is cue #9515
+
+9516
+02:38:36.000 --> 02:38:37.000
+This is cue #9516
+
+9517
+02:38:37.000 --> 02:38:38.000
+This is cue #9517
+
+9518
+02:38:38.000 --> 02:38:39.000
+This is cue #9518
+
+9519
+02:38:39.000 --> 02:38:40.000
+This is cue #9519
+
+9520
+02:38:40.000 --> 02:38:41.000
+This is cue #9520
+
+9521
+02:38:41.000 --> 02:38:42.000
+This is cue #9521
+
+9522
+02:38:42.000 --> 02:38:43.000
+This is cue #9522
+
+9523
+02:38:43.000 --> 02:38:44.000
+This is cue #9523
+
+9524
+02:38:44.000 --> 02:38:45.000
+This is cue #9524
+
+9525
+02:38:45.000 --> 02:38:46.000
+This is cue #9525
+
+9526
+02:38:46.000 --> 02:38:47.000
+This is cue #9526
+
+9527
+02:38:47.000 --> 02:38:48.000
+This is cue #9527
+
+9528
+02:38:48.000 --> 02:38:49.000
+This is cue #9528
+
+9529
+02:38:49.000 --> 02:38:50.000
+This is cue #9529
+
+9530
+02:38:50.000 --> 02:38:51.000
+This is cue #9530
+
+9531
+02:38:51.000 --> 02:38:52.000
+This is cue #9531
+
+9532
+02:38:52.000 --> 02:38:53.000
+This is cue #9532
+
+9533
+02:38:53.000 --> 02:38:54.000
+This is cue #9533
+
+9534
+02:38:54.000 --> 02:38:55.000
+This is cue #9534
+
+9535
+02:38:55.000 --> 02:38:56.000
+This is cue #9535
+
+9536
+02:38:56.000 --> 02:38:57.000
+This is cue #9536
+
+9537
+02:38:57.000 --> 02:38:58.000
+This is cue #9537
+
+9538
+02:38:58.000 --> 02:38:59.000
+This is cue #9538
+
+9539
+02:38:59.000 --> 02:39:00.000
+This is cue #9539
+
+9540
+02:39:00.000 --> 02:39:01.000
+This is cue #9540
+
+9541
+02:39:01.000 --> 02:39:02.000
+This is cue #9541
+
+9542
+02:39:02.000 --> 02:39:03.000
+This is cue #9542
+
+9543
+02:39:03.000 --> 02:39:04.000
+This is cue #9543
+
+9544
+02:39:04.000 --> 02:39:05.000
+This is cue #9544
+
+9545
+02:39:05.000 --> 02:39:06.000
+This is cue #9545
+
+9546
+02:39:06.000 --> 02:39:07.000
+This is cue #9546
+
+9547
+02:39:07.000 --> 02:39:08.000
+This is cue #9547
+
+9548
+02:39:08.000 --> 02:39:09.000
+This is cue #9548
+
+9549
+02:39:09.000 --> 02:39:10.000
+This is cue #9549
+
+9550
+02:39:10.000 --> 02:39:11.000
+This is cue #9550
+
+9551
+02:39:11.000 --> 02:39:12.000
+This is cue #9551
+
+9552
+02:39:12.000 --> 02:39:13.000
+This is cue #9552
+
+9553
+02:39:13.000 --> 02:39:14.000
+This is cue #9553
+
+9554
+02:39:14.000 --> 02:39:15.000
+This is cue #9554
+
+9555
+02:39:15.000 --> 02:39:16.000
+This is cue #9555
+
+9556
+02:39:16.000 --> 02:39:17.000
+This is cue #9556
+
+9557
+02:39:17.000 --> 02:39:18.000
+This is cue #9557
+
+9558
+02:39:18.000 --> 02:39:19.000
+This is cue #9558
+
+9559
+02:39:19.000 --> 02:39:20.000
+This is cue #9559
+
+9560
+02:39:20.000 --> 02:39:21.000
+This is cue #9560
+
+9561
+02:39:21.000 --> 02:39:22.000
+This is cue #9561
+
+9562
+02:39:22.000 --> 02:39:23.000
+This is cue #9562
+
+9563
+02:39:23.000 --> 02:39:24.000
+This is cue #9563
+
+9564
+02:39:24.000 --> 02:39:25.000
+This is cue #9564
+
+9565
+02:39:25.000 --> 02:39:26.000
+This is cue #9565
+
+9566
+02:39:26.000 --> 02:39:27.000
+This is cue #9566
+
+9567
+02:39:27.000 --> 02:39:28.000
+This is cue #9567
+
+9568
+02:39:28.000 --> 02:39:29.000
+This is cue #9568
+
+9569
+02:39:29.000 --> 02:39:30.000
+This is cue #9569
+
+9570
+02:39:30.000 --> 02:39:31.000
+This is cue #9570
+
+9571
+02:39:31.000 --> 02:39:32.000
+This is cue #9571
+
+9572
+02:39:32.000 --> 02:39:33.000
+This is cue #9572
+
+9573
+02:39:33.000 --> 02:39:34.000
+This is cue #9573
+
+9574
+02:39:34.000 --> 02:39:35.000
+This is cue #9574
+
+9575
+02:39:35.000 --> 02:39:36.000
+This is cue #9575
+
+9576
+02:39:36.000 --> 02:39:37.000
+This is cue #9576
+
+9577
+02:39:37.000 --> 02:39:38.000
+This is cue #9577
+
+9578
+02:39:38.000 --> 02:39:39.000
+This is cue #9578
+
+9579
+02:39:39.000 --> 02:39:40.000
+This is cue #9579
+
+9580
+02:39:40.000 --> 02:39:41.000
+This is cue #9580
+
+9581
+02:39:41.000 --> 02:39:42.000
+This is cue #9581
+
+9582
+02:39:42.000 --> 02:39:43.000
+This is cue #9582
+
+9583
+02:39:43.000 --> 02:39:44.000
+This is cue #9583
+
+9584
+02:39:44.000 --> 02:39:45.000
+This is cue #9584
+
+9585
+02:39:45.000 --> 02:39:46.000
+This is cue #9585
+
+9586
+02:39:46.000 --> 02:39:47.000
+This is cue #9586
+
+9587
+02:39:47.000 --> 02:39:48.000
+This is cue #9587
+
+9588
+02:39:48.000 --> 02:39:49.000
+This is cue #9588
+
+9589
+02:39:49.000 --> 02:39:50.000
+This is cue #9589
+
+9590
+02:39:50.000 --> 02:39:51.000
+This is cue #9590
+
+9591
+02:39:51.000 --> 02:39:52.000
+This is cue #9591
+
+9592
+02:39:52.000 --> 02:39:53.000
+This is cue #9592
+
+9593
+02:39:53.000 --> 02:39:54.000
+This is cue #9593
+
+9594
+02:39:54.000 --> 02:39:55.000
+This is cue #9594
+
+9595
+02:39:55.000 --> 02:39:56.000
+This is cue #9595
+
+9596
+02:39:56.000 --> 02:39:57.000
+This is cue #9596
+
+9597
+02:39:57.000 --> 02:39:58.000
+This is cue #9597
+
+9598
+02:39:58.000 --> 02:39:59.000
+This is cue #9598
+
+9599
+02:39:59.000 --> 02:40:00.000
+This is cue #9599
+
+9600
+02:40:00.000 --> 02:40:01.000
+This is cue #9600
+
+9601
+02:40:01.000 --> 02:40:02.000
+This is cue #9601
+
+9602
+02:40:02.000 --> 02:40:03.000
+This is cue #9602
+
+9603
+02:40:03.000 --> 02:40:04.000
+This is cue #9603
+
+9604
+02:40:04.000 --> 02:40:05.000
+This is cue #9604
+
+9605
+02:40:05.000 --> 02:40:06.000
+This is cue #9605
+
+9606
+02:40:06.000 --> 02:40:07.000
+This is cue #9606
+
+9607
+02:40:07.000 --> 02:40:08.000
+This is cue #9607
+
+9608
+02:40:08.000 --> 02:40:09.000
+This is cue #9608
+
+9609
+02:40:09.000 --> 02:40:10.000
+This is cue #9609
+
+9610
+02:40:10.000 --> 02:40:11.000
+This is cue #9610
+
+9611
+02:40:11.000 --> 02:40:12.000
+This is cue #9611
+
+9612
+02:40:12.000 --> 02:40:13.000
+This is cue #9612
+
+9613
+02:40:13.000 --> 02:40:14.000
+This is cue #9613
+
+9614
+02:40:14.000 --> 02:40:15.000
+This is cue #9614
+
+9615
+02:40:15.000 --> 02:40:16.000
+This is cue #9615
+
+9616
+02:40:16.000 --> 02:40:17.000
+This is cue #9616
+
+9617
+02:40:17.000 --> 02:40:18.000
+This is cue #9617
+
+9618
+02:40:18.000 --> 02:40:19.000
+This is cue #9618
+
+9619
+02:40:19.000 --> 02:40:20.000
+This is cue #9619
+
+9620
+02:40:20.000 --> 02:40:21.000
+This is cue #9620
+
+9621
+02:40:21.000 --> 02:40:22.000
+This is cue #9621
+
+9622
+02:40:22.000 --> 02:40:23.000
+This is cue #9622
+
+9623
+02:40:23.000 --> 02:40:24.000
+This is cue #9623
+
+9624
+02:40:24.000 --> 02:40:25.000
+This is cue #9624
+
+9625
+02:40:25.000 --> 02:40:26.000
+This is cue #9625
+
+9626
+02:40:26.000 --> 02:40:27.000
+This is cue #9626
+
+9627
+02:40:27.000 --> 02:40:28.000
+This is cue #9627
+
+9628
+02:40:28.000 --> 02:40:29.000
+This is cue #9628
+
+9629
+02:40:29.000 --> 02:40:30.000
+This is cue #9629
+
+9630
+02:40:30.000 --> 02:40:31.000
+This is cue #9630
+
+9631
+02:40:31.000 --> 02:40:32.000
+This is cue #9631
+
+9632
+02:40:32.000 --> 02:40:33.000
+This is cue #9632
+
+9633
+02:40:33.000 --> 02:40:34.000
+This is cue #9633
+
+9634
+02:40:34.000 --> 02:40:35.000
+This is cue #9634
+
+9635
+02:40:35.000 --> 02:40:36.000
+This is cue #9635
+
+9636
+02:40:36.000 --> 02:40:37.000
+This is cue #9636
+
+9637
+02:40:37.000 --> 02:40:38.000
+This is cue #9637
+
+9638
+02:40:38.000 --> 02:40:39.000
+This is cue #9638
+
+9639
+02:40:39.000 --> 02:40:40.000
+This is cue #9639
+
+9640
+02:40:40.000 --> 02:40:41.000
+This is cue #9640
+
+9641
+02:40:41.000 --> 02:40:42.000
+This is cue #9641
+
+9642
+02:40:42.000 --> 02:40:43.000
+This is cue #9642
+
+9643
+02:40:43.000 --> 02:40:44.000
+This is cue #9643
+
+9644
+02:40:44.000 --> 02:40:45.000
+This is cue #9644
+
+9645
+02:40:45.000 --> 02:40:46.000
+This is cue #9645
+
+9646
+02:40:46.000 --> 02:40:47.000
+This is cue #9646
+
+9647
+02:40:47.000 --> 02:40:48.000
+This is cue #9647
+
+9648
+02:40:48.000 --> 02:40:49.000
+This is cue #9648
+
+9649
+02:40:49.000 --> 02:40:50.000
+This is cue #9649
+
+9650
+02:40:50.000 --> 02:40:51.000
+This is cue #9650
+
+9651
+02:40:51.000 --> 02:40:52.000
+This is cue #9651
+
+9652
+02:40:52.000 --> 02:40:53.000
+This is cue #9652
+
+9653
+02:40:53.000 --> 02:40:54.000
+This is cue #9653
+
+9654
+02:40:54.000 --> 02:40:55.000
+This is cue #9654
+
+9655
+02:40:55.000 --> 02:40:56.000
+This is cue #9655
+
+9656
+02:40:56.000 --> 02:40:57.000
+This is cue #9656
+
+9657
+02:40:57.000 --> 02:40:58.000
+This is cue #9657
+
+9658
+02:40:58.000 --> 02:40:59.000
+This is cue #9658
+
+9659
+02:40:59.000 --> 02:41:00.000
+This is cue #9659
+
+9660
+02:41:00.000 --> 02:41:01.000
+This is cue #9660
+
+9661
+02:41:01.000 --> 02:41:02.000
+This is cue #9661
+
+9662
+02:41:02.000 --> 02:41:03.000
+This is cue #9662
+
+9663
+02:41:03.000 --> 02:41:04.000
+This is cue #9663
+
+9664
+02:41:04.000 --> 02:41:05.000
+This is cue #9664
+
+9665
+02:41:05.000 --> 02:41:06.000
+This is cue #9665
+
+9666
+02:41:06.000 --> 02:41:07.000
+This is cue #9666
+
+9667
+02:41:07.000 --> 02:41:08.000
+This is cue #9667
+
+9668
+02:41:08.000 --> 02:41:09.000
+This is cue #9668
+
+9669
+02:41:09.000 --> 02:41:10.000
+This is cue #9669
+
+9670
+02:41:10.000 --> 02:41:11.000
+This is cue #9670
+
+9671
+02:41:11.000 --> 02:41:12.000
+This is cue #9671
+
+9672
+02:41:12.000 --> 02:41:13.000
+This is cue #9672
+
+9673
+02:41:13.000 --> 02:41:14.000
+This is cue #9673
+
+9674
+02:41:14.000 --> 02:41:15.000
+This is cue #9674
+
+9675
+02:41:15.000 --> 02:41:16.000
+This is cue #9675
+
+9676
+02:41:16.000 --> 02:41:17.000
+This is cue #9676
+
+9677
+02:41:17.000 --> 02:41:18.000
+This is cue #9677
+
+9678
+02:41:18.000 --> 02:41:19.000
+This is cue #9678
+
+9679
+02:41:19.000 --> 02:41:20.000
+This is cue #9679
+
+9680
+02:41:20.000 --> 02:41:21.000
+This is cue #9680
+
+9681
+02:41:21.000 --> 02:41:22.000
+This is cue #9681
+
+9682
+02:41:22.000 --> 02:41:23.000
+This is cue #9682
+
+9683
+02:41:23.000 --> 02:41:24.000
+This is cue #9683
+
+9684
+02:41:24.000 --> 02:41:25.000
+This is cue #9684
+
+9685
+02:41:25.000 --> 02:41:26.000
+This is cue #9685
+
+9686
+02:41:26.000 --> 02:41:27.000
+This is cue #9686
+
+9687
+02:41:27.000 --> 02:41:28.000
+This is cue #9687
+
+9688
+02:41:28.000 --> 02:41:29.000
+This is cue #9688
+
+9689
+02:41:29.000 --> 02:41:30.000
+This is cue #9689
+
+9690
+02:41:30.000 --> 02:41:31.000
+This is cue #9690
+
+9691
+02:41:31.000 --> 02:41:32.000
+This is cue #9691
+
+9692
+02:41:32.000 --> 02:41:33.000
+This is cue #9692
+
+9693
+02:41:33.000 --> 02:41:34.000
+This is cue #9693
+
+9694
+02:41:34.000 --> 02:41:35.000
+This is cue #9694
+
+9695
+02:41:35.000 --> 02:41:36.000
+This is cue #9695
+
+9696
+02:41:36.000 --> 02:41:37.000
+This is cue #9696
+
+9697
+02:41:37.000 --> 02:41:38.000
+This is cue #9697
+
+9698
+02:41:38.000 --> 02:41:39.000
+This is cue #9698
+
+9699
+02:41:39.000 --> 02:41:40.000
+This is cue #9699
+
+9700
+02:41:40.000 --> 02:41:41.000
+This is cue #9700
+
+9701
+02:41:41.000 --> 02:41:42.000
+This is cue #9701
+
+9702
+02:41:42.000 --> 02:41:43.000
+This is cue #9702
+
+9703
+02:41:43.000 --> 02:41:44.000
+This is cue #9703
+
+9704
+02:41:44.000 --> 02:41:45.000
+This is cue #9704
+
+9705
+02:41:45.000 --> 02:41:46.000
+This is cue #9705
+
+9706
+02:41:46.000 --> 02:41:47.000
+This is cue #9706
+
+9707
+02:41:47.000 --> 02:41:48.000
+This is cue #9707
+
+9708
+02:41:48.000 --> 02:41:49.000
+This is cue #9708
+
+9709
+02:41:49.000 --> 02:41:50.000
+This is cue #9709
+
+9710
+02:41:50.000 --> 02:41:51.000
+This is cue #9710
+
+9711
+02:41:51.000 --> 02:41:52.000
+This is cue #9711
+
+9712
+02:41:52.000 --> 02:41:53.000
+This is cue #9712
+
+9713
+02:41:53.000 --> 02:41:54.000
+This is cue #9713
+
+9714
+02:41:54.000 --> 02:41:55.000
+This is cue #9714
+
+9715
+02:41:55.000 --> 02:41:56.000
+This is cue #9715
+
+9716
+02:41:56.000 --> 02:41:57.000
+This is cue #9716
+
+9717
+02:41:57.000 --> 02:41:58.000
+This is cue #9717
+
+9718
+02:41:58.000 --> 02:41:59.000
+This is cue #9718
+
+9719
+02:41:59.000 --> 02:42:00.000
+This is cue #9719
+
+9720
+02:42:00.000 --> 02:42:01.000
+This is cue #9720
+
+9721
+02:42:01.000 --> 02:42:02.000
+This is cue #9721
+
+9722
+02:42:02.000 --> 02:42:03.000
+This is cue #9722
+
+9723
+02:42:03.000 --> 02:42:04.000
+This is cue #9723
+
+9724
+02:42:04.000 --> 02:42:05.000
+This is cue #9724
+
+9725
+02:42:05.000 --> 02:42:06.000
+This is cue #9725
+
+9726
+02:42:06.000 --> 02:42:07.000
+This is cue #9726
+
+9727
+02:42:07.000 --> 02:42:08.000
+This is cue #9727
+
+9728
+02:42:08.000 --> 02:42:09.000
+This is cue #9728
+
+9729
+02:42:09.000 --> 02:42:10.000
+This is cue #9729
+
+9730
+02:42:10.000 --> 02:42:11.000
+This is cue #9730
+
+9731
+02:42:11.000 --> 02:42:12.000
+This is cue #9731
+
+9732
+02:42:12.000 --> 02:42:13.000
+This is cue #9732
+
+9733
+02:42:13.000 --> 02:42:14.000
+This is cue #9733
+
+9734
+02:42:14.000 --> 02:42:15.000
+This is cue #9734
+
+9735
+02:42:15.000 --> 02:42:16.000
+This is cue #9735
+
+9736
+02:42:16.000 --> 02:42:17.000
+This is cue #9736
+
+9737
+02:42:17.000 --> 02:42:18.000
+This is cue #9737
+
+9738
+02:42:18.000 --> 02:42:19.000
+This is cue #9738
+
+9739
+02:42:19.000 --> 02:42:20.000
+This is cue #9739
+
+9740
+02:42:20.000 --> 02:42:21.000
+This is cue #9740
+
+9741
+02:42:21.000 --> 02:42:22.000
+This is cue #9741
+
+9742
+02:42:22.000 --> 02:42:23.000
+This is cue #9742
+
+9743
+02:42:23.000 --> 02:42:24.000
+This is cue #9743
+
+9744
+02:42:24.000 --> 02:42:25.000
+This is cue #9744
+
+9745
+02:42:25.000 --> 02:42:26.000
+This is cue #9745
+
+9746
+02:42:26.000 --> 02:42:27.000
+This is cue #9746
+
+9747
+02:42:27.000 --> 02:42:28.000
+This is cue #9747
+
+9748
+02:42:28.000 --> 02:42:29.000
+This is cue #9748
+
+9749
+02:42:29.000 --> 02:42:30.000
+This is cue #9749
+
+9750
+02:42:30.000 --> 02:42:31.000
+This is cue #9750
+
+9751
+02:42:31.000 --> 02:42:32.000
+This is cue #9751
+
+9752
+02:42:32.000 --> 02:42:33.000
+This is cue #9752
+
+9753
+02:42:33.000 --> 02:42:34.000
+This is cue #9753
+
+9754
+02:42:34.000 --> 02:42:35.000
+This is cue #9754
+
+9755
+02:42:35.000 --> 02:42:36.000
+This is cue #9755
+
+9756
+02:42:36.000 --> 02:42:37.000
+This is cue #9756
+
+9757
+02:42:37.000 --> 02:42:38.000
+This is cue #9757
+
+9758
+02:42:38.000 --> 02:42:39.000
+This is cue #9758
+
+9759
+02:42:39.000 --> 02:42:40.000
+This is cue #9759
+
+9760
+02:42:40.000 --> 02:42:41.000
+This is cue #9760
+
+9761
+02:42:41.000 --> 02:42:42.000
+This is cue #9761
+
+9762
+02:42:42.000 --> 02:42:43.000
+This is cue #9762
+
+9763
+02:42:43.000 --> 02:42:44.000
+This is cue #9763
+
+9764
+02:42:44.000 --> 02:42:45.000
+This is cue #9764
+
+9765
+02:42:45.000 --> 02:42:46.000
+This is cue #9765
+
+9766
+02:42:46.000 --> 02:42:47.000
+This is cue #9766
+
+9767
+02:42:47.000 --> 02:42:48.000
+This is cue #9767
+
+9768
+02:42:48.000 --> 02:42:49.000
+This is cue #9768
+
+9769
+02:42:49.000 --> 02:42:50.000
+This is cue #9769
+
+9770
+02:42:50.000 --> 02:42:51.000
+This is cue #9770
+
+9771
+02:42:51.000 --> 02:42:52.000
+This is cue #9771
+
+9772
+02:42:52.000 --> 02:42:53.000
+This is cue #9772
+
+9773
+02:42:53.000 --> 02:42:54.000
+This is cue #9773
+
+9774
+02:42:54.000 --> 02:42:55.000
+This is cue #9774
+
+9775
+02:42:55.000 --> 02:42:56.000
+This is cue #9775
+
+9776
+02:42:56.000 --> 02:42:57.000
+This is cue #9776
+
+9777
+02:42:57.000 --> 02:42:58.000
+This is cue #9777
+
+9778
+02:42:58.000 --> 02:42:59.000
+This is cue #9778
+
+9779
+02:42:59.000 --> 02:43:00.000
+This is cue #9779
+
+9780
+02:43:00.000 --> 02:43:01.000
+This is cue #9780
+
+9781
+02:43:01.000 --> 02:43:02.000
+This is cue #9781
+
+9782
+02:43:02.000 --> 02:43:03.000
+This is cue #9782
+
+9783
+02:43:03.000 --> 02:43:04.000
+This is cue #9783
+
+9784
+02:43:04.000 --> 02:43:05.000
+This is cue #9784
+
+9785
+02:43:05.000 --> 02:43:06.000
+This is cue #9785
+
+9786
+02:43:06.000 --> 02:43:07.000
+This is cue #9786
+
+9787
+02:43:07.000 --> 02:43:08.000
+This is cue #9787
+
+9788
+02:43:08.000 --> 02:43:09.000
+This is cue #9788
+
+9789
+02:43:09.000 --> 02:43:10.000
+This is cue #9789
+
+9790
+02:43:10.000 --> 02:43:11.000
+This is cue #9790
+
+9791
+02:43:11.000 --> 02:43:12.000
+This is cue #9791
+
+9792
+02:43:12.000 --> 02:43:13.000
+This is cue #9792
+
+9793
+02:43:13.000 --> 02:43:14.000
+This is cue #9793
+
+9794
+02:43:14.000 --> 02:43:15.000
+This is cue #9794
+
+9795
+02:43:15.000 --> 02:43:16.000
+This is cue #9795
+
+9796
+02:43:16.000 --> 02:43:17.000
+This is cue #9796
+
+9797
+02:43:17.000 --> 02:43:18.000
+This is cue #9797
+
+9798
+02:43:18.000 --> 02:43:19.000
+This is cue #9798
+
+9799
+02:43:19.000 --> 02:43:20.000
+This is cue #9799
+
+9800
+02:43:20.000 --> 02:43:21.000
+This is cue #9800
+
+9801
+02:43:21.000 --> 02:43:22.000
+This is cue #9801
+
+9802
+02:43:22.000 --> 02:43:23.000
+This is cue #9802
+
+9803
+02:43:23.000 --> 02:43:24.000
+This is cue #9803
+
+9804
+02:43:24.000 --> 02:43:25.000
+This is cue #9804
+
+9805
+02:43:25.000 --> 02:43:26.000
+This is cue #9805
+
+9806
+02:43:26.000 --> 02:43:27.000
+This is cue #9806
+
+9807
+02:43:27.000 --> 02:43:28.000
+This is cue #9807
+
+9808
+02:43:28.000 --> 02:43:29.000
+This is cue #9808
+
+9809
+02:43:29.000 --> 02:43:30.000
+This is cue #9809
+
+9810
+02:43:30.000 --> 02:43:31.000
+This is cue #9810
+
+9811
+02:43:31.000 --> 02:43:32.000
+This is cue #9811
+
+9812
+02:43:32.000 --> 02:43:33.000
+This is cue #9812
+
+9813
+02:43:33.000 --> 02:43:34.000
+This is cue #9813
+
+9814
+02:43:34.000 --> 02:43:35.000
+This is cue #9814
+
+9815
+02:43:35.000 --> 02:43:36.000
+This is cue #9815
+
+9816
+02:43:36.000 --> 02:43:37.000
+This is cue #9816
+
+9817
+02:43:37.000 --> 02:43:38.000
+This is cue #9817
+
+9818
+02:43:38.000 --> 02:43:39.000
+This is cue #9818
+
+9819
+02:43:39.000 --> 02:43:40.000
+This is cue #9819
+
+9820
+02:43:40.000 --> 02:43:41.000
+This is cue #9820
+
+9821
+02:43:41.000 --> 02:43:42.000
+This is cue #9821
+
+9822
+02:43:42.000 --> 02:43:43.000
+This is cue #9822
+
+9823
+02:43:43.000 --> 02:43:44.000
+This is cue #9823
+
+9824
+02:43:44.000 --> 02:43:45.000
+This is cue #9824
+
+9825
+02:43:45.000 --> 02:43:46.000
+This is cue #9825
+
+9826
+02:43:46.000 --> 02:43:47.000
+This is cue #9826
+
+9827
+02:43:47.000 --> 02:43:48.000
+This is cue #9827
+
+9828
+02:43:48.000 --> 02:43:49.000
+This is cue #9828
+
+9829
+02:43:49.000 --> 02:43:50.000
+This is cue #9829
+
+9830
+02:43:50.000 --> 02:43:51.000
+This is cue #9830
+
+9831
+02:43:51.000 --> 02:43:52.000
+This is cue #9831
+
+9832
+02:43:52.000 --> 02:43:53.000
+This is cue #9832
+
+9833
+02:43:53.000 --> 02:43:54.000
+This is cue #9833
+
+9834
+02:43:54.000 --> 02:43:55.000
+This is cue #9834
+
+9835
+02:43:55.000 --> 02:43:56.000
+This is cue #9835
+
+9836
+02:43:56.000 --> 02:43:57.000
+This is cue #9836
+
+9837
+02:43:57.000 --> 02:43:58.000
+This is cue #9837
+
+9838
+02:43:58.000 --> 02:43:59.000
+This is cue #9838
+
+9839
+02:43:59.000 --> 02:44:00.000
+This is cue #9839
+
+9840
+02:44:00.000 --> 02:44:01.000
+This is cue #9840
+
+9841
+02:44:01.000 --> 02:44:02.000
+This is cue #9841
+
+9842
+02:44:02.000 --> 02:44:03.000
+This is cue #9842
+
+9843
+02:44:03.000 --> 02:44:04.000
+This is cue #9843
+
+9844
+02:44:04.000 --> 02:44:05.000
+This is cue #9844
+
+9845
+02:44:05.000 --> 02:44:06.000
+This is cue #9845
+
+9846
+02:44:06.000 --> 02:44:07.000
+This is cue #9846
+
+9847
+02:44:07.000 --> 02:44:08.000
+This is cue #9847
+
+9848
+02:44:08.000 --> 02:44:09.000
+This is cue #9848
+
+9849
+02:44:09.000 --> 02:44:10.000
+This is cue #9849
+
+9850
+02:44:10.000 --> 02:44:11.000
+This is cue #9850
+
+9851
+02:44:11.000 --> 02:44:12.000
+This is cue #9851
+
+9852
+02:44:12.000 --> 02:44:13.000
+This is cue #9852
+
+9853
+02:44:13.000 --> 02:44:14.000
+This is cue #9853
+
+9854
+02:44:14.000 --> 02:44:15.000
+This is cue #9854
+
+9855
+02:44:15.000 --> 02:44:16.000
+This is cue #9855
+
+9856
+02:44:16.000 --> 02:44:17.000
+This is cue #9856
+
+9857
+02:44:17.000 --> 02:44:18.000
+This is cue #9857
+
+9858
+02:44:18.000 --> 02:44:19.000
+This is cue #9858
+
+9859
+02:44:19.000 --> 02:44:20.000
+This is cue #9859
+
+9860
+02:44:20.000 --> 02:44:21.000
+This is cue #9860
+
+9861
+02:44:21.000 --> 02:44:22.000
+This is cue #9861
+
+9862
+02:44:22.000 --> 02:44:23.000
+This is cue #9862
+
+9863
+02:44:23.000 --> 02:44:24.000
+This is cue #9863
+
+9864
+02:44:24.000 --> 02:44:25.000
+This is cue #9864
+
+9865
+02:44:25.000 --> 02:44:26.000
+This is cue #9865
+
+9866
+02:44:26.000 --> 02:44:27.000
+This is cue #9866
+
+9867
+02:44:27.000 --> 02:44:28.000
+This is cue #9867
+
+9868
+02:44:28.000 --> 02:44:29.000
+This is cue #9868
+
+9869
+02:44:29.000 --> 02:44:30.000
+This is cue #9869
+
+9870
+02:44:30.000 --> 02:44:31.000
+This is cue #9870
+
+9871
+02:44:31.000 --> 02:44:32.000
+This is cue #9871
+
+9872
+02:44:32.000 --> 02:44:33.000
+This is cue #9872
+
+9873
+02:44:33.000 --> 02:44:34.000
+This is cue #9873
+
+9874
+02:44:34.000 --> 02:44:35.000
+This is cue #9874
+
+9875
+02:44:35.000 --> 02:44:36.000
+This is cue #9875
+
+9876
+02:44:36.000 --> 02:44:37.000
+This is cue #9876
+
+9877
+02:44:37.000 --> 02:44:38.000
+This is cue #9877
+
+9878
+02:44:38.000 --> 02:44:39.000
+This is cue #9878
+
+9879
+02:44:39.000 --> 02:44:40.000
+This is cue #9879
+
+9880
+02:44:40.000 --> 02:44:41.000
+This is cue #9880
+
+9881
+02:44:41.000 --> 02:44:42.000
+This is cue #9881
+
+9882
+02:44:42.000 --> 02:44:43.000
+This is cue #9882
+
+9883
+02:44:43.000 --> 02:44:44.000
+This is cue #9883
+
+9884
+02:44:44.000 --> 02:44:45.000
+This is cue #9884
+
+9885
+02:44:45.000 --> 02:44:46.000
+This is cue #9885
+
+9886
+02:44:46.000 --> 02:44:47.000
+This is cue #9886
+
+9887
+02:44:47.000 --> 02:44:48.000
+This is cue #9887
+
+9888
+02:44:48.000 --> 02:44:49.000
+This is cue #9888
+
+9889
+02:44:49.000 --> 02:44:50.000
+This is cue #9889
+
+9890
+02:44:50.000 --> 02:44:51.000
+This is cue #9890
+
+9891
+02:44:51.000 --> 02:44:52.000
+This is cue #9891
+
+9892
+02:44:52.000 --> 02:44:53.000
+This is cue #9892
+
+9893
+02:44:53.000 --> 02:44:54.000
+This is cue #9893
+
+9894
+02:44:54.000 --> 02:44:55.000
+This is cue #9894
+
+9895
+02:44:55.000 --> 02:44:56.000
+This is cue #9895
+
+9896
+02:44:56.000 --> 02:44:57.000
+This is cue #9896
+
+9897
+02:44:57.000 --> 02:44:58.000
+This is cue #9897
+
+9898
+02:44:58.000 --> 02:44:59.000
+This is cue #9898
+
+9899
+02:44:59.000 --> 02:45:00.000
+This is cue #9899
+
+9900
+02:45:00.000 --> 02:45:01.000
+This is cue #9900
+
+9901
+02:45:01.000 --> 02:45:02.000
+This is cue #9901
+
+9902
+02:45:02.000 --> 02:45:03.000
+This is cue #9902
+
+9903
+02:45:03.000 --> 02:45:04.000
+This is cue #9903
+
+9904
+02:45:04.000 --> 02:45:05.000
+This is cue #9904
+
+9905
+02:45:05.000 --> 02:45:06.000
+This is cue #9905
+
+9906
+02:45:06.000 --> 02:45:07.000
+This is cue #9906
+
+9907
+02:45:07.000 --> 02:45:08.000
+This is cue #9907
+
+9908
+02:45:08.000 --> 02:45:09.000
+This is cue #9908
+
+9909
+02:45:09.000 --> 02:45:10.000
+This is cue #9909
+
+9910
+02:45:10.000 --> 02:45:11.000
+This is cue #9910
+
+9911
+02:45:11.000 --> 02:45:12.000
+This is cue #9911
+
+9912
+02:45:12.000 --> 02:45:13.000
+This is cue #9912
+
+9913
+02:45:13.000 --> 02:45:14.000
+This is cue #9913
+
+9914
+02:45:14.000 --> 02:45:15.000
+This is cue #9914
+
+9915
+02:45:15.000 --> 02:45:16.000
+This is cue #9915
+
+9916
+02:45:16.000 --> 02:45:17.000
+This is cue #9916
+
+9917
+02:45:17.000 --> 02:45:18.000
+This is cue #9917
+
+9918
+02:45:18.000 --> 02:45:19.000
+This is cue #9918
+
+9919
+02:45:19.000 --> 02:45:20.000
+This is cue #9919
+
+9920
+02:45:20.000 --> 02:45:21.000
+This is cue #9920
+
+9921
+02:45:21.000 --> 02:45:22.000
+This is cue #9921
+
+9922
+02:45:22.000 --> 02:45:23.000
+This is cue #9922
+
+9923
+02:45:23.000 --> 02:45:24.000
+This is cue #9923
+
+9924
+02:45:24.000 --> 02:45:25.000
+This is cue #9924
+
+9925
+02:45:25.000 --> 02:45:26.000
+This is cue #9925
+
+9926
+02:45:26.000 --> 02:45:27.000
+This is cue #9926
+
+9927
+02:45:27.000 --> 02:45:28.000
+This is cue #9927
+
+9928
+02:45:28.000 --> 02:45:29.000
+This is cue #9928
+
+9929
+02:45:29.000 --> 02:45:30.000
+This is cue #9929
+
+9930
+02:45:30.000 --> 02:45:31.000
+This is cue #9930
+
+9931
+02:45:31.000 --> 02:45:32.000
+This is cue #9931
+
+9932
+02:45:32.000 --> 02:45:33.000
+This is cue #9932
+
+9933
+02:45:33.000 --> 02:45:34.000
+This is cue #9933
+
+9934
+02:45:34.000 --> 02:45:35.000
+This is cue #9934
+
+9935
+02:45:35.000 --> 02:45:36.000
+This is cue #9935
+
+9936
+02:45:36.000 --> 02:45:37.000
+This is cue #9936
+
+9937
+02:45:37.000 --> 02:45:38.000
+This is cue #9937
+
+9938
+02:45:38.000 --> 02:45:39.000
+This is cue #9938
+
+9939
+02:45:39.000 --> 02:45:40.000
+This is cue #9939
+
+9940
+02:45:40.000 --> 02:45:41.000
+This is cue #9940
+
+9941
+02:45:41.000 --> 02:45:42.000
+This is cue #9941
+
+9942
+02:45:42.000 --> 02:45:43.000
+This is cue #9942
+
+9943
+02:45:43.000 --> 02:45:44.000
+This is cue #9943
+
+9944
+02:45:44.000 --> 02:45:45.000
+This is cue #9944
+
+9945
+02:45:45.000 --> 02:45:46.000
+This is cue #9945
+
+9946
+02:45:46.000 --> 02:45:47.000
+This is cue #9946
+
+9947
+02:45:47.000 --> 02:45:48.000
+This is cue #9947
+
+9948
+02:45:48.000 --> 02:45:49.000
+This is cue #9948
+
+9949
+02:45:49.000 --> 02:45:50.000
+This is cue #9949
+
+9950
+02:45:50.000 --> 02:45:51.000
+This is cue #9950
+
+9951
+02:45:51.000 --> 02:45:52.000
+This is cue #9951
+
+9952
+02:45:52.000 --> 02:45:53.000
+This is cue #9952
+
+9953
+02:45:53.000 --> 02:45:54.000
+This is cue #9953
+
+9954
+02:45:54.000 --> 02:45:55.000
+This is cue #9954
+
+9955
+02:45:55.000 --> 02:45:56.000
+This is cue #9955
+
+9956
+02:45:56.000 --> 02:45:57.000
+This is cue #9956
+
+9957
+02:45:57.000 --> 02:45:58.000
+This is cue #9957
+
+9958
+02:45:58.000 --> 02:45:59.000
+This is cue #9958
+
+9959
+02:45:59.000 --> 02:46:00.000
+This is cue #9959
+
+9960
+02:46:00.000 --> 02:46:01.000
+This is cue #9960
+
+9961
+02:46:01.000 --> 02:46:02.000
+This is cue #9961
+
+9962
+02:46:02.000 --> 02:46:03.000
+This is cue #9962
+
+9963
+02:46:03.000 --> 02:46:04.000
+This is cue #9963
+
+9964
+02:46:04.000 --> 02:46:05.000
+This is cue #9964
+
+9965
+02:46:05.000 --> 02:46:06.000
+This is cue #9965
+
+9966
+02:46:06.000 --> 02:46:07.000
+This is cue #9966
+
+9967
+02:46:07.000 --> 02:46:08.000
+This is cue #9967
+
+9968
+02:46:08.000 --> 02:46:09.000
+This is cue #9968
+
+9969
+02:46:09.000 --> 02:46:10.000
+This is cue #9969
+
+9970
+02:46:10.000 --> 02:46:11.000
+This is cue #9970
+
+9971
+02:46:11.000 --> 02:46:12.000
+This is cue #9971
+
+9972
+02:46:12.000 --> 02:46:13.000
+This is cue #9972
+
+9973
+02:46:13.000 --> 02:46:14.000
+This is cue #9973
+
+9974
+02:46:14.000 --> 02:46:15.000
+This is cue #9974
+
+9975
+02:46:15.000 --> 02:46:16.000
+This is cue #9975
+
+9976
+02:46:16.000 --> 02:46:17.000
+This is cue #9976
+
+9977
+02:46:17.000 --> 02:46:18.000
+This is cue #9977
+
+9978
+02:46:18.000 --> 02:46:19.000
+This is cue #9978
+
+9979
+02:46:19.000 --> 02:46:20.000
+This is cue #9979
+
+9980
+02:46:20.000 --> 02:46:21.000
+This is cue #9980
+
+9981
+02:46:21.000 --> 02:46:22.000
+This is cue #9981
+
+9982
+02:46:22.000 --> 02:46:23.000
+This is cue #9982
+
+9983
+02:46:23.000 --> 02:46:24.000
+This is cue #9983
+
+9984
+02:46:24.000 --> 02:46:25.000
+This is cue #9984
+
+9985
+02:46:25.000 --> 02:46:26.000
+This is cue #9985
+
+9986
+02:46:26.000 --> 02:46:27.000
+This is cue #9986
+
+9987
+02:46:27.000 --> 02:46:28.000
+This is cue #9987
+
+9988
+02:46:28.000 --> 02:46:29.000
+This is cue #9988
+
+9989
+02:46:29.000 --> 02:46:30.000
+This is cue #9989
+
+9990
+02:46:30.000 --> 02:46:31.000
+This is cue #9990
+
+9991
+02:46:31.000 --> 02:46:32.000
+This is cue #9991
+
+9992
+02:46:32.000 --> 02:46:33.000
+This is cue #9992
+
+9993
+02:46:33.000 --> 02:46:34.000
+This is cue #9993
+
+9994
+02:46:34.000 --> 02:46:35.000
+This is cue #9994
+
+9995
+02:46:35.000 --> 02:46:36.000
+This is cue #9995
+
+9996
+02:46:36.000 --> 02:46:37.000
+This is cue #9996
+
+9997
+02:46:37.000 --> 02:46:38.000
+This is cue #9997
+
+9998
+02:46:38.000 --> 02:46:39.000
+This is cue #9998
+
+9999
+02:46:39.000 --> 02:46:40.000
+This is cue #9999
+
+10000
+02:46:40.000 --> 02:46:41.000
+This is cue #10000
+
+10001
+02:46:41.000 --> 02:46:42.000
+This is cue #10001
+
+10002
+02:46:42.000 --> 02:46:43.000
+This is cue #10002
+
+10003
+02:46:43.000 --> 02:46:44.000
+This is cue #10003
+
+10004
+02:46:44.000 --> 02:46:45.000
+This is cue #10004
+
+10005
+02:46:45.000 --> 02:46:46.000
+This is cue #10005
+
+10006
+02:46:46.000 --> 02:46:47.000
+This is cue #10006
+
+10007
+02:46:47.000 --> 02:46:48.000
+This is cue #10007
+
+10008
+02:46:48.000 --> 02:46:49.000
+This is cue #10008
+
+10009
+02:46:49.000 --> 02:46:50.000
+This is cue #10009
+
+10010
+02:46:50.000 --> 02:46:51.000
+This is cue #10010
+
+10011
+02:46:51.000 --> 02:46:52.000
+This is cue #10011
+
+10012
+02:46:52.000 --> 02:46:53.000
+This is cue #10012
+
+10013
+02:46:53.000 --> 02:46:54.000
+This is cue #10013
+
+10014
+02:46:54.000 --> 02:46:55.000
+This is cue #10014
+
+10015
+02:46:55.000 --> 02:46:56.000
+This is cue #10015
+
+10016
+02:46:56.000 --> 02:46:57.000
+This is cue #10016
+
+10017
+02:46:57.000 --> 02:46:58.000
+This is cue #10017
+
+10018
+02:46:58.000 --> 02:46:59.000
+This is cue #10018
+
+10019
+02:46:59.000 --> 02:47:00.000
+This is cue #10019
+
+10020
+02:47:00.000 --> 02:47:01.000
+This is cue #10020
+
+10021
+02:47:01.000 --> 02:47:02.000
+This is cue #10021
+
+10022
+02:47:02.000 --> 02:47:03.000
+This is cue #10022
+
+10023
+02:47:03.000 --> 02:47:04.000
+This is cue #10023
+
+10024
+02:47:04.000 --> 02:47:05.000
+This is cue #10024
+
+10025
+02:47:05.000 --> 02:47:06.000
+This is cue #10025
+
+10026
+02:47:06.000 --> 02:47:07.000
+This is cue #10026
+
+10027
+02:47:07.000 --> 02:47:08.000
+This is cue #10027
+
+10028
+02:47:08.000 --> 02:47:09.000
+This is cue #10028
+
+10029
+02:47:09.000 --> 02:47:10.000
+This is cue #10029
+
+10030
+02:47:10.000 --> 02:47:11.000
+This is cue #10030
+
+10031
+02:47:11.000 --> 02:47:12.000
+This is cue #10031
+
+10032
+02:47:12.000 --> 02:47:13.000
+This is cue #10032
+
+10033
+02:47:13.000 --> 02:47:14.000
+This is cue #10033
+
+10034
+02:47:14.000 --> 02:47:15.000
+This is cue #10034
+
+10035
+02:47:15.000 --> 02:47:16.000
+This is cue #10035
+
+10036
+02:47:16.000 --> 02:47:17.000
+This is cue #10036
+
+10037
+02:47:17.000 --> 02:47:18.000
+This is cue #10037
+
+10038
+02:47:18.000 --> 02:47:19.000
+This is cue #10038
+
+10039
+02:47:19.000 --> 02:47:20.000
+This is cue #10039
+
+10040
+02:47:20.000 --> 02:47:21.000
+This is cue #10040
+
+10041
+02:47:21.000 --> 02:47:22.000
+This is cue #10041
+
+10042
+02:47:22.000 --> 02:47:23.000
+This is cue #10042
+
+10043
+02:47:23.000 --> 02:47:24.000
+This is cue #10043
+
+10044
+02:47:24.000 --> 02:47:25.000
+This is cue #10044
+
+10045
+02:47:25.000 --> 02:47:26.000
+This is cue #10045
+
+10046
+02:47:26.000 --> 02:47:27.000
+This is cue #10046
+
+10047
+02:47:27.000 --> 02:47:28.000
+This is cue #10047
+
+10048
+02:47:28.000 --> 02:47:29.000
+This is cue #10048
+
+10049
+02:47:29.000 --> 02:47:30.000
+This is cue #10049
+
+10050
+02:47:30.000 --> 02:47:31.000
+This is cue #10050
+
+10051
+02:47:31.000 --> 02:47:32.000
+This is cue #10051
+
+10052
+02:47:32.000 --> 02:47:33.000
+This is cue #10052
+
+10053
+02:47:33.000 --> 02:47:34.000
+This is cue #10053
+
+10054
+02:47:34.000 --> 02:47:35.000
+This is cue #10054
+
+10055
+02:47:35.000 --> 02:47:36.000
+This is cue #10055
+
+10056
+02:47:36.000 --> 02:47:37.000
+This is cue #10056
+
+10057
+02:47:37.000 --> 02:47:38.000
+This is cue #10057
+
+10058
+02:47:38.000 --> 02:47:39.000
+This is cue #10058
+
+10059
+02:47:39.000 --> 02:47:40.000
+This is cue #10059
+
+10060
+02:47:40.000 --> 02:47:41.000
+This is cue #10060
+
+10061
+02:47:41.000 --> 02:47:42.000
+This is cue #10061
+
+10062
+02:47:42.000 --> 02:47:43.000
+This is cue #10062
+
+10063
+02:47:43.000 --> 02:47:44.000
+This is cue #10063
+
+10064
+02:47:44.000 --> 02:47:45.000
+This is cue #10064
+
+10065
+02:47:45.000 --> 02:47:46.000
+This is cue #10065
+
+10066
+02:47:46.000 --> 02:47:47.000
+This is cue #10066
+
+10067
+02:47:47.000 --> 02:47:48.000
+This is cue #10067
+
+10068
+02:47:48.000 --> 02:47:49.000
+This is cue #10068
+
+10069
+02:47:49.000 --> 02:47:50.000
+This is cue #10069
+
+10070
+02:47:50.000 --> 02:47:51.000
+This is cue #10070
+
+10071
+02:47:51.000 --> 02:47:52.000
+This is cue #10071
+
+10072
+02:47:52.000 --> 02:47:53.000
+This is cue #10072
+
+10073
+02:47:53.000 --> 02:47:54.000
+This is cue #10073
+
+10074
+02:47:54.000 --> 02:47:55.000
+This is cue #10074
+
+10075
+02:47:55.000 --> 02:47:56.000
+This is cue #10075
+
+10076
+02:47:56.000 --> 02:47:57.000
+This is cue #10076
+
+10077
+02:47:57.000 --> 02:47:58.000
+This is cue #10077
+
+10078
+02:47:58.000 --> 02:47:59.000
+This is cue #10078
+
+10079
+02:47:59.000 --> 02:48:00.000
+This is cue #10079
+
+10080
+02:48:00.000 --> 02:48:01.000
+This is cue #10080
+
+10081
+02:48:01.000 --> 02:48:02.000
+This is cue #10081
+
+10082
+02:48:02.000 --> 02:48:03.000
+This is cue #10082
+
+10083
+02:48:03.000 --> 02:48:04.000
+This is cue #10083
+
+10084
+02:48:04.000 --> 02:48:05.000
+This is cue #10084
+
+10085
+02:48:05.000 --> 02:48:06.000
+This is cue #10085
+
+10086
+02:48:06.000 --> 02:48:07.000
+This is cue #10086
+
+10087
+02:48:07.000 --> 02:48:08.000
+This is cue #10087
+
+10088
+02:48:08.000 --> 02:48:09.000
+This is cue #10088
+
+10089
+02:48:09.000 --> 02:48:10.000
+This is cue #10089
+
+10090
+02:48:10.000 --> 02:48:11.000
+This is cue #10090
+
+10091
+02:48:11.000 --> 02:48:12.000
+This is cue #10091
+
+10092
+02:48:12.000 --> 02:48:13.000
+This is cue #10092
+
+10093
+02:48:13.000 --> 02:48:14.000
+This is cue #10093
+
+10094
+02:48:14.000 --> 02:48:15.000
+This is cue #10094
+
+10095
+02:48:15.000 --> 02:48:16.000
+This is cue #10095
+
+10096
+02:48:16.000 --> 02:48:17.000
+This is cue #10096
+
+10097
+02:48:17.000 --> 02:48:18.000
+This is cue #10097
+
+10098
+02:48:18.000 --> 02:48:19.000
+This is cue #10098
+
+10099
+02:48:19.000 --> 02:48:20.000
+This is cue #10099
+
+10100
+02:48:20.000 --> 02:48:21.000
+This is cue #10100
+
+10101
+02:48:21.000 --> 02:48:22.000
+This is cue #10101
+
+10102
+02:48:22.000 --> 02:48:23.000
+This is cue #10102
+
+10103
+02:48:23.000 --> 02:48:24.000
+This is cue #10103
+
+10104
+02:48:24.000 --> 02:48:25.000
+This is cue #10104
+
+10105
+02:48:25.000 --> 02:48:26.000
+This is cue #10105
+
+10106
+02:48:26.000 --> 02:48:27.000
+This is cue #10106
+
+10107
+02:48:27.000 --> 02:48:28.000
+This is cue #10107
+
+10108
+02:48:28.000 --> 02:48:29.000
+This is cue #10108
+
+10109
+02:48:29.000 --> 02:48:30.000
+This is cue #10109
+
+10110
+02:48:30.000 --> 02:48:31.000
+This is cue #10110
+
+10111
+02:48:31.000 --> 02:48:32.000
+This is cue #10111
+
+10112
+02:48:32.000 --> 02:48:33.000
+This is cue #10112
+
+10113
+02:48:33.000 --> 02:48:34.000
+This is cue #10113
+
+10114
+02:48:34.000 --> 02:48:35.000
+This is cue #10114
+
+10115
+02:48:35.000 --> 02:48:36.000
+This is cue #10115
+
+10116
+02:48:36.000 --> 02:48:37.000
+This is cue #10116
+
+10117
+02:48:37.000 --> 02:48:38.000
+This is cue #10117
+
+10118
+02:48:38.000 --> 02:48:39.000
+This is cue #10118
+
+10119
+02:48:39.000 --> 02:48:40.000
+This is cue #10119
+
+10120
+02:48:40.000 --> 02:48:41.000
+This is cue #10120
+
+10121
+02:48:41.000 --> 02:48:42.000
+This is cue #10121
+
+10122
+02:48:42.000 --> 02:48:43.000
+This is cue #10122
+
+10123
+02:48:43.000 --> 02:48:44.000
+This is cue #10123
+
+10124
+02:48:44.000 --> 02:48:45.000
+This is cue #10124
+
+10125
+02:48:45.000 --> 02:48:46.000
+This is cue #10125
+
+10126
+02:48:46.000 --> 02:48:47.000
+This is cue #10126
+
+10127
+02:48:47.000 --> 02:48:48.000
+This is cue #10127
+
+10128
+02:48:48.000 --> 02:48:49.000
+This is cue #10128
+
+10129
+02:48:49.000 --> 02:48:50.000
+This is cue #10129
+
+10130
+02:48:50.000 --> 02:48:51.000
+This is cue #10130
+
+10131
+02:48:51.000 --> 02:48:52.000
+This is cue #10131
+
+10132
+02:48:52.000 --> 02:48:53.000
+This is cue #10132
+
+10133
+02:48:53.000 --> 02:48:54.000
+This is cue #10133
+
+10134
+02:48:54.000 --> 02:48:55.000
+This is cue #10134
+
+10135
+02:48:55.000 --> 02:48:56.000
+This is cue #10135
+
+10136
+02:48:56.000 --> 02:48:57.000
+This is cue #10136
+
+10137
+02:48:57.000 --> 02:48:58.000
+This is cue #10137
+
+10138
+02:48:58.000 --> 02:48:59.000
+This is cue #10138
+
+10139
+02:48:59.000 --> 02:49:00.000
+This is cue #10139
+
+10140
+02:49:00.000 --> 02:49:01.000
+This is cue #10140
+
+10141
+02:49:01.000 --> 02:49:02.000
+This is cue #10141
+
+10142
+02:49:02.000 --> 02:49:03.000
+This is cue #10142
+
+10143
+02:49:03.000 --> 02:49:04.000
+This is cue #10143
+
+10144
+02:49:04.000 --> 02:49:05.000
+This is cue #10144
+
+10145
+02:49:05.000 --> 02:49:06.000
+This is cue #10145
+
+10146
+02:49:06.000 --> 02:49:07.000
+This is cue #10146
+
+10147
+02:49:07.000 --> 02:49:08.000
+This is cue #10147
+
+10148
+02:49:08.000 --> 02:49:09.000
+This is cue #10148
+
+10149
+02:49:09.000 --> 02:49:10.000
+This is cue #10149
+
+10150
+02:49:10.000 --> 02:49:11.000
+This is cue #10150
+
+10151
+02:49:11.000 --> 02:49:12.000
+This is cue #10151
+
+10152
+02:49:12.000 --> 02:49:13.000
+This is cue #10152
+
+10153
+02:49:13.000 --> 02:49:14.000
+This is cue #10153
+
+10154
+02:49:14.000 --> 02:49:15.000
+This is cue #10154
+
+10155
+02:49:15.000 --> 02:49:16.000
+This is cue #10155
+
+10156
+02:49:16.000 --> 02:49:17.000
+This is cue #10156
+
+10157
+02:49:17.000 --> 02:49:18.000
+This is cue #10157
+
+10158
+02:49:18.000 --> 02:49:19.000
+This is cue #10158
+
+10159
+02:49:19.000 --> 02:49:20.000
+This is cue #10159
+
+10160
+02:49:20.000 --> 02:49:21.000
+This is cue #10160
+
+10161
+02:49:21.000 --> 02:49:22.000
+This is cue #10161
+
+10162
+02:49:22.000 --> 02:49:23.000
+This is cue #10162
+
+10163
+02:49:23.000 --> 02:49:24.000
+This is cue #10163
+
+10164
+02:49:24.000 --> 02:49:25.000
+This is cue #10164
+
+10165
+02:49:25.000 --> 02:49:26.000
+This is cue #10165
+
+10166
+02:49:26.000 --> 02:49:27.000
+This is cue #10166
+
+10167
+02:49:27.000 --> 02:49:28.000
+This is cue #10167
+
+10168
+02:49:28.000 --> 02:49:29.000
+This is cue #10168
+
+10169
+02:49:29.000 --> 02:49:30.000
+This is cue #10169
+
+10170
+02:49:30.000 --> 02:49:31.000
+This is cue #10170
+
+10171
+02:49:31.000 --> 02:49:32.000
+This is cue #10171
+
+10172
+02:49:32.000 --> 02:49:33.000
+This is cue #10172
+
+10173
+02:49:33.000 --> 02:49:34.000
+This is cue #10173
+
+10174
+02:49:34.000 --> 02:49:35.000
+This is cue #10174
+
+10175
+02:49:35.000 --> 02:49:36.000
+This is cue #10175
+
+10176
+02:49:36.000 --> 02:49:37.000
+This is cue #10176
+
+10177
+02:49:37.000 --> 02:49:38.000
+This is cue #10177
+
+10178
+02:49:38.000 --> 02:49:39.000
+This is cue #10178
+
+10179
+02:49:39.000 --> 02:49:40.000
+This is cue #10179
+
+10180
+02:49:40.000 --> 02:49:41.000
+This is cue #10180
+
+10181
+02:49:41.000 --> 02:49:42.000
+This is cue #10181
+
+10182
+02:49:42.000 --> 02:49:43.000
+This is cue #10182
+
+10183
+02:49:43.000 --> 02:49:44.000
+This is cue #10183
+
+10184
+02:49:44.000 --> 02:49:45.000
+This is cue #10184
+
+10185
+02:49:45.000 --> 02:49:46.000
+This is cue #10185
+
+10186
+02:49:46.000 --> 02:49:47.000
+This is cue #10186
+
+10187
+02:49:47.000 --> 02:49:48.000
+This is cue #10187
+
+10188
+02:49:48.000 --> 02:49:49.000
+This is cue #10188
+
+10189
+02:49:49.000 --> 02:49:50.000
+This is cue #10189
+
+10190
+02:49:50.000 --> 02:49:51.000
+This is cue #10190
+
+10191
+02:49:51.000 --> 02:49:52.000
+This is cue #10191
+
+10192
+02:49:52.000 --> 02:49:53.000
+This is cue #10192
+
+10193
+02:49:53.000 --> 02:49:54.000
+This is cue #10193
+
+10194
+02:49:54.000 --> 02:49:55.000
+This is cue #10194
+
+10195
+02:49:55.000 --> 02:49:56.000
+This is cue #10195
+
+10196
+02:49:56.000 --> 02:49:57.000
+This is cue #10196
+
+10197
+02:49:57.000 --> 02:49:58.000
+This is cue #10197
+
+10198
+02:49:58.000 --> 02:49:59.000
+This is cue #10198
+
+10199
+02:49:59.000 --> 02:50:00.000
+This is cue #10199
+
+10200
+02:50:00.000 --> 02:50:01.000
+This is cue #10200
+
+10201
+02:50:01.000 --> 02:50:02.000
+This is cue #10201
+
+10202
+02:50:02.000 --> 02:50:03.000
+This is cue #10202
+
+10203
+02:50:03.000 --> 02:50:04.000
+This is cue #10203
+
+10204
+02:50:04.000 --> 02:50:05.000
+This is cue #10204
+
+10205
+02:50:05.000 --> 02:50:06.000
+This is cue #10205
+
+10206
+02:50:06.000 --> 02:50:07.000
+This is cue #10206
+
+10207
+02:50:07.000 --> 02:50:08.000
+This is cue #10207
+
+10208
+02:50:08.000 --> 02:50:09.000
+This is cue #10208
+
+10209
+02:50:09.000 --> 02:50:10.000
+This is cue #10209
+
+10210
+02:50:10.000 --> 02:50:11.000
+This is cue #10210
+
+10211
+02:50:11.000 --> 02:50:12.000
+This is cue #10211
+
+10212
+02:50:12.000 --> 02:50:13.000
+This is cue #10212
+
+10213
+02:50:13.000 --> 02:50:14.000
+This is cue #10213
+
+10214
+02:50:14.000 --> 02:50:15.000
+This is cue #10214
+
+10215
+02:50:15.000 --> 02:50:16.000
+This is cue #10215
+
+10216
+02:50:16.000 --> 02:50:17.000
+This is cue #10216
+
+10217
+02:50:17.000 --> 02:50:18.000
+This is cue #10217
+
+10218
+02:50:18.000 --> 02:50:19.000
+This is cue #10218
+
+10219
+02:50:19.000 --> 02:50:20.000
+This is cue #10219
+
+10220
+02:50:20.000 --> 02:50:21.000
+This is cue #10220
+
+10221
+02:50:21.000 --> 02:50:22.000
+This is cue #10221
+
+10222
+02:50:22.000 --> 02:50:23.000
+This is cue #10222
+
+10223
+02:50:23.000 --> 02:50:24.000
+This is cue #10223
+
+10224
+02:50:24.000 --> 02:50:25.000
+This is cue #10224
+
+10225
+02:50:25.000 --> 02:50:26.000
+This is cue #10225
+
+10226
+02:50:26.000 --> 02:50:27.000
+This is cue #10226
+
+10227
+02:50:27.000 --> 02:50:28.000
+This is cue #10227
+
+10228
+02:50:28.000 --> 02:50:29.000
+This is cue #10228
+
+10229
+02:50:29.000 --> 02:50:30.000
+This is cue #10229
+
+10230
+02:50:30.000 --> 02:50:31.000
+This is cue #10230
+
+10231
+02:50:31.000 --> 02:50:32.000
+This is cue #10231
+
+10232
+02:50:32.000 --> 02:50:33.000
+This is cue #10232
+
+10233
+02:50:33.000 --> 02:50:34.000
+This is cue #10233
+
+10234
+02:50:34.000 --> 02:50:35.000
+This is cue #10234
+
+10235
+02:50:35.000 --> 02:50:36.000
+This is cue #10235
+
+10236
+02:50:36.000 --> 02:50:37.000
+This is cue #10236
+
+10237
+02:50:37.000 --> 02:50:38.000
+This is cue #10237
+
+10238
+02:50:38.000 --> 02:50:39.000
+This is cue #10238
+
+10239
+02:50:39.000 --> 02:50:40.000
+This is cue #10239
+
+10240
+02:50:40.000 --> 02:50:41.000
+This is cue #10240
+
+10241
+02:50:41.000 --> 02:50:42.000
+This is cue #10241
+
+10242
+02:50:42.000 --> 02:50:43.000
+This is cue #10242
+
+10243
+02:50:43.000 --> 02:50:44.000
+This is cue #10243
+
+10244
+02:50:44.000 --> 02:50:45.000
+This is cue #10244
+
+10245
+02:50:45.000 --> 02:50:46.000
+This is cue #10245
+
+10246
+02:50:46.000 --> 02:50:47.000
+This is cue #10246
+
+10247
+02:50:47.000 --> 02:50:48.000
+This is cue #10247
+
+10248
+02:50:48.000 --> 02:50:49.000
+This is cue #10248
+
+10249
+02:50:49.000 --> 02:50:50.000
+This is cue #10249
+
+10250
+02:50:50.000 --> 02:50:51.000
+This is cue #10250
+
+10251
+02:50:51.000 --> 02:50:52.000
+This is cue #10251
+
+10252
+02:50:52.000 --> 02:50:53.000
+This is cue #10252
+
+10253
+02:50:53.000 --> 02:50:54.000
+This is cue #10253
+
+10254
+02:50:54.000 --> 02:50:55.000
+This is cue #10254
+
+10255
+02:50:55.000 --> 02:50:56.000
+This is cue #10255
+
+10256
+02:50:56.000 --> 02:50:57.000
+This is cue #10256
+
+10257
+02:50:57.000 --> 02:50:58.000
+This is cue #10257
+
+10258
+02:50:58.000 --> 02:50:59.000
+This is cue #10258
+
+10259
+02:50:59.000 --> 02:51:00.000
+This is cue #10259
+
+10260
+02:51:00.000 --> 02:51:01.000
+This is cue #10260
+
+10261
+02:51:01.000 --> 02:51:02.000
+This is cue #10261
+
+10262
+02:51:02.000 --> 02:51:03.000
+This is cue #10262
+
+10263
+02:51:03.000 --> 02:51:04.000
+This is cue #10263
+
+10264
+02:51:04.000 --> 02:51:05.000
+This is cue #10264
+
+10265
+02:51:05.000 --> 02:51:06.000
+This is cue #10265
+
+10266
+02:51:06.000 --> 02:51:07.000
+This is cue #10266
+
+10267
+02:51:07.000 --> 02:51:08.000
+This is cue #10267
+
+10268
+02:51:08.000 --> 02:51:09.000
+This is cue #10268
+
+10269
+02:51:09.000 --> 02:51:10.000
+This is cue #10269
+
+10270
+02:51:10.000 --> 02:51:11.000
+This is cue #10270
+
+10271
+02:51:11.000 --> 02:51:12.000
+This is cue #10271
+
+10272
+02:51:12.000 --> 02:51:13.000
+This is cue #10272
+
+10273
+02:51:13.000 --> 02:51:14.000
+This is cue #10273
+
+10274
+02:51:14.000 --> 02:51:15.000
+This is cue #10274
+
+10275
+02:51:15.000 --> 02:51:16.000
+This is cue #10275
+
+10276
+02:51:16.000 --> 02:51:17.000
+This is cue #10276
+
+10277
+02:51:17.000 --> 02:51:18.000
+This is cue #10277
+
+10278
+02:51:18.000 --> 02:51:19.000
+This is cue #10278
+
+10279
+02:51:19.000 --> 02:51:20.000
+This is cue #10279
+
+10280
+02:51:20.000 --> 02:51:21.000
+This is cue #10280
+
+10281
+02:51:21.000 --> 02:51:22.000
+This is cue #10281
+
+10282
+02:51:22.000 --> 02:51:23.000
+This is cue #10282
+
+10283
+02:51:23.000 --> 02:51:24.000
+This is cue #10283
+
+10284
+02:51:24.000 --> 02:51:25.000
+This is cue #10284
+
+10285
+02:51:25.000 --> 02:51:26.000
+This is cue #10285
+
+10286
+02:51:26.000 --> 02:51:27.000
+This is cue #10286
+
+10287
+02:51:27.000 --> 02:51:28.000
+This is cue #10287
+
+10288
+02:51:28.000 --> 02:51:29.000
+This is cue #10288
+
+10289
+02:51:29.000 --> 02:51:30.000
+This is cue #10289
+
+10290
+02:51:30.000 --> 02:51:31.000
+This is cue #10290
+
+10291
+02:51:31.000 --> 02:51:32.000
+This is cue #10291
+
+10292
+02:51:32.000 --> 02:51:33.000
+This is cue #10292
+
+10293
+02:51:33.000 --> 02:51:34.000
+This is cue #10293
+
+10294
+02:51:34.000 --> 02:51:35.000
+This is cue #10294
+
+10295
+02:51:35.000 --> 02:51:36.000
+This is cue #10295
+
+10296
+02:51:36.000 --> 02:51:37.000
+This is cue #10296
+
+10297
+02:51:37.000 --> 02:51:38.000
+This is cue #10297
+
+10298
+02:51:38.000 --> 02:51:39.000
+This is cue #10298
+
+10299
+02:51:39.000 --> 02:51:40.000
+This is cue #10299
+
+10300
+02:51:40.000 --> 02:51:41.000
+This is cue #10300
+
+10301
+02:51:41.000 --> 02:51:42.000
+This is cue #10301
+
+10302
+02:51:42.000 --> 02:51:43.000
+This is cue #10302
+
+10303
+02:51:43.000 --> 02:51:44.000
+This is cue #10303
+
+10304
+02:51:44.000 --> 02:51:45.000
+This is cue #10304
+
+10305
+02:51:45.000 --> 02:51:46.000
+This is cue #10305
+
+10306
+02:51:46.000 --> 02:51:47.000
+This is cue #10306
+
+10307
+02:51:47.000 --> 02:51:48.000
+This is cue #10307
+
+10308
+02:51:48.000 --> 02:51:49.000
+This is cue #10308
+
+10309
+02:51:49.000 --> 02:51:50.000
+This is cue #10309
+
+10310
+02:51:50.000 --> 02:51:51.000
+This is cue #10310
+
+10311
+02:51:51.000 --> 02:51:52.000
+This is cue #10311
+
+10312
+02:51:52.000 --> 02:51:53.000
+This is cue #10312
+
+10313
+02:51:53.000 --> 02:51:54.000
+This is cue #10313
+
+10314
+02:51:54.000 --> 02:51:55.000
+This is cue #10314
+
+10315
+02:51:55.000 --> 02:51:56.000
+This is cue #10315
+
+10316
+02:51:56.000 --> 02:51:57.000
+This is cue #10316
+
+10317
+02:51:57.000 --> 02:51:58.000
+This is cue #10317
+
+10318
+02:51:58.000 --> 02:51:59.000
+This is cue #10318
+
+10319
+02:51:59.000 --> 02:52:00.000
+This is cue #10319
+
+10320
+02:52:00.000 --> 02:52:01.000
+This is cue #10320
+
+10321
+02:52:01.000 --> 02:52:02.000
+This is cue #10321
+
+10322
+02:52:02.000 --> 02:52:03.000
+This is cue #10322
+
+10323
+02:52:03.000 --> 02:52:04.000
+This is cue #10323
+
+10324
+02:52:04.000 --> 02:52:05.000
+This is cue #10324
+
+10325
+02:52:05.000 --> 02:52:06.000
+This is cue #10325
+
+10326
+02:52:06.000 --> 02:52:07.000
+This is cue #10326
+
+10327
+02:52:07.000 --> 02:52:08.000
+This is cue #10327
+
+10328
+02:52:08.000 --> 02:52:09.000
+This is cue #10328
+
+10329
+02:52:09.000 --> 02:52:10.000
+This is cue #10329
+
+10330
+02:52:10.000 --> 02:52:11.000
+This is cue #10330
+
+10331
+02:52:11.000 --> 02:52:12.000
+This is cue #10331
+
+10332
+02:52:12.000 --> 02:52:13.000
+This is cue #10332
+
+10333
+02:52:13.000 --> 02:52:14.000
+This is cue #10333
+
+10334
+02:52:14.000 --> 02:52:15.000
+This is cue #10334
+
+10335
+02:52:15.000 --> 02:52:16.000
+This is cue #10335
+
+10336
+02:52:16.000 --> 02:52:17.000
+This is cue #10336
+
+10337
+02:52:17.000 --> 02:52:18.000
+This is cue #10337
+
+10338
+02:52:18.000 --> 02:52:19.000
+This is cue #10338
+
+10339
+02:52:19.000 --> 02:52:20.000
+This is cue #10339
+
+10340
+02:52:20.000 --> 02:52:21.000
+This is cue #10340
+
+10341
+02:52:21.000 --> 02:52:22.000
+This is cue #10341
+
+10342
+02:52:22.000 --> 02:52:23.000
+This is cue #10342
+
+10343
+02:52:23.000 --> 02:52:24.000
+This is cue #10343
+
+10344
+02:52:24.000 --> 02:52:25.000
+This is cue #10344
+
+10345
+02:52:25.000 --> 02:52:26.000
+This is cue #10345
+
+10346
+02:52:26.000 --> 02:52:27.000
+This is cue #10346
+
+10347
+02:52:27.000 --> 02:52:28.000
+This is cue #10347
+
+10348
+02:52:28.000 --> 02:52:29.000
+This is cue #10348
+
+10349
+02:52:29.000 --> 02:52:30.000
+This is cue #10349
+
+10350
+02:52:30.000 --> 02:52:31.000
+This is cue #10350
+
+10351
+02:52:31.000 --> 02:52:32.000
+This is cue #10351
+
+10352
+02:52:32.000 --> 02:52:33.000
+This is cue #10352
+
+10353
+02:52:33.000 --> 02:52:34.000
+This is cue #10353
+
+10354
+02:52:34.000 --> 02:52:35.000
+This is cue #10354
+
+10355
+02:52:35.000 --> 02:52:36.000
+This is cue #10355
+
+10356
+02:52:36.000 --> 02:52:37.000
+This is cue #10356
+
+10357
+02:52:37.000 --> 02:52:38.000
+This is cue #10357
+
+10358
+02:52:38.000 --> 02:52:39.000
+This is cue #10358
+
+10359
+02:52:39.000 --> 02:52:40.000
+This is cue #10359
+
+10360
+02:52:40.000 --> 02:52:41.000
+This is cue #10360
+
+10361
+02:52:41.000 --> 02:52:42.000
+This is cue #10361
+
+10362
+02:52:42.000 --> 02:52:43.000
+This is cue #10362
+
+10363
+02:52:43.000 --> 02:52:44.000
+This is cue #10363
+
+10364
+02:52:44.000 --> 02:52:45.000
+This is cue #10364
+
+10365
+02:52:45.000 --> 02:52:46.000
+This is cue #10365
+
+10366
+02:52:46.000 --> 02:52:47.000
+This is cue #10366
+
+10367
+02:52:47.000 --> 02:52:48.000
+This is cue #10367
+
+10368
+02:52:48.000 --> 02:52:49.000
+This is cue #10368
+
+10369
+02:52:49.000 --> 02:52:50.000
+This is cue #10369
+
+10370
+02:52:50.000 --> 02:52:51.000
+This is cue #10370
+
+10371
+02:52:51.000 --> 02:52:52.000
+This is cue #10371
+
+10372
+02:52:52.000 --> 02:52:53.000
+This is cue #10372
+
+10373
+02:52:53.000 --> 02:52:54.000
+This is cue #10373
+
+10374
+02:52:54.000 --> 02:52:55.000
+This is cue #10374
+
+10375
+02:52:55.000 --> 02:52:56.000
+This is cue #10375
+
+10376
+02:52:56.000 --> 02:52:57.000
+This is cue #10376
+
+10377
+02:52:57.000 --> 02:52:58.000
+This is cue #10377
+
+10378
+02:52:58.000 --> 02:52:59.000
+This is cue #10378
+
+10379
+02:52:59.000 --> 02:53:00.000
+This is cue #10379
+
+10380
+02:53:00.000 --> 02:53:01.000
+This is cue #10380
+
+10381
+02:53:01.000 --> 02:53:02.000
+This is cue #10381
+
+10382
+02:53:02.000 --> 02:53:03.000
+This is cue #10382
+
+10383
+02:53:03.000 --> 02:53:04.000
+This is cue #10383
+
+10384
+02:53:04.000 --> 02:53:05.000
+This is cue #10384
+
+10385
+02:53:05.000 --> 02:53:06.000
+This is cue #10385
+
+10386
+02:53:06.000 --> 02:53:07.000
+This is cue #10386
+
+10387
+02:53:07.000 --> 02:53:08.000
+This is cue #10387
+
+10388
+02:53:08.000 --> 02:53:09.000
+This is cue #10388
+
+10389
+02:53:09.000 --> 02:53:10.000
+This is cue #10389
+
+10390
+02:53:10.000 --> 02:53:11.000
+This is cue #10390
+
+10391
+02:53:11.000 --> 02:53:12.000
+This is cue #10391
+
+10392
+02:53:12.000 --> 02:53:13.000
+This is cue #10392
+
+10393
+02:53:13.000 --> 02:53:14.000
+This is cue #10393
+
+10394
+02:53:14.000 --> 02:53:15.000
+This is cue #10394
+
+10395
+02:53:15.000 --> 02:53:16.000
+This is cue #10395
+
+10396
+02:53:16.000 --> 02:53:17.000
+This is cue #10396
+
+10397
+02:53:17.000 --> 02:53:18.000
+This is cue #10397
+
+10398
+02:53:18.000 --> 02:53:19.000
+This is cue #10398
+
+10399
+02:53:19.000 --> 02:53:20.000
+This is cue #10399
+
+10400
+02:53:20.000 --> 02:53:21.000
+This is cue #10400
+
+10401
+02:53:21.000 --> 02:53:22.000
+This is cue #10401
+
+10402
+02:53:22.000 --> 02:53:23.000
+This is cue #10402
+
+10403
+02:53:23.000 --> 02:53:24.000
+This is cue #10403
+
+10404
+02:53:24.000 --> 02:53:25.000
+This is cue #10404
+
+10405
+02:53:25.000 --> 02:53:26.000
+This is cue #10405
+
+10406
+02:53:26.000 --> 02:53:27.000
+This is cue #10406
+
+10407
+02:53:27.000 --> 02:53:28.000
+This is cue #10407
+
+10408
+02:53:28.000 --> 02:53:29.000
+This is cue #10408
+
+10409
+02:53:29.000 --> 02:53:30.000
+This is cue #10409
+
+10410
+02:53:30.000 --> 02:53:31.000
+This is cue #10410
+
+10411
+02:53:31.000 --> 02:53:32.000
+This is cue #10411
+
+10412
+02:53:32.000 --> 02:53:33.000
+This is cue #10412
+
+10413
+02:53:33.000 --> 02:53:34.000
+This is cue #10413
+
+10414
+02:53:34.000 --> 02:53:35.000
+This is cue #10414
+
+10415
+02:53:35.000 --> 02:53:36.000
+This is cue #10415
+
+10416
+02:53:36.000 --> 02:53:37.000
+This is cue #10416
+
+10417
+02:53:37.000 --> 02:53:38.000
+This is cue #10417
+
+10418
+02:53:38.000 --> 02:53:39.000
+This is cue #10418
+
+10419
+02:53:39.000 --> 02:53:40.000
+This is cue #10419
+
+10420
+02:53:40.000 --> 02:53:41.000
+This is cue #10420
+
+10421
+02:53:41.000 --> 02:53:42.000
+This is cue #10421
+
+10422
+02:53:42.000 --> 02:53:43.000
+This is cue #10422
+
+10423
+02:53:43.000 --> 02:53:44.000
+This is cue #10423
+
+10424
+02:53:44.000 --> 02:53:45.000
+This is cue #10424
+
+10425
+02:53:45.000 --> 02:53:46.000
+This is cue #10425
+
+10426
+02:53:46.000 --> 02:53:47.000
+This is cue #10426
+
+10427
+02:53:47.000 --> 02:53:48.000
+This is cue #10427
+
+10428
+02:53:48.000 --> 02:53:49.000
+This is cue #10428
+
+10429
+02:53:49.000 --> 02:53:50.000
+This is cue #10429
+
+10430
+02:53:50.000 --> 02:53:51.000
+This is cue #10430
+
+10431
+02:53:51.000 --> 02:53:52.000
+This is cue #10431
+
+10432
+02:53:52.000 --> 02:53:53.000
+This is cue #10432
+
+10433
+02:53:53.000 --> 02:53:54.000
+This is cue #10433
+
+10434
+02:53:54.000 --> 02:53:55.000
+This is cue #10434
+
+10435
+02:53:55.000 --> 02:53:56.000
+This is cue #10435
+
+10436
+02:53:56.000 --> 02:53:57.000
+This is cue #10436
+
+10437
+02:53:57.000 --> 02:53:58.000
+This is cue #10437
+
+10438
+02:53:58.000 --> 02:53:59.000
+This is cue #10438
+
+10439
+02:53:59.000 --> 02:54:00.000
+This is cue #10439
+
+10440
+02:54:00.000 --> 02:54:01.000
+This is cue #10440
+
+10441
+02:54:01.000 --> 02:54:02.000
+This is cue #10441
+
+10442
+02:54:02.000 --> 02:54:03.000
+This is cue #10442
+
+10443
+02:54:03.000 --> 02:54:04.000
+This is cue #10443
+
+10444
+02:54:04.000 --> 02:54:05.000
+This is cue #10444
+
+10445
+02:54:05.000 --> 02:54:06.000
+This is cue #10445
+
+10446
+02:54:06.000 --> 02:54:07.000
+This is cue #10446
+
+10447
+02:54:07.000 --> 02:54:08.000
+This is cue #10447
+
+10448
+02:54:08.000 --> 02:54:09.000
+This is cue #10448
+
+10449
+02:54:09.000 --> 02:54:10.000
+This is cue #10449
+
+10450
+02:54:10.000 --> 02:54:11.000
+This is cue #10450
+
+10451
+02:54:11.000 --> 02:54:12.000
+This is cue #10451
+
+10452
+02:54:12.000 --> 02:54:13.000
+This is cue #10452
+
+10453
+02:54:13.000 --> 02:54:14.000
+This is cue #10453
+
+10454
+02:54:14.000 --> 02:54:15.000
+This is cue #10454
+
+10455
+02:54:15.000 --> 02:54:16.000
+This is cue #10455
+
+10456
+02:54:16.000 --> 02:54:17.000
+This is cue #10456
+
+10457
+02:54:17.000 --> 02:54:18.000
+This is cue #10457
+
+10458
+02:54:18.000 --> 02:54:19.000
+This is cue #10458
+
+10459
+02:54:19.000 --> 02:54:20.000
+This is cue #10459
+
+10460
+02:54:20.000 --> 02:54:21.000
+This is cue #10460
+
+10461
+02:54:21.000 --> 02:54:22.000
+This is cue #10461
+
+10462
+02:54:22.000 --> 02:54:23.000
+This is cue #10462
+
+10463
+02:54:23.000 --> 02:54:24.000
+This is cue #10463
+
+10464
+02:54:24.000 --> 02:54:25.000
+This is cue #10464
+
+10465
+02:54:25.000 --> 02:54:26.000
+This is cue #10465
+
+10466
+02:54:26.000 --> 02:54:27.000
+This is cue #10466
+
+10467
+02:54:27.000 --> 02:54:28.000
+This is cue #10467
+
+10468
+02:54:28.000 --> 02:54:29.000
+This is cue #10468
+
+10469
+02:54:29.000 --> 02:54:30.000
+This is cue #10469
+
+10470
+02:54:30.000 --> 02:54:31.000
+This is cue #10470
+
+10471
+02:54:31.000 --> 02:54:32.000
+This is cue #10471
+
+10472
+02:54:32.000 --> 02:54:33.000
+This is cue #10472
+
+10473
+02:54:33.000 --> 02:54:34.000
+This is cue #10473
+
+10474
+02:54:34.000 --> 02:54:35.000
+This is cue #10474
+
+10475
+02:54:35.000 --> 02:54:36.000
+This is cue #10475
+
+10476
+02:54:36.000 --> 02:54:37.000
+This is cue #10476
+
+10477
+02:54:37.000 --> 02:54:38.000
+This is cue #10477
+
+10478
+02:54:38.000 --> 02:54:39.000
+This is cue #10478
+
+10479
+02:54:39.000 --> 02:54:40.000
+This is cue #10479
+
+10480
+02:54:40.000 --> 02:54:41.000
+This is cue #10480
+
+10481
+02:54:41.000 --> 02:54:42.000
+This is cue #10481
+
+10482
+02:54:42.000 --> 02:54:43.000
+This is cue #10482
+
+10483
+02:54:43.000 --> 02:54:44.000
+This is cue #10483
+
+10484
+02:54:44.000 --> 02:54:45.000
+This is cue #10484
+
+10485
+02:54:45.000 --> 02:54:46.000
+This is cue #10485
+
+10486
+02:54:46.000 --> 02:54:47.000
+This is cue #10486
+
+10487
+02:54:47.000 --> 02:54:48.000
+This is cue #10487
+
+10488
+02:54:48.000 --> 02:54:49.000
+This is cue #10488
+
+10489
+02:54:49.000 --> 02:54:50.000
+This is cue #10489
+
+10490
+02:54:50.000 --> 02:54:51.000
+This is cue #10490
+
+10491
+02:54:51.000 --> 02:54:52.000
+This is cue #10491
+
+10492
+02:54:52.000 --> 02:54:53.000
+This is cue #10492
+
+10493
+02:54:53.000 --> 02:54:54.000
+This is cue #10493
+
+10494
+02:54:54.000 --> 02:54:55.000
+This is cue #10494
+
+10495
+02:54:55.000 --> 02:54:56.000
+This is cue #10495
+
+10496
+02:54:56.000 --> 02:54:57.000
+This is cue #10496
+
+10497
+02:54:57.000 --> 02:54:58.000
+This is cue #10497
+
+10498
+02:54:58.000 --> 02:54:59.000
+This is cue #10498
+
+10499
+02:54:59.000 --> 02:55:00.000
+This is cue #10499
+
+10500
+02:55:00.000 --> 02:55:01.000
+This is cue #10500
+
+10501
+02:55:01.000 --> 02:55:02.000
+This is cue #10501
+
+10502
+02:55:02.000 --> 02:55:03.000
+This is cue #10502
+
+10503
+02:55:03.000 --> 02:55:04.000
+This is cue #10503
+
+10504
+02:55:04.000 --> 02:55:05.000
+This is cue #10504
+
+10505
+02:55:05.000 --> 02:55:06.000
+This is cue #10505
+
+10506
+02:55:06.000 --> 02:55:07.000
+This is cue #10506
+
+10507
+02:55:07.000 --> 02:55:08.000
+This is cue #10507
+
+10508
+02:55:08.000 --> 02:55:09.000
+This is cue #10508
+
+10509
+02:55:09.000 --> 02:55:10.000
+This is cue #10509
+
+10510
+02:55:10.000 --> 02:55:11.000
+This is cue #10510
+
+10511
+02:55:11.000 --> 02:55:12.000
+This is cue #10511
+
+10512
+02:55:12.000 --> 02:55:13.000
+This is cue #10512
+
+10513
+02:55:13.000 --> 02:55:14.000
+This is cue #10513
+
+10514
+02:55:14.000 --> 02:55:15.000
+This is cue #10514
+
+10515
+02:55:15.000 --> 02:55:16.000
+This is cue #10515
+
+10516
+02:55:16.000 --> 02:55:17.000
+This is cue #10516
+
+10517
+02:55:17.000 --> 02:55:18.000
+This is cue #10517
+
+10518
+02:55:18.000 --> 02:55:19.000
+This is cue #10518
+
+10519
+02:55:19.000 --> 02:55:20.000
+This is cue #10519
+
+10520
+02:55:20.000 --> 02:55:21.000
+This is cue #10520
+
+10521
+02:55:21.000 --> 02:55:22.000
+This is cue #10521
+
+10522
+02:55:22.000 --> 02:55:23.000
+This is cue #10522
+
+10523
+02:55:23.000 --> 02:55:24.000
+This is cue #10523
+
+10524
+02:55:24.000 --> 02:55:25.000
+This is cue #10524
+
+10525
+02:55:25.000 --> 02:55:26.000
+This is cue #10525
+
+10526
+02:55:26.000 --> 02:55:27.000
+This is cue #10526
+
+10527
+02:55:27.000 --> 02:55:28.000
+This is cue #10527
+
+10528
+02:55:28.000 --> 02:55:29.000
+This is cue #10528
+
+10529
+02:55:29.000 --> 02:55:30.000
+This is cue #10529
+
+10530
+02:55:30.000 --> 02:55:31.000
+This is cue #10530
+
+10531
+02:55:31.000 --> 02:55:32.000
+This is cue #10531
+
+10532
+02:55:32.000 --> 02:55:33.000
+This is cue #10532
+
+10533
+02:55:33.000 --> 02:55:34.000
+This is cue #10533
+
+10534
+02:55:34.000 --> 02:55:35.000
+This is cue #10534
+
+10535
+02:55:35.000 --> 02:55:36.000
+This is cue #10535
+
+10536
+02:55:36.000 --> 02:55:37.000
+This is cue #10536
+
+10537
+02:55:37.000 --> 02:55:38.000
+This is cue #10537
+
+10538
+02:55:38.000 --> 02:55:39.000
+This is cue #10538
+
+10539
+02:55:39.000 --> 02:55:40.000
+This is cue #10539
+
+10540
+02:55:40.000 --> 02:55:41.000
+This is cue #10540
+
+10541
+02:55:41.000 --> 02:55:42.000
+This is cue #10541
+
+10542
+02:55:42.000 --> 02:55:43.000
+This is cue #10542
+
+10543
+02:55:43.000 --> 02:55:44.000
+This is cue #10543
+
+10544
+02:55:44.000 --> 02:55:45.000
+This is cue #10544
+
+10545
+02:55:45.000 --> 02:55:46.000
+This is cue #10545
+
+10546
+02:55:46.000 --> 02:55:47.000
+This is cue #10546
+
+10547
+02:55:47.000 --> 02:55:48.000
+This is cue #10547
+
+10548
+02:55:48.000 --> 02:55:49.000
+This is cue #10548
+
+10549
+02:55:49.000 --> 02:55:50.000
+This is cue #10549
+
+10550
+02:55:50.000 --> 02:55:51.000
+This is cue #10550
+
+10551
+02:55:51.000 --> 02:55:52.000
+This is cue #10551
+
+10552
+02:55:52.000 --> 02:55:53.000
+This is cue #10552
+
+10553
+02:55:53.000 --> 02:55:54.000
+This is cue #10553
+
+10554
+02:55:54.000 --> 02:55:55.000
+This is cue #10554
+
+10555
+02:55:55.000 --> 02:55:56.000
+This is cue #10555
+
+10556
+02:55:56.000 --> 02:55:57.000
+This is cue #10556
+
+10557
+02:55:57.000 --> 02:55:58.000
+This is cue #10557
+
+10558
+02:55:58.000 --> 02:55:59.000
+This is cue #10558
+
+10559
+02:55:59.000 --> 02:56:00.000
+This is cue #10559
+
+10560
+02:56:00.000 --> 02:56:01.000
+This is cue #10560
+
+10561
+02:56:01.000 --> 02:56:02.000
+This is cue #10561
+
+10562
+02:56:02.000 --> 02:56:03.000
+This is cue #10562
+
+10563
+02:56:03.000 --> 02:56:04.000
+This is cue #10563
+
+10564
+02:56:04.000 --> 02:56:05.000
+This is cue #10564
+
+10565
+02:56:05.000 --> 02:56:06.000
+This is cue #10565
+
+10566
+02:56:06.000 --> 02:56:07.000
+This is cue #10566
+
+10567
+02:56:07.000 --> 02:56:08.000
+This is cue #10567
+
+10568
+02:56:08.000 --> 02:56:09.000
+This is cue #10568
+
+10569
+02:56:09.000 --> 02:56:10.000
+This is cue #10569
+
+10570
+02:56:10.000 --> 02:56:11.000
+This is cue #10570
+
+10571
+02:56:11.000 --> 02:56:12.000
+This is cue #10571
+
+10572
+02:56:12.000 --> 02:56:13.000
+This is cue #10572
+
+10573
+02:56:13.000 --> 02:56:14.000
+This is cue #10573
+
+10574
+02:56:14.000 --> 02:56:15.000
+This is cue #10574
+
+10575
+02:56:15.000 --> 02:56:16.000
+This is cue #10575
+
+10576
+02:56:16.000 --> 02:56:17.000
+This is cue #10576
+
+10577
+02:56:17.000 --> 02:56:18.000
+This is cue #10577
+
+10578
+02:56:18.000 --> 02:56:19.000
+This is cue #10578
+
+10579
+02:56:19.000 --> 02:56:20.000
+This is cue #10579
+
+10580
+02:56:20.000 --> 02:56:21.000
+This is cue #10580
+
+10581
+02:56:21.000 --> 02:56:22.000
+This is cue #10581
+
+10582
+02:56:22.000 --> 02:56:23.000
+This is cue #10582
+
+10583
+02:56:23.000 --> 02:56:24.000
+This is cue #10583
+
+10584
+02:56:24.000 --> 02:56:25.000
+This is cue #10584
+
+10585
+02:56:25.000 --> 02:56:26.000
+This is cue #10585
+
+10586
+02:56:26.000 --> 02:56:27.000
+This is cue #10586
+
+10587
+02:56:27.000 --> 02:56:28.000
+This is cue #10587
+
+10588
+02:56:28.000 --> 02:56:29.000
+This is cue #10588
+
+10589
+02:56:29.000 --> 02:56:30.000
+This is cue #10589
+
+10590
+02:56:30.000 --> 02:56:31.000
+This is cue #10590
+
+10591
+02:56:31.000 --> 02:56:32.000
+This is cue #10591
+
+10592
+02:56:32.000 --> 02:56:33.000
+This is cue #10592
+
+10593
+02:56:33.000 --> 02:56:34.000
+This is cue #10593
+
+10594
+02:56:34.000 --> 02:56:35.000
+This is cue #10594
+
+10595
+02:56:35.000 --> 02:56:36.000
+This is cue #10595
+
+10596
+02:56:36.000 --> 02:56:37.000
+This is cue #10596
+
+10597
+02:56:37.000 --> 02:56:38.000
+This is cue #10597
+
+10598
+02:56:38.000 --> 02:56:39.000
+This is cue #10598
+
+10599
+02:56:39.000 --> 02:56:40.000
+This is cue #10599
+
+10600
+02:56:40.000 --> 02:56:41.000
+This is cue #10600
+
+10601
+02:56:41.000 --> 02:56:42.000
+This is cue #10601
+
+10602
+02:56:42.000 --> 02:56:43.000
+This is cue #10602
+
+10603
+02:56:43.000 --> 02:56:44.000
+This is cue #10603
+
+10604
+02:56:44.000 --> 02:56:45.000
+This is cue #10604
+
+10605
+02:56:45.000 --> 02:56:46.000
+This is cue #10605
+
+10606
+02:56:46.000 --> 02:56:47.000
+This is cue #10606
+
+10607
+02:56:47.000 --> 02:56:48.000
+This is cue #10607
+
+10608
+02:56:48.000 --> 02:56:49.000
+This is cue #10608
+
+10609
+02:56:49.000 --> 02:56:50.000
+This is cue #10609
+
+10610
+02:56:50.000 --> 02:56:51.000
+This is cue #10610
+
+10611
+02:56:51.000 --> 02:56:52.000
+This is cue #10611
+
+10612
+02:56:52.000 --> 02:56:53.000
+This is cue #10612
+
+10613
+02:56:53.000 --> 02:56:54.000
+This is cue #10613
+
+10614
+02:56:54.000 --> 02:56:55.000
+This is cue #10614
+
+10615
+02:56:55.000 --> 02:56:56.000
+This is cue #10615
+
+10616
+02:56:56.000 --> 02:56:57.000
+This is cue #10616
+
+10617
+02:56:57.000 --> 02:56:58.000
+This is cue #10617
+
+10618
+02:56:58.000 --> 02:56:59.000
+This is cue #10618
+
+10619
+02:56:59.000 --> 02:57:00.000
+This is cue #10619
+
+10620
+02:57:00.000 --> 02:57:01.000
+This is cue #10620
+
+10621
+02:57:01.000 --> 02:57:02.000
+This is cue #10621
+
+10622
+02:57:02.000 --> 02:57:03.000
+This is cue #10622
+
+10623
+02:57:03.000 --> 02:57:04.000
+This is cue #10623
+
+10624
+02:57:04.000 --> 02:57:05.000
+This is cue #10624
+
+10625
+02:57:05.000 --> 02:57:06.000
+This is cue #10625
+
+10626
+02:57:06.000 --> 02:57:07.000
+This is cue #10626
+
+10627
+02:57:07.000 --> 02:57:08.000
+This is cue #10627
+
+10628
+02:57:08.000 --> 02:57:09.000
+This is cue #10628
+
+10629
+02:57:09.000 --> 02:57:10.000
+This is cue #10629
+
+10630
+02:57:10.000 --> 02:57:11.000
+This is cue #10630
+
+10631
+02:57:11.000 --> 02:57:12.000
+This is cue #10631
+
+10632
+02:57:12.000 --> 02:57:13.000
+This is cue #10632
+
+10633
+02:57:13.000 --> 02:57:14.000
+This is cue #10633
+
+10634
+02:57:14.000 --> 02:57:15.000
+This is cue #10634
+
+10635
+02:57:15.000 --> 02:57:16.000
+This is cue #10635
+
+10636
+02:57:16.000 --> 02:57:17.000
+This is cue #10636
+
+10637
+02:57:17.000 --> 02:57:18.000
+This is cue #10637
+
+10638
+02:57:18.000 --> 02:57:19.000
+This is cue #10638
+
+10639
+02:57:19.000 --> 02:57:20.000
+This is cue #10639
+
+10640
+02:57:20.000 --> 02:57:21.000
+This is cue #10640
+
+10641
+02:57:21.000 --> 02:57:22.000
+This is cue #10641
+
+10642
+02:57:22.000 --> 02:57:23.000
+This is cue #10642
+
+10643
+02:57:23.000 --> 02:57:24.000
+This is cue #10643
+
+10644
+02:57:24.000 --> 02:57:25.000
+This is cue #10644
+
+10645
+02:57:25.000 --> 02:57:26.000
+This is cue #10645
+
+10646
+02:57:26.000 --> 02:57:27.000
+This is cue #10646
+
+10647
+02:57:27.000 --> 02:57:28.000
+This is cue #10647
+
+10648
+02:57:28.000 --> 02:57:29.000
+This is cue #10648
+
+10649
+02:57:29.000 --> 02:57:30.000
+This is cue #10649
+
+10650
+02:57:30.000 --> 02:57:31.000
+This is cue #10650
+
+10651
+02:57:31.000 --> 02:57:32.000
+This is cue #10651
+
+10652
+02:57:32.000 --> 02:57:33.000
+This is cue #10652
+
+10653
+02:57:33.000 --> 02:57:34.000
+This is cue #10653
+
+10654
+02:57:34.000 --> 02:57:35.000
+This is cue #10654
+
+10655
+02:57:35.000 --> 02:57:36.000
+This is cue #10655
+
+10656
+02:57:36.000 --> 02:57:37.000
+This is cue #10656
+
+10657
+02:57:37.000 --> 02:57:38.000
+This is cue #10657
+
+10658
+02:57:38.000 --> 02:57:39.000
+This is cue #10658
+
+10659
+02:57:39.000 --> 02:57:40.000
+This is cue #10659
+
+10660
+02:57:40.000 --> 02:57:41.000
+This is cue #10660
+
+10661
+02:57:41.000 --> 02:57:42.000
+This is cue #10661
+
+10662
+02:57:42.000 --> 02:57:43.000
+This is cue #10662
+
+10663
+02:57:43.000 --> 02:57:44.000
+This is cue #10663
+
+10664
+02:57:44.000 --> 02:57:45.000
+This is cue #10664
+
+10665
+02:57:45.000 --> 02:57:46.000
+This is cue #10665
+
+10666
+02:57:46.000 --> 02:57:47.000
+This is cue #10666
+
+10667
+02:57:47.000 --> 02:57:48.000
+This is cue #10667
+
+10668
+02:57:48.000 --> 02:57:49.000
+This is cue #10668
+
+10669
+02:57:49.000 --> 02:57:50.000
+This is cue #10669
+
+10670
+02:57:50.000 --> 02:57:51.000
+This is cue #10670
+
+10671
+02:57:51.000 --> 02:57:52.000
+This is cue #10671
+
+10672
+02:57:52.000 --> 02:57:53.000
+This is cue #10672
+
+10673
+02:57:53.000 --> 02:57:54.000
+This is cue #10673
+
+10674
+02:57:54.000 --> 02:57:55.000
+This is cue #10674
+
+10675
+02:57:55.000 --> 02:57:56.000
+This is cue #10675
+
+10676
+02:57:56.000 --> 02:57:57.000
+This is cue #10676
+
+10677
+02:57:57.000 --> 02:57:58.000
+This is cue #10677
+
+10678
+02:57:58.000 --> 02:57:59.000
+This is cue #10678
+
+10679
+02:57:59.000 --> 02:58:00.000
+This is cue #10679
+
+10680
+02:58:00.000 --> 02:58:01.000
+This is cue #10680
+
+10681
+02:58:01.000 --> 02:58:02.000
+This is cue #10681
+
+10682
+02:58:02.000 --> 02:58:03.000
+This is cue #10682
+
+10683
+02:58:03.000 --> 02:58:04.000
+This is cue #10683
+
+10684
+02:58:04.000 --> 02:58:05.000
+This is cue #10684
+
+10685
+02:58:05.000 --> 02:58:06.000
+This is cue #10685
+
+10686
+02:58:06.000 --> 02:58:07.000
+This is cue #10686
+
+10687
+02:58:07.000 --> 02:58:08.000
+This is cue #10687
+
+10688
+02:58:08.000 --> 02:58:09.000
+This is cue #10688
+
+10689
+02:58:09.000 --> 02:58:10.000
+This is cue #10689
+
+10690
+02:58:10.000 --> 02:58:11.000
+This is cue #10690
+
+10691
+02:58:11.000 --> 02:58:12.000
+This is cue #10691
+
+10692
+02:58:12.000 --> 02:58:13.000
+This is cue #10692
+
+10693
+02:58:13.000 --> 02:58:14.000
+This is cue #10693
+
+10694
+02:58:14.000 --> 02:58:15.000
+This is cue #10694
+
+10695
+02:58:15.000 --> 02:58:16.000
+This is cue #10695
+
+10696
+02:58:16.000 --> 02:58:17.000
+This is cue #10696
+
+10697
+02:58:17.000 --> 02:58:18.000
+This is cue #10697
+
+10698
+02:58:18.000 --> 02:58:19.000
+This is cue #10698
+
+10699
+02:58:19.000 --> 02:58:20.000
+This is cue #10699
+
+10700
+02:58:20.000 --> 02:58:21.000
+This is cue #10700
+
+10701
+02:58:21.000 --> 02:58:22.000
+This is cue #10701
+
+10702
+02:58:22.000 --> 02:58:23.000
+This is cue #10702
+
+10703
+02:58:23.000 --> 02:58:24.000
+This is cue #10703
+
+10704
+02:58:24.000 --> 02:58:25.000
+This is cue #10704
+
+10705
+02:58:25.000 --> 02:58:26.000
+This is cue #10705
+
+10706
+02:58:26.000 --> 02:58:27.000
+This is cue #10706
+
+10707
+02:58:27.000 --> 02:58:28.000
+This is cue #10707
+
+10708
+02:58:28.000 --> 02:58:29.000
+This is cue #10708
+
+10709
+02:58:29.000 --> 02:58:30.000
+This is cue #10709
+
+10710
+02:58:30.000 --> 02:58:31.000
+This is cue #10710
+
+10711
+02:58:31.000 --> 02:58:32.000
+This is cue #10711
+
+10712
+02:58:32.000 --> 02:58:33.000
+This is cue #10712
+
+10713
+02:58:33.000 --> 02:58:34.000
+This is cue #10713
+
+10714
+02:58:34.000 --> 02:58:35.000
+This is cue #10714
+
+10715
+02:58:35.000 --> 02:58:36.000
+This is cue #10715
+
+10716
+02:58:36.000 --> 02:58:37.000
+This is cue #10716
+
+10717
+02:58:37.000 --> 02:58:38.000
+This is cue #10717
+
+10718
+02:58:38.000 --> 02:58:39.000
+This is cue #10718
+
+10719
+02:58:39.000 --> 02:58:40.000
+This is cue #10719
+
+10720
+02:58:40.000 --> 02:58:41.000
+This is cue #10720
+
+10721
+02:58:41.000 --> 02:58:42.000
+This is cue #10721
+
+10722
+02:58:42.000 --> 02:58:43.000
+This is cue #10722
+
+10723
+02:58:43.000 --> 02:58:44.000
+This is cue #10723
+
+10724
+02:58:44.000 --> 02:58:45.000
+This is cue #10724
+
+10725
+02:58:45.000 --> 02:58:46.000
+This is cue #10725
+
+10726
+02:58:46.000 --> 02:58:47.000
+This is cue #10726
+
+10727
+02:58:47.000 --> 02:58:48.000
+This is cue #10727
+
+10728
+02:58:48.000 --> 02:58:49.000
+This is cue #10728
+
+10729
+02:58:49.000 --> 02:58:50.000
+This is cue #10729
+
+10730
+02:58:50.000 --> 02:58:51.000
+This is cue #10730
+
+10731
+02:58:51.000 --> 02:58:52.000
+This is cue #10731
+
+10732
+02:58:52.000 --> 02:58:53.000
+This is cue #10732
+
+10733
+02:58:53.000 --> 02:58:54.000
+This is cue #10733
+
+10734
+02:58:54.000 --> 02:58:55.000
+This is cue #10734
+
+10735
+02:58:55.000 --> 02:58:56.000
+This is cue #10735
+
+10736
+02:58:56.000 --> 02:58:57.000
+This is cue #10736
+
+10737
+02:58:57.000 --> 02:58:58.000
+This is cue #10737
+
+10738
+02:58:58.000 --> 02:58:59.000
+This is cue #10738
+
+10739
+02:58:59.000 --> 02:59:00.000
+This is cue #10739
+
+10740
+02:59:00.000 --> 02:59:01.000
+This is cue #10740
+
+10741
+02:59:01.000 --> 02:59:02.000
+This is cue #10741
+
+10742
+02:59:02.000 --> 02:59:03.000
+This is cue #10742
+
+10743
+02:59:03.000 --> 02:59:04.000
+This is cue #10743
+
+10744
+02:59:04.000 --> 02:59:05.000
+This is cue #10744
+
+10745
+02:59:05.000 --> 02:59:06.000
+This is cue #10745
+
+10746
+02:59:06.000 --> 02:59:07.000
+This is cue #10746
+
+10747
+02:59:07.000 --> 02:59:08.000
+This is cue #10747
+
+10748
+02:59:08.000 --> 02:59:09.000
+This is cue #10748
+
+10749
+02:59:09.000 --> 02:59:10.000
+This is cue #10749
+
+10750
+02:59:10.000 --> 02:59:11.000
+This is cue #10750
+
+10751
+02:59:11.000 --> 02:59:12.000
+This is cue #10751
+
+10752
+02:59:12.000 --> 02:59:13.000
+This is cue #10752
+
+10753
+02:59:13.000 --> 02:59:14.000
+This is cue #10753
+
+10754
+02:59:14.000 --> 02:59:15.000
+This is cue #10754
+
+10755
+02:59:15.000 --> 02:59:16.000
+This is cue #10755
+
+10756
+02:59:16.000 --> 02:59:17.000
+This is cue #10756
+
+10757
+02:59:17.000 --> 02:59:18.000
+This is cue #10757
+
+10758
+02:59:18.000 --> 02:59:19.000
+This is cue #10758
+
+10759
+02:59:19.000 --> 02:59:20.000
+This is cue #10759
+
+10760
+02:59:20.000 --> 02:59:21.000
+This is cue #10760
+
+10761
+02:59:21.000 --> 02:59:22.000
+This is cue #10761
+
+10762
+02:59:22.000 --> 02:59:23.000
+This is cue #10762
+
+10763
+02:59:23.000 --> 02:59:24.000
+This is cue #10763
+
+10764
+02:59:24.000 --> 02:59:25.000
+This is cue #10764
+
+10765
+02:59:25.000 --> 02:59:26.000
+This is cue #10765
+
+10766
+02:59:26.000 --> 02:59:27.000
+This is cue #10766
+
+10767
+02:59:27.000 --> 02:59:28.000
+This is cue #10767
+
+10768
+02:59:28.000 --> 02:59:29.000
+This is cue #10768
+
+10769
+02:59:29.000 --> 02:59:30.000
+This is cue #10769
+
+10770
+02:59:30.000 --> 02:59:31.000
+This is cue #10770
+
+10771
+02:59:31.000 --> 02:59:32.000
+This is cue #10771
+
+10772
+02:59:32.000 --> 02:59:33.000
+This is cue #10772
+
+10773
+02:59:33.000 --> 02:59:34.000
+This is cue #10773
+
+10774
+02:59:34.000 --> 02:59:35.000
+This is cue #10774
+
+10775
+02:59:35.000 --> 02:59:36.000
+This is cue #10775
+
+10776
+02:59:36.000 --> 02:59:37.000
+This is cue #10776
+
+10777
+02:59:37.000 --> 02:59:38.000
+This is cue #10777
+
+10778
+02:59:38.000 --> 02:59:39.000
+This is cue #10778
+
+10779
+02:59:39.000 --> 02:59:40.000
+This is cue #10779
+
+10780
+02:59:40.000 --> 02:59:41.000
+This is cue #10780
+
+10781
+02:59:41.000 --> 02:59:42.000
+This is cue #10781
+
+10782
+02:59:42.000 --> 02:59:43.000
+This is cue #10782
+
+10783
+02:59:43.000 --> 02:59:44.000
+This is cue #10783
+
+10784
+02:59:44.000 --> 02:59:45.000
+This is cue #10784
+
+10785
+02:59:45.000 --> 02:59:46.000
+This is cue #10785
+
+10786
+02:59:46.000 --> 02:59:47.000
+This is cue #10786
+
+10787
+02:59:47.000 --> 02:59:48.000
+This is cue #10787
+
+10788
+02:59:48.000 --> 02:59:49.000
+This is cue #10788
+
+10789
+02:59:49.000 --> 02:59:50.000
+This is cue #10789
+
+10790
+02:59:50.000 --> 02:59:51.000
+This is cue #10790
+
+10791
+02:59:51.000 --> 02:59:52.000
+This is cue #10791
+
+10792
+02:59:52.000 --> 02:59:53.000
+This is cue #10792
+
+10793
+02:59:53.000 --> 02:59:54.000
+This is cue #10793
+
+10794
+02:59:54.000 --> 02:59:55.000
+This is cue #10794
+
+10795
+02:59:55.000 --> 02:59:56.000
+This is cue #10795
+
+10796
+02:59:56.000 --> 02:59:57.000
+This is cue #10796
+
+10797
+02:59:57.000 --> 02:59:58.000
+This is cue #10797
+
+10798
+02:59:58.000 --> 02:59:59.000
+This is cue #10798
+
+10799
+02:59:59.000 --> 03:00:00.000
+This is cue #10799
+
+10800
+03:00:00.000 --> 03:00:01.000
+This is cue #10800
+
+10801
+03:00:01.000 --> 03:00:02.000
+This is cue #10801
+
+10802
+03:00:02.000 --> 03:00:03.000
+This is cue #10802
+
+10803
+03:00:03.000 --> 03:00:04.000
+This is cue #10803
+
+10804
+03:00:04.000 --> 03:00:05.000
+This is cue #10804
+
+10805
+03:00:05.000 --> 03:00:06.000
+This is cue #10805
+
+10806
+03:00:06.000 --> 03:00:07.000
+This is cue #10806
+
+10807
+03:00:07.000 --> 03:00:08.000
+This is cue #10807
+
+10808
+03:00:08.000 --> 03:00:09.000
+This is cue #10808
+
+10809
+03:00:09.000 --> 03:00:10.000
+This is cue #10809
+
+10810
+03:00:10.000 --> 03:00:11.000
+This is cue #10810
+
+10811
+03:00:11.000 --> 03:00:12.000
+This is cue #10811
+
+10812
+03:00:12.000 --> 03:00:13.000
+This is cue #10812
+
+10813
+03:00:13.000 --> 03:00:14.000
+This is cue #10813
+
+10814
+03:00:14.000 --> 03:00:15.000
+This is cue #10814
+
+10815
+03:00:15.000 --> 03:00:16.000
+This is cue #10815
+
+10816
+03:00:16.000 --> 03:00:17.000
+This is cue #10816
+
+10817
+03:00:17.000 --> 03:00:18.000
+This is cue #10817
+
+10818
+03:00:18.000 --> 03:00:19.000
+This is cue #10818
+
+10819
+03:00:19.000 --> 03:00:20.000
+This is cue #10819
+
+10820
+03:00:20.000 --> 03:00:21.000
+This is cue #10820
+
+10821
+03:00:21.000 --> 03:00:22.000
+This is cue #10821
+
+10822
+03:00:22.000 --> 03:00:23.000
+This is cue #10822
+
+10823
+03:00:23.000 --> 03:00:24.000
+This is cue #10823
+
+10824
+03:00:24.000 --> 03:00:25.000
+This is cue #10824
+
+10825
+03:00:25.000 --> 03:00:26.000
+This is cue #10825
+
+10826
+03:00:26.000 --> 03:00:27.000
+This is cue #10826
+
+10827
+03:00:27.000 --> 03:00:28.000
+This is cue #10827
+
+10828
+03:00:28.000 --> 03:00:29.000
+This is cue #10828
+
+10829
+03:00:29.000 --> 03:00:30.000
+This is cue #10829
+
+10830
+03:00:30.000 --> 03:00:31.000
+This is cue #10830
+
+10831
+03:00:31.000 --> 03:00:32.000
+This is cue #10831
+
+10832
+03:00:32.000 --> 03:00:33.000
+This is cue #10832
+
+10833
+03:00:33.000 --> 03:00:34.000
+This is cue #10833
+
+10834
+03:00:34.000 --> 03:00:35.000
+This is cue #10834
+
+10835
+03:00:35.000 --> 03:00:36.000
+This is cue #10835
+
+10836
+03:00:36.000 --> 03:00:37.000
+This is cue #10836
+
+10837
+03:00:37.000 --> 03:00:38.000
+This is cue #10837
+
+10838
+03:00:38.000 --> 03:00:39.000
+This is cue #10838
+
+10839
+03:00:39.000 --> 03:00:40.000
+This is cue #10839
+
+10840
+03:00:40.000 --> 03:00:41.000
+This is cue #10840
+
+10841
+03:00:41.000 --> 03:00:42.000
+This is cue #10841
+
+10842
+03:00:42.000 --> 03:00:43.000
+This is cue #10842
+
+10843
+03:00:43.000 --> 03:00:44.000
+This is cue #10843
+
+10844
+03:00:44.000 --> 03:00:45.000
+This is cue #10844
+
+10845
+03:00:45.000 --> 03:00:46.000
+This is cue #10845
+
+10846
+03:00:46.000 --> 03:00:47.000
+This is cue #10846
+
+10847
+03:00:47.000 --> 03:00:48.000
+This is cue #10847
+
+10848
+03:00:48.000 --> 03:00:49.000
+This is cue #10848
+
+10849
+03:00:49.000 --> 03:00:50.000
+This is cue #10849
+
+10850
+03:00:50.000 --> 03:00:51.000
+This is cue #10850
+
+10851
+03:00:51.000 --> 03:00:52.000
+This is cue #10851
+
+10852
+03:00:52.000 --> 03:00:53.000
+This is cue #10852
+
+10853
+03:00:53.000 --> 03:00:54.000
+This is cue #10853
+
+10854
+03:00:54.000 --> 03:00:55.000
+This is cue #10854
+
+10855
+03:00:55.000 --> 03:00:56.000
+This is cue #10855
+
+10856
+03:00:56.000 --> 03:00:57.000
+This is cue #10856
+
+10857
+03:00:57.000 --> 03:00:58.000
+This is cue #10857
+
+10858
+03:00:58.000 --> 03:00:59.000
+This is cue #10858
+
+10859
+03:00:59.000 --> 03:01:00.000
+This is cue #10859
+
+10860
+03:01:00.000 --> 03:01:01.000
+This is cue #10860
+
+10861
+03:01:01.000 --> 03:01:02.000
+This is cue #10861
+
+10862
+03:01:02.000 --> 03:01:03.000
+This is cue #10862
+
+10863
+03:01:03.000 --> 03:01:04.000
+This is cue #10863
+
+10864
+03:01:04.000 --> 03:01:05.000
+This is cue #10864
+
+10865
+03:01:05.000 --> 03:01:06.000
+This is cue #10865
+
+10866
+03:01:06.000 --> 03:01:07.000
+This is cue #10866
+
+10867
+03:01:07.000 --> 03:01:08.000
+This is cue #10867
+
+10868
+03:01:08.000 --> 03:01:09.000
+This is cue #10868
+
+10869
+03:01:09.000 --> 03:01:10.000
+This is cue #10869
+
+10870
+03:01:10.000 --> 03:01:11.000
+This is cue #10870
+
+10871
+03:01:11.000 --> 03:01:12.000
+This is cue #10871
+
+10872
+03:01:12.000 --> 03:01:13.000
+This is cue #10872
+
+10873
+03:01:13.000 --> 03:01:14.000
+This is cue #10873
+
+10874
+03:01:14.000 --> 03:01:15.000
+This is cue #10874
+
+10875
+03:01:15.000 --> 03:01:16.000
+This is cue #10875
+
+10876
+03:01:16.000 --> 03:01:17.000
+This is cue #10876
+
+10877
+03:01:17.000 --> 03:01:18.000
+This is cue #10877
+
+10878
+03:01:18.000 --> 03:01:19.000
+This is cue #10878
+
+10879
+03:01:19.000 --> 03:01:20.000
+This is cue #10879
+
+10880
+03:01:20.000 --> 03:01:21.000
+This is cue #10880
+
+10881
+03:01:21.000 --> 03:01:22.000
+This is cue #10881
+
+10882
+03:01:22.000 --> 03:01:23.000
+This is cue #10882
+
+10883
+03:01:23.000 --> 03:01:24.000
+This is cue #10883
+
+10884
+03:01:24.000 --> 03:01:25.000
+This is cue #10884
+
+10885
+03:01:25.000 --> 03:01:26.000
+This is cue #10885
+
+10886
+03:01:26.000 --> 03:01:27.000
+This is cue #10886
+
+10887
+03:01:27.000 --> 03:01:28.000
+This is cue #10887
+
+10888
+03:01:28.000 --> 03:01:29.000
+This is cue #10888
+
+10889
+03:01:29.000 --> 03:01:30.000
+This is cue #10889
+
+10890
+03:01:30.000 --> 03:01:31.000
+This is cue #10890
+
+10891
+03:01:31.000 --> 03:01:32.000
+This is cue #10891
+
+10892
+03:01:32.000 --> 03:01:33.000
+This is cue #10892
+
+10893
+03:01:33.000 --> 03:01:34.000
+This is cue #10893
+
+10894
+03:01:34.000 --> 03:01:35.000
+This is cue #10894
+
+10895
+03:01:35.000 --> 03:01:36.000
+This is cue #10895
+
+10896
+03:01:36.000 --> 03:01:37.000
+This is cue #10896
+
+10897
+03:01:37.000 --> 03:01:38.000
+This is cue #10897
+
+10898
+03:01:38.000 --> 03:01:39.000
+This is cue #10898
+
+10899
+03:01:39.000 --> 03:01:40.000
+This is cue #10899
+
+10900
+03:01:40.000 --> 03:01:41.000
+This is cue #10900
+
+10901
+03:01:41.000 --> 03:01:42.000
+This is cue #10901
+
+10902
+03:01:42.000 --> 03:01:43.000
+This is cue #10902
+
+10903
+03:01:43.000 --> 03:01:44.000
+This is cue #10903
+
+10904
+03:01:44.000 --> 03:01:45.000
+This is cue #10904
+
+10905
+03:01:45.000 --> 03:01:46.000
+This is cue #10905
+
+10906
+03:01:46.000 --> 03:01:47.000
+This is cue #10906
+
+10907
+03:01:47.000 --> 03:01:48.000
+This is cue #10907
+
+10908
+03:01:48.000 --> 03:01:49.000
+This is cue #10908
+
+10909
+03:01:49.000 --> 03:01:50.000
+This is cue #10909
+
+10910
+03:01:50.000 --> 03:01:51.000
+This is cue #10910
+
+10911
+03:01:51.000 --> 03:01:52.000
+This is cue #10911
+
+10912
+03:01:52.000 --> 03:01:53.000
+This is cue #10912
+
+10913
+03:01:53.000 --> 03:01:54.000
+This is cue #10913
+
+10914
+03:01:54.000 --> 03:01:55.000
+This is cue #10914
+
+10915
+03:01:55.000 --> 03:01:56.000
+This is cue #10915
+
+10916
+03:01:56.000 --> 03:01:57.000
+This is cue #10916
+
+10917
+03:01:57.000 --> 03:01:58.000
+This is cue #10917
+
+10918
+03:01:58.000 --> 03:01:59.000
+This is cue #10918
+
+10919
+03:01:59.000 --> 03:02:00.000
+This is cue #10919
+
+10920
+03:02:00.000 --> 03:02:01.000
+This is cue #10920
+
+10921
+03:02:01.000 --> 03:02:02.000
+This is cue #10921
+
+10922
+03:02:02.000 --> 03:02:03.000
+This is cue #10922
+
+10923
+03:02:03.000 --> 03:02:04.000
+This is cue #10923
+
+10924
+03:02:04.000 --> 03:02:05.000
+This is cue #10924
+
+10925
+03:02:05.000 --> 03:02:06.000
+This is cue #10925
+
+10926
+03:02:06.000 --> 03:02:07.000
+This is cue #10926
+
+10927
+03:02:07.000 --> 03:02:08.000
+This is cue #10927
+
+10928
+03:02:08.000 --> 03:02:09.000
+This is cue #10928
+
+10929
+03:02:09.000 --> 03:02:10.000
+This is cue #10929
+
+10930
+03:02:10.000 --> 03:02:11.000
+This is cue #10930
+
+10931
+03:02:11.000 --> 03:02:12.000
+This is cue #10931
+
+10932
+03:02:12.000 --> 03:02:13.000
+This is cue #10932
+
+10933
+03:02:13.000 --> 03:02:14.000
+This is cue #10933
+
+10934
+03:02:14.000 --> 03:02:15.000
+This is cue #10934
+
+10935
+03:02:15.000 --> 03:02:16.000
+This is cue #10935
+
+10936
+03:02:16.000 --> 03:02:17.000
+This is cue #10936
+
+10937
+03:02:17.000 --> 03:02:18.000
+This is cue #10937
+
+10938
+03:02:18.000 --> 03:02:19.000
+This is cue #10938
+
+10939
+03:02:19.000 --> 03:02:20.000
+This is cue #10939
+
+10940
+03:02:20.000 --> 03:02:21.000
+This is cue #10940
+
+10941
+03:02:21.000 --> 03:02:22.000
+This is cue #10941
+
+10942
+03:02:22.000 --> 03:02:23.000
+This is cue #10942
+
+10943
+03:02:23.000 --> 03:02:24.000
+This is cue #10943
+
+10944
+03:02:24.000 --> 03:02:25.000
+This is cue #10944
+
+10945
+03:02:25.000 --> 03:02:26.000
+This is cue #10945
+
+10946
+03:02:26.000 --> 03:02:27.000
+This is cue #10946
+
+10947
+03:02:27.000 --> 03:02:28.000
+This is cue #10947
+
+10948
+03:02:28.000 --> 03:02:29.000
+This is cue #10948
+
+10949
+03:02:29.000 --> 03:02:30.000
+This is cue #10949
+
+10950
+03:02:30.000 --> 03:02:31.000
+This is cue #10950
+
+10951
+03:02:31.000 --> 03:02:32.000
+This is cue #10951
+
+10952
+03:02:32.000 --> 03:02:33.000
+This is cue #10952
+

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/multiline-header-additional.vtt Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/multiline-header-id-invalid.vtt Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/multiline-header-id.vtt Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/multiline-header.vtt Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/overlapping-end.vtt Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/overlapping-middle.vtt Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/overlapping-rewritten.vtt Added

@@ -0,0 +1,81 @@
+WEBVTT Example of overlapping cues being rewritten to be able to signal RAP 
+
+1 RAP here                        
+00:00:00.000 --> 00:00:03.000 
+First cue from 0s to 5s
+
+1b RAP here
+00:00:03.000 --> 00:00:05.000 
+First cue from 0s to 5s
+
+2
+00:00:03.000 --> 00:00:05.000 
+Second cue from 3s to 9s 
+
+2b RAP here
+00:00:05.000 --> 00:00:08.000 
+Second cue from 3s to 9s 
+
+2c RAP here
+00:00:08.000 --> 00:00:09.000 
+Second cue from 3s to 9s
+
+3
+00:00:08.000 --> 00:00:09.000 
+3rd cue from 8s to 14s
+
+3b RAP here
+00:00:09.000 --> 00:00:10.000 
+3rd cue from 8s to 14s
+
+3c RAP here
+00:00:10.000 --> 00:00:12.000 
+3rd cue from 8s to 14s
+
+4
+00:00:10.000 --> 00:00:12.000
+4th cue from 10s to 18s
+
+3d RAP here
+00:00:12.000 --> 00:00:14.000 
+3rd cue from 8s to 14s
+
+4b
+00:00:12.000 --> 00:00:14.000
+4th cue from 10s to 18s
+
+5
+00:00:12.000 --> 00:00:14.000
+5th cue from 12s to 24s
+
+4c RAP here
+00:00:14.000 --> 00:00:16.000
+4th cue from 10s to 18s
+
+5b
+00:00:14.000 --> 00:00:16.000
+5th cue from 12s to 24s
+
+4d RAP here
+00:00:16.000 --> 00:00:18.000
+4th cue from 10s to 18s
+
+5b
+00:00:16.000 --> 00:00:18.000
+5th cue from 12s to 24s
+
+6
+00:00:16.000 --> 00:00:18.000
+6th cue from 16s to 26s
+
+5c RAP here
+00:00:18.000 --> 00:00:24.000
+5th cue from 12s to 24s
+
+6b 
+00:00:18.000 --> 00:00:24.000
+6th cue from 16s to 26s
+
+6c 
+00:00:24.000 --> 00:00:26.000
+6th cue from 16s to 26s

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/overlapping-start.vtt Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/overlapping.vtt Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/spaces.vtt Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/spec-example-basic.vtt Added

@@ -0,0 +1,40 @@
+WEBVTT
+
+00:11.000 --> 00:13.000
+<v Roger Bingham>We are in New York City
+
+00:13.000 --> 00:16.000
+<v Roger Bingham>We're actually at the Lucern Hotel, just down the street
+
+00:16.000 --> 00:18.000
+<v Roger Bingham>from the American Museum of Natural History
+
+00:18.000 --> 00:20.000
+<v Roger Bingham>And with me is Neil deGrasse Tyson
+
+00:20.000 --> 00:22.000
+<v Roger Bingham>Astrophysicist, Director of the Hayden Planetarium
+
+00:22.000 --> 00:24.000
+<v Roger Bingham>at the AMNH.
+
+00:24.000 --> 00:26.000
+<v Roger Bingham>Thank you for walking down here.
+
+00:27.000 --> 00:30.000
+<v Roger Bingham>And I want to do a follow-up on the last conversation we did.
+
+00:30.000 --> 00:31.500 align:end size:50%
+<v Roger Bingham>When we e-mailed-
+
+00:30.500 --> 00:32.500 align:start size:50%
+<v Neil deGrasse Tyson>Didn't we talk about enough in that conversation?
+
+00:32.000 --> 00:35.500 align:end size:50%
+<v Roger Bingham>No! No no no no; 'cos 'cos obviously 'cos
+
+00:32.500 --> 00:33.500 align:start size:50%
+<v Neil deGrasse Tyson><i>Laughs</i>
+
+00:35.500 --> 00:38.000
+<v Roger Bingham>You know I'm so excited my glasses are falling off here.
\ No newline at end of file

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/spec-example-comment.vtt Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/spec-example-comment2.vtt Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/spec-example-identifier.vtt Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/spec-example-multiple-lines.vtt Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/spec-example-nested.vtt Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/spec-example-voice.vtt Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/svg.vtt Added

@@ -0,0 +1,4502 @@
+WEBVTT
+
+00:00.000	--> 	00:00.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	0	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:00.040	--> 	00:00.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:00.080	--> 	00:00.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:00.120	--> 	00:00.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:00.160	--> 	00:00.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:00.200	--> 	00:00.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:00.240	--> 	00:00.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:00.280	--> 	00:00.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:00.320	--> 	00:00.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:00.360	--> 	00:00.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:00.400	--> 	00:00.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:00.440	--> 	00:00.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:00.480	--> 	00:00.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:00.520	--> 	00:00.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:00.560	--> 	00:00.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:00.600	--> 	00:00.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:00.640	--> 	00:00.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:00.680	--> 	00:00.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:00.720	--> 	00:00.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:00.760	--> 	00:00.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:00.800	--> 	00:00.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:00.840	--> 	00:00.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:00.880	--> 	00:00.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:00.920	--> 	00:00.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:00.960	--> 	00:01.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:01.000	--> 	00:01.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	-1.13687E-13	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:01.040	--> 	00:01.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:01.080	--> 	00:01.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:01.120	--> 	00:01.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:01.160	--> 	00:01.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:01.200	--> 	00:01.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:01.240	--> 	00:01.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:01.280	--> 	00:01.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:01.320	--> 	00:01.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:01.360	--> 	00:01.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:01.400	--> 	00:01.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:01.440	--> 	00:01.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:01.480	--> 	00:01.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:01.520	--> 	00:01.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:01.560	--> 	00:01.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:01.600	--> 	00:01.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:01.640	--> 	00:01.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:01.680	--> 	00:01.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:01.720	--> 	00:01.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:01.760	--> 	00:01.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:01.800	--> 	00:01.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:01.840	--> 	00:01.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:01.880	--> 	00:01.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:01.920	--> 	00:01.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:01.960	--> 	00:02.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:02.000	--> 	00:02.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:02.040	--> 	00:02.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:02.080	--> 	00:02.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:02.120	--> 	00:02.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:02.160	--> 	00:02.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:02.200	--> 	00:02.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:02.240	--> 	00:02.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:02.280	--> 	00:02.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:02.320	--> 	00:02.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:02.360	--> 	00:02.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:02.400	--> 	00:02.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:02.440	--> 	00:02.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:02.480	--> 	00:02.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:02.520	--> 	00:02.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:02.560	--> 	00:02.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:02.600	--> 	00:02.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:02.640	--> 	00:02.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:02.680	--> 	00:02.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:02.720	--> 	00:02.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:02.760	--> 	00:02.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:02.800	--> 	00:02.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:02.840	--> 	00:02.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:02.880	--> 	00:02.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:02.920	--> 	00:02.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:02.960	--> 	00:03.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:03.000	--> 	00:03.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:03.040	--> 	00:03.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:03.080	--> 	00:03.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:03.120	--> 	00:03.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:03.160	--> 	00:03.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:03.200	--> 	00:03.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:03.240	--> 	00:03.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:03.280	--> 	00:03.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:03.320	--> 	00:03.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:03.360	--> 	00:03.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:03.400	--> 	00:03.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:03.440	--> 	00:03.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:03.480	--> 	00:03.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:03.520	--> 	00:03.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:03.560	--> 	00:03.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:03.600	--> 	00:03.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:03.640	--> 	00:03.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:03.680	--> 	00:03.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:03.720	--> 	00:03.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:03.760	--> 	00:03.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:03.800	--> 	00:03.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:03.840	--> 	00:03.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:03.880	--> 	00:03.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:03.920	--> 	00:03.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:03.960	--> 	00:04.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:04.000	--> 	00:04.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:04.040	--> 	00:04.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:04.080	--> 	00:04.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:04.120	--> 	00:04.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:04.160	--> 	00:04.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:04.200	--> 	00:04.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:04.240	--> 	00:04.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:04.280	--> 	00:04.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:04.320	--> 	00:04.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:04.360	--> 	00:04.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:04.400	--> 	00:04.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:04.440	--> 	00:04.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:04.480	--> 	00:04.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:04.520	--> 	00:04.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:04.560	--> 	00:04.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:04.600	--> 	00:04.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:04.640	--> 	00:04.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:04.680	--> 	00:04.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:04.720	--> 	00:04.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:04.760	--> 	00:04.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:04.800	--> 	00:04.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:04.840	--> 	00:04.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:04.880	--> 	00:04.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:04.920	--> 	00:04.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:04.960	--> 	00:05.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:05.000	--> 	00:05.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:05.040	--> 	00:05.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:05.080	--> 	00:05.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:05.120	--> 	00:05.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:05.160	--> 	00:05.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:05.200	--> 	00:05.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:05.240	--> 	00:05.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:05.280	--> 	00:05.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:05.320	--> 	00:05.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:05.360	--> 	00:05.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:05.400	--> 	00:05.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:05.440	--> 	00:05.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:05.480	--> 	00:05.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:05.520	--> 	00:05.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:05.560	--> 	00:05.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:05.600	--> 	00:05.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:05.640	--> 	00:05.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:05.680	--> 	00:05.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:05.720	--> 	00:05.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:05.760	--> 	00:05.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:05.800	--> 	00:05.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:05.840	--> 	00:05.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:05.880	--> 	00:05.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:05.920	--> 	00:05.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:05.960	--> 	00:06.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:06.000	--> 	00:06.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:06.040	--> 	00:06.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:06.080	--> 	00:06.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:06.120	--> 	00:06.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:06.160	--> 	00:06.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:06.200	--> 	00:06.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:06.240	--> 	00:06.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:06.280	--> 	00:06.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:06.320	--> 	00:06.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:06.360	--> 	00:06.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:06.400	--> 	00:06.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:06.440	--> 	00:06.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:06.480	--> 	00:06.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:06.520	--> 	00:06.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:06.560	--> 	00:06.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:06.600	--> 	00:06.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:06.640	--> 	00:06.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:06.680	--> 	00:06.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:06.720	--> 	00:06.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:06.760	--> 	00:06.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:06.800	--> 	00:06.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:06.840	--> 	00:06.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:06.880	--> 	00:06.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:06.920	--> 	00:06.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:06.960	--> 	00:07.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:07.000	--> 	00:07.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:07.040	--> 	00:07.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:07.080	--> 	00:07.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:07.120	--> 	00:07.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:07.160	--> 	00:07.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:07.200	--> 	00:07.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:07.240	--> 	00:07.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:07.280	--> 	00:07.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:07.320	--> 	00:07.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:07.360	--> 	00:07.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:07.400	--> 	00:07.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:07.440	--> 	00:07.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:07.480	--> 	00:07.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:07.520	--> 	00:07.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:07.560	--> 	00:07.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:07.600	--> 	00:07.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:07.640	--> 	00:07.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:07.680	--> 	00:07.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:07.720	--> 	00:07.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:07.760	--> 	00:07.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:07.800	--> 	00:07.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:07.840	--> 	00:07.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:07.880	--> 	00:07.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:07.920	--> 	00:07.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:07.960	--> 	00:08.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:08.000	--> 	00:08.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:08.040	--> 	00:08.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:08.080	--> 	00:08.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:08.120	--> 	00:08.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:08.160	--> 	00:08.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:08.200	--> 	00:08.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:08.240	--> 	00:08.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:08.280	--> 	00:08.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:08.320	--> 	00:08.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:08.360	--> 	00:08.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:08.400	--> 	00:08.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:08.440	--> 	00:08.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:08.480	--> 	00:08.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:08.520	--> 	00:08.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:08.560	--> 	00:08.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:08.600	--> 	00:08.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:08.640	--> 	00:08.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:08.680	--> 	00:08.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:08.720	--> 	00:08.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:08.760	--> 	00:08.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:08.800	--> 	00:08.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:08.840	--> 	00:08.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:08.880	--> 	00:08.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:08.920	--> 	00:08.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:08.960	--> 	00:09.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:09.000	--> 	00:09.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:09.040	--> 	00:09.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:09.080	--> 	00:09.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:09.120	--> 	00:09.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:09.160	--> 	00:09.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:09.200	--> 	00:09.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:09.240	--> 	00:09.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:09.280	--> 	00:09.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:09.320	--> 	00:09.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:09.360	--> 	00:09.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:09.400	--> 	00:09.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:09.440	--> 	00:09.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:09.480	--> 	00:09.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:09.520	--> 	00:09.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:09.560	--> 	00:09.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:09.600	--> 	00:09.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:09.640	--> 	00:09.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:09.680	--> 	00:09.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:09.720	--> 	00:09.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:09.760	--> 	00:09.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:09.800	--> 	00:09.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:09.840	--> 	00:09.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:09.880	--> 	00:09.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:09.920	--> 	00:09.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:09.960	--> 	00:10.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:10.000	--> 	00:10.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:10.040	--> 	00:10.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:10.080	--> 	00:10.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:10.120	--> 	00:10.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:10.160	--> 	00:10.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:10.200	--> 	00:10.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:10.240	--> 	00:10.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:10.280	--> 	00:10.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:10.320	--> 	00:10.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:10.360	--> 	00:10.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:10.400	--> 	00:10.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:10.440	--> 	00:10.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:10.480	--> 	00:10.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:10.520	--> 	00:10.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:10.560	--> 	00:10.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:10.600	--> 	00:10.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:10.640	--> 	00:10.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:10.680	--> 	00:10.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:10.720	--> 	00:10.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:10.760	--> 	00:10.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:10.800	--> 	00:10.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:10.840	--> 	00:10.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:10.880	--> 	00:10.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:10.920	--> 	00:10.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:10.960	--> 	00:11.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:11.000	--> 	00:11.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:11.040	--> 	00:11.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:11.080	--> 	00:11.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:11.120	--> 	00:11.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:11.160	--> 	00:11.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:11.200	--> 	00:11.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:11.240	--> 	00:11.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:11.280	--> 	00:11.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:11.320	--> 	00:11.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:11.360	--> 	00:11.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:11.400	--> 	00:11.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:11.440	--> 	00:11.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:11.480	--> 	00:11.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:11.520	--> 	00:11.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:11.560	--> 	00:11.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:11.600	--> 	00:11.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:11.640	--> 	00:11.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:11.680	--> 	00:11.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:11.720	--> 	00:11.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:11.760	--> 	00:11.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:11.800	--> 	00:11.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:11.840	--> 	00:11.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:11.880	--> 	00:11.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:11.920	--> 	00:11.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:11.960	--> 	00:12.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:12.000	--> 	00:12.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:12.040	--> 	00:12.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:12.080	--> 	00:12.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:12.120	--> 	00:12.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:12.160	--> 	00:12.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:12.200	--> 	00:12.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:12.240	--> 	00:12.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:12.280	--> 	00:12.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:12.320	--> 	00:12.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:12.360	--> 	00:12.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:12.400	--> 	00:12.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:12.440	--> 	00:12.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:12.480	--> 	00:12.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:12.520	--> 	00:12.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:12.560	--> 	00:12.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:12.600	--> 	00:12.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:12.640	--> 	00:12.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:12.680	--> 	00:12.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:12.720	--> 	00:12.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:12.760	--> 	00:12.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:12.800	--> 	00:12.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:12.840	--> 	00:12.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:12.880	--> 	00:12.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:12.920	--> 	00:12.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:12.960	--> 	00:13.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:13.000	--> 	00:13.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:13.040	--> 	00:13.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:13.080	--> 	00:13.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:13.120	--> 	00:13.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:13.160	--> 	00:13.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:13.200	--> 	00:13.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:13.240	--> 	00:13.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:13.280	--> 	00:13.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:13.320	--> 	00:13.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:13.360	--> 	00:13.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:13.400	--> 	00:13.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:13.440	--> 	00:13.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:13.480	--> 	00:13.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:13.520	--> 	00:13.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:13.560	--> 	00:13.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:13.600	--> 	00:13.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:13.640	--> 	00:13.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:13.680	--> 	00:13.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:13.720	--> 	00:13.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:13.760	--> 	00:13.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:13.800	--> 	00:13.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:13.840	--> 	00:13.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:13.880	--> 	00:13.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:13.920	--> 	00:13.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:13.960	--> 	00:14.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:14.000	--> 	00:14.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:14.040	--> 	00:14.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:14.080	--> 	00:14.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:14.120	--> 	00:14.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:14.160	--> 	00:14.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:14.200	--> 	00:14.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:14.240	--> 	00:14.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:14.280	--> 	00:14.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:14.320	--> 	00:14.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:14.360	--> 	00:14.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:14.400	--> 	00:14.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:14.440	--> 	00:14.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:14.480	--> 	00:14.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:14.520	--> 	00:14.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:14.560	--> 	00:14.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:14.600	--> 	00:14.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:14.640	--> 	00:14.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:14.680	--> 	00:14.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:14.720	--> 	00:14.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:14.760	--> 	00:14.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:14.800	--> 	00:14.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:14.840	--> 	00:14.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:14.880	--> 	00:14.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:14.920	--> 	00:14.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:14.960	--> 	00:15.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:15.000	--> 	00:15.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:15.040	--> 	00:15.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:15.080	--> 	00:15.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:15.120	--> 	00:15.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:15.160	--> 	00:15.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:15.200	--> 	00:15.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:15.240	--> 	00:15.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:15.280	--> 	00:15.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:15.320	--> 	00:15.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:15.360	--> 	00:15.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:15.400	--> 	00:15.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:15.440	--> 	00:15.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:15.480	--> 	00:15.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:15.520	--> 	00:15.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:15.560	--> 	00:15.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:15.600	--> 	00:15.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:15.640	--> 	00:15.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:15.680	--> 	00:15.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:15.720	--> 	00:15.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:15.760	--> 	00:15.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:15.800	--> 	00:15.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:15.840	--> 	00:15.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:15.880	--> 	00:15.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:15.920	--> 	00:15.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:15.960	--> 	00:16.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:16.000	--> 	00:16.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:16.040	--> 	00:16.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:16.080	--> 	00:16.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:16.120	--> 	00:16.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:16.160	--> 	00:16.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:16.200	--> 	00:16.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:16.240	--> 	00:16.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:16.280	--> 	00:16.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:16.320	--> 	00:16.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:16.360	--> 	00:16.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:16.400	--> 	00:16.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:16.440	--> 	00:16.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:16.480	--> 	00:16.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:16.520	--> 	00:16.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:16.560	--> 	00:16.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:16.600	--> 	00:16.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:16.640	--> 	00:16.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:16.680	--> 	00:16.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:16.720	--> 	00:16.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:16.760	--> 	00:16.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:16.800	--> 	00:16.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:16.840	--> 	00:16.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:16.880	--> 	00:16.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:16.920	--> 	00:16.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:16.960	--> 	00:17.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:17.000	--> 	00:17.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:17.040	--> 	00:17.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:17.080	--> 	00:17.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:17.120	--> 	00:17.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:17.160	--> 	00:17.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:17.200	--> 	00:17.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:17.240	--> 	00:17.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:17.280	--> 	00:17.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:17.320	--> 	00:17.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:17.360	--> 	00:17.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:17.400	--> 	00:17.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:17.440	--> 	00:17.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:17.480	--> 	00:17.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:17.520	--> 	00:17.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:17.560	--> 	00:17.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:17.600	--> 	00:17.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:17.640	--> 	00:17.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:17.680	--> 	00:17.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:17.720	--> 	00:17.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:17.760	--> 	00:17.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:17.800	--> 	00:17.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:17.840	--> 	00:17.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:17.880	--> 	00:17.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:17.920	--> 	00:17.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:17.960	--> 	00:18.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:18.000	--> 	00:18.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:18.040	--> 	00:18.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:18.080	--> 	00:18.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:18.120	--> 	00:18.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:18.160	--> 	00:18.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:18.200	--> 	00:18.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:18.240	--> 	00:18.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:18.280	--> 	00:18.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:18.320	--> 	00:18.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:18.360	--> 	00:18.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:18.400	--> 	00:18.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:18.440	--> 	00:18.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:18.480	--> 	00:18.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:18.520	--> 	00:18.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:18.560	--> 	00:18.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:18.600	--> 	00:18.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:18.640	--> 	00:18.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:18.680	--> 	00:18.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:18.720	--> 	00:18.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:18.760	--> 	00:18.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:18.800	--> 	00:18.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:18.840	--> 	00:18.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:18.880	--> 	00:18.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:18.920	--> 	00:18.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:18.960	--> 	00:19.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:19.000	--> 	00:19.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:19.040	--> 	00:19.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:19.080	--> 	00:19.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:19.120	--> 	00:19.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:19.160	--> 	00:19.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:19.200	--> 	00:19.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:19.240	--> 	00:19.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:19.280	--> 	00:19.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:19.320	--> 	00:19.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:19.360	--> 	00:19.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:19.400	--> 	00:19.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:19.440	--> 	00:19.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:19.480	--> 	00:19.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:19.520	--> 	00:19.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:19.560	--> 	00:19.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:19.600	--> 	00:19.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:19.640	--> 	00:19.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:19.680	--> 	00:19.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:19.720	--> 	00:19.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:19.760	--> 	00:19.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:19.800	--> 	00:19.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:19.840	--> 	00:19.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:19.880	--> 	00:19.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:19.920	--> 	00:19.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:19.960	--> 	00:20.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:20.000	--> 	00:20.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:20.040	--> 	00:20.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:20.080	--> 	00:20.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:20.120	--> 	00:20.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:20.160	--> 	00:20.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:20.200	--> 	00:20.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:20.240	--> 	00:20.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:20.280	--> 	00:20.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:20.320	--> 	00:20.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:20.360	--> 	00:20.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:20.400	--> 	00:20.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:20.440	--> 	00:20.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:20.480	--> 	00:20.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:20.520	--> 	00:20.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:20.560	--> 	00:20.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:20.600	--> 	00:20.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:20.640	--> 	00:20.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:20.680	--> 	00:20.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:20.720	--> 	00:20.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:20.760	--> 	00:20.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:20.800	--> 	00:20.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:20.840	--> 	00:20.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:20.880	--> 	00:20.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:20.920	--> 	00:20.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:20.960	--> 	00:21.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:21.000	--> 	00:21.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:21.040	--> 	00:21.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:21.080	--> 	00:21.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:21.120	--> 	00:21.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:21.160	--> 	00:21.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:21.200	--> 	00:21.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:21.240	--> 	00:21.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:21.280	--> 	00:21.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:21.320	--> 	00:21.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:21.360	--> 	00:21.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:21.400	--> 	00:21.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:21.440	--> 	00:21.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:21.480	--> 	00:21.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:21.520	--> 	00:21.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:21.560	--> 	00:21.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:21.600	--> 	00:21.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:21.640	--> 	00:21.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:21.680	--> 	00:21.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:21.720	--> 	00:21.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:21.760	--> 	00:21.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:21.800	--> 	00:21.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:21.840	--> 	00:21.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:21.880	--> 	00:21.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:21.920	--> 	00:21.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:21.960	--> 	00:22.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:22.000	--> 	00:22.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:22.040	--> 	00:22.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:22.080	--> 	00:22.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:22.120	--> 	00:22.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:22.160	--> 	00:22.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:22.200	--> 	00:22.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:22.240	--> 	00:22.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:22.280	--> 	00:22.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:22.320	--> 	00:22.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:22.360	--> 	00:22.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:22.400	--> 	00:22.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:22.440	--> 	00:22.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:22.480	--> 	00:22.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:22.520	--> 	00:22.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:22.560	--> 	00:22.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:22.600	--> 	00:22.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:22.640	--> 	00:22.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:22.680	--> 	00:22.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:22.720	--> 	00:22.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:22.760	--> 	00:22.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:22.800	--> 	00:22.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:22.840	--> 	00:22.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:22.880	--> 	00:22.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:22.920	--> 	00:22.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:22.960	--> 	00:23.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:23.000	--> 	00:23.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:23.040	--> 	00:23.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:23.080	--> 	00:23.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:23.120	--> 	00:23.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:23.160	--> 	00:23.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:23.200	--> 	00:23.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:23.240	--> 	00:23.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:23.280	--> 	00:23.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:23.320	--> 	00:23.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:23.360	--> 	00:23.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:23.400	--> 	00:23.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:23.440	--> 	00:23.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:23.480	--> 	00:23.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:23.520	--> 	00:23.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:23.560	--> 	00:23.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:23.600	--> 	00:23.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:23.640	--> 	00:23.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:23.680	--> 	00:23.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:23.720	--> 	00:23.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:23.760	--> 	00:23.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:23.800	--> 	00:23.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:23.840	--> 	00:23.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:23.880	--> 	00:23.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:23.920	--> 	00:23.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:23.960	--> 	00:24.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:24.000	--> 	00:24.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:24.040	--> 	00:24.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:24.080	--> 	00:24.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:24.120	--> 	00:24.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:24.160	--> 	00:24.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:24.200	--> 	00:24.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:24.240	--> 	00:24.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:24.280	--> 	00:24.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:24.320	--> 	00:24.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:24.360	--> 	00:24.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:24.400	--> 	00:24.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:24.440	--> 	00:24.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:24.480	--> 	00:24.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:24.520	--> 	00:24.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:24.560	--> 	00:24.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:24.600	--> 	00:24.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:24.640	--> 	00:24.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:24.680	--> 	00:24.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:24.720	--> 	00:24.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:24.760	--> 	00:24.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:24.800	--> 	00:24.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:24.840	--> 	00:24.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:24.880	--> 	00:24.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:24.920	--> 	00:24.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:24.960	--> 	00:25.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:25.000	--> 	00:25.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:25.040	--> 	00:25.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:25.080	--> 	00:25.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:25.120	--> 	00:25.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:25.160	--> 	00:25.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:25.200	--> 	00:25.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:25.240	--> 	00:25.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:25.280	--> 	00:25.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:25.320	--> 	00:25.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:25.360	--> 	00:25.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:25.400	--> 	00:25.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:25.440	--> 	00:25.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:25.480	--> 	00:25.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:25.520	--> 	00:25.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:25.560	--> 	00:25.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:25.600	--> 	00:25.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:25.640	--> 	00:25.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:25.680	--> 	00:25.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:25.720	--> 	00:25.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:25.760	--> 	00:25.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:25.800	--> 	00:25.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:25.840	--> 	00:25.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:25.880	--> 	00:25.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:25.920	--> 	00:25.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:25.960	--> 	00:26.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:26.000	--> 	00:26.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:26.040	--> 	00:26.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:26.080	--> 	00:26.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:26.120	--> 	00:26.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:26.160	--> 	00:26.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:26.200	--> 	00:26.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:26.240	--> 	00:26.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:26.280	--> 	00:26.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:26.320	--> 	00:26.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:26.360	--> 	00:26.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:26.400	--> 	00:26.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:26.440	--> 	00:26.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:26.480	--> 	00:26.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:26.520	--> 	00:26.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:26.560	--> 	00:26.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:26.600	--> 	00:26.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:26.640	--> 	00:26.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:26.680	--> 	00:26.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:26.720	--> 	00:26.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:26.760	--> 	00:26.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:26.800	--> 	00:26.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:26.840	--> 	00:26.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:26.880	--> 	00:26.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:26.920	--> 	00:26.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:26.960	--> 	00:27.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:27.000	--> 	00:27.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:27.040	--> 	00:27.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:27.080	--> 	00:27.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:27.120	--> 	00:27.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:27.160	--> 	00:27.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:27.200	--> 	00:27.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:27.240	--> 	00:27.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:27.280	--> 	00:27.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:27.320	--> 	00:27.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:27.360	--> 	00:27.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:27.400	--> 	00:27.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:27.440	--> 	00:27.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:27.480	--> 	00:27.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:27.520	--> 	00:27.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:27.560	--> 	00:27.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:27.600	--> 	00:27.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:27.640	--> 	00:27.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:27.680	--> 	00:27.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:27.720	--> 	00:27.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:27.760	--> 	00:27.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:27.800	--> 	00:27.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:27.840	--> 	00:27.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:27.880	--> 	00:27.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:27.920	--> 	00:27.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:27.960	--> 	00:28.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:28.000	--> 	00:28.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:28.040	--> 	00:28.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:28.080	--> 	00:28.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:28.120	--> 	00:28.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:28.160	--> 	00:28.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:28.200	--> 	00:28.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:28.240	--> 	00:28.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:28.280	--> 	00:28.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:28.320	--> 	00:28.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:28.360	--> 	00:28.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:28.400	--> 	00:28.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:28.440	--> 	00:28.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:28.480	--> 	00:28.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:28.520	--> 	00:28.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:28.560	--> 	00:28.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:28.600	--> 	00:28.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:28.640	--> 	00:28.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:28.680	--> 	00:28.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:28.720	--> 	00:28.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:28.760	--> 	00:28.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:28.800	--> 	00:28.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:28.840	--> 	00:28.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:28.880	--> 	00:28.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:28.920	--> 	00:28.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:28.960	--> 	00:29.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:29.000	--> 	00:29.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:29.040	--> 	00:29.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:29.080	--> 	00:29.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:29.120	--> 	00:29.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:29.160	--> 	00:29.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:29.200	--> 	00:29.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:29.240	--> 	00:29.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:29.280	--> 	00:29.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:29.320	--> 	00:29.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:29.360	--> 	00:29.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:29.400	--> 	00:29.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:29.440	--> 	00:29.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:29.480	--> 	00:29.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:29.520	--> 	00:29.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:29.560	--> 	00:29.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:29.600	--> 	00:29.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:29.640	--> 	00:29.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:29.680	--> 	00:29.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:29.720	--> 	00:29.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:29.760	--> 	00:29.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:29.800	--> 	00:29.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:29.840	--> 	00:29.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:29.880	--> 	00:29.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:29.920	--> 	00:29.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:29.960	--> 	00:30.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:30.000	--> 	00:30.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:30.040	--> 	00:30.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:30.080	--> 	00:30.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:30.120	--> 	00:30.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:30.160	--> 	00:30.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:30.200	--> 	00:30.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:30.240	--> 	00:30.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:30.280	--> 	00:30.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:30.320	--> 	00:30.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:30.360	--> 	00:30.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:30.400	--> 	00:30.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:30.440	--> 	00:30.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:30.480	--> 	00:30.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:30.520	--> 	00:30.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:30.560	--> 	00:30.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:30.600	--> 	00:30.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:30.640	--> 	00:30.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:30.680	--> 	00:30.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:30.720	--> 	00:30.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:30.760	--> 	00:30.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:30.800	--> 	00:30.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:30.840	--> 	00:30.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:30.880	--> 	00:30.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:30.920	--> 	00:30.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:30.960	--> 	00:31.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:31.000	--> 	00:31.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:31.040	--> 	00:31.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:31.080	--> 	00:31.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:31.120	--> 	00:31.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:31.160	--> 	00:31.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:31.200	--> 	00:31.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:31.240	--> 	00:31.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:31.280	--> 	00:31.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:31.320	--> 	00:31.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:31.360	--> 	00:31.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:31.400	--> 	00:31.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:31.440	--> 	00:31.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:31.480	--> 	00:31.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:31.520	--> 	00:31.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:31.560	--> 	00:31.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:31.600	--> 	00:31.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:31.640	--> 	00:31.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:31.680	--> 	00:31.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:31.720	--> 	00:31.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:31.760	--> 	00:31.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:31.800	--> 	00:31.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:31.840	--> 	00:31.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:31.880	--> 	00:31.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:31.920	--> 	00:31.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:31.960	--> 	00:32.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:32.000	--> 	00:32.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:32.040	--> 	00:32.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:32.080	--> 	00:32.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:32.120	--> 	00:32.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:32.160	--> 	00:32.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:32.200	--> 	00:32.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:32.240	--> 	00:32.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:32.280	--> 	00:32.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:32.320	--> 	00:32.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:32.360	--> 	00:32.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:32.400	--> 	00:32.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:32.440	--> 	00:32.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:32.480	--> 	00:32.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:32.520	--> 	00:32.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:32.560	--> 	00:32.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:32.600	--> 	00:32.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:32.640	--> 	00:32.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:32.680	--> 	00:32.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:32.720	--> 	00:32.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:32.760	--> 	00:32.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:32.800	--> 	00:32.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:32.840	--> 	00:32.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:32.880	--> 	00:32.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:32.920	--> 	00:32.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:32.960	--> 	00:33.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:33.000	--> 	00:33.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:33.040	--> 	00:33.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:33.080	--> 	00:33.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:33.120	--> 	00:33.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:33.160	--> 	00:33.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:33.200	--> 	00:33.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:33.240	--> 	00:33.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:33.280	--> 	00:33.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:33.320	--> 	00:33.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:33.360	--> 	00:33.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:33.400	--> 	00:33.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:33.440	--> 	00:33.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:33.480	--> 	00:33.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:33.520	--> 	00:33.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:33.560	--> 	00:33.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:33.600	--> 	00:33.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:33.640	--> 	00:33.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:33.680	--> 	00:33.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:33.720	--> 	00:33.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:33.760	--> 	00:33.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:33.800	--> 	00:33.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:33.840	--> 	00:33.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:33.880	--> 	00:33.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:33.920	--> 	00:33.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:33.960	--> 	00:34.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:34.000	--> 	00:34.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:34.040	--> 	00:34.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:34.080	--> 	00:34.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:34.120	--> 	00:34.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:34.160	--> 	00:34.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:34.200	--> 	00:34.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:34.240	--> 	00:34.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:34.280	--> 	00:34.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:34.320	--> 	00:34.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:34.360	--> 	00:34.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:34.400	--> 	00:34.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:34.440	--> 	00:34.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:34.480	--> 	00:34.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:34.520	--> 	00:34.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:34.560	--> 	00:34.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:34.600	--> 	00:34.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:34.640	--> 	00:34.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:34.680	--> 	00:34.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:34.720	--> 	00:34.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:34.760	--> 	00:34.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:34.800	--> 	00:34.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:34.840	--> 	00:34.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:34.880	--> 	00:34.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:34.920	--> 	00:34.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:34.960	--> 	00:35.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:35.000	--> 	00:35.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:35.040	--> 	00:35.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:35.080	--> 	00:35.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:35.120	--> 	00:35.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:35.160	--> 	00:35.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:35.200	--> 	00:35.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:35.240	--> 	00:35.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:35.280	--> 	00:35.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:35.320	--> 	00:35.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:35.360	--> 	00:35.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:35.400	--> 	00:35.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:35.440	--> 	00:35.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:35.480	--> 	00:35.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:35.520	--> 	00:35.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:35.560	--> 	00:35.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:35.600	--> 	00:35.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:35.640	--> 	00:35.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:35.680	--> 	00:35.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:35.720	--> 	00:35.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:35.760	--> 	00:35.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:35.800	--> 	00:35.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:35.840	--> 	00:35.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:35.880	--> 	00:35.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:35.920	--> 	00:35.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:35.960	--> 	00:36.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:36.000	--> 	00:36.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:36.040	--> 	00:36.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:36.080	--> 	00:36.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:36.120	--> 	00:36.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:36.160	--> 	00:36.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:36.200	--> 	00:36.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:36.240	--> 	00:36.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:36.280	--> 	00:36.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:36.320	--> 	00:36.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:36.360	--> 	00:36.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:36.400	--> 	00:36.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:36.440	--> 	00:36.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:36.480	--> 	00:36.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:36.520	--> 	00:36.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:36.560	--> 	00:36.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:36.600	--> 	00:36.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:36.640	--> 	00:36.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:36.680	--> 	00:36.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:36.720	--> 	00:36.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:36.760	--> 	00:36.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:36.800	--> 	00:36.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:36.840	--> 	00:36.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:36.880	--> 	00:36.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:36.920	--> 	00:36.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:36.960	--> 	00:37.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:37.000	--> 	00:37.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:37.040	--> 	00:37.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:37.080	--> 	00:37.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:37.120	--> 	00:37.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:37.160	--> 	00:37.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:37.200	--> 	00:37.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:37.240	--> 	00:37.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:37.280	--> 	00:37.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:37.320	--> 	00:37.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:37.360	--> 	00:37.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:37.400	--> 	00:37.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:37.440	--> 	00:37.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:37.480	--> 	00:37.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:37.520	--> 	00:37.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:37.560	--> 	00:37.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:37.600	--> 	00:37.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:37.640	--> 	00:37.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:37.680	--> 	00:37.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:37.720	--> 	00:37.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:37.760	--> 	00:37.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:37.800	--> 	00:37.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:37.840	--> 	00:37.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:37.880	--> 	00:37.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:37.920	--> 	00:37.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:37.960	--> 	00:38.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:38.000	--> 	00:38.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:38.040	--> 	00:38.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:38.080	--> 	00:38.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:38.120	--> 	00:38.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:38.160	--> 	00:38.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:38.200	--> 	00:38.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:38.240	--> 	00:38.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:38.280	--> 	00:38.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:38.320	--> 	00:38.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:38.360	--> 	00:38.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:38.400	--> 	00:38.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:38.440	--> 	00:38.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:38.480	--> 	00:38.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:38.520	--> 	00:38.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:38.560	--> 	00:38.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:38.600	--> 	00:38.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:38.640	--> 	00:38.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:38.680	--> 	00:38.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:38.720	--> 	00:38.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:38.760	--> 	00:38.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:38.800	--> 	00:38.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:38.840	--> 	00:38.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:38.880	--> 	00:38.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:38.920	--> 	00:38.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:38.960	--> 	00:39.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:39.000	--> 	00:39.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:39.040	--> 	00:39.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:39.080	--> 	00:39.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:39.120	--> 	00:39.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:39.160	--> 	00:39.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:39.200	--> 	00:39.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:39.240	--> 	00:39.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:39.280	--> 	00:39.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:39.320	--> 	00:39.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:39.360	--> 	00:39.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:39.400	--> 	00:39.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:39.440	--> 	00:39.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:39.480	--> 	00:39.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:39.520	--> 	00:39.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:39.560	--> 	00:39.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:39.600	--> 	00:39.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:39.640	--> 	00:39.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:39.680	--> 	00:39.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:39.720	--> 	00:39.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:39.760	--> 	00:39.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:39.800	--> 	00:39.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:39.840	--> 	00:39.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:39.880	--> 	00:39.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:39.920	--> 	00:39.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:39.960	--> 	00:40.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:40.000	--> 	00:40.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:40.040	--> 	00:40.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:40.080	--> 	00:40.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:40.120	--> 	00:40.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:40.160	--> 	00:40.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:40.200	--> 	00:40.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:40.240	--> 	00:40.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:40.280	--> 	00:40.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:40.320	--> 	00:40.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:40.360	--> 	00:40.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:40.400	--> 	00:40.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:40.440	--> 	00:40.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:40.480	--> 	00:40.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:40.520	--> 	00:40.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:40.560	--> 	00:40.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:40.600	--> 	00:40.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:40.640	--> 	00:40.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:40.680	--> 	00:40.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:40.720	--> 	00:40.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:40.760	--> 	00:40.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:40.800	--> 	00:40.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:40.840	--> 	00:40.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:40.880	--> 	00:40.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:40.920	--> 	00:40.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:40.960	--> 	00:41.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:41.000	--> 	00:41.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:41.040	--> 	00:41.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:41.080	--> 	00:41.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:41.120	--> 	00:41.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:41.160	--> 	00:41.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:41.200	--> 	00:41.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:41.240	--> 	00:41.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:41.280	--> 	00:41.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:41.320	--> 	00:41.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:41.360	--> 	00:41.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:41.400	--> 	00:41.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:41.440	--> 	00:41.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:41.480	--> 	00:41.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:41.520	--> 	00:41.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:41.560	--> 	00:41.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:41.600	--> 	00:41.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:41.640	--> 	00:41.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:41.680	--> 	00:41.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:41.720	--> 	00:41.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:41.760	--> 	00:41.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:41.800	--> 	00:41.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:41.840	--> 	00:41.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:41.880	--> 	00:41.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:41.920	--> 	00:41.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:41.960	--> 	00:42.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:42.000	--> 	00:42.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:42.040	--> 	00:42.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:42.080	--> 	00:42.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:42.120	--> 	00:42.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:42.160	--> 	00:42.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:42.200	--> 	00:42.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:42.240	--> 	00:42.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:42.280	--> 	00:42.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:42.320	--> 	00:42.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:42.360	--> 	00:42.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:42.400	--> 	00:42.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:42.440	--> 	00:42.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:42.480	--> 	00:42.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:42.520	--> 	00:42.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:42.560	--> 	00:42.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:42.600	--> 	00:42.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:42.640	--> 	00:42.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:42.680	--> 	00:42.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:42.720	--> 	00:42.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:42.760	--> 	00:42.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:42.800	--> 	00:42.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:42.840	--> 	00:42.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:42.880	--> 	00:42.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:42.920	--> 	00:42.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:42.960	--> 	00:43.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:43.000	--> 	00:43.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:43.040	--> 	00:43.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:43.080	--> 	00:43.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:43.120	--> 	00:43.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:43.160	--> 	00:43.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:43.200	--> 	00:43.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:43.240	--> 	00:43.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:43.280	--> 	00:43.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:43.320	--> 	00:43.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:43.360	--> 	00:43.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:43.400	--> 	00:43.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:43.440	--> 	00:43.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:43.480	--> 	00:43.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:43.520	--> 	00:43.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:43.560	--> 	00:43.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:43.600	--> 	00:43.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:43.640	--> 	00:43.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:43.680	--> 	00:43.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:43.720	--> 	00:43.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:43.760	--> 	00:43.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:43.800	--> 	00:43.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:43.840	--> 	00:43.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:43.880	--> 	00:43.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:43.920	--> 	00:43.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:43.960	--> 	00:44.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:44.000	--> 	00:44.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:44.040	--> 	00:44.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:44.080	--> 	00:44.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:44.120	--> 	00:44.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:44.160	--> 	00:44.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:44.200	--> 	00:44.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:44.240	--> 	00:44.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:44.280	--> 	00:44.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:44.320	--> 	00:44.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:44.360	--> 	00:44.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:44.400	--> 	00:44.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:44.440	--> 	00:44.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:44.480	--> 	00:44.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:44.520	--> 	00:44.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:44.560	--> 	00:44.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:44.600	--> 	00:44.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:44.640	--> 	00:44.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:44.680	--> 	00:44.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:44.720	--> 	00:44.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:44.760	--> 	00:44.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:44.800	--> 	00:44.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:44.840	--> 	00:44.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:44.880	--> 	00:44.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:44.920	--> 	00:44.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:44.960	--> 	00:45.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:45.000	--> 	00:45.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:45.040	--> 	00:45.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:45.080	--> 	00:45.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:45.120	--> 	00:45.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:45.160	--> 	00:45.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:45.200	--> 	00:45.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:45.240	--> 	00:45.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:45.280	--> 	00:45.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:45.320	--> 	00:45.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:45.360	--> 	00:45.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:45.400	--> 	00:45.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:45.440	--> 	00:45.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:45.480	--> 	00:45.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:45.520	--> 	00:45.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:45.560	--> 	00:45.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:45.600	--> 	00:45.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:45.640	--> 	00:45.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:45.680	--> 	00:45.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:45.720	--> 	00:45.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:45.760	--> 	00:45.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:45.800	--> 	00:45.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:45.840	--> 	00:45.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:45.880	--> 	00:45.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:45.920	--> 	00:45.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:45.960	--> 	00:46.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:46.000	--> 	00:46.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:46.040	--> 	00:46.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:46.080	--> 	00:46.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:46.120	--> 	00:46.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:46.160	--> 	00:46.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:46.200	--> 	00:46.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:46.240	--> 	00:46.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:46.280	--> 	00:46.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:46.320	--> 	00:46.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:46.360	--> 	00:46.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:46.400	--> 	00:46.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:46.440	--> 	00:46.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:46.480	--> 	00:46.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:46.520	--> 	00:46.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:46.560	--> 	00:46.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:46.600	--> 	00:46.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:46.640	--> 	00:46.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:46.680	--> 	00:46.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:46.720	--> 	00:46.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:46.760	--> 	00:46.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:46.800	--> 	00:46.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:46.840	--> 	00:46.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:46.880	--> 	00:46.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:46.920	--> 	00:46.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:46.960	--> 	00:47.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:47.000	--> 	00:47.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:47.040	--> 	00:47.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:47.080	--> 	00:47.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:47.120	--> 	00:47.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:47.160	--> 	00:47.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:47.200	--> 	00:47.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:47.240	--> 	00:47.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:47.280	--> 	00:47.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:47.320	--> 	00:47.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:47.360	--> 	00:47.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:47.400	--> 	00:47.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:47.440	--> 	00:47.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:47.480	--> 	00:47.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:47.520	--> 	00:47.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:47.560	--> 	00:47.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:47.600	--> 	00:47.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:47.640	--> 	00:47.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:47.680	--> 	00:47.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:47.720	--> 	00:47.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:47.760	--> 	00:47.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:47.800	--> 	00:47.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:47.840	--> 	00:47.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:47.880	--> 	00:47.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:47.920	--> 	00:47.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:47.960	--> 	00:48.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:48.000	--> 	00:48.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:48.040	--> 	00:48.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:48.080	--> 	00:48.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:48.120	--> 	00:48.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:48.160	--> 	00:48.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:48.200	--> 	00:48.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:48.240	--> 	00:48.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:48.280	--> 	00:48.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:48.320	--> 	00:48.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:48.360	--> 	00:48.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:48.400	--> 	00:48.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:48.440	--> 	00:48.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:48.480	--> 	00:48.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:48.520	--> 	00:48.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:48.560	--> 	00:48.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:48.600	--> 	00:48.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:48.640	--> 	00:48.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:48.680	--> 	00:48.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:48.720	--> 	00:48.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:48.760	--> 	00:48.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:48.800	--> 	00:48.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:48.840	--> 	00:48.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:48.880	--> 	00:48.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:48.920	--> 	00:48.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:48.960	--> 	00:49.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:49.000	--> 	00:49.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:49.040	--> 	00:49.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:49.080	--> 	00:49.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:49.120	--> 	00:49.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:49.160	--> 	00:49.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:49.200	--> 	00:49.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:49.240	--> 	00:49.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:49.280	--> 	00:49.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:49.320	--> 	00:49.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:49.360	--> 	00:49.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:49.400	--> 	00:49.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:49.440	--> 	00:49.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:49.480	--> 	00:49.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:49.520	--> 	00:49.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:49.560	--> 	00:49.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:49.600	--> 	00:49.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:49.640	--> 	00:49.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:49.680	--> 	00:49.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:49.720	--> 	00:49.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:49.760	--> 	00:49.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:49.800	--> 	00:49.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:49.840	--> 	00:49.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:49.880	--> 	00:49.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:49.920	--> 	00:49.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:49.960	--> 	00:50.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:50.000	--> 	00:50.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:50.040	--> 	00:50.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:50.080	--> 	00:50.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:50.120	--> 	00:50.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:50.160	--> 	00:50.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:50.200	--> 	00:50.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:50.240	--> 	00:50.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:50.280	--> 	00:50.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:50.320	--> 	00:50.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:50.360	--> 	00:50.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:50.400	--> 	00:50.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:50.440	--> 	00:50.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:50.480	--> 	00:50.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:50.520	--> 	00:50.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:50.560	--> 	00:50.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:50.600	--> 	00:50.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:50.640	--> 	00:50.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:50.680	--> 	00:50.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:50.720	--> 	00:50.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:50.760	--> 	00:50.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:50.800	--> 	00:50.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:50.840	--> 	00:50.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:50.880	--> 	00:50.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:50.920	--> 	00:50.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:50.960	--> 	00:51.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:51.000	--> 	00:51.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:51.040	--> 	00:51.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:51.080	--> 	00:51.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:51.120	--> 	00:51.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:51.160	--> 	00:51.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:51.200	--> 	00:51.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:51.240	--> 	00:51.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:51.280	--> 	00:51.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:51.320	--> 	00:51.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:51.360	--> 	00:51.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:51.400	--> 	00:51.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:51.440	--> 	00:51.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:51.480	--> 	00:51.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:51.520	--> 	00:51.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:51.560	--> 	00:51.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:51.600	--> 	00:51.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:51.640	--> 	00:51.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:51.680	--> 	00:51.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:51.720	--> 	00:51.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:51.760	--> 	00:51.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:51.800	--> 	00:51.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:51.840	--> 	00:51.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:51.880	--> 	00:51.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:51.920	--> 	00:51.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:51.960	--> 	00:52.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:52.000	--> 	00:52.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:52.040	--> 	00:52.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:52.080	--> 	00:52.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:52.120	--> 	00:52.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:52.160	--> 	00:52.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:52.200	--> 	00:52.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:52.240	--> 	00:52.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:52.280	--> 	00:52.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:52.320	--> 	00:52.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:52.360	--> 	00:52.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:52.400	--> 	00:52.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:52.440	--> 	00:52.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:52.480	--> 	00:52.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:52.520	--> 	00:52.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:52.560	--> 	00:52.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:52.600	--> 	00:52.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:52.640	--> 	00:52.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:52.680	--> 	00:52.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:52.720	--> 	00:52.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:52.760	--> 	00:52.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:52.800	--> 	00:52.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:52.840	--> 	00:52.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:52.880	--> 	00:52.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:52.920	--> 	00:52.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:52.960	--> 	00:53.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:53.000	--> 	00:53.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:53.040	--> 	00:53.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:53.080	--> 	00:53.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:53.120	--> 	00:53.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:53.160	--> 	00:53.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:53.200	--> 	00:53.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:53.240	--> 	00:53.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:53.280	--> 	00:53.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:53.320	--> 	00:53.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:53.360	--> 	00:53.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:53.400	--> 	00:53.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:53.440	--> 	00:53.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:53.480	--> 	00:53.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:53.520	--> 	00:53.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:53.560	--> 	00:53.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:53.600	--> 	00:53.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:53.640	--> 	00:53.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:53.680	--> 	00:53.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:53.720	--> 	00:53.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:53.760	--> 	00:53.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:53.800	--> 	00:53.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:53.840	--> 	00:53.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:53.880	--> 	00:53.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:53.920	--> 	00:53.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:53.960	--> 	00:54.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:54.000	--> 	00:54.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:54.040	--> 	00:54.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:54.080	--> 	00:54.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:54.120	--> 	00:54.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:54.160	--> 	00:54.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:54.200	--> 	00:54.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:54.240	--> 	00:54.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:54.280	--> 	00:54.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:54.320	--> 	00:54.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:54.360	--> 	00:54.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:54.400	--> 	00:54.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:54.440	--> 	00:54.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:54.480	--> 	00:54.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:54.520	--> 	00:54.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:54.560	--> 	00:54.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:54.600	--> 	00:54.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:54.640	--> 	00:54.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:54.680	--> 	00:54.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:54.720	--> 	00:54.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:54.760	--> 	00:54.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:54.800	--> 	00:54.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:54.840	--> 	00:54.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:54.880	--> 	00:54.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:54.920	--> 	00:54.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:54.960	--> 	00:55.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:55.000	--> 	00:55.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:55.040	--> 	00:55.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:55.080	--> 	00:55.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:55.120	--> 	00:55.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:55.160	--> 	00:55.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:55.200	--> 	00:55.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:55.240	--> 	00:55.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:55.280	--> 	00:55.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:55.320	--> 	00:55.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:55.360	--> 	00:55.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:55.400	--> 	00:55.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:55.440	--> 	00:55.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:55.480	--> 	00:55.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:55.520	--> 	00:55.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:55.560	--> 	00:55.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:55.600	--> 	00:55.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:55.640	--> 	00:55.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:55.680	--> 	00:55.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:55.720	--> 	00:55.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:55.760	--> 	00:55.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:55.800	--> 	00:55.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:55.840	--> 	00:55.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:55.880	--> 	00:55.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:55.920	--> 	00:55.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:55.960	--> 	00:56.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:56.000	--> 	00:56.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:56.040	--> 	00:56.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:56.080	--> 	00:56.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:56.120	--> 	00:56.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:56.160	--> 	00:56.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:56.200	--> 	00:56.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:56.240	--> 	00:56.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:56.280	--> 	00:56.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:56.320	--> 	00:56.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:56.360	--> 	00:56.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:56.400	--> 	00:56.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:56.440	--> 	00:56.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:56.480	--> 	00:56.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:56.520	--> 	00:56.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:56.560	--> 	00:56.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:56.600	--> 	00:56.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:56.640	--> 	00:56.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:56.680	--> 	00:56.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:56.720	--> 	00:56.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:56.760	--> 	00:56.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:56.800	--> 	00:56.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:56.840	--> 	00:56.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:56.880	--> 	00:56.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:56.920	--> 	00:56.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:56.960	--> 	00:57.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:57.000	--> 	00:57.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:57.040	--> 	00:57.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:57.080	--> 	00:57.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:57.120	--> 	00:57.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:57.160	--> 	00:57.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:57.200	--> 	00:57.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:57.240	--> 	00:57.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:57.280	--> 	00:57.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:57.320	--> 	00:57.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:57.360	--> 	00:57.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:57.400	--> 	00:57.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:57.440	--> 	00:57.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:57.480	--> 	00:57.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:57.520	--> 	00:57.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:57.560	--> 	00:57.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:57.600	--> 	00:57.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:57.640	--> 	00:57.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:57.680	--> 	00:57.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:57.720	--> 	00:57.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:57.760	--> 	00:57.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:57.800	--> 	00:57.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:57.840	--> 	00:57.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:57.880	--> 	00:57.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:57.920	--> 	00:57.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:57.960	--> 	00:58.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:58.000	--> 	00:58.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:58.040	--> 	00:58.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:58.080	--> 	00:58.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:58.120	--> 	00:58.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:58.160	--> 	00:58.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:58.200	--> 	00:58.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:58.240	--> 	00:58.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:58.280	--> 	00:58.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:58.320	--> 	00:58.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:58.360	--> 	00:58.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:58.400	--> 	00:58.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:58.440	--> 	00:58.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:58.480	--> 	00:58.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:58.520	--> 	00:58.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:58.560	--> 	00:58.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:58.600	--> 	00:58.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:58.640	--> 	00:58.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:58.680	--> 	00:58.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:58.720	--> 	00:58.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:58.760	--> 	00:58.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:58.800	--> 	00:58.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:58.840	--> 	00:58.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:58.880	--> 	00:58.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:58.920	--> 	00:58.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:58.960	--> 	00:59.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:59.000	--> 	00:59.040	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:59.040	--> 	00:59.080	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:59.080	--> 	00:59.120	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:59.120	--> 	00:59.160	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:59.160	--> 	00:59.200	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:59.200	--> 	00:59.240	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:59.240	--> 	00:59.280	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:59.280	--> 	00:59.320	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:59.320	--> 	00:59.360	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:59.360	--> 	00:59.400	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:59.400	--> 	00:59.440	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:59.440	--> 	00:59.480	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:59.480	--> 	00:59.520	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:59.520	--> 	00:59.560	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:59.560	--> 	00:59.600	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:59.600	--> 	00:59.640	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:59.640	--> 	00:59.680	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:59.680	--> 	00:59.720	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:59.720	--> 	00:59.760	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:59.760	--> 	00:59.800	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:59.800	--> 	00:59.840	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:59.840	--> 	00:59.880	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:59.880	--> 	00:59.920	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:59.920	--> 	00:59.960	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+
+00:59.960	--> 	00:00.000	
+<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
+

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/timestamps-invalid.vtt Added

gpac-0.5.0.svn4668.tar.bz2/regression_tests/webvtt/timestamps.vtt Added

gpac-0.5.0.svn4296.tar.bz2/src/Makefile -> gpac-0.5.0.svn4668.tar.bz2/src/Makefile Changed

@@ -21,7 +21,7 @@
 endif
 
 ifeq ($(DISABLE_PLAYER), no)
-LIBGPAC_UTILS+=utils/color.o utils/os_module.o utils/math.o utils/path2d.o utils/path2d_stroker.o utils/module.o utils/uni_bidi.o utils/ringbuffer.o utils/unicode.o
+LIBGPAC_UTILS+=utils/color.o utils/os_module.o utils/math.o utils/path2d.o utils/path2d_stroker.o utils/module.o utils/uni_bidi.o utils/ringbuffer.o utils/unicode.o utils/map.o 
 endif
 
 ## libgpac objects gathering: src/ietf
@@ -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
+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 objects gathering: src/mcrypt
 LIBGPAC_MCRYPT=
@@ -91,7 +91,7 @@
 LIBGPAC_MEDIATOOLS+=media_tools/m3u8.o media_tools/mpd.o
 endif
 ifeq ($(DISABLE_DASH_CLIENT), no)
-LIBGPAC_MEDIATOOLS+=media_tools/dash_client.o
+LIBGPAC_MEDIATOOLS+=media_tools/dash_client.o 
 endif
 ifeq ($(DISABLE_MEDIA_EXPORT), no)
 LIBGPAC_MEDIATOOLS+=media_tools/media_export.o
@@ -134,6 +134,13 @@
 LIBGPAC_MEDIATOOLS+=media_tools/text_import.o
 endif
 
+ifeq ($(DISABLE_PLAYER), no)
+LIBGPAC_MEDIATOOLS+=media_tools/html5_media.o media_tools/html5_mse.o
+ifeq ($(DISABLE_TTXT), no)
+LIBGPAC_MEDIATOOLS+=media_tools/webvtt.o
+endif
+endif
+
 
 ## libgpac objects gathering: src/scene_manager
 LIBGPAC_SCENEMANAGER=
@@ -193,13 +200,259 @@
 LIBGPAC_LASER=laser/lsr_enc.o laser/lsr_dec.o laser/lsr_tables.o
 endif
 
-## libgpac objects gathering: la totale ...
+## libgpac objects gathering: 
 OBJS=$(LIBGPAC_UTILS) $(LIBGPAC_MCRYPT) $(LIBGPAC_SCENE) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ISOM) $(LIBGPAC_ODF) $(LIBGPAC_MEDIATOOLS) $(LIBGPAC_SCENEMANAGER) $(LIBGPAC_TERMINAL) $(LIBGPAC_COMPOSITOR) $(LIBGPAC_LASER)
 
+
+# configure static modules
+ifeq ($(STATIC_MODULES), yes)
+
+CFLAGS+= -DGPAC_STATIC_MODULES
+
+OBJS+=../modules/aac_in/aac_in.o
+ifneq ($(CONFIG_FAAD), no)
+OBJS+=../modules/aac_in/faad_dec.o
+CFLAGS+=-DGPAC_HAS_FAAD
+EXTRALIBS+= -lfaad
+endif
+
+OBJS+=../modules/ac3_in/ac3_in.o
+ifneq ($(CONFIG_A52), no)
+OBJS+=../modules/ac3_in/liba52_dec.o
+CFLAGS+=-DGPAC_HAS_LIBA52
+EXTRALIBS+= -la52
+endif
+
+ifeq ($(CONFIG_ALSA), yes)
+OBJS+=../modules/alsa/alsa.o
+CFLAGS+=-DGPAC_HAS_ALSA
+EXTRALIBS+= -lasound
+endif
+
+OBJS+=../modules/audio_filter/audio_filter.o
+OBJS+=../modules/bifs_dec/bifs_dec.o
+
+ifeq ($(DISABLE_SMGR), no)
+OBJS+=../modules/ctx_load/ctx_load.o
+OBJS+=../modules/svg_in/svg_in.o
+endif
+
+OBJS+=../modules/dummy_in/dummy_in.o
+OBJS+=../modules/ismacryp/isma_ea.o
+ifneq ($(CONFIG_JS), no)
+CFLAGS+=$(JS_FLAGS)
+OBJS+=../modules/gpac_js/gpac_js.o
+endif
+ifeq ($(DISABLE_SVG), no)
+OBJS+=../modules/laser_dec/laser_dec.o
+endif
+OBJS+=../modules/soft_raster/ftgrays.o ../modules/soft_raster/raster_load.o ../modules/soft_raster/raster_565.o ../modules/soft_raster/raster_argb.o ../modules/soft_raster/raster_rgb.o ../modules/soft_raster/stencil.o ../modules/soft_raster/surface.o
+
+OBJS+=../modules/mp3_in/mp3_in.o
+ifneq ($(CONFIG_MAD), no)
+OBJS+=../modules/mp3_in/mad_dec.o
+CFLAGS+=-DGPAC_HAS_MAD
+EXTRALIBS+= -lmad
+endif
+OBJS+=../modules/isom_in/load.o ../modules/isom_in/read.o ../modules/isom_in/read_ch.o ../modules/isom_in/isom_cache.o
+OBJS+=../modules/odf_dec/odf_dec.o
+OBJS+=../modules/rtp_in/rtp_in.o ../modules/rtp_in/rtp_session.o ../modules/rtp_in/rtp_signaling.o ../modules/rtp_in/rtp_stream.o ../modules/rtp_in/sdp_fetch.o ../modules/rtp_in/sdp_load.o
+OBJS+=../modules/saf_in/saf_in.o
+ifeq ($(DISABLE_DASH_CLIENT), no)
+OBJS+=../modules/mpd_in/mpd_in.o
+ifneq ($(CONFIG_JS),no)
+OBJS+=../modules/mse_in/mse_in.o
+endif
+endif
+OBJS+=../modules/timedtext/timedtext_dec.o ../modules/timedtext/timedtext_in.o
+OBJS+=../modules/validator/validator.o
+OBJS+=../modules/raw_out/raw_video.o
+
+OBJS+=../modules/img_in/img_dec.o ../modules/img_in/img_in.o ../modules/img_in/bmp_dec.o ../modules/img_in/png_dec.o ../modules/img_in/jpeg_dec.o
+ifneq ($(CONFIG_JP2), no)
+OBJS+=../modules/img_in/jp2_dec.o
+EXTRALIBS+= -lopenjpeg
+CFLAGS+=-DGPAC_HAS_JP2
+endif
+
+ifneq ($(CONFIG_FT), no)
+OBJS+=../modules/ft_font/ft_font.o 
+EXTRALIBS+= $(FT_LIBS)
+CFLAGS+=-DGPAC_HAS_FREETYPE $(FT_CFLAGS)
+endif
+
+ifeq ($(DISABLE_MEDIA_IMPORT), no)
+OBJS+=../modules/mpegts_in/mpegts_in.o 
+endif
+
+ifeq ($(DISABLE_LOADER_BT), no)
+OBJS+=../modules/osd/osd.o
+endif
+
+#cf comment for openHEVC - we cannot build ffmpeg and openhevc as static modules for the current time :(
+ifneq ($(CONFIG_FFMPEG), no)
+ifneq ($(CONFIG_OPENHEVC),yes)
+OBJS+=../modules/ffmpeg_in/ffmpeg_decode.o ../modules/ffmpeg_in/ffmpeg_demux.o ../modules/ffmpeg_in/ffmpeg_load.o
+CFLAGS+=-DGPAC_HAS_FFMPEG -Wno-deprecated-declarations -I"$(SRC_PATH)/include" $(ffmpeg_cflags)
+EXTRALIBS+= $(ffmpeg_lflags)
+#fix it first
+#OBJS+=../modules/redirect_av/redirect_av.o  
+endif
+endif
+
+ifneq ($(CONFIG_XVID), no)
+OBJS+=../modules/xvid_dec/xvid_dec.o
+CFLAGS+=-DGPAC_HAS_XVID
+EXTRALIBS+= -lxvidcore 
+endif
+
+ifneq ($(CONFIG_OGG), no)
+OBJS+=../modules/ogg/ogg_load.o ../modules/ogg/ogg_in.o ../modules/ogg/theora_dec.o ../modules/ogg/vorbis_dec.o
+CFLAGS+=-DGPAC_HAS_OGG
+EXTRALIBS+= -logg
+ifneq ($(CONFIG_VORBIS), no)
+CFLAGS+=-DGPAC_HAS_VORBIS
+EXTRALIBS+= -lvorbis
+endif
+ifneq ($(CONFIG_THEORA), no)
+CFLAGS+=-DGPAC_HAS_THEORA
+EXTRALIBS+= -ltheora
+endif
+
+endif
+
+
+ifeq ($(CONFIG_SDL), yes)
+CFLAGS+=-DGPAC_HAS_SDL $(SDL_CFLAGS)
+EXTRALIBS+= $(SDL_LIBS)
+OBJS+=../modules/sdl_out/sdl_out.o ../modules/sdl_out/audio.o ../modules/sdl_out/video.o
+endif
+
+
+ifeq ($(DISABLE_SVG), no)
+OBJS+=../modules/widgetman/widgetman.o ../modules/widgetman/unzip.o ../modules/widgetman/widget.o ../modules/widgetman/wgt_load.o
+endif
+
+ifeq ($(CONFIG_OPENSVC),yes)
+OBJS+= ../modules/opensvc_dec/opensvc_dec.o
+CFLAGS+=-DGPAC_HAS_OPENSVC $(OSVC_CFLAGS)
+EXTRALIBS+=$(OSVC_LDFLAGS)
+endif
+
+#cannot include openhevc and ffmpeg (yet) here since it uses avcodec_* calls which are relocated to libavcodec.so ...
+ifeq ($(CONFIG_OPENHEVC),yes)
+ifeq ($(CONFIG_FFMPEG), no)
+OBJS+= ../modules/openhevc_dec/openhevc_dec.o
+CFLAGS+=-DGPAC_HAS_OPENHEVC $(OHEVC_CFLAGS)
+EXTRALIBS+=$(OHEVC_LDFLAGS)
+endif
+endif
+
+ifeq ($(CONFIG_X11),yes)
+OBJS+= ../modules/x11_out/x11_out.o
+CFLAGS+=-DGPAC_HAS_X11
+ifneq ($(X11_INC_PATH), )
+CFLAGS+=-I$(X11_INC_PATH)
+endif
+
+ifneq ($(X11_LIB_PATH), )
+EXTRALIBS+=-L$(X11_LIB_PATH)
+endif
+EXTRALIBS+=-lX11
+
+ifeq ($(USE_X11_XV), yes)
+CFLAGS+=-DGPAC_HAS_X11_XV
+EXTRALIBS+=-lXv
+endif
+
+ifeq ($(USE_X11_XV), yes)
+CFLAGS+=-DGPAC_HAS_X11_XV
+EXTRALIBS+=-lXv
+endif
+
+ifeq ($(USE_X11_SHM), yes)
+CFLAGS+=-DGPAC_HAS_X11_SHM
+EXTRALIBS+=-lXext
+endif
+
+ifeq ($(HAS_OPENGL), yes)
+ifeq ($(CONFIG_DARWIN),yes)
+EXTRALIBS+=-lGL -lGLU
+endif
+endif
+
+#end of x11
+endif
+
+
+ifeq ($(CONFIG_JACK), yes)
+OBJS+= ../modules/jack/jack.o
+CFLAGS+=-DGPAC_HAS_JACK
+EXTRALIBS+=-ljack
+endif
+
+ifneq ($(CONFIG_OSS_AUDIO), no)
+OBJS+= ../modules/oss_audio/oss.o
+CFLAGS+=-DGPAC_HAS_OSS $(OSS_CFLAGS)
+EXTRALIBS+=$(OSS_LDFLAGS)
+ifneq ($(OSS_INC_TYPE), yes)
+CFLAGS+=-DOSS_FIX_INC
+endif
+ifeq ($(TARGET_ARCH_ARMV4L), yes)
+CFLAGS+=-DFORCE_SR_LIMIT
+endif
+
+endif
+
+
+ifeq ($(CONFIG_PULSEAUDIO), yes)
+OBJS+= ../modules/pulseaudio/pulseaudio.o
+CFLAGS+=-DGPAC_HAS_PULSEAUDIO
+EXTRALIBS+=-lpulse -lpulse-simple
+endif
+
+
+ifeq ($(CONFIG_DIRECTFB),yes)
+OBJS+= ../modules/directfb_out/directfb_out.o ../modules/directfb_out/directfb_wrapper.o
+CFLAGS+=-DGPAC_HAS_DIRECTFB -I$(DIRECTFB_INC_PATH)
+EXTRALIBS+=$(DIRECTFB_LIB)
+endif
+
+ifeq ($(CONFIG_WIN32),yes)
+OBJS+= ../modules/wav_out/wav_out.o
+EXTRALIBS+=-DGPAC_HAS_WAVEOUT -DDISABLE_WAVE_EX
+endif
+
+ifeq ($(CONFIG_DIRECTX),yes)
+OBJS+= ../dx_hw/dx_hw/dx_audio.o  ../dx_hw/dx_hw/dx_video.o  ../dx_hw/dx_hw/dx_window.o  ../dx_hw/dx_hw/dx_2d.o  ../dx_hw/dx_hw/copy_pixels.o
+CFLAGS+=-DGPAC_HAS_DIRECTX -DDIRECTSOUND_VERSION=0x0500
+ifneq ($(DX_PATH), system)
+EXTRALIBS+=-L$(DX_PATH)/lib
+CFLAGS+= -I$(DX_PATH)/include
+endif
+EXTRALIBS+=-ldsound -ldxguid -lddraw -lole32 -lgdi32 -lopengl32
+endif
+
+
+ifneq ($(CONFIG_FREENECT), no)
+OBJS+= ../modules/freenect/freenect.o
+CFLAGS+=-DGPAC_HAS_FREENECT $(FREENECT_CFLAGS)
+ifeq ($(CONFIG_FREENECT), local)
+CFLAGS+= -I"$(LOCAL_INC_PATH)"
+EXTRALIBS+=-L../../extra_lib/lib/gcc
+endif
+EXTRALIBS+=-lfreenect
+endif
+
+#end of static modules
+
+endif
+
+
 NEED_LOCAL_LIB="no"
 LINKLIBS=
 SCENEGRAPH_CFLAGS=
-MEDIATOOLS_CFLAGS=
+MEDIATOOLS_CFLAGS=$(JS_FLAGS)
 
 ifeq ($(DISABLE_CORE_TOOLS), no)
 
@@ -303,7 +556,7 @@
 #LDFLAGS+=-export-symbols libgpac.def
 else
 ifeq ($(CONFIG_DARWIN),yes)
-LDFLAGS+=-install_name $(prefix)/lib/$(LIB)
+LDFLAGS+=-dynamiclib -install_name $(prefix)/lib/$(LIB)
 endif
 EXTRALIBS+=$(GPAC_SH_FLAGS)
 endif
@@ -340,6 +593,8 @@
 
 $(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"
+	@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

gpac-0.5.0.svn4296.tar.bz2/src/bifs/com_dec.c -> gpac-0.5.0.svn4668.tar.bz2/src/bifs/com_dec.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/bifs/field_decode.c -> gpac-0.5.0.svn4668.tar.bz2/src/bifs/field_decode.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/bifs/field_encode.c -> gpac-0.5.0.svn4668.tar.bz2/src/bifs/field_encode.c Changed

@@ -103,17 +103,17 @@
 			GF_BIFS_WRITE_INT(codec, bs, size, val, "length", NULL);
 			gf_f64_seek(f, 0, SEEK_SET);
 			while (size) {
-				u32 read = fread(buf, 1, 4096, f);
+				u32 read = (u32) fread(buf, 1, 4096, f);
 				gf_bs_write_data(bs, buf, read);
 				size -= read;
 			}
 		} else {
-			u32 i, len, val;
+			u32 i, val, len;
 			char *str = (char *) ((SFString*)field->far_ptr)->buffer;
 			if (node && (node->sgprivate->tag==TAG_MPEG4_BitWrapper) ) {
 				len = ((M_BitWrapper*)node)->buffer_len;
 			} else {
-				len = str ? strlen(str) : 0;
+				len = str ? (u32) strlen(str) : 0;
 			}
 			val = gf_get_bit_size(len);
 			GF_BIFS_WRITE_INT(codec, bs, val, 5, "nbBits", NULL);
@@ -146,8 +146,7 @@
 		if (url->OD_ID>0) {
 			GF_BIFS_WRITE_INT(codec, bs, url->OD_ID, 10, "ODID", "SFURL");
 		} else {
-			u32 i;
-			u32 len = url->url ? strlen(url->url) : 0;
+			u32 i, len = url->url ? (u32) strlen(url->url) : 0;
 			u32 val = gf_get_bit_size(len);
 			GF_BIFS_WRITE_INT(codec, bs, val, 5, "nbBits", NULL);
 			GF_BIFS_WRITE_INT(codec, bs, len, val, "length", NULL);

gpac-0.5.0.svn4296.tar.bz2/src/bifs/quantize.c -> gpac-0.5.0.svn4668.tar.bz2/src/bifs/quantize.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/bifs/script_dec.c -> gpac-0.5.0.svn4668.tar.bz2/src/bifs/script_dec.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/bifs/script_enc.c -> gpac-0.5.0.svn4668.tar.bz2/src/bifs/script_enc.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/compositor/audio_render.c -> gpac-0.5.0.svn4668.tar.bz2/src/compositor/audio_render.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/compositor/camera.c -> gpac-0.5.0.svn4668.tar.bz2/src/compositor/camera.c Changed

@@ -204,15 +204,15 @@
 
 			viewing_distance = nominal_view_distance;
 
-			wd2 = cam->z_near * gf_tan(cam->fieldOfView/2);
+			wd2 = gf_mulfix(cam->z_near, gf_tan(cam->fieldOfView/2));
 			ndfl = gf_divfix(cam->z_near, viewing_distance);
 			/*compute h displacement*/
 			shift = gf_mulfix(horizontal_shift, ndfl);
 
 			top = wd2;
 			bottom = -top;
-			left = -ar * wd2 - shift;
-			right = ar * wd2 - shift;
+			left = -gf_mulfix(ar, wd2) - shift;
+			right = gf_mulfix(ar, wd2) - shift;
 
 			gf_mx_init(cam->projection);
 			cam->projection.m[0] = gf_divfix(2*cam->z_near, (right-left));
@@ -231,7 +231,7 @@
 
 			gf_vec_diff(center, cam->world_bbox.center, cam->position);
 			vlen = gf_vec_len(center);
-			shift = horizontal_shift * vlen / viewing_distance;
+			shift = gf_mulfix(horizontal_shift, gf_divfix(vlen, viewing_distance));
 
 			pos = gf_vec_scale(disp, shift);
 			gf_vec_add(pos, pos, cam->position);
@@ -247,7 +247,7 @@
 		}
 
 		if (!center_coords) {
-			gf_mx_add_scale(&post_model_view, 1, -1, 1);
+			gf_mx_add_scale(&post_model_view, FIX_ONE, -FIX_ONE, FIX_ONE);
 			gf_mx_add_translation(&post_model_view, -cam->width / 2, -cam->height / 2, 0);
 		}
 
@@ -282,7 +282,7 @@
 #endif
 
 		if (!center_coords) {
-			gf_mx_add_scale(&post_model_view, 1, -1, 1);
+			gf_mx_add_scale(&post_model_view, FIX_ONE, -FIX_ONE, FIX_ONE);
 			gf_mx_add_translation(&post_model_view, -hw, -hh, 0);
 		}
 		if (user_transform) {
@@ -321,6 +321,7 @@
 
 		gf_vec_diff(center, cam->world_bbox.center, cam->position);
 		vlen = gf_vec_len(center);
+		vlen += gf_mulfix(view_distance_offset, gf_divfix(vlen, nominal_view_distance));
 
 		gf_vec_diff(pos, cam->target, cam->position);
 		gf_vec_norm(&pos);
@@ -343,7 +344,7 @@
 
 		gf_vec_diff(center, cam->world_bbox.center, cam->position);
 		vlen = gf_vec_len(center);
-		vlen += view_distance_offset * (vlen/nominal_view_distance);
+		vlen += gf_mulfix(view_distance_offset, gf_divfix(vlen, nominal_view_distance));
 	
 		gf_vec_diff(eye, cam->target, cam->position);
 		gf_vec_norm(&eye);
@@ -353,7 +354,7 @@
 		disp = gf_vec_cross(eye, cam->up);
 		gf_vec_norm(&disp);
 
-		disp= gf_vec_scale(disp, vlen*horizontal_shift/viewing_distance);
+		disp= gf_vec_scale(disp, gf_divfix(gf_mulfix(vlen, horizontal_shift), viewing_distance));
 		gf_vec_add(pos, cam->position, disp);
 
 		gf_mx_lookat(&cam->modelview, pos, tar, cam->up);

gpac-0.5.0.svn4296.tar.bz2/src/compositor/compositor.c -> gpac-0.5.0.svn4668.tar.bz2/src/compositor/compositor.c Changed

@@ -95,7 +95,7 @@
 static void gf_sc_reconfig_task(GF_Compositor *compositor)
 {
 	GF_Event evt;
-	Bool notif_size=0;
+	Bool notif_size=GF_FALSE;
 	u32 width,height;
 	
 	/*reconfig audio if needed (non-threaded compositors)*/
@@ -178,7 +178,10 @@
 		u32 k=0;
 		GF_VideoListener *l;
 		while ((l = gf_list_enum(compositor->video_listeners, &k))) {
-			l->on_video_reconfig(l->udta, compositor->display_width, compositor->display_height);
+			if ( compositor->user && (compositor->user->init_flags & GF_TERM_WINDOW_TRANSPARENT) )
+				l->on_video_reconfig(l->udta, compositor->display_width, compositor->display_height, 4);
+			else
+				l->on_video_reconfig(l->udta, compositor->display_width, compositor->display_height, 3);
 		}
 	}
 
@@ -204,7 +207,7 @@
 	gf_sc_simulation_tick(compositor);
 	if (compositor->frame_draw_type) return 1;
 	if (compositor->fonts_pending) return 1;
-	return 0;
+	return GF_FALSE;
 }
 
 
@@ -223,7 +226,7 @@
 static void gf_sc_reset_framerate(GF_Compositor *compositor)
 {
 	u32 i;
-	for (i=0; i<GF_SR_FPS_COMPUTE_SIZE; i++) compositor->frame_time[i] = 0;
+	for (i=0; i<GF_SR_FPS_COMPUTE_SIZE; i++) compositor->frame_time[i] = compositor->frame_dur[i] = 0;
 	compositor->current_frame = 0;
 }
 
@@ -237,7 +240,7 @@
 	if (!ifce->surface_clear || !ifce->surface_set_path || !ifce->surface_fill) return 0;
 	/*check we can init a surface with the current driver (the rest is optional)*/
 	if (ifce->surface_attach_to_buffer) return 1;
-	return 0;
+	return GF_FALSE;
 }
 
 static GF_Err gf_sc_load(GF_Compositor *compositor)
@@ -262,7 +265,7 @@
 	compositor->visual->GetSurfaceAccess = compositor_2d_get_video_access;
 	compositor->visual->ReleaseSurfaceAccess = compositor_2d_release_video_access;
 	if (compositor->video_out->FlushRectangles)
-		compositor->visual->direct_flush = 1;
+		compositor->visual->direct_flush = GF_TRUE;
 
 	compositor_2d_init_callbacks(compositor);
 
@@ -286,7 +289,7 @@
 #ifndef GPAC_DISABLE_3D
 	/*default collision mode*/
 	compositor->collide_mode = GF_COLLISION_DISPLACEMENT; //GF_COLLISION_NORMAL
-	compositor->gravity_on = 1;
+	compositor->gravity_on = GF_TRUE;
 
 	/*create default unit sphere and box for bounds*/
 	compositor->unit_bbox = new_mesh();
@@ -505,8 +508,7 @@
 	}
 	
 	if ((tmp->user->init_flags & GF_TERM_NO_REGULATION) || !tmp->VisualThread)
-		tmp->no_regulation = 1;
-
+		tmp->no_regulation = GF_TRUE;
 
 	/*set default size if owning output*/
 	if (!tmp->user->os_window_handler) {
@@ -514,7 +516,7 @@
 	}
 	/*try to load GL extensions*/
 #ifndef GPAC_DISABLE_3D
-	gf_sc_load_opengl_extensions(tmp, 0);
+	gf_sc_load_opengl_extensions(tmp, GF_FALSE);
 #endif
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_RTI, ("[RTI]\tCompositor Cycle Log\tNetworks\tDecoders\tFrame\tDirect Draw\tVisual Config\tEvent\tRoute\tSMIL Timing\tTime node\tTexture\tSMIL Anim\tTraverse setup\tTraverse (and direct Draw)\tTraverse (and direct Draw) without anim\tIndirect Draw\tTraverse And Draw (Indirect or Not)\tFlush\tCycle\n"));
@@ -527,15 +529,15 @@
 	if (!compositor) return;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Destroying\n"));
-	gf_sc_lock(compositor, 1);
+	gf_sc_lock(compositor, GF_TRUE);
 
 	if (compositor->VisualThread) {
 		if (compositor->video_th_state == GF_COMPOSITOR_THREAD_RUN) {
 			compositor->video_th_state = GF_COMPOSITOR_THREAD_ABORTING;
 			while (compositor->video_th_state != GF_COMPOSITOR_THREAD_DONE) {
-				gf_sc_lock(compositor, 0);
+				gf_sc_lock(compositor, GF_FALSE);
 				gf_sleep(1);
-				gf_sc_lock(compositor, 1);
+				gf_sc_lock(compositor, GF_TRUE);
 			}
 		}
 		gf_th_del(compositor->VisualThread);
@@ -612,7 +614,7 @@
 	if (compositor->extra_scenes) gf_list_del(compositor->extra_scenes);
 	if (compositor->video_listeners) gf_list_del(compositor->video_listeners);
 	
-	gf_sc_lock(compositor, 0);
+	gf_sc_lock(compositor, GF_FALSE);
 	gf_mx_del(compositor->mx);
 	gf_free(compositor);
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Destroyed\n"));
@@ -836,12 +838,12 @@
 
 	/*set current graph*/
 	compositor->scene = scene_graph;
-	do_notif = 0;
+	do_notif = GF_FALSE;
 	if (scene_graph) {
 #ifndef GPAC_DISABLE_SVG
 		SVG_Length *w, *h;
 		SVG_ViewBox *vb;
-		Bool is_svg = 0;
+		Bool is_svg = GF_FALSE;
 		u32 tag;
 		GF_Node *top_node;
 #endif
@@ -996,6 +998,7 @@
 	Bool lock_ok;
 	if (!NewWidth || !NewHeight) {
 		compositor->override_size_flags &= ~2;
+		compositor->msg_type |= GF_SR_CFG_AR;
 		return GF_OK;
 	}
 	/*EXTRA CARE HERE: the caller (user app) is likely a different thread than the compositor one, and depending on window 
@@ -1141,6 +1144,7 @@
 
 #ifdef OPENGL_RASTER
 	compositor->opengl_raster = (sOpt && !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", "DefaultNavigationMode");
@@ -1186,7 +1190,7 @@
 	else compositor->draw_normals = GF_NORMALS_NONE;
 
 	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "DisableGLUScale");
-	compositor->disable_glu_scale = (sOpt && !stricmp(sOpt, "yes") ) ? 1 : 0;	
+    compositor->disable_glu_scale = (sOpt && !stricmp(sOpt, "yes") ) ? 1 : 0;
 
 	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "DisableRectExt");
 	compositor->disable_rect_ext = (sOpt && !stricmp(sOpt, "yes") ) ? 1 : 0;
@@ -1260,8 +1264,8 @@
 
 	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "CameraLayout");
 	if (!sOpt) {
-		sOpt = "OffAxis";
-		gf_cfg_set_key(compositor->user->config, "Compositor", "CameraLayout", "OffAxis");
+		sOpt = "Straight";
+		gf_cfg_set_key(compositor->user->config, "Compositor", "CameraLayout", "Straight");
 	}
 	if (!strcmp(sOpt, "Linear")) compositor->visual->camera_layout = GF_3D_CAMERA_LINEAR;
 	else if (!strcmp(sOpt, "Circular")) compositor->visual->camera_layout = GF_3D_CAMERA_CIRCULAR;
@@ -1716,15 +1720,17 @@
 	Double fps;
 	u32 ind, 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_time[ind];
+	run_time = compositor->frame_dur[ind];
 	for (num=0; num<GF_SR_FPS_COMPUTE_SIZE; num++) {
 		if (absoluteFPS) {
-			run_time += compositor->frame_time[ind];
+			run_time += compositor->frame_dur[ind];
 		} else {
-			run_time += MAX(compositor->frame_time[ind], compositor->frame_duration);
+			run_time += MAX(compositor->frame_dur[ind], compositor->frame_duration);
 		}
 		frames++;
 		if (frames==GF_SR_FPS_COMPUTE_SIZE) break;
@@ -1734,6 +1740,20 @@
 			ind--;
 		}
 	}
+#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);
+
 	if (!run_time) return (Double) compositor->frame_rate;
 	fps = 1000*frames;
 	fps /= run_time;
@@ -1977,6 +1997,7 @@
 	s32 event_time, route_time, smil_timing_time=0, time_node_time, texture_time, traverse_time, flush_time;
 #endif
 
+	in_time = gf_sys_clock();
 	/*lock compositor for the whole cycle*/
 	gf_sc_lock(compositor, 1);
 
@@ -1999,8 +2020,6 @@
 		return;
 	}
 
-	in_time = gf_sys_clock();
-
 	if (compositor->reset_graphics) {
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);		
 		visual_reset_graphics(compositor->visual);
@@ -2138,6 +2157,7 @@
 	/*setup root visual BEFORE updating the texture, because of potential composite texture */
 	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();
 #endif
@@ -2150,6 +2170,13 @@
 		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
+	//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;
 
@@ -2194,7 +2221,7 @@
 			traverse_time = gf_sys_clock() - traverse_time;
 #endif
 
-			if (compositor->video_listeners && !compositor->skip_flush) {
+			if (compositor->video_listeners && compositor->skip_flush!=1) {
 				u32 k=0;
 				GF_VideoListener *l;
 				while ((l = gf_list_enum(compositor->video_listeners, &k))) {
@@ -2279,7 +2306,8 @@
 
 	if (frame_drawn) {
 		compositor->current_frame = (compositor->current_frame+1) % GF_SR_FPS_COMPUTE_SIZE;
-		compositor->frame_time[compositor->current_frame] = end_time;
+		compositor->frame_dur[compositor->current_frame] = end_time;
+		compositor->frame_time[compositor->current_frame] = compositor->last_frame_time;
 		compositor->frame_number++;
 	}
 
@@ -2297,7 +2325,11 @@
 #endif
 
 	/*not threaded, let the owner decide*/
-	if (compositor->no_regulation) return;
+	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);
+		return;
+	}
 
 	/*TO CHECK - THERE WAS A BUG HERE WITH TRISCOPE@SHIX*/
 	if (end_time > compositor->frame_duration) {
@@ -2560,11 +2592,11 @@
 		retry--;
 		gf_sleep(1);
 		if (!retry) {
-			return 0;
+			return GF_FALSE;
 		}
 	}
 	ret = gf_sc_exec_event(compositor, event);
-	gf_sc_lock(compositor, 0);
+	gf_sc_lock(compositor, GF_FALSE);
 
 	if (!from_user) {
 	}
@@ -2587,7 +2619,7 @@
 static Bool gf_sc_on_event_ex(GF_Compositor *compositor , GF_Event *event, Bool from_user)
 {
 	/*not assigned yet*/
-	if (!compositor || !compositor->visual) return 0;
+	if (!compositor || !compositor->visual) return GF_FALSE;
 	/*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) {
@@ -2595,7 +2627,7 @@
 			if (event->setup.back_buffer) 
 				compositor->recompute_ar = 1;
 		}
-		return 0;
+		return GF_FALSE;
 	}
 	switch (event->type) {
 	case GF_EVENT_MOVE:
@@ -2626,7 +2658,7 @@
 	case GF_EVENT_SIZE:
 		/*user consummed the resize event, do nothing*/
 		if ( gf_term_send_event(compositor->term, event) ) 
-			return 1;
+			return GF_TRUE;
 
 		/*not consummed and compositor "owns" the output window (created by the output module), resize*/
 		if (!compositor->user->os_window_handler) {
@@ -2643,9 +2675,9 @@
 				/*remove pending resize notif*/
 				compositor->msg_type = 0;
 			}
-			if (lock_ok) gf_sc_lock(compositor, 0);
+			if (lock_ok) gf_sc_lock(compositor, GF_FALSE);
 		}
-		return 0;
+		return GF_FALSE;
 
 	case GF_EVENT_KEYDOWN:
 	case GF_EVENT_KEYUP:
@@ -2676,11 +2708,11 @@
 		
 		}	
 	
-		ret = 0;
+		ret = GF_FALSE;
 		event->key.flags |= compositor->key_states;
 		/*key sensor*/
 		if (compositor->term && (compositor->interaction_level & GF_INTERACT_INPUT_SENSOR) ) {
-			ret = gf_term_keyboard_input(compositor->term, event->key.key_code, event->key.hw_code, (event->type==GF_EVENT_KEYUP) ? 1 : 0);
+			ret = gf_term_keyboard_input(compositor->term, event->key.key_code, event->key.hw_code, (event->type==GF_EVENT_KEYUP) ? GF_TRUE : GF_FALSE);
 		}			
 		ret += gf_sc_handle_event_intern(compositor, event, from_user);
 		return ret;
@@ -2693,7 +2725,7 @@
 		return gf_sc_handle_event_intern(compositor, event, from_user);
 	/*switch fullscreen off!!!*/
 	case GF_EVENT_SHOWHIDE:
-		compositor->is_hidden = event->show.show_type ? 0 : 1;
+		compositor->is_hidden = event->show.show_type ? GF_FALSE : GF_TRUE;
 		break;
 
 	case GF_EVENT_SET_CAPTION:
@@ -2723,12 +2755,12 @@
 		return gf_term_send_event(compositor->term, event);
 	}
 	/*if we get here, event has been consumed*/
-	return 1;
+	return GF_TRUE;
 }
 
 static Bool gf_sc_on_event(void *cbck, GF_Event *event)
 {
-	return gf_sc_on_event_ex((GF_Compositor *)cbck, event, 0);
+	return gf_sc_on_event_ex((GF_Compositor *)cbck, event, GF_FALSE);
 }
 
 Bool gf_sc_user_event(GF_Compositor *compositor, GF_Event *event)
@@ -2738,19 +2770,19 @@
 	case GF_EVENT_MOVE:
 	case GF_EVENT_SET_CAPTION:
 		compositor->video_out->ProcessEvent(compositor->video_out, event);
-		return 0;
+		return GF_FALSE;
 	default:
-		return gf_sc_on_event_ex(compositor, event, 1);
+		return gf_sc_on_event_ex(compositor, event, GF_TRUE);
 	}
 }
 
 GF_EXPORT
 void gf_sc_register_extra_graph(GF_Compositor *compositor, GF_SceneGraph *extra_scene, Bool do_remove)
 {
-	gf_sc_lock(compositor, 1);
+	gf_sc_lock(compositor, GF_TRUE);
 	if (do_remove) gf_list_del_item(compositor->extra_scenes, extra_scene);
 	else if (gf_list_find(compositor->extra_scenes, extra_scene)<0) gf_list_add(compositor->extra_scenes, extra_scene);
-	gf_sc_lock(compositor, 0);
+	gf_sc_lock(compositor, GF_FALSE);
 }
 
 
@@ -2763,28 +2795,28 @@
 Bool gf_sc_script_action(GF_Compositor *compositor, u32 type, GF_Node *n, GF_JSAPIParam *param)
 {
 	switch (type) {
-	case GF_JSAPI_OP_GET_SCALE: param->val = compositor->zoom; return 1;
-	case GF_JSAPI_OP_SET_SCALE: compositor_2d_set_user_transform(compositor, param->val, compositor->trans_x, compositor->trans_y, 0); return 1;
-	case GF_JSAPI_OP_GET_ROTATION: param->val = gf_divfix(180*compositor->rotation, GF_PI); return 1;
-	case GF_JSAPI_OP_SET_ROTATION: compositor->rotation = gf_mulfix(GF_PI, param->val/180); compositor_2d_set_user_transform(compositor, compositor->zoom, compositor->trans_x, compositor->trans_y, 0); return 1;
-	case GF_JSAPI_OP_GET_TRANSLATE: param->pt.x = compositor->trans_x; param->pt.y = compositor->trans_y; return 1;
-	case GF_JSAPI_OP_SET_TRANSLATE: compositor_2d_set_user_transform(compositor, compositor->zoom, param->pt.x, param->pt.y, 0); return 1;
+	case GF_JSAPI_OP_GET_SCALE: param->val = compositor->zoom; return GF_TRUE;
+	case GF_JSAPI_OP_SET_SCALE: compositor_2d_set_user_transform(compositor, param->val, compositor->trans_x, compositor->trans_y, GF_FALSE); return GF_TRUE;
+	case GF_JSAPI_OP_GET_ROTATION: param->val = gf_divfix(180*compositor->rotation, GF_PI); return GF_TRUE;
+	case GF_JSAPI_OP_SET_ROTATION: compositor->rotation = gf_mulfix(GF_PI, param->val/180); compositor_2d_set_user_transform(compositor, compositor->zoom, compositor->trans_x, compositor->trans_y, GF_FALSE); return GF_TRUE;
+	case GF_JSAPI_OP_GET_TRANSLATE: param->pt.x = compositor->trans_x; param->pt.y = compositor->trans_y; return GF_TRUE;
+	case GF_JSAPI_OP_SET_TRANSLATE: compositor_2d_set_user_transform(compositor, compositor->zoom, param->pt.x, param->pt.y, GF_FALSE); return GF_TRUE;
 	/*FIXME - better SMIL timelines support*/
-	case GF_JSAPI_OP_GET_TIME: param->time = gf_node_get_scene_time(n); return 1;
-	case GF_JSAPI_OP_SET_TIME: /*seek_to(param->time);*/ return 0;
+	case GF_JSAPI_OP_GET_TIME: param->time = gf_node_get_scene_time(n); return GF_TRUE;
+	case GF_JSAPI_OP_SET_TIME: /*seek_to(param->time);*/ return GF_FALSE;
 	/*FIXME - this will not work for inline docs, we will have to store the clipper at the <svg> level*/
 	case GF_JSAPI_OP_GET_VIEWPORT: 
 #ifndef GPAC_DISABLE_SVG
-		if (compositor_svg_get_viewport(n, &param->rc)) return 1;
+		if (compositor_svg_get_viewport(n, &param->rc)) return GF_TRUE;
 #endif
 		param->rc = gf_rect_center(compositor->traverse_state->vp_size.x, compositor->traverse_state->vp_size.y); 
 		if (!compositor->visual->center_coords) {
 			param->rc.x = 0;
 			param->rc.y = 0;
 		}
-		return 1;
-	case GF_JSAPI_OP_SET_FOCUS: compositor->focus_node = param->node; return 1;
-	case GF_JSAPI_OP_GET_FOCUS: param->node = compositor->focus_node; return 1;
+		return GF_TRUE;
+	case GF_JSAPI_OP_SET_FOCUS: compositor->focus_node = param->node; return GF_TRUE;
+	case GF_JSAPI_OP_GET_FOCUS: param->node = compositor->focus_node; return GF_TRUE;
 
 	/*same routine: traverse tree from root to target, collecting both bounds and transform matrix*/
 	case GF_JSAPI_OP_GET_LOCAL_BBOX:
@@ -2797,7 +2829,7 @@
 		tr_state.visual = compositor->visual;
 		tr_state.vp_size = compositor->traverse_state->vp_size;
 		tr_state.for_node = n;
-		tr_state.ignore_strike = 1;
+		tr_state.ignore_strike = GF_TRUE;
 		tr_state.min_hsize = compositor->traverse_state->min_hsize;
 		tr_state.pixel_metrics = compositor->traverse_state->pixel_metrics;
 		gf_mx2d_init(tr_state.transform);
@@ -2808,7 +2840,7 @@
 #ifndef GPAC_DISABLE_SVG
 			GF_SAFEALLOC(tr_state.svg_props, SVGPropertiesPointers);
 			gf_svg_properties_init_pointers(tr_state.svg_props);
-			tr_state.abort_bounds_traverse=1;
+			tr_state.abort_bounds_traverse = GF_TRUE;
 			gf_node_traverse(n, &tr_state);
 			gf_svg_properties_reset_pointers(tr_state.svg_props);
 			gf_free(tr_state.svg_props);
@@ -2816,8 +2848,8 @@
 		} else {
 			gf_node_traverse(gf_sg_get_root_node(compositor->scene), &tr_state);
 		}
-		if (!tr_state.bounds.height && !tr_state.bounds.width && !tr_state.bounds.x && !tr_state.bounds.height)
-			tr_state.abort_bounds_traverse=0;
+		if (!tr_state.bounds.height && !tr_state.bounds.width && !tr_state.bounds.x && !tr_state.bounds.y)
+			tr_state.abort_bounds_traverse = GF_FALSE;
 
 		gf_mx2d_pre_multiply(&tr_state.mx_at_node, &compositor->traverse_state->transform);
 
@@ -2829,27 +2861,27 @@
 			gf_mx2d_apply_rect(&tr_state.mx_at_node, &tr_state.bounds);
 			gf_bbox_from_rect(&param->bbox, &tr_state.bounds);
 		}
-		if (!tr_state.abort_bounds_traverse) param->bbox.is_set = 0;
+		if (!tr_state.abort_bounds_traverse) param->bbox.is_set = GF_FALSE;
 	}
-		return 1;
+		return GF_TRUE;
 	case GF_JSAPI_OP_LOAD_URL:
 	{
 #ifndef GPAC_DISABLE_VRML
 		GF_Node *target;
 		char *sub_url = strrchr(param->uri.url, '#');
-		if (!sub_url) return 0;
+		if (!sub_url) return GF_FALSE;
 		target = gf_sg_find_node_by_name(gf_node_get_graph(n), sub_url+1);
 		if (target && (gf_node_get_tag(target)==TAG_MPEG4_Viewport) ) {
 			((M_Viewport *)target)->set_bind = 1;
 			((M_Viewport *)target)->on_set_bind(n, NULL);
-			return 1;
+			return GF_TRUE;
 		}
 #endif
-		return 0;
+		return GF_FALSE;
 	}
 	case GF_JSAPI_OP_GET_FPS:
-		param->time = gf_sc_get_fps(compositor, 0);
-		return 1;
+		param->time = gf_sc_get_fps(compositor, GF_FALSE);
+		return GF_TRUE;
 	case GF_JSAPI_OP_GET_SPEED:
 		param->time = 0;
 #ifndef GPAC_DISABLE_3D
@@ -2857,41 +2889,41 @@
 			param->time = FIX2FLT(compositor->visual->camera.speed);
 		}
 #endif
-		return 1;
+		return GF_TRUE;
 	case GF_JSAPI_OP_PAUSE_SVG:
 		if (n) {
 			u32 tag = gf_node_get_tag(n);
 			switch(tag) {
 #ifndef GPAC_DISABLE_SVG
-			case TAG_SVG_audio: svg_pause_audio(n, 1); break;
-			case TAG_SVG_video: svg_pause_video(n, 1); break;
-			case TAG_SVG_animation: svg_pause_animation(n, 1); break;
+			case TAG_SVG_audio: svg_pause_audio(n, GF_TRUE); break;
+			case TAG_SVG_video: svg_pause_video(n, GF_TRUE); break;
+			case TAG_SVG_animation: svg_pause_animation(n, GF_TRUE); break;
 #endif
 			}
 		} else {
-			return 0;
+			return GF_FALSE;
 		}
-		return 1;
+		return GF_TRUE;
 	case GF_JSAPI_OP_RESUME_SVG:
 		{
 			u32 tag = gf_node_get_tag(n);
 			switch(tag) {
 #ifndef GPAC_DISABLE_SVG
-			case TAG_SVG_audio: svg_pause_audio(n, 0); break;
-			case TAG_SVG_video: svg_pause_video(n, 0); break;
-			case TAG_SVG_animation: svg_pause_animation(n, 0); break;
+			case TAG_SVG_audio: svg_pause_audio(n, GF_FALSE); break;
+			case TAG_SVG_video: svg_pause_video(n, GF_FALSE); break;
+			case TAG_SVG_animation: svg_pause_animation(n, GF_FALSE); break;
 #endif
 			}
 		}
-		return 1;
+		return GF_TRUE;
 	case GF_JSAPI_OP_GET_DPI_X: 
 		param->opt = compositor->video_out->dpi_x;
-		return 1;
+		return GF_TRUE;
 	case GF_JSAPI_OP_GET_DPI_Y: 
 		param->opt = compositor->video_out->dpi_y;
-		return 1;
+		return GF_TRUE;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 Bool gf_sc_pick_in_clipper(GF_TraverseState *tr_state, GF_Rect *clip)
@@ -2905,9 +2937,9 @@
 		gf_mx_inverse(&mx);
 		r = tr_state->ray;
 		gf_mx_apply_ray(&mx, &r);
-		if (!compositor_get_2d_plane_intersection(&r, &pos)) return 0;
+		if (!compositor_get_2d_plane_intersection(&r, &pos)) return GF_FALSE;
 		if ( (pos.x < clip->x) || (pos.y > clip->y) 
-			|| (pos.x > clip->x + clip->width) || (pos.y < clip->y - clip->height) ) return 0;
+			|| (pos.x > clip->x + clip->width) || (pos.y < clip->y - clip->height) ) return GF_FALSE;
 
 	} else 
 #endif
@@ -2919,24 +2951,24 @@
 		pt.y = tr_state->ray.orig.y;
 
 		if ( (pt.x < rc.x) || (pt.y > rc.y) 
-			|| (pt.x > rc.x + rc.width) || (pt.y < rc.y - rc.height) ) return 0;
+			|| (pt.x > rc.x + rc.width) || (pt.y < rc.y - rc.height) ) return GF_FALSE;
 	}
-	return 1;
+	return GF_TRUE;
 }
 
 
 Bool gf_sc_has_text_selection(GF_Compositor *compositor)
 {
-	return (compositor->store_text_state==GF_SC_TSEL_FROZEN) ? 1 : 0;
+	return (compositor->store_text_state==GF_SC_TSEL_FROZEN) ? GF_TRUE : GF_FALSE;
 }
 
 const char *gf_sc_get_selected_text(GF_Compositor *compositor)
 {
 	const u16 *srcp;
-	u32 len;
+	size_t len;
 	if (compositor->store_text_state != GF_SC_TSEL_FROZEN) return NULL;
 
-	gf_sc_lock(compositor, 1);
+	gf_sc_lock(compositor, GF_TRUE);
 
 	compositor->traverse_state->traversing_mode = TRAVERSE_GET_TEXT;
 	if (compositor->sel_buffer) {
@@ -2951,12 +2983,12 @@
 	srcp = compositor->sel_buffer;
 	if (compositor->selected_text) gf_free(compositor->selected_text);
 	compositor->selected_text = gf_malloc(sizeof(char)*2*compositor->sel_buffer_len);
-	len = gf_utf8_wcstombs(compositor->selected_text, 2*compositor->sel_buffer_len, &srcp);
+	len = gf_utf8_wcstombs((char *) compositor->selected_text, 2*compositor->sel_buffer_len, &srcp);
 	if ((s32)len<0) len = 0;
 	compositor->selected_text[len] = 0;
-	gf_sc_lock(compositor, 0);
+	gf_sc_lock(compositor, GF_FALSE);
 
-	return compositor->selected_text;
+	return (const char *) compositor->selected_text;
 }
 
 
@@ -2968,7 +3000,7 @@
 	if (compositor->focus_node==n) {
 		compositor->focus_node = NULL;
 		compositor->focus_text_type = 0;
-		compositor->focus_uses_dom_events = 0;
+		compositor->focus_uses_dom_events = GF_FALSE;
 		gf_list_reset(compositor->focus_ancestors);
 		gf_list_reset(compositor->focus_use_stack);
 	}
@@ -2981,10 +3013,10 @@
 {
 	if (!sc|| !vl || !vl->on_video_frame || !vl->on_video_reconfig) return GF_BAD_PARAM;
 
-	gf_sc_lock(sc, 1);
+	gf_sc_lock(sc, GF_TRUE);
 	if (!sc->video_listeners) sc->video_listeners = gf_list_new();
 	gf_list_add(sc->video_listeners, vl);
-	gf_sc_lock(sc, 0);
+	gf_sc_lock(sc, GF_FALSE);
 	return GF_OK;
 }
 
@@ -2993,12 +3025,12 @@
 {
 	if (!sc|| !vl) return GF_BAD_PARAM;
 
-	gf_sc_lock(sc, 1);
+	gf_sc_lock(sc, GF_TRUE);
 	gf_list_del_item(sc->video_listeners, vl);
 	if (!gf_list_count(sc->video_listeners)) {
 		gf_list_del(sc->video_listeners);
 		sc->video_listeners = NULL;
 	}
-	gf_sc_lock(sc, 0);
+	gf_sc_lock(sc, GF_FALSE);
 	return GF_OK;
 }

gpac-0.5.0.svn4296.tar.bz2/src/compositor/compositor_2d.c -> gpac-0.5.0.svn4668.tar.bz2/src/compositor/compositor_2d.c Changed

@@ -314,11 +314,11 @@
 
 	src->w = src->h = 0;
 	dst->w = dst->h = 0;
-	if (disable_blit) *disable_blit = 0;
-	if (has_scale) *has_scale = 0;
+	if (disable_blit) *disable_blit = GF_FALSE;
+	if (has_scale) *has_scale = GF_FALSE;
 
-	if (final.width<=0 || final.height <=0) return 0;
-	if (txh->width==0 || txh->height==0) return 0;
+	if (final.width<=0 || final.height <=0) return GF_FALSE;
+	if (txh->width==0 || txh->height==0) return GF_FALSE;
 
 
 	w_scale = final.width / txh->width;
@@ -423,14 +423,14 @@
 	if (src->w>txh->width) src->w=txh->width;
 	if (src->h>txh->height) src->h=txh->height;
 
-	if (!src->w || !src->h) return 0;
+	if (!src->w || !src->h) return GF_FALSE;
 
 	/*make sure we lie in src bounds*/
 	if (src->x + src->w>txh->width) src->w = txh->width - src->x;
 	if (src->y + src->h>txh->height) src->h = txh->height - src->y;
 
-	if (disable_blit) *disable_blit = use_blit ? 0 : 1;
-	return 1;
+	if (disable_blit) *disable_blit = use_blit ? GF_FALSE : GF_TRUE;
+	return GF_TRUE;
 }
 
 static Bool compositor_2d_draw_bitmap_ex(GF_VisualManager *visual, GF_TextureHandler *txh, DrawableContext *ctx, GF_IRect *clip, GF_Rect *unclip, u8 alpha, GF_ColorKey *col_key, GF_TraverseState *tr_state, Bool force_soft_blt)
@@ -443,7 +443,7 @@
 	u32 output_width, output_height, hw_caps;
 
 
-	if (!txh->data) return 1;
+	if (!txh->data) return GF_TRUE;
 
 	if (!visual->compositor->has_size_info && !(visual->compositor->msg_type & GF_SR_CFG_OVERRIDE_SIZE)
 		&& (visual->compositor->override_size_flags & 1)
@@ -454,25 +454,22 @@
 			visual->compositor->scene_width = txh->width;
 			visual->compositor->scene_height = txh->height;
 			visual->compositor->msg_type |= GF_SR_CFG_OVERRIDE_SIZE;
-			return 1;
+			return GF_TRUE;
 		}
 	}
 
-	if (!compositor_texture_rectangles(visual, txh, clip, unclip, &src_wnd, &dst_wnd, &use_blit, &has_scale)) return 1;
+	if (!compositor_texture_rectangles(visual, txh, clip, unclip, &src_wnd, &dst_wnd, &use_blit, &has_scale)) return GF_TRUE;
 	
 	/*can we use hardware blitter ?*/
 	hw_caps = visual->compositor->video_out->hw_caps;
 	overlay_type = 0;
-	flush_video = 0;
-	use_soft_stretch = 1;
+	flush_video = GF_FALSE;
+	use_soft_stretch = GF_TRUE;
 
 	output_width = visual->compositor->vp_width;
 	output_height = visual->compositor->vp_height;
 
-	if (!(hw_caps & GF_VIDEO_HW_HAS_STRETCH)) {
-		if (has_scale) force_soft_blt = 1;
-	}
-	if (visual->compositor->disable_hardware_blit) force_soft_blt = 1;
+	if (visual->compositor->disable_hardware_blit) force_soft_blt = GF_TRUE;
 
 	if (!force_soft_blt) {
 
@@ -489,14 +486,14 @@
 //		case GF_PIXEL_RGB_555:
 //		case GF_PIXEL_RGB_565:
 			if (hw_caps & GF_VIDEO_HW_HAS_RGB)
-				use_soft_stretch = 0;
+				use_soft_stretch = GF_FALSE;
 			break;
 		case GF_PIXEL_ARGB:
 		case GF_PIXEL_RGBA:
 		case GF_PIXEL_RGBAS:
 		case GF_PIXEL_RGBDS:
 			if (hw_caps & GF_VIDEO_HW_HAS_RGBA)
-				use_soft_stretch = 0;
+				use_soft_stretch = GF_FALSE;
 			break;
 		case GF_PIXEL_YV12:
 		case GF_PIXEL_IYUV:
@@ -504,7 +501,7 @@
 		case GF_PIXEL_YVYU:
 		case GF_PIXEL_YUY2:
 		case GF_PIXEL_YUVD:
-			if (hw_caps & GF_VIDEO_HW_HAS_YUV) use_soft_stretch = 0;
+			if (hw_caps & GF_VIDEO_HW_HAS_YUV) use_soft_stretch = GF_FALSE;
 			else if (hw_caps & GF_VIDEO_HW_HAS_YUV_OVERLAY) overlay_type = 1;
 			break;
 		default:
@@ -514,16 +511,16 @@
 		if (!visual->compositor->enable_yuv_hw
 			|| (ctx->col_mat || (alpha!=0xFF) || !visual->compositor->video_out->Blit)
 			) {
-			use_soft_stretch = 1;
+			use_soft_stretch = GF_TRUE;
 			overlay_type = 0;
 		}
 		if (visual->compositor->disable_partial_hw_blit && ((src_wnd.w!=txh->width) || (src_wnd.h!=txh->height) )) {
-			use_soft_stretch = 1;
+			use_soft_stretch = GF_TRUE;
 		}
 
 		/*disable HW color keying - not compatible with MPEG-4 MaterialKey*/
 		if (col_key) {
-			use_soft_stretch = 1;
+			use_soft_stretch = GF_TRUE;
 			overlay_type = 0;
 		}
 
@@ -548,7 +545,10 @@
 				overlay_type = 0;
 			}
 		}
+	}
 
+	if (has_scale && !(hw_caps & GF_VIDEO_HW_HAS_STRETCH) && !overlay_type) {
+		force_soft_blt = use_soft_stretch = GF_TRUE;
 	}
 
 	video_src.height = txh->height;
@@ -590,7 +590,7 @@
 			o_rc.width = dst_wnd.w;
 			o_rc.height = dst_wnd.h;
 			visual->ClearSurface(visual, &o_rc, visual->compositor->video_out->overlay_color_key);
-			visual->has_overlays = 1;
+			visual->has_overlays = GF_TRUE;
 			/*mark drawable as overlay*/
 			ctx->drawable->flags |= DRAWABLE_IS_OVERLAY;
 
@@ -598,7 +598,7 @@
 			but not allocating it*/
 			if (tr_state->immediate_draw)
 				visual_2d_get_drawable_context(visual);
-			return 1;
+			return GF_TRUE;
 		}
 		/*top level overlay*/
 		if (flush_video) {
@@ -617,11 +617,11 @@
 		if (!e) {
 			/*mark drawable as overlay*/
 			ctx->drawable->flags |= DRAWABLE_IS_OVERLAY;
-			visual->has_overlays = 1;
-			return 1;
+			visual->has_overlays = GF_TRUE;
+			return GF_TRUE;
 		}
 		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor2D] Error during overlay blit - trying with soft one\n"));
-		visual->compositor->skip_flush = 0;
+		visual->compositor->skip_flush = GF_FALSE;
 	}
 
 	/*most graphic cards can't perform bliting on locked surface - force unlock by releasing the hardware*/
@@ -632,7 +632,7 @@
 		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 = 1;
+			use_soft_stretch = GF_TRUE;
 			if (visual->compositor->video_memory==1) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor2D] Error during hardware blit - will use soft one\n"));
 				visual->compositor->video_memory = 2;
@@ -640,33 +640,33 @@
 			/*force a reconfigure of video output*/
 			else if (visual->compositor->video_memory!=2) {
 				GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor2D] Reconfiguring video output to use video memory\n"));
-				visual->compositor->request_video_memory = 1;
-				visual->compositor->root_visual_setup = 0;
+				visual->compositor->request_video_memory = GF_TRUE;
+				visual->compositor->root_visual_setup = GF_FALSE;
 				gf_sc_next_frame_state(visual->compositor, GF_SC_DRAW_FRAME);
 			}
 		}
 	}
 	if (use_soft_stretch) {
 		GF_VideoSurface backbuffer;
-		e = visual->compositor->video_out->LockBackBuffer(visual->compositor->video_out, &backbuffer, 1);
+		e = visual->compositor->video_out->LockBackBuffer(visual->compositor->video_out, &backbuffer, GF_TRUE);
 		if (!e) {
 			gf_stretch_bits(&backbuffer, &video_src, &dst_wnd, &src_wnd, alpha, 0, col_key, ctx->col_mat);
-			e = visual->compositor->video_out->LockBackBuffer(visual->compositor->video_out, &backbuffer, 0);
+			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 0;
+			return GF_FALSE;
 		}
 		if (!visual->compositor->video_memory) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor2D] Reconfiguring video output to use video memory\n"));
-			visual->compositor->video_memory = 1;
-			visual->compositor->root_visual_setup = 0;
+			visual->compositor->video_memory = GF_TRUE;
+			visual->compositor->root_visual_setup = GF_FALSE;
 			gf_sc_next_frame_state(visual->compositor, GF_SC_DRAW_FRAME);
 		}
 	}
-	visual->has_modif = 1;
+	visual->has_modif = GF_TRUE;
 	if (is_attached) visual_2d_init_raster(visual);
-	return 1;
+	return GF_TRUE;
 }
 
 
@@ -724,13 +724,13 @@
 		/*using OpenGL to render depth images*/
 		if (visual->compositor->depth_gl_type) {
 			gf_sc_set_option(visual->compositor, GF_OPT_USE_OPENGL, 2);
-			return 1;
+			return GF_TRUE;
 		}
 #endif
 		break;
 	/*the rest has to be displayed through brush for now, we only use YUV and RGB pool*/
 	default:
-		return 0;
+		return GF_FALSE;
 	}
 
 	/*direct drawing, no clippers */
@@ -743,10 +743,10 @@
 				, 0, 0
 #endif
 				))
-				return 0;
+				return GF_FALSE;
 		} else {
 			if (!compositor_2d_draw_bitmap_ex(visual, ctx->aspect.fill_texture, ctx, &ctx->bi->clip, &ctx->bi->unclip, alpha, col_key, tr_state, 0))
-				return 0;
+				return GF_FALSE;
 		}
 	}
 	/*draw bitmap for all dirty rects*/

gpac-0.5.0.svn4296.tar.bz2/src/compositor/events.c -> gpac-0.5.0.svn4668.tar.bz2/src/compositor/events.c Changed

@@ -71,7 +71,7 @@
 {
 	Bool signal;
 	char *txt;
-	u32 len;
+	size_t len;
 	if (!compositor->edited_text) return;
 
     /* if this is the final editing and there is text, 
@@ -133,7 +133,7 @@
 GF_Err gf_sc_paste_text(GF_Compositor *compositor, const char *text)
 {
 	u16 *conv_buf;
-	u32 len;
+	size_t len;
 	if (!compositor->sel_buffer || !compositor->edited_text) return GF_BAD_PARAM;
 	if (!text) return GF_OK;
 	len = strlen(text);
@@ -144,7 +144,7 @@
 	conv_buf = gf_malloc(sizeof(u16)*len);
 	len = gf_utf8_mbstowcs(conv_buf, len, &text);
 
-	compositor->sel_buffer_alloc += len;
+	compositor->sel_buffer_alloc += (u32) len;
 	if (compositor->sel_buffer_len == compositor->sel_buffer_alloc)
 		compositor->sel_buffer_alloc++;
 
@@ -152,8 +152,8 @@
 	memmove(&compositor->sel_buffer[compositor->caret_pos+len], &compositor->sel_buffer[compositor->caret_pos], sizeof(u16)*(compositor->sel_buffer_len-compositor->caret_pos));
 	memcpy(&compositor->sel_buffer[compositor->caret_pos], conv_buf, sizeof(u16)*len);
 	gf_free(conv_buf);
-	compositor->sel_buffer_len += len;
-	compositor->caret_pos += len;
+	compositor->sel_buffer_len += (u32) len;
+	compositor->caret_pos += (u32) len;
 	compositor->sel_buffer[compositor->sel_buffer_len]=0;
 	flush_text_node_edit(compositor, 0);
 	gf_sc_lock(compositor, 0);
@@ -265,7 +265,7 @@
 				if (append) {
 					u16 end;
 					const u16 *srcp;
-					u32 len;
+					size_t len;
 					GF_DOMText *cur, *ntext;
 					GF_ChildNodeItem *children = ((GF_ParentNode *) compositor->focus_node)->children;
 					GF_Node *t = gf_node_new(gf_node_get_graph(child->node), TAG_SVG_tbreak);
@@ -326,7 +326,7 @@
 								flush_text_node_edit(compositor, 1);
 							}
 							if (!n1->textContent) n1->textContent = gf_strdup("");
-							caret_pos = strlen(n1->textContent);
+							caret_pos = (u32) strlen(n1->textContent);
 							if (n2->textContent) {
 								n1->textContent = gf_realloc(n1->textContent, sizeof(char)*(strlen(n1->textContent)+strlen(n2->textContent)+1));
 								strcat(n1->textContent, n2->textContent);
@@ -374,17 +374,19 @@
 
 	if (*res) {
 		const char *src = *res;
-		compositor->sel_buffer_alloc = 2+strlen(src);
+		compositor->sel_buffer_alloc = 2 + (u32) strlen(src);
 		compositor->sel_buffer = gf_realloc(compositor->sel_buffer, sizeof(u16)*compositor->sel_buffer_alloc);
 
 		if (caret_pos>=0) {
-			compositor->sel_buffer_len = gf_utf8_mbstowcs(compositor->sel_buffer, compositor->sel_buffer_alloc, &src);
+			size_t l = gf_utf8_mbstowcs(compositor->sel_buffer, compositor->sel_buffer_alloc, &src);
+			compositor->sel_buffer_len = (u32) l;
 			memmove(&compositor->sel_buffer[caret_pos+1], &compositor->sel_buffer[caret_pos], sizeof(u16)*(compositor->sel_buffer_len-caret_pos));
 			compositor->sel_buffer[caret_pos] = GF_CARET_CHAR;
 			compositor->caret_pos = caret_pos;
 
 		} else {
-			compositor->sel_buffer_len = gf_utf8_mbstowcs(compositor->sel_buffer, compositor->sel_buffer_alloc, &src);
+			size_t l = gf_utf8_mbstowcs(compositor->sel_buffer, compositor->sel_buffer_alloc, &src);
+			compositor->sel_buffer_len = (u32) l;
 			compositor->sel_buffer[compositor->sel_buffer_len] = GF_CARET_CHAR;
 			compositor->caret_pos = compositor->sel_buffer_len;
 		}

gpac-0.5.0.svn4296.tar.bz2/src/compositor/gl_inc.h -> gpac-0.5.0.svn4668.tar.bz2/src/compositor/gl_inc.h Changed

gpac-0.5.0.svn4296.tar.bz2/src/compositor/hardcoded_protos.c -> gpac-0.5.0.svn4668.tar.bz2/src/compositor/hardcoded_protos.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/compositor/mesh_collide.c -> gpac-0.5.0.svn4668.tar.bz2/src/compositor/mesh_collide.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/compositor/mesh_tesselate.c -> gpac-0.5.0.svn4668.tar.bz2/src/compositor/mesh_tesselate.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/compositor/mpeg4_audio.c -> gpac-0.5.0.svn4668.tar.bz2/src/compositor/mpeg4_audio.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/compositor/mpeg4_bitmap.c -> gpac-0.5.0.svn4668.tar.bz2/src/compositor/mpeg4_bitmap.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/compositor/mpeg4_layout.c -> gpac-0.5.0.svn4668.tar.bz2/src/compositor/mpeg4_layout.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/compositor/mpeg4_sensors.c -> gpac-0.5.0.svn4668.tar.bz2/src/compositor/mpeg4_sensors.c Changed

@@ -465,7 +465,7 @@
 			SFVec2f res;
 			Fixed diff = (ev->key.flags & GF_KEY_MOD_SHIFT) ? 5*FIX_ONE : FIX_ONE;
 			if (!gf_sg_use_pixel_metrics(gf_node_get_graph(sh->sensor)))
-				diff = gf_divfix(diff, compositor->vp_width/2);
+				diff = gf_divfix(diff, INT2FIX(compositor->vp_width/2));
 			res = stack->start_drag;
 			switch (ev->key.key_code) {
 			case GF_KEY_LEFT: res.x += -diff; break;
@@ -867,7 +867,7 @@
 			SFVec3f res;
 			Fixed diff = (ev->key.flags & GF_KEY_MOD_SHIFT) ? 5*FIX_ONE : FIX_ONE;
 			if (!gf_sg_use_pixel_metrics(gf_node_get_graph(sh->sensor)))
-				diff = gf_divfix(diff, compositor->vp_width/2);
+				diff = gf_divfix(diff, INT2FIX(compositor->vp_width/2));
 
 			res = stack->start_drag;
 			switch (ev->key.key_code) {
@@ -1018,9 +1018,12 @@
 
 				/*no intersection, use intersection with "main" fronting plane*/
 				if ( ABS(r.dir.z) > ABS(r.dir.y)) {
-					if (ABS(r.dir.x) > ABS(r.dir.x)) project_to = st->xplane;
+					if (ABS(r.dir.z) > ABS(r.dir.x)) project_to = st->xplane;
+					else project_to = st->yplane;
+				} else {
+					if (ABS(r.dir.z) > ABS(r.dir.x)) project_to = st->xplane;
 					else project_to = st->zplane;
-				} else project_to = st->yplane;
+				}
 				if (!gf_plane_intersect_line(&project_to, &r.orig, &r.dir, &compositor->hit_local_point)) return 0;
 			}

gpac-0.5.0.svn4296.tar.bz2/src/compositor/mpeg4_textures.c -> gpac-0.5.0.svn4668.tar.bz2/src/compositor/mpeg4_textures.c Changed

@@ -286,7 +286,7 @@
 
 			/*BT/XMT playback*/
 			if (ct->image.buffer) {
-				e = gf_img_file_dec(ct->image.buffer, &ct->objectTypeIndication, &txh->width, &txh->height, &txh->pixelformat, &txh->data, &out_size);
+				e = gf_img_file_dec(ct->image.buffer, (u32 *) &ct->objectTypeIndication, &txh->width, &txh->height, &txh->pixelformat, &txh->data, &out_size);
 				if (e==GF_OK) {
 					txh->needs_refresh = 1;
 					txh->stride = out_size / txh->height;
@@ -297,14 +297,14 @@
 				switch (ct->objectTypeIndication) {
 				case GPAC_OTI_IMAGE_JPEG:
 					out_size = 0;
-					e = gf_img_jpeg_dec(ct->data, ct->data_len, &txh->width, &txh->height, &txh->pixelformat, NULL, &out_size, 3);
+					e = gf_img_jpeg_dec((char *) ct->data, ct->data_len, &txh->width, &txh->height, &txh->pixelformat, NULL, &out_size, 3);
 					if (e==GF_BUFFER_TOO_SMALL) {
 						u32 BPP;
 						txh->data = gf_malloc(sizeof(char) * out_size);
 						if (txh->pixelformat==GF_PIXEL_GREYSCALE) BPP = 1;
 						else BPP = 3;
 
-						e = gf_img_jpeg_dec(ct->data, ct->data_len, &txh->width, &txh->height, &txh->pixelformat, txh->data, &out_size, BPP);
+						e = gf_img_jpeg_dec((char *) ct->data, ct->data_len, &txh->width, &txh->height, &txh->pixelformat, txh->data, &out_size, BPP);
 						if (e==GF_OK) {
 							txh->needs_refresh = 1;
 							txh->stride = out_size / txh->height;
@@ -313,10 +313,10 @@
 					break;
 				case GPAC_OTI_IMAGE_PNG:
 					out_size = 0;
-					e = gf_img_png_dec(ct->data, ct->data_len, &txh->width, &txh->height, &txh->pixelformat, NULL, &out_size);
+					e = gf_img_png_dec((char *) ct->data, ct->data_len, &txh->width, &txh->height, &txh->pixelformat, NULL, &out_size);
 					if (e==GF_BUFFER_TOO_SMALL) {
 						txh->data = gf_malloc(sizeof(char) * out_size);
-						e = gf_img_png_dec(ct->data, ct->data_len, &txh->width, &txh->height, &txh->pixelformat, txh->data, &out_size);
+						e = gf_img_png_dec((char *) ct->data, ct->data_len, &txh->width, &txh->height, &txh->pixelformat, txh->data, &out_size);
 						if (e==GF_OK) {
 							txh->needs_refresh = 1;
 							txh->stride = out_size / txh->height;
@@ -344,7 +344,7 @@
 				strcat(szExtractName, "/");
 				src_url = (char *) gf_scene_get_service_url( gf_node_get_graph(txh->owner ) );
 
-				gf_sha1_csum(src_url, strlen(src_url), hash);
+				gf_sha1_csum((u8 *)src_url, (u32) strlen(src_url), hash);
 				for (i=0; i<20; i++) {
 					char t[3];
 					t[2] = 0;

gpac-0.5.0.svn4296.tar.bz2/src/compositor/offscreen_cache.c -> gpac-0.5.0.svn4668.tar.bz2/src/compositor/offscreen_cache.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/compositor/svg_filters.c -> gpac-0.5.0.svn4668.tar.bz2/src/compositor/svg_filters.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/compositor/svg_font.c -> gpac-0.5.0.svn4668.tar.bz2/src/compositor/svg_font.c Changed

@@ -44,7 +44,7 @@
 static GF_Err svg_font_get_glyphs(void *udta, const char *utf_string, u32 *glyph_buffer, u32 *io_glyph_buffer_size, const char *lang, Bool *is_rtl)
 {
 	u32 prev_c;
-	u32 len;
+	size_t len;
 	u32 i, gl_idx;
 	u16 *utf_res;
 	GF_Node *node = (GF_Node *)udta;
@@ -52,28 +52,28 @@
 	char *utf8 = (char*) utf_string;
 
 	/*FIXME - use glyphs unicode attributes for glyph substitution*/
-	len = utf_string ? strlen(utf_string) : 0;
+	len = utf_string ? (u32) strlen(utf_string) : 0;
 	if (!len) {
 		*io_glyph_buffer_size = 0;
 		return GF_OK;
 	}
 
 	if (*io_glyph_buffer_size < len+1) {
-		*io_glyph_buffer_size = len+1;
+		*io_glyph_buffer_size = (u32) len+1;
 		return GF_BUFFER_TOO_SMALL;
 	}
 
 	len = gf_utf8_mbstowcs((u16*) glyph_buffer, *io_glyph_buffer_size, (const char**)&utf8);
-	if ((s32) len < 0) return GF_IO_ERR;
+	if (len == (size_t) -1) return GF_IO_ERR;
 	/*should not happen*/
 	if (utf8) return GF_IO_ERR;
 
 	/*perform bidi relayout*/
 	utf_res = (u16 *) glyph_buffer;
-	*is_rtl = gf_utf8_reorder_bidi(utf_res, len);
+	*is_rtl = gf_utf8_reorder_bidi(utf_res, (u32) len);
 
 	/*move 16bit buffer to 32bit*/
-	for (i=len; i>0; i--) {
+	for (i=(u32)len; i>0; i--) {
 		glyph_buffer[i-1] = utf_res[i-1];
 	}
 
@@ -157,7 +157,7 @@
 		
 		gl_idx++;
 	}
-	*io_glyph_buffer_size = len = gl_idx;
+	*io_glyph_buffer_size = /* len = */ gl_idx;
 	
 	return GF_OK;
 }
@@ -321,7 +321,7 @@
 {
 	u16 utf_name[20];
 	u8 *utf8;
-	u32 len;
+	size_t len;
 	GF_Rect rc;
 	GF_Glyph *glyph;
 	GF_Font *font;
@@ -345,7 +345,7 @@
 	if (!atts.unicode) return;
 
 	GF_SAFEALLOC(st, SVG_GlyphStack);
-	utf8 = *atts.unicode;
+	utf8 = (u8 *) *atts.unicode;
 	len = gf_utf8_mbstowcs(utf_name, 200, (const char **) &utf8);
 	/*this is a single glyph*/
 	if (len==1) {
@@ -354,7 +354,7 @@
 	} else {
 		st->glyph.utf_name = (u32) (PTR_TO_U_CAST st);
 		st->unicode = gf_malloc(sizeof(u16)*len);
-		st->uni_len = len;
+		st->uni_len = (u16) len;
 		memcpy(st->unicode, utf_name, sizeof(u16)*len);
 	}

gpac-0.5.0.svn4296.tar.bz2/src/compositor/svg_grouping.c -> gpac-0.5.0.svn4668.tar.bz2/src/compositor/svg_grouping.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/compositor/svg_media.c -> gpac-0.5.0.svn4668.tar.bz2/src/compositor/svg_media.c Changed

@@ -49,9 +49,9 @@
 static Bool svg_video_get_transform_behavior(GF_TraverseState *tr_state, SVGAllAttributes *atts, Fixed *cx, Fixed *cy, Fixed *angle)
 {
 	SFVec2f pt;
-	if (!atts->transformBehavior) return 0;
+	if (!atts->transformBehavior) return GF_FALSE;
 	if (*atts->transformBehavior == SVG_TRANSFORMBEHAVIOR_GEOMETRIC)
-		return 0;
+		return GF_FALSE;
 
 	pt.x = atts->x ? atts->x->value : 0;
 	pt.y = atts->y ? atts->y->value : 0;
@@ -73,7 +73,7 @@
 		*angle = GF_PI/2;
 		break;
 	}
-	return 1;
+	return GF_TRUE;
 }
 
 
@@ -118,7 +118,7 @@
 	if (!txwidth || !txheight) return;
 
 	if (!atts.preserveAspectRatio) {
-		pAR.defer = 0;
+		pAR.defer = GF_FALSE;
 		pAR.meetOrSlice = SVG_MEETORSLICE_MEET;
 		pAR.align = SVG_PRESERVEASPECTRATIO_XMIDYMID;
 	} else {
@@ -217,19 +217,19 @@
 static void svg_play_texture(SVG_video_stack *stack, SVGAllAttributes *atts)
 {
 	SVGAllAttributes all_atts;
-	Bool lock_scene = 0;
+	Bool lock_scene = GF_FALSE;
 	if (stack->txh.is_open) gf_sc_texture_stop(&stack->txh);
 
 	if (!atts) {
 		gf_svg_flatten_attributes((SVG_Element*)stack->txh.owner, &all_atts);
 		atts = &all_atts;
 	}
-	if (atts->syncBehavior) lock_scene = (*atts->syncBehavior == SMIL_SYNCBEHAVIOR_LOCKED) ? 1 : 0;
+	if (atts->syncBehavior) lock_scene = (*atts->syncBehavior == SMIL_SYNCBEHAVIOR_LOCKED) ? GF_TRUE : GF_FALSE;
 
 	gf_sc_texture_play_from_to(&stack->txh, &stack->txurl, 
 		atts->clipBegin ? (*atts->clipBegin) : 0.0,
 		atts->clipEnd ? (*atts->clipEnd) : -1.0,
-		0, 
+		GF_FALSE, 
 		lock_scene);
 }
 
@@ -285,7 +285,7 @@
 			gf_node_unregister(stack->audio, NULL);
 			stack->audio = NULL;
 		}
-		stack->audio_dirty = 1;
+		stack->audio_dirty = GF_TRUE;
 		
 		if (stack->txurl.count) svg_play_texture(stack, &all_atts);
 		gf_node_dirty_clear(node, GF_SG_SVG_XLINK_HREF_DIRTY);
@@ -323,7 +323,7 @@
 	} else if (tr_state->traversing_mode == TRAVERSE_SORT) {
 		if (!compositor_svg_is_display_off(tr_state->svg_props) && ( *(tr_state->svg_props->visibility) != SVG_VISIBILITY_HIDDEN) ) {
 			GF_Matrix mx_bck;
-			Bool restore_mx = 0;
+			Bool restore_mx = GF_FALSE;
 
 			compositor_svg_apply_local_transformation(tr_state, &all_atts, &backup_matrix, &mx_3d);
 
@@ -331,11 +331,11 @@
 			if (!ctx || !ctx->aspect.fill_texture ) return;
 
 			if (svg_video_get_transform_behavior(tr_state, &all_atts, &cx, &cy, &angle)) {
-				drawable_reset_path(stack->graph);			
+				drawable_reset_path(stack->graph);
 				gf_path_add_rect_center(stack->graph->path, cx, cy, INT2FIX(stack->txh.width), INT2FIX(stack->txh.height));
 
 				gf_mx2d_copy(mx_bck, tr_state->transform);
-				restore_mx = 1;
+				restore_mx = GF_TRUE;
 				
 				gf_mx2d_init(tr_state->transform);
 				gf_mx2d_add_rotation(&tr_state->transform, cx, cy, angle);
@@ -376,7 +376,7 @@
 			compositor_svg_restore_parent_transformation(tr_state, &backup_matrix, &mx_3d);
 		}
 	}
-	if (stack->audio) svg_traverse_audio_ex(stack->audio, rs, 0, tr_state->svg_props);
+	if (stack->audio) svg_traverse_audio_ex(stack->audio, rs, GF_FALSE, tr_state->svg_props);
 
 	memcpy(tr_state->svg_props, &backup_props, sizeof(SVGPropertiesPointers));
 	tr_state->svg_flags = backup_flags;
@@ -392,10 +392,10 @@
 
 	/*setup texture if needed*/
 	if (!txh->is_open && txurl->count) {
-		gf_sc_texture_play_from_to(txh, txurl, 0, -1, 0, 0);
+		gf_sc_texture_play_from_to(txh, txurl, 0, -1, GF_FALSE, GF_FALSE);
 	}
 
-	gf_sc_texture_update_frame(txh, 0);
+	gf_sc_texture_update_frame(txh, GF_FALSE);
 	/*URL is present but not opened - redraw till fetch*/
 	if (txh->stream && (!txh->tx_io || txh->needs_refresh) ) {
 		/*mark all subtrees using this image as dirty*/
@@ -422,7 +422,7 @@
 	stack->txh.flags = GF_SR_TEXTURE_SVG;
 
 	/*force first processing of xlink-href*/
-	gf_node_dirty_set(node, GF_SG_SVG_XLINK_HREF_DIRTY, 0);
+	gf_node_dirty_set(node, GF_SG_SVG_XLINK_HREF_DIRTY, GF_FALSE);
 
 	gf_node_set_private(node, stack);
 	gf_node_set_callback_function(node, svg_traverse_image);
@@ -442,7 +442,7 @@
 
 		init_vis = SVG_INITIALVISIBILTY_WHENSTARTED;
 
-		if (gf_node_get_attribute_by_tag(txh->owner, TAG_SVG_ATT_initialVisibility, 0, 0, &init_vis_info) == GF_OK) {
+		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;
 		}
 
@@ -455,17 +455,17 @@
 	} 
 
 	/*when fetching the first frame disable resync*/
-	gf_sc_texture_update_frame(txh, 0);
+	gf_sc_texture_update_frame(txh, GF_FALSE);
 
 	/* only when needs_refresh = 1, first frame is fetched */
 	if (!stack->first_frame_fetched) {
 		if (txh->needs_refresh) {
-			stack->first_frame_fetched = 1;
+			stack->first_frame_fetched = GF_TRUE;
 			/*stop stream if needed*/
 			if (!gf_smil_timing_is_active(txh->owner)) {
 				gf_sc_texture_stop(txh);
 				//make sure the refresh flag is not cleared
-				txh->needs_refresh = 1;
+				txh->needs_refresh = GF_TRUE;
 			}
 		}
 	}
@@ -473,17 +473,17 @@
 	if (!stack->audio && stack->audio_dirty) {
 		u32 res = gf_mo_has_audio(stack->txh.stream);
 		if (res != 2) {
-			stack->audio_dirty = 0;
+			stack->audio_dirty = GF_FALSE;
 			if (res) {
 				GF_FieldInfo att_vid, att_aud;
 				stack->audio = gf_node_new(gf_node_get_graph(stack->txh.owner), TAG_SVG_audio);
 				gf_node_register(stack->audio, NULL);
-				if (gf_node_get_attribute_by_tag(stack->txh.owner, TAG_XLINK_ATT_href, 0, 0, &att_vid)==GF_OK) {
-					gf_node_get_attribute_by_tag(stack->audio, TAG_XLINK_ATT_href, 1, 0, &att_aud);
-					gf_svg_attributes_copy(&att_aud, &att_vid, 0);
+				if (gf_node_get_attribute_by_tag(stack->txh.owner, TAG_XLINK_ATT_href, GF_FALSE, GF_FALSE, &att_vid)==GF_OK) {
+					gf_node_get_attribute_by_tag(stack->audio, TAG_XLINK_ATT_href, GF_TRUE, GF_FALSE, &att_aud);
+					gf_svg_attributes_copy(&att_aud, &att_vid, GF_FALSE);
 				}
 				/*BYPASS SMIL TIMING MODULE!!*/
-				compositor_init_svg_audio(stack->txh.compositor, stack->audio, 1);
+				compositor_init_svg_audio(stack->txh.compositor, stack->audio, GF_TRUE);
 			}
 		}
 	}
@@ -495,7 +495,7 @@
 		gf_sc_invalidate(txh->compositor, NULL);
 
 	if (stack->stop_requested) {
-		stack->stop_requested = 0;
+		stack->stop_requested = GF_FALSE;
 		gf_sc_texture_stop(&stack->txh);
 	}
 }
@@ -507,7 +507,9 @@
 	switch (status) {
 	case SMIL_TIMING_EVAL_UPDATE:
 		if (!stack->txh.is_open) { 
-			if (stack->txurl.count) svg_play_texture((SVG_video_stack*)stack, NULL);
+			if (stack->txurl.count) {
+				svg_play_texture((SVG_video_stack*)stack, NULL);
+			}
 		}
 		else if (stack->txh.stream_finished && (gf_smil_get_media_duration(rti)<0) ) { 
 			Double dur = gf_mo_get_duration(stack->txh.stream);
@@ -520,7 +522,7 @@
 		break;
 	case SMIL_TIMING_EVAL_FREEZE:
 	case SMIL_TIMING_EVAL_REMOVE:
-		stack->stop_requested = 1;
+		stack->stop_requested = GF_TRUE;
 		break;
 	case SMIL_TIMING_EVAL_REPEAT:
 		gf_sc_texture_restart(&stack->txh);
@@ -547,7 +549,7 @@
 	stack->txh.flags = GF_SR_TEXTURE_SVG;
 
 	/*force first processing of xlink-href*/
-	gf_node_dirty_set(node, GF_SG_SVG_XLINK_HREF_DIRTY, 0);
+	gf_node_dirty_set(node, GF_SG_SVG_XLINK_HREF_DIRTY, GF_FALSE);
 
 	gf_smil_set_evaluation_callback(node, svg_video_smil_evaluate);
 
@@ -557,7 +559,7 @@
 
 void svg_pause_video(GF_Node *n, Bool pause)
 {
-	SVG_video_stack *st = gf_node_get_private(n);
+	SVG_video_stack *st = (SVG_video_stack *)gf_node_get_private(n);
 	if (!st) return;
 	if (pause) gf_mo_pause(st->txh.stream);
 	else gf_mo_resume(st->txh.stream);
@@ -568,7 +570,7 @@
 	/*if href has been modified, stop the video (and associated audio if any) right away - we cannot wait for next traversal to
 	process this as the video could be in a hidden subtree not traversed*/
 	if (gf_node_dirty_get(node) & GF_SG_SVG_XLINK_HREF_DIRTY) {
-		SVG_video_stack *st = gf_node_get_private(node);
+		SVG_video_stack *st = (SVG_video_stack *)gf_node_get_private(node);
 		/*WARNING - stack may be NULL at this point when inserting the video from script*/
 		if (st && st->txh.is_open) {
 			if (st->audio) {
@@ -581,7 +583,7 @@
 			gf_sc_texture_stop(&st->txh);
 		}
 	}
-	gf_node_dirty_set(node, 0, 0);
+	gf_node_dirty_set(node, 0, GF_FALSE);
 	/*and force a redraw of next frame*/
 	gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 }
@@ -612,10 +614,10 @@
 		if (!stack->is_active && !stack->is_error) { 
 			if (stack->aurl.count) {
 				SVGAllAttributes atts;
-				Bool lock_timeline = 0;
+				Bool lock_timeline = GF_FALSE;
 				gf_svg_flatten_attributes((SVG_Element*) (video ? video : audio), &atts);
 
-				if (atts.syncBehavior) lock_timeline = (*atts.syncBehavior == SMIL_SYNCBEHAVIOR_LOCKED) ? 1 : 0;		
+				if (atts.syncBehavior) lock_timeline = (*atts.syncBehavior == SMIL_SYNCBEHAVIOR_LOCKED) ? GF_TRUE : GF_FALSE;
 
 				if (gf_sc_audio_open(&stack->input, &stack->aurl,
 						atts.clipBegin ? (*atts.clipBegin) : 0.0,
@@ -623,9 +625,9 @@
 						lock_timeline) == GF_OK) 
 				{
 					gf_mo_set_speed(stack->input.stream, FIX_ONE);
-					stack->is_active = 1;
+					stack->is_active = GF_TRUE;
 				} else {
-					stack->is_error = 1;
+					stack->is_error = GF_TRUE;
 				}
 			}
 		}
@@ -644,17 +646,17 @@
 		break;
 	case SMIL_TIMING_EVAL_FREEZE:
 		gf_sc_audio_stop(&stack->input);
-		stack->is_active = 0;
+		stack->is_active = GF_FALSE;
 		break;
 	case SMIL_TIMING_EVAL_REMOVE:
 		gf_sc_audio_stop(&stack->input);
-		stack->is_active = 0;
+		stack->is_active = GF_FALSE;
 		break;
 	case SMIL_TIMING_EVAL_DEACTIVATE:
 		if (stack->is_active) {
 			gf_sc_audio_stop(&stack->input);
 			gf_sc_audio_unregister(&stack->input);
-			stack->is_active = 0;
+			stack->is_active = GF_FALSE;
 		}
 		break;
 	}
@@ -695,17 +697,17 @@
 
 	if (gf_node_dirty_get(node) & GF_SG_SVG_XLINK_HREF_DIRTY) {
 		SVGAllAttributes atts;
-		Bool lock_timeline = 0;
+		Bool lock_timeline = GF_FALSE;
 		if (stack->is_active) 
 			gf_sc_audio_stop(&stack->input);
 
-		stack->is_error = 0;
+		stack->is_error = GF_FALSE;
 		
 		gf_node_dirty_clear(node, GF_SG_SVG_XLINK_HREF_DIRTY);
 		gf_term_get_mfurl_from_xlink(node, &(stack->aurl));
 
 		gf_svg_flatten_attributes((SVG_Element*) node, &atts);
-		if (atts.syncBehavior) lock_timeline = (*atts.syncBehavior == SMIL_SYNCBEHAVIOR_LOCKED) ? 1 : 0;		
+		if (atts.syncBehavior) lock_timeline = (*atts.syncBehavior == SMIL_SYNCBEHAVIOR_LOCKED) ? GF_TRUE : GF_FALSE;
 
 		if (stack->aurl.count && (gf_sc_audio_open(&stack->input, &stack->aurl,
 				atts.clipBegin ? (*atts.clipBegin) : 0.0,
@@ -714,20 +716,20 @@
 
 		) {
 			gf_mo_set_speed(stack->input.stream, FIX_ONE);
-			stack->is_active = 1;
+			stack->is_active = GF_TRUE;
 		} else if (stack->is_active) {
 			gf_sc_audio_unregister(&stack->input);
-			stack->is_active = 0;
+			stack->is_active = GF_FALSE;
 		}
 	}
 
 	/*store mute flag*/
-	stack->input.is_muted = 0;
+	stack->input.is_muted = GF_FALSE;
 	if (tr_state->switched_off
 		|| compositor_svg_is_display_off(props)
 		|| (*(props->visibility) == SVG_VISIBILITY_HIDDEN) ) {
 	
-		stack->input.is_muted = 1;
+		stack->input.is_muted = GF_TRUE;
 	}
 
 	stack->input.intensity = tr_state->svg_props->computed_audio_level;
@@ -750,7 +752,7 @@
 	gf_sc_audio_setup(&stack->input, compositor, node);
 
 	/*force first processing of xlink-href*/
-	gf_node_dirty_set(node, GF_SG_SVG_XLINK_HREF_DIRTY, 0);
+	gf_node_dirty_set(node, GF_SG_SVG_XLINK_HREF_DIRTY, GF_FALSE);
 
 	if (!slaved_timing) 
 		gf_smil_set_evaluation_callback(node, svg_audio_smil_evaluate);
@@ -761,7 +763,7 @@
 
 void svg_pause_audio(GF_Node *n, Bool pause)
 {
-	SVG_audio_stack *st = gf_node_get_private(n);
+	SVG_audio_stack *st = (SVG_audio_stack *)gf_node_get_private(n);
 	if (!st) return;
 	if (pause) gf_mo_pause(st->input.stream);
 	else gf_mo_resume(st->input.stream);
@@ -791,8 +793,8 @@
 	switch (status) {
 	case SMIL_TIMING_EVAL_UPDATE:
 		if (!stack->is_open) { 
-			if (stack->resource ) gf_mo_play(stack->resource, stack->clipBegin, stack->clipEnd, 0);
-			stack->is_open = 1;
+			if (stack->resource ) gf_mo_play(stack->resource, stack->clipBegin, stack->clipEnd, GF_FALSE);
+			stack->is_open = GF_TRUE;
 		}
 		else if (gf_mo_is_done(stack->resource) && (gf_smil_get_media_duration(rti)<0) ) { 
 			Double dur = gf_mo_get_duration(stack->resource);
@@ -801,8 +803,8 @@
 		break;
 	case SMIL_TIMING_EVAL_FREEZE:
 	case SMIL_TIMING_EVAL_REMOVE:
-		stack->is_open = 0;
-		gf_mo_set_flag(stack->resource, GF_MO_DISPLAY_REMOVE, 1);
+		stack->is_open = GF_FALSE;
+		gf_mo_set_flag(stack->resource, GF_MO_DISPLAY_REMOVE, GF_TRUE);
 		gf_mo_stop(stack->resource);
 		break;
 	case SMIL_TIMING_EVAL_REPEAT:
@@ -823,7 +825,7 @@
 	if (is_destroy) {
 		if (stack->resource) {
 			if (stack->is_open) {
-				gf_mo_set_flag(stack->resource, GF_MO_DISPLAY_REMOVE, 1);
+				gf_mo_set_flag(stack->resource, GF_MO_DISPLAY_REMOVE, GF_TRUE);
 				gf_mo_stop(stack->resource);
 			}
 			gf_mo_unregister(node, stack->resource);
@@ -846,15 +848,15 @@
 		if (dirty_flags & GF_SG_SVG_XLINK_HREF_DIRTY) {
 			GF_MediaObject *new_res;
 			MFURL url;
-			Bool lock_timeline=0;
+			Bool lock_timeline=GF_FALSE;
 			url.vals = NULL;
 			url.count = 0;
 
-			if (all_atts.syncBehavior) lock_timeline = (*all_atts.syncBehavior == SMIL_SYNCBEHAVIOR_LOCKED) ? 1 : 0;		
+			if (all_atts.syncBehavior) lock_timeline = (*all_atts.syncBehavior == SMIL_SYNCBEHAVIOR_LOCKED) ? GF_TRUE : GF_FALSE;
 
 			gf_term_get_mfurl_from_xlink(node, &url);
 
-			new_res = gf_mo_register(node, &url, lock_timeline, 0);
+			new_res = gf_mo_register(node, &url, lock_timeline, GF_FALSE);
 			gf_sg_mfurl_del(url);
 			
 			if (stack->resource!=new_res) {
@@ -863,7 +865,7 @@
 					gf_mo_unregister(node, stack->resource);
 				}
 				stack->resource = new_res;
-				if (stack->resource && stack->is_open) gf_mo_play(stack->resource, stack->clipBegin, stack->clipEnd, 0);
+				if (stack->resource && stack->is_open) gf_mo_play(stack->resource, stack->clipBegin, stack->clipEnd, GF_FALSE);
 			}
 		}
 		gf_node_dirty_clear(node, 0);
@@ -878,7 +880,7 @@
 	GF_SAFEALLOC(stack, SVG_updates_stack)
 
 	/*force first processing of xlink-href*/
-	gf_node_dirty_set(node, GF_SG_SVG_XLINK_HREF_DIRTY, 0);
+	gf_node_dirty_set(node, GF_SG_SVG_XLINK_HREF_DIRTY, GF_FALSE);
 
 	gf_smil_set_evaluation_callback(node, svg_updates_smil_evaluate);

gpac-0.5.0.svn4296.tar.bz2/src/compositor/svg_text.c -> gpac-0.5.0.svn4668.tar.bz2/src/compositor/svg_text.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/compositor/texturing.c -> gpac-0.5.0.svn4668.tar.bz2/src/compositor/texturing.c Changed

@@ -133,12 +133,12 @@
 static void setup_texture_object(GF_TextureHandler *txh, Bool private_media)
 {
 	if (!txh->tx_io) {
-		gf_sc_texture_allocate(txh);
+        gf_sc_texture_allocate(txh);
 		if (!txh->tx_io) return;
 
-		gf_mo_get_visual_info(txh->stream, &txh->width, &txh->height, &txh->stride, &txh->pixel_ar, &txh->pixelformat);
-
-		if (private_media) {
+		gf_mo_get_visual_info(txh->stream, &txh->width, &txh->height, &txh->stride, &txh->pixel_ar, &txh->pixelformat, &txh->is_flipped);
+        
+        if (private_media) {
 			txh->transparent = 1;
 			txh->pixelformat = GF_PIXEL_ARGB;
 			txh->flags |= GF_SR_TEXTURE_PRIVATE_MEDIA;
@@ -162,6 +162,7 @@
 GF_EXPORT
 void gf_sc_texture_update_frame(GF_TextureHandler *txh, Bool disable_resync)
 {
+	Bool needs_reload = 0;
 	u32 size, ts;
 
 	/*already refreshed*/
@@ -177,11 +178,23 @@
 
 	/*check init flag*/
 	if (!(gf_mo_get_flags(txh->stream) & GF_MO_IS_INIT)) {
+		needs_reload = 1;
+		txh->data = NULL;
+		if (txh->tx_io) {
+			gf_sc_texture_release(txh);
+		}
+	}
+	txh->data = gf_mo_fetch_data(txh->stream, !disable_resync, &txh->stream_finished, &ts, &size);
+
+	if (!(gf_mo_get_flags(txh->stream) & GF_MO_IS_INIT)) {
+		needs_reload = 1;
+	}
+
+	if (needs_reload) {
 		/*if we had a texture this means the object has changed - delete texture and resetup. Do not skip
 		texture update as this may lead to an empty rendering pass (blank frame for this object), especially in DASH*/
 		if (txh->tx_io) {
 			gf_sc_texture_release(txh);
-			txh->data = NULL;
 			txh->needs_refresh = 1;
 		}
 		if (gf_mo_is_private_media(txh->stream)) {
@@ -189,7 +202,6 @@
 			gf_node_dirty_set(txh->owner, 0, 0);
 		}
 	}
-	txh->data = gf_mo_fetch_data(txh->stream, !disable_resync, &txh->stream_finished, &ts, &size);
 
 	/*if no frame or muted don't draw*/
 	if (!txh->data || !size) {
@@ -206,8 +218,11 @@
 	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;
 		return;
 	}
+	txh->compositor->video_regulation = 1;
 	txh->needs_release = 1; 
 	txh->last_frame_time = ts;
 	if (gf_mo_is_muted(txh->stream)) return;

gpac-0.5.0.svn4296.tar.bz2/src/compositor/texturing_gl.c -> gpac-0.5.0.svn4668.tar.bz2/src/compositor/texturing_gl.c Changed

@@ -217,7 +217,7 @@
 Bool tx_can_use_rect_ext(GF_Compositor *compositor, GF_TextureHandler *txh)
 {
 #ifndef GPAC_DISABLE_VRML
-	u32 i, count;
+	u32 i, j, count;
 #endif
 
 //	compositor->gl_caps.yuv_texture = 0;
@@ -233,11 +233,11 @@
 	if (gf_node_get_tag(txh->owner)==TAG_MPEG4_Background2D) return 1;
 	/*if a bitmap is using the texture force using RECT*/
 	for (i=0; i<count; i++) {
-		GF_Node *n = gf_node_get_parent(txh->owner, 0);
+		GF_Node *n = gf_node_get_parent(txh->owner, i);
 		if (gf_node_get_tag(n)==TAG_MPEG4_Appearance) {
 			count = gf_node_get_parent_count(n);
-			for (i=0; i<count; i++) {
-				M_Shape *s = (M_Shape *) gf_node_get_parent(n, 0);
+			for (j=0; j<count; j++) {
+				M_Shape *s = (M_Shape *) gf_node_get_parent(n, j);
 				if (s->geometry && (gf_node_get_tag((GF_Node *)s)==TAG_MPEG4_Shape) && (gf_node_get_tag(s->geometry)==TAG_MPEG4_Bitmap)) return 1;
 			}
 		}
@@ -298,6 +298,14 @@
 		txh->tx_io->gl_format = GL_RGB;
 		txh->tx_io->nb_comp = 3;
 		break;
+	case GF_PIXEL_BGR_24:
+		txh->tx_io->gl_format = GL_RGB;
+		txh->tx_io->nb_comp = 3;
+		break;
+    case GF_PIXEL_BGR_32:
+        txh->tx_io->gl_format = GL_RGBA;
+        txh->tx_io->nb_comp = 4;
+        break;
 	case GF_PIXEL_RGB_32:
 	case GF_PIXEL_RGBA:
 		txh->tx_io->gl_format = GL_RGBA;
@@ -410,9 +418,9 @@
 	if (!txh->tx_io->conv_data) {
 		txh->tx_io->conv_data = (char*)gf_malloc(sizeof(char) * 2 * txh->width * txh->height);
 	}
-	p_y = txh->data;
-	p_u = txh->data + txh->stride*txh->height;
-	p_v = txh->data + 5*txh->stride*txh->height/4;
+	p_y = (u8 *) txh->data;
+	p_u = (u8 *) txh->data + txh->stride*txh->height;
+	p_v = (u8 *) txh->data + 5*txh->stride*txh->height/4;
 
 	/*convert to UYVY and flip texture*/
 	for (i=0; i<txh->height; i++) {
@@ -420,7 +428,7 @@
 		y = p_y + idx*txh->stride;
 		u = p_u + (idx/2) * txh->stride/2;
 		v = p_v + (idx/2) * txh->stride/2;
-		dst = txh->tx_io->conv_data + 2*i*txh->stride;
+		dst = (u8 *) txh->tx_io->conv_data + 2*i*txh->stride;
 
 		for (j=0; j<txh->width/2;j++) {
 			*dst = *u;
@@ -461,6 +469,12 @@
 			bpp = 4;
 			break;
 		}
+	case GF_PIXEL_BGR_24:
+		bpp = 3;
+		break;
+    case GF_PIXEL_BGR_32:
+        bpp = 4;
+        break;
 	case GF_PIXEL_GREYSCALE:
 	case GF_PIXEL_ALPHAGREY:
 	case GF_PIXEL_RGB_24:
@@ -489,6 +503,7 @@
 		return 1;
 	case GF_PIXEL_YV12:
 	case GF_PIXEL_NV21:
+	case GF_PIXEL_I420:
 		if (txh->tx_io->gl_format == compositor->gl_caps.yuv_texture) {
 			txh->tx_io->conv_format = GF_PIXEL_YVYU;
 			txh->tx_io->flags |= TX_NEEDS_HW_LOAD;
@@ -540,12 +555,16 @@
 	case GF_PIXEL_YUY2:
 	case GF_PIXEL_YV12:
 	case GF_PIXEL_NV21:
-		txh->tx_io->conv_format = dst.pixel_format = GF_PIXEL_RGB_24;
+	case GF_PIXEL_I420:
+	case GF_PIXEL_BGR_24:
+    case GF_PIXEL_BGR_32:
+    	txh->tx_io->conv_format = dst.pixel_format = GF_PIXEL_RGB_24;
 		/*stretch and flip*/
-		gf_stretch_bits(&dst, &src, NULL, NULL, 0xFF, 1, NULL, NULL);
-		txh->flags |= GF_SR_TEXTURE_NO_GL_FLIP;
+		gf_stretch_bits(&dst, &src, NULL, NULL, 0xFF, !txh->is_flipped, NULL, NULL);
+        if ( !txh->is_flipped)
+            txh->flags |= GF_SR_TEXTURE_NO_GL_FLIP;
 		break;
-	case GF_PIXEL_YUVD:
+    case GF_PIXEL_YUVD:
 		if ((txh->compositor->depth_gl_type==GF_SC_DEPTH_GL_NONE) || (txh->compositor->depth_gl_type==GF_SC_DEPTH_GL_VBO)) {
 			src.pixel_format = GF_PIXEL_YV12;
 			txh->tx_io->conv_format = GF_PIXEL_RGB_24_DEPTH;
@@ -570,9 +589,9 @@
 			dst.pixel_format = GF_PIXEL_RGB_24;
 
 			for (j=0; j<txh->height; j++) {
-				u8 *src = txh->data + (txh->height-j-1)*txh->stride;
-				u8 *dst_p = txh->tx_io->conv_data + j*3*txh->width;
-				u8 *dst_d = txh->tx_io->conv_data + txh->height*3*txh->width + j*txh->width;
+				u8 *src = (u8 *) txh->data + (txh->height-j-1)*txh->stride;
+				u8 *dst_p = (u8 *) txh->tx_io->conv_data + j*3*txh->width;
+				u8 *dst_d = (u8 *) txh->tx_io->conv_data + txh->height*3*txh->width + j*txh->width;
 
 				for (i=0; i<txh->width; i++) {
 					*dst_p++ = src[i*4];

gpac-0.5.0.svn4296.tar.bz2/src/compositor/visual_manager_2d_draw.c -> gpac-0.5.0.svn4668.tar.bz2/src/compositor/visual_manager_2d_draw.c Changed

@@ -368,14 +368,14 @@
 
 		/*if texture not ready, update the size before computing output rectangles */
 		if (!txh->width || !txh->height) {
-			gf_mo_get_visual_info(txh->stream, &txh->width, &txh->height, &txh->stride, &txh->pixel_ar, &txh->pixelformat);
+			gf_mo_get_visual_info(txh->stream, &txh->width, &txh->height, &txh->stride, &txh->pixel_ar, &txh->pixelformat, &txh->is_flipped);
 			/*in case the node is an MPEG-4 bitmap, force stack rebuild at next frame */
   			gf_node_dirty_set(ctx->drawable->node, GF_SG_NODE_DIRTY, 1);
 		}
 		
 		if (compositor_texture_rectangles(visual, txh, &ctx->bi->clip, &ctx->bi->unclip, &src, &dst, NULL, NULL)) {
 			if (txh->stream && gf_mo_set_position(txh->stream, &src, &dst)) {
-				gf_mo_get_visual_info(txh->stream, &txh->width, &txh->height, &txh->stride, &txh->pixel_ar, &txh->pixelformat);
+				gf_mo_get_visual_info(txh->stream, &txh->width, &txh->height, &txh->stride, &txh->pixel_ar, &txh->pixelformat, &txh->is_flipped);
 				/*force dirty flag to get called again*/
 				gf_node_dirty_set(ctx->drawable->node, GF_SG_NODE_DIRTY, 1);
 				gf_sc_next_frame_state(visual->compositor, GF_SC_DRAW_FRAME);

gpac-0.5.0.svn4296.tar.bz2/src/compositor/visual_manager_3d.c -> gpac-0.5.0.svn4668.tar.bz2/src/compositor/visual_manager_3d.c Changed

@@ -208,7 +208,7 @@
 		);
 
 		/*fixed-point overflow*/
-		if (tr_state->camera->z_far <0) {
+		if (tr_state->camera->z_far <= tr_state->camera->z_near) {
 			tr_state->camera->z_far = FIX_MAX/4;
 		}
 	}
@@ -332,7 +332,7 @@
 #endif
 
 			/*default viewpoint*/
-			pos.x = pos.y = 0; pos.z = 10 * FIX_ONE;
+			pos.x = pos.y = 0; pos.z = INT2FIX(10);
 			center.x = center.y = center.z = 0;
 			r.q = r.x = r.z = 0; r.y = FIX_ONE;
 			/*this takes care of pixelMetrics*/
@@ -533,8 +533,8 @@
 		GF_Rect orig_vp;
 		orig_vp = tr_state->camera->vp;
 		
-		tr_state->camera->vp.width /= tr_state->visual->nb_views;
-		tr_state->camera->vp.x += tr_state->visual->current_view * tr_state->camera->vp.width;
+		tr_state->camera->vp.width = gf_divfix(tr_state->camera->vp.width, INT2FIX(tr_state->visual->nb_views));
+		tr_state->camera->vp.x += gf_mulfix(INT2FIX(tr_state->visual->current_view), tr_state->camera->vp.width);
 
 		visual_3d_set_viewport(tr_state->visual, tr_state->camera->vp);
 		visual_3d_set_scissor(tr_state->visual, &tr_state->camera->vp);
@@ -551,8 +551,8 @@
 		GF_Rect orig_vp;
 		orig_vp = tr_state->camera->vp;
 		
-		tr_state->camera->vp.height /= tr_state->visual->nb_views;
-		tr_state->camera->vp.y += tr_state->visual->current_view * tr_state->camera->vp.height;
+		tr_state->camera->vp.height = gf_divfix(tr_state->camera->vp.height, INT2FIX(tr_state->visual->nb_views));
+		tr_state->camera->vp.y += gf_mulfix(INT2FIX(tr_state->visual->current_view), tr_state->camera->vp.height);
 //		tr_state->camera->vp.y = orig_vp.height - tr_state->camera->vp.height - tr_state->camera->vp.y;
 		if (tr_state->visual->compositor->visual==tr_state->visual)
 			tr_state->camera->vp.y = tr_state->visual->compositor->output_height - tr_state->camera->vp.y - tr_state->camera->vp.height;

gpac-0.5.0.svn4296.tar.bz2/src/compositor/visual_manager_3d_gl.c -> gpac-0.5.0.svn4668.tar.bz2/src/compositor/visual_manager_3d_gl.c Changed

@@ -395,7 +395,7 @@
 	GLsizei slen = 0;
 	u32 len;
 	if (!source || !shader_id) return 0;
-	len = strlen(source);
+	len = (u32) strlen(source);
 	glShaderSource(shader_id, 1, &source, &len);
 	glCompileShader(shader_id);
 	
@@ -452,17 +452,19 @@
 		if (sOpt) {
 			FILE *src = gf_f64_open(sOpt, "rt");
 			if (src) {
-				u32 size;
+				size_t size;
 				char *shader_src;
 				gf_f64_seek(src, 0, SEEK_END);
-				size = (u32) gf_f64_tell(src);
+				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);
-				shader_src[size]=0;
-				visual->glsl_fragment = glCreateShader(GL_FRAGMENT_SHADER);
-				visual_3d_compile_shader(visual->glsl_fragment, "fragment", shader_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);
 			}
 		}
@@ -718,7 +720,7 @@
 	glShadeModel(GL_SMOOTH);
 	glGetIntegerv(GL_MAX_LIGHTS, (GLint*)&visual->max_lights);
 #ifdef GL_MAX_CLIP_PLANES
-	glGetIntegerv(GL_MAX_CLIP_PLANES, &visual->max_clips);
+	glGetIntegerv(GL_MAX_CLIP_PLANES, (GLint*)&visual->max_clips);
 #endif
 
 	visual_3d_setup_quality(visual);
@@ -2340,15 +2342,15 @@
 
 		scale = FIX2FLT(visual->compositor->depth_gl_scale);
 		inc = 1;
-		if (!tr_state->pixel_metrics) inc /= tr_state->min_hsize;
+		if (!tr_state->pixel_metrics) inc /= FIX2FLT(tr_state->min_hsize);
 		x = 0;
-		y = 1; y*=txh->height/2;
-		if (!tr_state->pixel_metrics) y /= tr_state->min_hsize;
+		y = 1; y = gf_mulfix(y, INT2FIX(txh->height/2));
+		if (!tr_state->pixel_metrics) y = gf_divfix(y, tr_state->min_hsize);
 
 		glBegin(GL_POINTS);
 		for (h=0; h<txh->height; h++) {
-			x = -1; x *= txh->width/2;
-			if (!tr_state->pixel_metrics) x /= tr_state->min_hsize;
+			x = -1; x = gf_mulfix(x, INT2FIX(txh->width/2));
+			if (!tr_state->pixel_metrics) x = gf_divfix(x, tr_state->min_hsize);
 			for (w=0; w<txh->width; w++) {
 				u8 *p = data + h*stride + w*4;
 				r = p[0]; r /= 255;
@@ -2390,16 +2392,16 @@
 restart:
 		scale = FIX2FLT(visual->compositor->depth_gl_scale);
 		inc = 1;
-		if (!tr_state->pixel_metrics) inc /= tr_state->min_hsize;
+		if (!tr_state->pixel_metrics) inc /= FIX2FLT(tr_state->min_hsize);
 		x = 0;
-		y = 1; y*=txh->height/2;
-		if (!tr_state->pixel_metrics) y /= tr_state->min_hsize;
+		y = 1; y = gf_mulfix(y, INT2FIX(txh->height/2));;
+		if (!tr_state->pixel_metrics) y = gf_divfix(y, tr_state->min_hsize);
 
 		in_strip = 0;
 		for (h=0; h<txh->height - 1; h++) {
 			char *src = data + h*stride;
-			x = -1; x *= txh->width/2;
-			if (!tr_state->pixel_metrics) x /= tr_state->min_hsize;
+			x = -1; x = gf_mulfix(x, INT2FIX(txh->width/2));
+			if (!tr_state->pixel_metrics) x  = gf_divfix(x, tr_state->min_hsize);
 
 			for (w=0; w<txh->width; w++) {
 				u8 *p1 = src + w*4;
@@ -2477,18 +2479,18 @@
 		stack->mesh = new_mesh();
 		stack->mesh->vbo_dynamic = 1;
 		inc = 1;
-		if (!tr_state->pixel_metrics) inc /= tr_state->min_hsize;
+		if (!tr_state->pixel_metrics) inc /= FIX2FLT(tr_state->min_hsize);
 		x = 0;
-		y = 1; y*=txh->height/2;
-		if (!tr_state->pixel_metrics) y /= tr_state->min_hsize;
+		y = 1; y = gf_mulfix(y, FLT2FIX(txh->height/2));
+		if (!tr_state->pixel_metrics) y = gf_divfix(y, tr_state->min_hsize);
 
 		for (h=0; h<txh->height; h++) {
 			u32 idx_offset = h ? ((h-1)*txh->width) : 0;
-			x = -1; x *= txh->width/2;
-			if (!tr_state->pixel_metrics) x /= tr_state->min_hsize;
+			x = -1; x = gf_mulfix(x, FLT2FIX(txh->width/2));
+			if (!tr_state->pixel_metrics) x = gf_divfix(x, tr_state->min_hsize);
 
 			for (w=0; w<txh->width; w++) {
-				mesh_set_vertex(stack->mesh, x, y, 0, 0, 0, -FIX_ONE, INT2FIX(w) / (txh->width-1), INT2FIX(txh->height - h  -1) / (txh->height-1) );
+				mesh_set_vertex(stack->mesh, x, y, 0, 0, 0, -FIX_ONE, INT2FIX(w / (txh->width-1)), INT2FIX((txh->height - h  -1) / (txh->height-1)) );
 				x += FLT2FIX(inc);
 
 				/*set triangle*/

gpac-0.5.0.svn4296.tar.bz2/src/export.cpp -> gpac-0.5.0.svn4668.tar.bz2/src/export.cpp Changed

@@ -26,7 +26,7 @@
 /*this file is only used with Win32&MSVC to export the symbols from libgpac(static) to libgpac(dynamic) based on the GPAC configuration*/
 #include <gpac/setup.h>
 
-#ifdef _WIN32_WCE
+#if defined(_WIN32_WCE) || defined(_WIN64)
 #define EXPORT_SYMBOL(a) "/export:"#a
 #else
 #define EXPORT_SYMBOL(a) "/export:_"#a
@@ -133,6 +133,28 @@
 #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_reverse) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_list_clone) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_list_rev_enum) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_list_pop_front) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_list_pop_back) )
+
+
+/* Map */
+#ifndef GPAC_DISABLE_PLAYER
+#pragma comment (linker, EXPORT_SYMBOL(gf_map_new) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_map_del) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_map_reset) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_map_find) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_map_insert) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_map_rem) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_map_count) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_map_has_key) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_map_iter_new) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_map_iter_del) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_map_iter_has_next) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_map_iter_reset) )
+#endif
 
 /* Bitstream */
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_new) )
@@ -142,6 +164,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_read_int) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_read_long_int) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_read_u8) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_bs_read_u8_until_delimiter) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_read_u16) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_read_u24) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_read_u32) )
@@ -170,6 +193,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_get_size) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_get_refreshed_size) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_set_output_buffering) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_bs_transfer) )
 
 /* Thread */
 #pragma comment (linker, EXPORT_SYMBOL(gf_th_new) )
@@ -191,6 +215,11 @@
 #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) )
 
@@ -222,8 +251,11 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_url_concatenate) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_url_get_resource_path) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_url_get_resource_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_url_remove_last_delimiter) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_url_get_ressource_extension) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_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_has_ipv6) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_net_is_ipv6) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_net_mobileip_set_callback) )
@@ -260,6 +292,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_modules_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_modules_refresh) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_modules_get_count) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_modules_get_module_directories) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_modules_get_file_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_module_get_file_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_modules_load_interface) )
@@ -295,6 +328,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_set_data_rate) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_get_data_rate) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_reassign) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cache_get_url) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cache_get_cache_filename) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cache_create_entry) )
@@ -338,6 +372,11 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_parse) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_create_root) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_get_attribute) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_set_attribute) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_append_child) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_node_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_get_root) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_get_error) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_get_line) )
@@ -512,7 +551,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_codec_get_com) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_com_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_com_del) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_odf_avc_cfg_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_afx_get_type_description) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_esd_get_textual_description) )
 
@@ -523,17 +561,22 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_get_laser_config) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_encode_ui_config) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sl_depacketize) )
-
-#ifndef GPAC_MINIMAL_ODF
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_desc_write) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_desc_size) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_stream_type_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_stream_type_by_name) )
+
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_avc_cfg_del) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_avc_cfg_new) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_hevc_cfg_read) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_hevc_cfg_del) )
+
+#ifndef GPAC_MINIMAL_ODF
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_desc_add_desc) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_desc_list_read) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_desc_list_write) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_desc_list_size) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_desc_list_del) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_odf_stream_type_name) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_odf_stream_type_by_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_qos_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_qos_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_qos_add_qualif) )
@@ -554,7 +597,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_oci_codec_encode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_oci_codec_decode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_oci_codec_get_event) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_odf_avc_cfg_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_avc_cfg_read) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_avc_cfg_write) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sl_packetize) )
@@ -702,6 +744,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_track_original_id) )
 #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) )
+
 
 # ifndef GPAC_DISABLE_ISOM_DUMP
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_dump) )
@@ -830,6 +874,7 @@
 #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_3gp_config_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_3gp_config_update) )
@@ -886,9 +931,13 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_setup_track_fragment) )
 #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_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_start_segment) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_close_segment) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_traf_base_media_decode_time) )
 #endif
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
@@ -957,6 +1006,39 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_remove_event_filter) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_lock_media_queue) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_get_current_service_id) )
+
+/*mediaobject.h exports*/
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_register) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_unregister) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_play) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_stop) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_restart) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_pause) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_resume) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_set_speed) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_get_speed) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_get_loop) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_get_duration) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_should_deactivate) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_url_changed) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_fetch_data) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_release_data) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_get_object_time) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_is_muted) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_is_done) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_adjust_clock) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_get_last_frame_time) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_get_visual_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_get_audio_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_get_current_speed) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_has_audio) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_is_private_media) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_set_position) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_get_flags) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_set_flag) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_load_xlink_resource) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_unload_xlink_resource) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mo_get_scenegraph) )
 #endif
 
 /*ietf.h exports*/
@@ -1007,6 +1089,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_setup_payload) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_enable_nat_keepalive) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_initialize) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_rtp_stop) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_set_info_rtp) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_get_current_time) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_reset_buffers) )
@@ -1052,6 +1135,12 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_depacketizer_reset) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_depacketizer_process) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_depacketizer_get_slconfig) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_rtp_reorderer_new) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_rtp_reorderer_del) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_rtp_reorderer_reset) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_rtp_reorderer_add) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_rtp_reorderer_get) )
+
 #endif /*GPAC_DISABLE_STREAMING*/
 
 
@@ -1090,6 +1179,7 @@
 #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) )
 #endif /*GPAC_DISABLE_MEDIA_IMPORT*/
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -1097,9 +1187,18 @@
 #endif
 
 #ifndef GPAC_DISABLE_AV_PARSERS
+#pragma comment (linker, EXPORT_SYMBOL(gf_media_nalu_next_start_code) )
+
 #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) )
+
+#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) )
+#endif //GPAC_DISABLE_HEVC
+
 #endif /*GPAC_DISABLE_AV_PARSERS*/
 
 
@@ -1117,6 +1216,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_crypt_set_state) )
 #endif GPAC_DISABLE_MCRYPT
 #pragma comment (linker, EXPORT_SYMBOL(gf_sha1_csum) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sha1_csum_hexa) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sha1_file) )
 
 #ifndef GPAC_DISABLE_AV_PARSERS
@@ -1159,6 +1259,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_mp3_version) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mp3_version_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m4a_object_type_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_m4a_get_profile) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m4a_get_profile_name) )
 
 #if !defined(GPAC_DISABLE_MCRYPT) && !defined(GPAC_DISABLE_ISOM_WRITE)
@@ -1354,6 +1455,11 @@
 #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_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) )
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_svg_parse_attribute) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_svg_parse_style) )
@@ -1548,6 +1654,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_node_callback) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_message) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_clock_time) )
+//for Ivica
+#pragma comment (linker, EXPORT_SYMBOL(gf_scene_get_media_object_ex) )
 
 #endif
 
@@ -1623,6 +1731,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_demux_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_process_data) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_reset_parsers) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_es_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_set_pes_framing) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_get_stream_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_crc32_check) )
@@ -1662,11 +1771,12 @@
 #pragma comment (linker, EXPORT_SYMBOL(variant_playlist_del) )
 
 
-#pragma comment (linker, EXPORT_SYMBOL(TSDemux_Demux_Setup))
-#pragma comment (linker, EXPORT_SYMBOL(TSDemux_DemuxPlay) )
-#pragma comment (linker, EXPORT_SYMBOL(TSDemux_CloseDemux) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_demuxer_setup))
+#pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_demuxer_play) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_demuxer_close) )
 
 #endif /*GPAC_DISABLE_MPEG2TS*/
+#pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_get_socket) )
 
 /*laser.h exports*/
 #ifndef GPAC_DISABLE_LASER
@@ -1734,6 +1844,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_num_segments_ready) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_discard_segment) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_next_segment_location) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_probe_current_download_segment_location) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_max_segments_in_cache) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_group_done) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_in_period_setup) )
@@ -1746,13 +1857,51 @@
 #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_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_odf_hevc_cfg_read) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_odf_hevc_cfg_del) )
+#endif
+
+#pragma comment (linker, EXPORT_SYMBOL(utf8_to_ucs4) )
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-#pragma comment (linker, EXPORT_SYMBOL(gf_media_nalu_next_start_code) )
 
-#endif

gpac-0.5.0.svn4296.tar.bz2/src/ietf/rtcp.c -> gpac-0.5.0.svn4668.tar.bz2/src/ietf/rtcp.c Changed

@@ -74,23 +74,27 @@
 		rtcp_hdr.Padding = gf_bs_read_int(bs, 1);
 		rtcp_hdr.Count = gf_bs_read_int(bs, 5);
 		rtcp_hdr.PayloadType = gf_bs_read_u8(bs);
-		rtcp_hdr.Length = gf_bs_read_u16(bs);	
+		rtcp_hdr.Length = 1 + gf_bs_read_u16(bs);	
 
 		//check pck size
-		if (pck_size < (u32) (rtcp_hdr.Length + 1) * 4) {
+		if (pck_size < (u32) rtcp_hdr.Length * 4) {
 			gf_bs_del(bs);
 			//we return OK
 			return GF_CORRUPTED_DATA;
 		}
 		//substract this RTCP pck size
-		pck_size -= (rtcp_hdr.Length + 1) * 4;
+		pck_size -= rtcp_hdr.Length * 4;
+
+		/*we read the RTCP header*/
+		rtcp_hdr.Length -= 1;	
+
 		//in all RTCP Compounds (>1 pck), the first RTCP report SHALL be SR or RR without padding
 		if (first) {
 			if ( ( (rtcp_hdr.PayloadType!=200) && (rtcp_hdr.PayloadType!=201) )
 				|| rtcp_hdr.Padding
 			) {
 				gf_bs_del(bs);
-				GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTCP] Corrupted RTCP packet: payload type %d (200 or 2001 expected) - Padding %d (0 expected)\n", rtcp_hdr.PayloadType, rtcp_hdr.Padding));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTCP] Corrupted RTCP packet: payload type %d (200 or 201 expected) - Padding %d (0 expected)\n", rtcp_hdr.PayloadType, rtcp_hdr.Padding));
 				return GF_CORRUPTED_DATA;
 			}
 			first = 0;
@@ -272,6 +276,14 @@
 
 	is_sr = ch->pck_sent_since_last_sr ? 1 : 0;
 
+	if (ch->forced_ntp_sec) {
+		sec = ch->forced_ntp_sec;
+		frac = ch->forced_ntp_frac;
+		is_sr = 1;
+	} else {
+		gf_net_get_ntp(&sec, &frac);
+	}
+
 	//common header
 	//version
 	gf_bs_write_int(bs, 2, 2);
@@ -293,7 +305,6 @@
 
 	size = 8;
 
-	gf_net_get_ntp(&sec, &frac);
 
 	//SenderReport part
 	if (is_sr) {
@@ -379,21 +390,20 @@
 {
 	u32 length, padd;
 
-	//one item (type, len, data) + \0 marker at the end of the item
-	length = 2+strlen(ch->CName) + 1;
-//	length = 2+strlen(ch->CName);
+	//we start with header and SSRC: 2x32 bits word
+	length = 8;
+	//ten only send one CName item is type (1byte) , len (1byte), data (len byte) +  NULL marker (0 on 1 byte) at the end of the item list
+	length += 2 + (u32) strlen(ch->CName) + 1;
+	//we padd the end of the content to 32-bit boundary, and set length to the number of 32 bit words
 	padd = length % 4;
-	if (padd*4 != length) {
+	if (padd*4 != 0) {
 		//padding octets
 		padd = 4 - padd;
-		//header length
 		length = length/4 + 1;
 	} else {
 		padd = 0;
 		length = length/4;
 	}
-	//add SSRC
-	length += 1;
 	
 	//common part as usual
 	gf_bs_write_int(bs, 2, 2);
@@ -402,11 +412,12 @@
 	//encrypted as a whole" -> we write it without notifying it (this is a bit messy in 
 	//the spec IMO)
 	gf_bs_write_int(bs, 0, 1);
-	gf_bs_write_int(bs, 1, 5);
+	//report count is one
+	gf_bs_write_int(bs, 1, 5); 
 	//SDES pck type
 	gf_bs_write_u8(bs, 202);
-	//length
-	gf_bs_write_u16(bs, length);
+	//write length minus one
+	gf_bs_write_u16(bs, length - 1);
 
 	//SSRC
 	gf_bs_write_u32(bs, ch->SSRC);
@@ -414,8 +425,8 @@
 	//CNAME type
 	gf_bs_write_u8(bs, 1);
 	//length and cname
-	gf_bs_write_u8(bs, strlen(ch->CName));	
-	gf_bs_write_data(bs, ch->CName, strlen(ch->CName));
+	gf_bs_write_u8(bs, (u32) strlen(ch->CName));	
+	gf_bs_write_data(bs, ch->CName, (u32) strlen(ch->CName));
 
 	gf_bs_write_u8(bs, 0);
 
@@ -494,14 +505,15 @@
 	char *report_buf;
 	GF_Err e = GF_OK;
 
-	if (ch->first_SR) return GF_OK;
-	Time = gf_rtp_get_report_time();
+	/*skip first SR when acting as a receiver*/
+	if (!ch->forced_ntp_sec && ch->first_SR) return GF_OK;
+	Time = gf_rtp_get_report_time();	
 	if ( Time < ch->next_report_time) return GF_OK;
 
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 
 	//pck were received/sent send the RR/SR
-	if (ch->last_num_pck_rcv || ch->pck_sent_since_last_sr) {
+	if (ch->last_num_pck_rcv || ch->pck_sent_since_last_sr || ch->forced_ntp_sec) {
 		RTCP_FormatReport(ch, bs, Time);
 	}

gpac-0.5.0.svn4296.tar.bz2/src/ietf/rtp.c -> gpac-0.5.0.svn4668.tar.bz2/src/ietf/rtp.c Changed

@@ -149,6 +149,19 @@
 }
 
 GF_EXPORT
+GF_Err gf_rtp_stop(GF_RTPChannel *ch)
+{
+	if (!ch) return GF_BAD_PARAM;
+	if (ch->rtp) gf_sk_del(ch->rtp);
+	ch->rtp = NULL;
+	if (ch->rtcp) gf_sk_del(ch->rtcp);
+	ch->rtcp = NULL;
+	if (ch->po) gf_rtp_reorderer_del(ch->po);
+	ch->po = NULL;
+	return GF_OK;
+}
+
+GF_EXPORT
 GF_Err gf_rtp_initialize(GF_RTPChannel *ch, u32 UDPBufferSize, Bool IsSource, u32 PathMTU, u32 ReorederingSize, u32 MaxReorderDelay, char *local_ip)
 {
 	u16 port;
@@ -266,7 +279,7 @@
 		} else {
 			char name[GF_MAX_IP_NAME_LEN];
 
-			s32 start;
+			size_t start;
 			gf_get_user_name(name, 1024);
 			if (strlen(name)) strcat(name, "@");
 			start = strlen(name);
@@ -746,6 +759,7 @@
 
 #define SN_CHECK_OFFSET		0x0A
 
+GF_EXPORT
 GF_RTPReorder *gf_rtp_reorderer_new(u32 MaxCount, u32 MaxDelay)
 {
 	GF_RTPReorder *tmp;
@@ -768,12 +782,14 @@
 }
 
 
+GF_EXPORT
 void gf_rtp_reorderer_del(GF_RTPReorder *po)
 {
 	if (po->in) DelItem(po->in);
 	gf_free(po);
 }
 
+GF_EXPORT
 void gf_rtp_reorderer_reset(GF_RTPReorder *po)
 {
 	if (!po) return;
@@ -785,6 +801,7 @@
 	po->in = NULL;
 }
 
+GF_EXPORT
 GF_Err gf_rtp_reorderer_add(GF_RTPReorder *po, const void * pck, u32 pck_size, u32 pck_seqnum)
 {
 	GF_POItem *it, *cur;
@@ -825,8 +842,7 @@
 	//same seq num, we drop
 	if (po->in->pck_seq_num == pck_seqnum) goto discard;
 
-	if ( ( (u16) (pck_seqnum + bounds) <= (u16) (po->in->pck_seq_num + bounds) )
-		&& ( (u16) (pck_seqnum + bounds) >= (u16) (po->head_seqnum + bounds)) ) {
+	if ( ( (u16) (pck_seqnum + bounds) <= (u16) (po->in->pck_seq_num + bounds) ) ) {
 
 		it->next = po->in;
 		po->in = it;
@@ -847,12 +863,7 @@
 		if (!cur->next) {
 			cur->next = it;
 			po->Count += 1;
-#ifndef GPAC_DISABLE_LOG
-			if (cur->pck_seq_num +1 != it->pck_seq_num) 
-				GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[rtp] Packet Reorderer: got %d expected %d\n", cur->pck_seq_num+1, it->pck_seq_num));
-
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[rtp] Packet Reorderer: Appending packet %d\n", pck_seqnum));
-#endif
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[rtp] Packet Reorderer: Appending packet %d (last %d)\n", pck_seqnum, cur->pck_seq_num));
 			return GF_OK;
 		}
 
@@ -865,7 +876,7 @@
 			cur->next = it;
 			po->Count += 1;
 
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[rtp] Packet Reorderer: Inserting packet %d", pck_seqnum));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[rtp] Packet Reorderer: Inserting packet %d\n", pck_seqnum));
 			//done
 			return GF_OK;
 		}
@@ -883,6 +894,7 @@
 //retrieve the first available packet. Note that the behavior will be undefined if the first
 //ever received packet if its SeqNum was unknown
 //the BUFFER is yours, you must delete it
+GF_EXPORT
 void *gf_rtp_reorderer_get(GF_RTPReorder *po, u32 *pck_size)
 {
 	GF_POItem *t;
@@ -914,7 +926,7 @@
 
 #ifndef GPAC_DISABLE_LOG
 		if (po->in->pck_seq_num + 1 != po->in->next->pck_seq_num) 
-			GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[rtp] Packet Reorderer: Fetched %d expected %d\n", po->in->pck_seq_num, po->in->next->pck_seq_num));
+			GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[rtp] WARNING Packet Loss: Sending %d out of the queue but next is %d\n", po->in->pck_seq_num, po->in->next->pck_seq_num ));
 #endif
 		goto send_it;
 	}

gpac-0.5.0.svn4296.tar.bz2/src/ietf/rtp_depacketizer.c -> gpac-0.5.0.svn4668.tar.bz2/src/ietf/rtp_depacketizer.c Changed

@@ -658,7 +658,8 @@
 		rtp->on_sl_packet(rtp->udta, nalhdr, 4, &rtp->sl_hdr, GF_OK);
 
 		rtp->sl_hdr.accessUnitStartFlag = 0;
-		rtp->sl_hdr.compositionTimeStampFlag = 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*/
@@ -914,6 +915,7 @@
 	else if (!stricmp(map->payload_name, "H264")) return GF_RTP_PAYT_H264_AVC;
 	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 return 0;
 }
 
@@ -930,7 +932,7 @@
 
 	/*PL (not needed when IOD is here)*/
 	if (!stricmp(param_name, "Profile-level-id")) {
-		if (rtp->payt == GF_RTP_PAYT_H264_AVC) {
+		if (rtp->payt == GF_RTP_PAYT_H264_AVC || rtp->payt == GF_RTP_PAYT_H264_SVC) {
 			sscanf(param_val, "%x", &rtp->sl_map.PL_ID);
 		} else {
 			rtp->sl_map.PL_ID = atoi(param_val);
@@ -938,7 +940,7 @@
 	}
 	/*decoder specific info (not needed when IOD is here)*/
 	else if (!stricmp(param_name, "config")) {
-		u32 len = strlen(param_val);
+		u32 len = (u32) strlen(param_val);
 		//decode the buffer - the string buffer is MSB hexadecimal
 		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 		valS[2] = 0;
@@ -1302,7 +1304,7 @@
 			strcpy(a_tx3g, tx3g);
 			next_tx3g = strchr(a_tx3g, ',');
 			if (next_tx3g) next_tx3g[0] = 0;
-			len = gf_base64_decode(a_tx3g, strlen(a_tx3g), szOut, 1000);
+			len = gf_base64_decode(a_tx3g, (u32) strlen(a_tx3g), szOut, 1000);
 			gf_bs_write_data(bs, szOut, len);
 			tx3g = strchr(tx3g, ',');
 			if (!tx3g) break;
@@ -1325,6 +1327,7 @@
 		break;
 #ifndef GPAC_DISABLE_AV_PARSERS
 	case GF_RTP_PAYT_H264_AVC:
+	case GF_RTP_PAYT_H264_SVC:
 	{
 		GF_SDP_FMTP *fmtp;
 		GF_AVCConfig *avcc = gf_odf_avc_cfg_new();
@@ -1355,18 +1358,18 @@
 					sep = strchr(nal_ptr, ',');
 					if (sep) sep[0] = 0;
 
-					b64size = strlen(nal_ptr);
+					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;
 
 					nalt = b64_d[0] & 0x1F;
-					if (/*SPS*/(nalt==0x07) || /*PPS*/(nalt==0x08)) {
+					if (/*SPS*/(nalt==0x07) || /*PPS*/(nalt==0x08) || /*SSPS*/(nalt==0x0F)) {
 						GF_AVCConfigSlot *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);
-						if (nalt==0x07) {
+						if (nalt==0x07 || nalt==0x0F) {
 							gf_list_add(avcc->sequenceParameterSets, sl);
 						} else {
 							gf_list_add(avcc->pictureParameterSets, sl);
@@ -1499,6 +1502,7 @@
 	}
 	/*AUSeqNum is only signaled if streamState is used (eg for carrouselling); otherwise we ignore it*/
 	slc->AUSeqNumLength = rtp->sl_map.StreamStateIndication;
+	slc->no_dts_signaling = rtp->sl_map.DTSDeltaLength ? 0 : 1;
 
 
 	/*RTP SN is on 16 bits*/

gpac-0.5.0.svn4296.tar.bz2/src/ietf/rtp_packetizer.c -> gpac-0.5.0.svn4668.tar.bz2/src/ietf/rtp_packetizer.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/ietf/rtp_streamer.c -> gpac-0.5.0.svn4668.tar.bz2/src/ietf/rtp_streamer.c Changed

@@ -580,7 +580,7 @@
 		sprintf(sdpLine, "a=fmtp:%d maxptime=%d\n", rtp->packetizer->PayloadType, rtp->packetizer->auh_size*20);
 	}
 	/*H264/AVC*/
-	else if (rtp->packetizer->rtp_payt == GF_RTP_PAYT_H264_AVC || rtp->packetizer->rtp_payt == GF_RTP_PAYT_H264_SVC) {
+	else if ((rtp->packetizer->rtp_payt == GF_RTP_PAYT_H264_AVC) || (rtp->packetizer->rtp_payt == GF_RTP_PAYT_H264_SVC)) {
 		GF_AVCConfig *avcc = dsi ? gf_odf_avc_cfg_read(dsi, dsi_len) : NULL;
 
 		if (avcc) {
@@ -666,7 +666,7 @@
 
 	strcat(sdp, sdpLine);
 
-	size = strlen(sdp) + (*out_sdp_buffer ? strlen(*out_sdp_buffer) : 0) + 1;
+	size = (u32) strlen(sdp) + (*out_sdp_buffer ? (u32) strlen(*out_sdp_buffer) : 0) + 1;
 	if ( !*out_sdp_buffer) {
 		*out_sdp_buffer = gf_malloc(sizeof(char)*size);
 		if (! *out_sdp_buffer) return GF_OUT_OF_MEM;
@@ -702,7 +702,7 @@
 		strcat(sdp, "\n");
 	}
 
-	size = strlen(sdp) + (*out_sdp_buffer ? strlen(*out_sdp_buffer) : 0) + 1;
+	size = (u32) strlen(sdp) + (*out_sdp_buffer ? (u32) strlen(*out_sdp_buffer) : 0) + 1;
 	if ( !*out_sdp_buffer) {
 		*out_sdp_buffer = gf_malloc(sizeof(char)*size);
 		if (! *out_sdp_buffer) return GF_OUT_OF_MEM;
@@ -781,9 +781,13 @@
 }
 
 GF_EXPORT
-GF_Err gf_rtp_streamer_send_rtcp(GF_RTPStreamer *streamer, Bool force_ts, u32 rtp_ts)
+GF_Err gf_rtp_streamer_send_rtcp(GF_RTPStreamer *streamer, Bool force_ts, u32 rtp_ts, u32 force_ntp_type, u32 ntp_sec, u32 ntp_frac)
 {
 	if (force_ts) streamer->channel->last_pck_ts = rtp_ts;
+	streamer->channel->forced_ntp_sec = force_ntp_type ? ntp_sec : 0;
+	streamer->channel->forced_ntp_frac = force_ntp_type ? ntp_frac : 0;
+	if (force_ntp_type==2)
+		streamer->channel->next_report_time = 0;
 	return gf_rtp_send_rtcp_report(streamer->channel, NULL, NULL);
 }

gpac-0.5.0.svn4296.tar.bz2/src/ietf/rtsp_command.c -> gpac-0.5.0.svn4668.tar.bz2/src/ietf/rtsp_command.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/ietf/rtsp_response.c -> gpac-0.5.0.svn4668.tar.bz2/src/ietf/rtsp_response.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/ietf/rtsp_session.c -> gpac-0.5.0.svn4668.tar.bz2/src/ietf/rtsp_session.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/ietf/sdp.c -> gpac-0.5.0.svn4668.tar.bz2/src/ietf/sdp.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/isomedia/avc_ext.c -> gpac-0.5.0.svn4668.tar.bz2/src/isomedia/avc_ext.c Changed

@@ -56,15 +56,17 @@
 	}				
 }
 
+/* FIXME : unused function
 static void merge_nalus_list(GF_List  *src, GF_List *dst)
 {
 	u32 i, count = gf_list_count(src);
 	for (i=0; i<count; i++) {
 		void *p = gf_list_get(src, i);
-		if (p) gf_list_insert(dst, p, 0);
+		if (p) gf_list_add(dst, p);
 	}
 }
 
+
 static void merge_nalus(GF_MPEGVisualSampleEntryBox *entry, GF_List *sps, GF_List *pps)
 {
 	if (entry->avc_config) {
@@ -76,8 +78,7 @@
 		merge_nalus_list(entry->svc_config->config->sequenceParameterSets, sps);
 		merge_nalus_list(entry->svc_config->config->pictureParameterSets, pps);
 	}
-}
-
+}*/
 
 /* Rewrite mode:
  * mode = 0: playback
@@ -88,24 +89,30 @@
 	Bool is_hevc = 0;
 	GF_Err e = GF_OK;
 	GF_ISOSample *ref_samp;
-	GF_BitStream *src_bs, *ref_bs, *dst_bs;
+	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;
-	Bool rewrite_ps, rewrite_start_codes;
+	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;
+	Bool rewrite_ps, rewrite_start_codes, insert_vdrd_code;
 	u8 ref_track_ID, ref_track_num;
 	s8 sample_offset, nal_type;
 	u32 nal_hdr;
+	u32 temporal_id = 0;
 	char *buffer;
 	GF_ISOFile *file = mdia->mediaTrack->moov->mov;
 
-	src_bs = ref_bs = dst_bs = NULL;
+	src_bs = ref_bs = dst_bs = ps_bs = NULL;
 	ref_samp = NULL;
 	buffer = NULL;
 	rewrite_ps = (mdia->mediaTrack->extractor_mode & GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG) ? 1 : 0;
 	if (! 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;
 	extractor_mode = mdia->mediaTrack->extractor_mode&0x0000FFFF;
 
+	if (extractor_mode != GF_ISOM_NALU_EXTRACT_LAYER_ONLY)
+		insert_vdrd_code = 0;
+
 	if (extractor_mode == GF_ISOM_NALU_EXTRACT_INSPECT) {
 		if (!rewrite_ps && !rewrite_start_codes)
 			return GF_OK;
@@ -132,22 +139,36 @@
 	if (!nal_unit_size_field) return GF_ISOM_INVALID_FILE;
 
 	dst_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	ps_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	src_bs = gf_bs_new(sample->data, sample->dataLength, GF_BITSTREAM_READ);
 	max_size = 4096;
 
 	/*rewrite start code with NALU delim*/
 	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, (sample->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)*/;
+
+		//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);
+		}
+		//AVC/HEVC base, insert NALU delim
+		else {
+			gf_bs_write_int(dst_bs, 1, 32);
+			if (is_hevc) {
+#ifndef GPAC_DISABLE_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, 6);
+				gf_bs_write_int(dst_bs, 1, 3); //nuh_temporal_id_plus1 - cannot be 0, we use 1 by default, and overwrite it if needed at the end
+
+				/*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);
+#endif
+			} else {
+				gf_bs_write_int(dst_bs, (sample->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)*/;
+			}
 		}
 	}
 
@@ -157,7 +178,7 @@
 			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, dst_bs, rewrite_start_codes, nal_unit_size_field);
+				rewrite_nalus_list(ar->nalus, ps_bs, rewrite_start_codes, nal_unit_size_field);
 			}
 
 			/*little optimization if we are not asked to start codes: copy over the sample*/
@@ -171,82 +192,40 @@
 				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);
+			}
 
-			/*this is an SVC track: get all SPS/PPS from this track down to the base layer and rewrite them*/
-			if (mdia->mediaTrack->has_base_layer) {
-				u32 j;
-				GF_List *nalu_sps = gf_list_new();
-				GF_List *nalu_pps = gf_list_new();
-				GF_TrackReferenceTypeBox *dpnd = NULL;
-				Track_FindRef(mdia->mediaTrack, GF_ISOM_REF_SCAL, &dpnd);
-
-#if 0
-				/*get all upper layers with SCAL reference to this track*/
-				for (j = 0; j < gf_isom_get_track_count(file); j++) {
-					if (gf_isom_has_track_reference(file, j+1, GF_ISOM_REF_SCAL, mdia->mediaTrack->Header->trackID)) {
-						u32 tkID;
-						GF_TrackBox *base_track;
-						GF_MPEGVisualSampleEntryBox *base_entry;
-						gf_isom_get_reference_ID(file, j+1, GF_ISOM_REF_SCAL, 1, &tkID);
-						
-						base_track = GetTrackbyID(mdia->mediaTrack->moov, tkID);
-						base_entry = base_track ? gf_list_get(base_track->Media->information->sampleTable->SampleDescription->other_boxes, 0) : NULL;
-						if (base_entry)
-							merge_nalus(base_entry, nalu_sps, nalu_pps);
-					}
-				}
-
-#endif
-
-				merge_nalus(entry, nalu_sps, nalu_pps);
-				if (dpnd) {
-					for (j=0; j<dpnd->trackIDCount; j++) {
-						GF_TrackBox *base_track = GetTrackbyID(mdia->mediaTrack->moov, dpnd->trackIDs[j]);
-						GF_MPEGVisualSampleEntryBox *base_entry = base_track ? gf_list_get(base_track->Media->information->sampleTable->SampleDescription->other_boxes, 0) : NULL;
-						if (base_entry)
-							merge_nalus(base_entry, nalu_sps, nalu_pps);
-					}
-				}
-
-				//rewrite nalus
-				rewrite_nalus_list(nalu_sps, dst_bs, rewrite_start_codes, nal_unit_size_field);
-				rewrite_nalus_list(nalu_pps, dst_bs, rewrite_start_codes, nal_unit_size_field);
-
-				gf_list_del(nalu_sps);
-				gf_list_del(nalu_pps);
-			} else {
-
-				if (entry->avc_config) {
-					rewrite_nalus_list(entry->avc_config->config->sequenceParameterSets, dst_bs, rewrite_start_codes, nal_unit_size_field);
-					rewrite_nalus_list(entry->avc_config->config->pictureParameterSets, dst_bs, rewrite_start_codes, nal_unit_size_field);
-					rewrite_nalus_list(entry->avc_config->config->sequenceParameterSetExtensions, dst_bs, rewrite_start_codes, nal_unit_size_field);
-				}
-
-				/*add svc config */
-				if (entry->svc_config) {
-					rewrite_nalus_list(entry->svc_config->config->sequenceParameterSets, dst_bs, rewrite_start_codes, nal_unit_size_field);
-					rewrite_nalus_list(entry->svc_config->config->pictureParameterSets, dst_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) {
-					gf_bs_write_data(dst_bs, sample->data, sample->dataLength);
-					gf_free(sample->data);
-					sample->data = NULL;
-					gf_bs_get_content(dst_bs, &sample->data, &sample->dataLength);
-					gf_bs_del(src_bs);
-					gf_bs_del(dst_bs);
-					return GF_OK;
-				}
-			
+			/*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 (ps_bs)
+		{
+			gf_bs_transfer(dst_bs, ps_bs);
+			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;
+		gf_bs_get_content(dst_bs, &sample->data, &sample->dataLength);
+		gf_bs_del(src_bs);
+		gf_bs_del(dst_bs);
+		return GF_OK;
+	}
+
 	buffer = (char *)gf_malloc(sizeof(char)*max_size);
 
-	while (gf_bs_available(src_bs))
-	{
+	while (gf_bs_available(src_bs)) {
 		nal_size = gf_bs_read_int(src_bs, 8*nal_unit_size_field);
 		if (nal_size>max_size) {
 			buffer = (char*) gf_realloc(buffer, sizeof(char)*nal_size);
@@ -261,12 +240,29 @@
 		} 
 
 		if (is_hevc) {
+			if (ps_bs) {
+				gf_bs_transfer(dst_bs, ps_bs);
+				gf_bs_del(ps_bs);
+				ps_bs = NULL;
+			}
+
+#ifndef GPAC_DISABLE_HEVC
 			/*we already wrote this stuff*/
 			if (nal_type==GF_HEVC_NALU_ACCESS_UNIT) {
 				gf_bs_skip_bytes(src_bs, nal_size-2);
 				continue;
 			}
-
+			switch (nal_type) {
+			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;
+			}
+#endif
+			
 			/*rewrite nal*/
 			gf_bs_read_data(src_bs, buffer, nal_size-2);
 			if (rewrite_start_codes) 
@@ -280,96 +276,145 @@
 			continue;
 		} 
 		
-		/*we already wrote this stuff*/
-		if (nal_type==GF_AVC_NALU_ACCESS_UNIT) {
-			gf_bs_skip_bytes(src_bs, nal_size-1);
-			continue;
-		}
-
-		//extractor
-		if (nal_type == 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);
-				gf_isom_set_nalu_extract_mode(file, ref_track_num, GF_ISOM_NALU_EXTRACT_INSPECT);
-				ref_samp = gf_isom_get_sample(file, ref_track_num, sampleNumber+sample_offset, &di);
-				if (!ref_samp) {
-					e = GF_IO_ERR;
-					goto exit;
-				}
-				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))) {
+		switch(nal_type) {
+			case GF_AVC_NALU_ACCESS_UNIT:
+				/*we already wrote this stuff*/
+				gf_bs_skip_bytes(src_bs, nal_size-1);
+				continue;		
+			//extractor
+			case 31:
+				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;
 						}
-
-						e = gf_bs_seek(ref_bs, offset);
-						if (e)
+						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;
-					}
-					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);
+					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;
 				}
-
-				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 GF_AVC_NALU_SEI:
+			case GF_AVC_NALU_SEQ_PARAM:
+			case GF_AVC_NALU_PIC_PARAM:
+			case GF_AVC_NALU_SEQ_PARAM_EXT:
+			case GF_AVC_NALU_SVC_SUBSEQ_PARAM:
+				// we will rewrite the sps/pps if and only if there is no sps/pps in bistream
+				if (ps_bs) {
+					gf_bs_del(ps_bs);
+					ps_bs = NULL;
+				}
 			default:
-				//skip to end of this NALU
-				gf_bs_skip_bytes(src_bs, nal_size-1);
-				continue;
-			}
-		} else {
-			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);
+				if (ps_bs) {
+					gf_bs_transfer(dst_bs, ps_bs);
+					gf_bs_del(ps_bs);
+					ps_bs = NULL;
+				}
+				gf_bs_read_data(src_bs, buffer, nal_size-1);
+				if (rewrite_start_codes) 
+					gf_bs_write_u32(dst_bs, 1);
+				else
+					gf_bs_write_int(dst_bs, nal_size, 8*nal_unit_size_field);
+
+				gf_bs_write_u8(dst_bs, nal_hdr);
+				gf_bs_write_data(dst_bs, buffer, nal_size-1);
 		}
 	}
+
 	/*done*/
 	gf_free(sample->data);
 	sample->data = NULL;
 	gf_bs_get_content(dst_bs, &sample->data, &sample->dataLength);
 
+	/*rewrite temporal ID of AU Ddelim NALU (first one)*/
+	if (rewrite_start_codes && is_hevc && temporal_id) {
+		sample->data[6] = (sample->data[6] & 0xF8) | (temporal_id+1);
+	}
+
+
 exit:
 	if (ref_samp) gf_isom_sample_del(&ref_samp);
 	if (src_bs) gf_bs_del(src_bs);
@@ -457,8 +502,12 @@
 	if (avc->emul_esd) gf_odf_desc_del((GF_Descriptor *)avc->emul_esd);
 	avc->emul_esd = gf_odf_desc_esd_new(2);
 	avc->emul_esd->decoderConfig->streamType = GF_STREAM_VISUAL;
-	/*AVC OTI is 0x21, AVC parameter set stream OTI (not supported in gpac) is 0x22*/
-	avc->emul_esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_AVC;
+	/*AVC OTI is 0x21, AVC parameter set stream OTI (not supported in gpac) is 0x22, SVC OTI is 0x24*/
+	/*if we have only SVC stream, set objectTypeIndication to AVC OTI; else set it to AVC OTI*/
+	if (avc->svc_config && !avc->avc_config)
+		avc->emul_esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_SVC;
+	else
+		avc->emul_esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_AVC;
 	if (avc->bitrate) {
 		avc->emul_esd->decoderConfig->bufferSizeDB = avc->bitrate->bufferSizeDB;
 		avc->emul_esd->decoderConfig->avgBitrate = avc->bitrate->avgBitrate;
@@ -599,6 +648,7 @@
 
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
+GF_EXPORT
 GF_Err gf_isom_avc_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_AVCConfig *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex)
 {
 	GF_TrackBox *trak;
@@ -719,6 +769,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Err gf_isom_avc_set_inband_config(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex)
 {
 	return gf_isom_avc_config_update_ex(the_file, trackNumber, DescriptionIndex, NULL, 3);
@@ -867,7 +918,8 @@
 	return e;
 }
 
-GF_Err gf_isom_hevc_config_update(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_HEVCConfig *cfg)
+static
+GF_Err gf_isom_hevc_config_update_ex(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_HEVCConfig *cfg, u32 operand_type)
 {
 	u32 i, array_incomplete;
 	GF_TrackBox *trak;
@@ -895,17 +947,34 @@
 	array_incomplete = 0;
 	for (i=0; i<gf_list_count(entry->hevc_config->config->param_array); i++) {
 		GF_HEVCParamArray *ar = gf_list_get(entry->hevc_config->config->param_array, i);
+	
+		/*we want to force hev1*/
+		if (operand_type==1) ar->array_completeness = 0;
+
 		if (!ar->array_completeness) {
 			array_incomplete = 1;
 			break;
 		}
 	}
+
 	entry->type = array_incomplete ? GF_ISOM_BOX_TYPE_HEV1 : GF_ISOM_BOX_TYPE_HVC1;
 	
 	HEVC_RewriteESDescriptor(entry);
 	return GF_OK;
 }
 
+GF_EXPORT
+GF_Err gf_isom_hevc_config_update(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_HEVCConfig *cfg)
+{
+	return gf_isom_hevc_config_update_ex(the_file, trackNumber, DescriptionIndex, cfg, 0);;
+}
+
+GF_EXPORT
+GF_Err gf_isom_hevc_set_inband_config(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex)
+{
+	return gf_isom_hevc_config_update_ex(the_file, trackNumber, DescriptionIndex, NULL, 1);
+}
+
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 GF_EXPORT
@@ -1160,7 +1229,7 @@
 				AVCState avc;
 				s32 idx, vui_flag_pos;
 				GF_AVCConfigSlot *sl = gf_list_get(ptr->config->sequenceParameterSets, 0);
-				idx = gf_media_avc_read_sps(sl->data+1, sl->size-1, &avc, 0, &vui_flag_pos);
+				idx = gf_media_avc_read_sps(sl->data+1, sl->size-1, &avc, 0, (u32 *) &vui_flag_pos);
 				if (idx>=0) {
 					ptr->config->chroma_format = avc.sps[idx].chroma_format;
 					ptr->config->luma_bit_depth = 8 + avc.sps[idx].luma_bit_depth_m8;
@@ -1366,7 +1435,7 @@
 		ptr->size = 0;
 		return e;
 	}
-	ptr->size += 16;
+	ptr->size += 23;
 
 	count = gf_list_count(ptr->config->param_array);
 	for (i=0; i<count; i++) {

gpac-0.5.0.svn4296.tar.bz2/src/isomedia/box_code_3gpp.c -> gpac-0.5.0.svn4668.tar.bz2/src/isomedia/box_code_3gpp.c Changed

@@ -290,7 +290,7 @@
 	for (i=0; i<ptr->entry_count; i++) {
 		gf_bs_write_u16(bs, ptr->fonts[i].fontID);
 		if (ptr->fonts[i].fontName) {
-			u32 len = strlen(ptr->fonts[i].fontName);
+			u32 len = (u32) strlen(ptr->fonts[i].fontName);
 			gf_bs_write_u8(bs, len);
 			gf_bs_write_data(bs, ptr->fonts[i].fontName, len);
 		} else {
@@ -527,7 +527,7 @@
 	gf_bs_write_u8(bs, ptr->reserved2);				/*Reserved*/
 	gf_bs_write_u16(bs, ptr->reserved3);			/*Reserved*/
 	gf_bs_write_data(bs, ptr->foreground_color, 6);	/*Foreground color*/
-	if (ptr->textName && (pSize=strlen(ptr->textName))) {
+	if (ptr->textName && (pSize=(u32) strlen(ptr->textName))) {
 		gf_bs_write_u8(bs, pSize);					/*a Pascal string begins with its size*/
 		gf_bs_write_data(bs, ptr->textName, pSize);	/*Font name*/
 	} else {
@@ -844,14 +844,14 @@
 	gf_bs_write_u16(bs, ptr->startcharoffset);
 	gf_bs_write_u16(bs, ptr->endcharoffset);
 	if (ptr->URL) {
-		len = strlen(ptr->URL);
+		len = (u32) strlen(ptr->URL);
 		gf_bs_write_u8(bs, len);
 		gf_bs_write_data(bs, ptr->URL, len);
 	} else {
 		gf_bs_write_u8(bs, 0);
 	}
 	if (ptr->URL_hint) {
-		len = strlen(ptr->URL_hint);
+		len = (u32) strlen(ptr->URL_hint);
 		gf_bs_write_u8(bs, len);
 		gf_bs_write_data(bs, ptr->URL_hint, len);
 	} else {
@@ -1128,8 +1128,8 @@
 	gf_bs_write_int(bs, p->fullRequestHost, 1);
 	gf_bs_write_int(bs, p->streamType, 1);
 	gf_bs_write_int(bs, p->containsRedundant, 2);
-	gf_bs_write_data(bs, p->textEncoding, strlen(p->textEncoding)+1);
-	gf_bs_write_data(bs, p->contentEncoding, strlen(p->contentEncoding)+1);
+	gf_bs_write_data(bs, p->textEncoding, (u32) strlen(p->textEncoding)+1);
+	gf_bs_write_data(bs, p->contentEncoding, (u32) strlen(p->contentEncoding)+1);
 	return GF_OK;
 }
 GF_Err dimC_Size(GF_Box *s)
@@ -1182,7 +1182,7 @@
 	GF_Err e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
 	if (p->content_script_types)
-		gf_bs_write_data(bs, p->content_script_types, strlen(p->content_script_types)+1);
+		gf_bs_write_data(bs, p->content_script_types, (u32) strlen(p->content_script_types)+1);
 	else
 		gf_bs_write_u8(bs, 0);
 	return GF_OK;

gpac-0.5.0.svn4296.tar.bz2/src/isomedia/box_code_base.c -> gpac-0.5.0.svn4668.tar.bz2/src/isomedia/box_code_base.c Changed

@@ -186,7 +186,7 @@
 		GF_ChapterEntry *ce = (GF_ChapterEntry *)gf_list_get(ptr->list, i);
 		gf_bs_write_u64(bs, ce->start_time);
 		if (ce->name) {
-			len = strlen(ce->name); if (len>255) len = 255;
+			len = (u32) strlen(ce->name); if (len>255) len = 255;
 			gf_bs_write_u8(bs, len);
 			gf_bs_write_data(bs, ce->name, len);
 		} else {
@@ -1499,7 +1499,7 @@
 	gf_bs_write_u32(bs, ptr->reserved1);
 	gf_bs_write_u32(bs, ptr->handlerType);
 	gf_bs_write_data(bs, (char*)ptr->reserved2, 12);
-	if (ptr->nameUTF8) gf_bs_write_data(bs, ptr->nameUTF8, strlen(ptr->nameUTF8));
+	if (ptr->nameUTF8) gf_bs_write_data(bs, ptr->nameUTF8, (u32) strlen(ptr->nameUTF8));
 	/*NULL-terminated string is written*/
 	gf_bs_write_u8(bs, 0);
 	return GF_OK;
@@ -1766,7 +1766,7 @@
 			if (e) return e;
 			gf_bs_write_u32(bs, rtp->subType);
 			//don't write the NULL char
-			gf_bs_write_data(bs, rtp->sdpText, strlen(rtp->sdpText));
+			gf_bs_write_data(bs, rtp->sdpText, (u32) strlen(rtp->sdpText));
 		}
 	}
 	return GF_OK;
@@ -1846,7 +1846,7 @@
 	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
 	//don't write the NULL char!!!
-	gf_bs_write_data(bs, ptr->sdpText, strlen(ptr->sdpText));
+	gf_bs_write_data(bs, ptr->sdpText, (u32) strlen(ptr->sdpText));
 	return GF_OK;
 }
 GF_Err sdp_Size(GF_Box *s)
@@ -2482,7 +2482,7 @@
 	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
 	gf_bs_write_u32(bs, ptr->payloadCode);
-	len = strlen(ptr->payloadString);
+	len = (u32) strlen(ptr->payloadString);
 	gf_bs_write_u8(bs, len);
 	if (len) gf_bs_write_data(bs, ptr->payloadString, len);
 	return GF_OK;
@@ -2536,7 +2536,7 @@
 	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
 	if (ptr->string) {
-		gf_bs_write_data(bs, ptr->string, strlen(ptr->string) + 1);
+		gf_bs_write_data(bs, ptr->string, (u32) strlen(ptr->string) + 1);
 	}
 	return GF_OK;
 }
@@ -4507,7 +4507,7 @@
 			}
 
 			if (a->size>8) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Box \"%s\" has %d extra bytes\n", gf_4cc_to_str(a->type), a->size));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[iso file] Box \"%s\" has %d extra bytes\n", gf_4cc_to_str(a->type), a->size));
 				gf_bs_skip_bytes(bs, a->size-8);
 			}
 			a->size = s;
@@ -4982,6 +4982,7 @@
 	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);
 	/*for 3GP config, we must set the type*/
 	case GF_ISOM_SUBTYPE_3GP_AMR:
@@ -5458,7 +5459,7 @@
 	if (ptr->type == GF_ISOM_BOX_TYPE_STSZ) {
 		if (! ptr->sampleSize) {
 			for (i = 0; i < ptr->sampleCount; i++) {
-				gf_bs_write_u32(bs, ptr->sizes[i]);
+				gf_bs_write_u32(bs, ptr->sizes ? ptr->sizes[i] : 0);
 			}
 		}
 	} else {
@@ -6190,6 +6191,7 @@
 		case GF_ISOM_BOX_TYPE_DIMS:
 		case GF_ISOM_BOX_TYPE_AC3:
 		case GF_ISOM_BOX_TYPE_LSR1:
+		case GF_ISOM_BOX_TYPE_WVTT:
 			continue;
 		default:
 			break;
@@ -6235,22 +6237,24 @@
 
 		default:
 			/*remove entry*/
-			gf_list_rem(trak->Media->information->sampleTable->SampleDescription->other_boxes, i-1);
-			genm = (GF_GenericSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_GNRM);
-			genm->size = a->size;
-			bs = gf_bs_new(a->data, a->dataSize, GF_BITSTREAM_READ);
-			gf_bs_read_data(bs, genm->reserved, 6);
-			genm->dataReferenceIndex = gf_bs_read_u16(bs);
-			genm->data_size = (u32) gf_bs_available(bs);
-			if (genm->data_size) {
-				genm->data = (char*)gf_malloc(sizeof(char) * genm->data_size);
-				gf_bs_read_data(bs, genm->data, genm->data_size);
-			}
-			gf_bs_del(bs);
-			genm->size = a->size;
-			genm->EntryType = a->type;
-			gf_isom_box_del((GF_Box *)a);
-			gf_list_insert(trak->Media->information->sampleTable->SampleDescription->other_boxes, genm, i-1);
+      if (a->data && a->size) {
+			  gf_list_rem(trak->Media->information->sampleTable->SampleDescription->other_boxes, i-1);
+			  genm = (GF_GenericSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_GNRM);
+			  genm->size = a->size;
+			  bs = gf_bs_new(a->data, a->dataSize, GF_BITSTREAM_READ);
+			  gf_bs_read_data(bs, genm->reserved, 6);
+			  genm->dataReferenceIndex = gf_bs_read_u16(bs);
+			  genm->data_size = (u32) gf_bs_available(bs);
+			  if (genm->data_size) {
+				  genm->data = (char*)gf_malloc(sizeof(char) * genm->data_size);
+				  gf_bs_read_data(bs, genm->data, genm->data_size);
+			  }
+			  gf_bs_del(bs);
+			  genm->size = a->size;
+			  genm->EntryType = a->type;
+			  gf_isom_box_del((GF_Box *)a);
+			  gf_list_insert(trak->Media->information->sampleTable->SampleDescription->other_boxes, genm, i-1);
+      }
 			break;
 		}
 
@@ -7317,16 +7321,16 @@
 	gf_bs_write_u16(bs, ptr->dataReferenceIndex);
 
 	if (ptr->content_encoding) 
-		gf_bs_write_data(bs, ptr->content_encoding, strlen(ptr->content_encoding));
+		gf_bs_write_data(bs, ptr->content_encoding, (u32) strlen(ptr->content_encoding));
 	gf_bs_write_u8(bs, 0);
 
 	if (ptr->mime_type_or_namespace) 
-		gf_bs_write_data(bs, ptr->mime_type_or_namespace, strlen(ptr->mime_type_or_namespace));
+		gf_bs_write_data(bs, ptr->mime_type_or_namespace, (u32) strlen(ptr->mime_type_or_namespace));
 	gf_bs_write_u8(bs, 0);
 	
 	if (ptr->type == GF_ISOM_BOX_TYPE_METX) { 
 	    if (ptr->xml_schema_loc) 
-		    gf_bs_write_data(bs, ptr->xml_schema_loc, strlen(ptr->xml_schema_loc));
+		    gf_bs_write_data(bs, ptr->xml_schema_loc, (u32) strlen(ptr->xml_schema_loc));
 	    gf_bs_write_u8(bs, 0);
     }
 
@@ -8243,7 +8247,7 @@
 		GF_SAFEALLOC(ptr, GF_DefaultSampleGroupDescriptionEntry);
 		ptr->length = entry_size;
 		ptr->data = (u8 *) gf_malloc(sizeof(u8)*ptr->length);
-		gf_bs_read_data(bs, ptr->data, ptr->length);
+		gf_bs_read_data(bs, (char *) ptr->data, ptr->length);
 		*total_bytes = entry_size;
 		return ptr;
 	}
@@ -8282,7 +8286,7 @@
 	default:
 		{
 		GF_DefaultSampleGroupDescriptionEntry *ptr = (GF_DefaultSampleGroupDescriptionEntry *)entry;
-		gf_bs_write_data(bs, ptr->data, ptr->length);
+		gf_bs_write_data(bs, (char *) ptr->data, ptr->length);
 		}
 	}
 }
@@ -8434,7 +8438,7 @@
 	ptr->size -= 5;
 	if (ptr->default_sample_info_size == 0) {
 		ptr->sample_info_size = gf_malloc(sizeof(u8)*ptr->sample_count);
-		gf_bs_read_data(bs, ptr->sample_info_size, ptr->sample_count);
+		gf_bs_read_data(bs, (char *) ptr->sample_info_size, ptr->sample_count);
 		ptr->size -= ptr->sample_count;
 	}
 	return GF_OK;
@@ -8463,7 +8467,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) {
-		gf_bs_write_data(bs, ptr->sample_info_size, ptr->sample_count);
+		gf_bs_write_data(bs, (char *) ptr->sample_info_size, ptr->sample_count);
 	}
 	return GF_OK;
 }

gpac-0.5.0.svn4296.tar.bz2/src/isomedia/box_code_drm.c -> gpac-0.5.0.svn4668.tar.bz2/src/isomedia/box_code_drm.c Changed

@@ -200,7 +200,7 @@
 	assert(e == GF_OK);
 	gf_bs_write_u32(bs, ptr->scheme_type);
 	gf_bs_write_u32(bs, ptr->scheme_version);
-	if (ptr->flags & 0x000001) gf_bs_write_data(bs, ptr->URI, strlen(ptr->URI)+1);
+	if (ptr->flags & 0x000001) gf_bs_write_data(bs, ptr->URI, (u32) strlen(ptr->URI)+1);
 	return GF_OK;
 }
 
@@ -383,7 +383,7 @@
 	if (!s) return GF_BAD_PARAM;
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
-	gf_bs_write_data(bs, ptr->URI, strlen(ptr->URI)+1);
+	gf_bs_write_data(bs, ptr->URI, (u32) strlen(ptr->URI)+1);
 	return GF_OK;
 }
 
@@ -535,14 +535,14 @@
 	gf_bs_write_u8(bs, ptr->PaddingScheme);
 	gf_bs_write_u64(bs, ptr->PlaintextLength);
 	
-	cid_len = ptr->ContentID ? strlen(ptr->ContentID) : 0;
+	cid_len = ptr->ContentID ? (u32) strlen(ptr->ContentID) : 0;
 	gf_bs_write_u16(bs, cid_len);
-	ri_len = ptr->RightsIssuerURL ? strlen(ptr->RightsIssuerURL) : 0;
+	ri_len = ptr->RightsIssuerURL ? (u32) strlen(ptr->RightsIssuerURL) : 0;
 	gf_bs_write_u16(bs, ri_len);
 	gf_bs_write_u16(bs, ptr->TextualHeadersLen);
 
-	if (cid_len) gf_bs_write_data(bs, ptr->ContentID, strlen(ptr->ContentID));
-	if (ri_len) gf_bs_write_data(bs, ptr->RightsIssuerURL, strlen(ptr->RightsIssuerURL));
+	if (cid_len) gf_bs_write_data(bs, ptr->ContentID, (u32) strlen(ptr->ContentID));
+	if (ri_len) gf_bs_write_data(bs, ptr->RightsIssuerURL, (u32) strlen(ptr->RightsIssuerURL));
 	if (ptr->TextualHeadersLen) gf_bs_write_data(bs, ptr->TextualHeaders, ptr->TextualHeadersLen);
 	ptr->size -= cid_len+ri_len+ptr->TextualHeadersLen;
 	return GF_OK;
@@ -615,7 +615,7 @@
 	if (!s) return GF_BAD_PARAM;
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
-	gid_len = ptr->GroupID ? strlen(ptr->GroupID) : 0;
+	gid_len = ptr->GroupID ? (u32) strlen(ptr->GroupID) : 0;
 	gf_bs_write_u16(bs, gid_len);
 	gf_bs_write_u8(bs, ptr->GKEncryptionMethod);
 	gf_bs_write_u16(bs, ptr->GKLength);
@@ -897,7 +897,7 @@
 	e = gf_isom_full_box_read(s, bs);
 	if (e) return e;
 
-	gf_bs_read_data(bs, ptr->SystemID, 16);
+	gf_bs_read_data(bs, (char *) ptr->SystemID, 16);
 	ptr->size -= 16;
 	if (ptr->version > 0) {
 		ptr->KID_count = gf_bs_read_u32(bs);
@@ -906,7 +906,7 @@
 			u32 i;
 			ptr->KIDs = gf_malloc(sizeof(bin128));
 			for (i=0; i<ptr->KID_count; i++) {
-				gf_bs_read_data(bs, ptr->KIDs[i], 16);
+				gf_bs_read_data(bs, (char *) ptr->KIDs[i], 16);
 				ptr->size -= 16;
 			}
 		}
@@ -915,7 +915,7 @@
 	ptr->size -= 4;
 	if (ptr->private_data_size) {
 		ptr->private_data = gf_malloc(sizeof(char)*ptr->private_data_size);
-		gf_bs_read_data(bs, ptr->private_data, ptr->private_data_size);
+		gf_bs_read_data(bs, (char *) ptr->private_data, ptr->private_data_size);
 		ptr->size -= ptr->private_data_size;
 	}
 	return GF_OK;
@@ -931,16 +931,16 @@
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
 
-	gf_bs_write_data(bs, ptr->SystemID, 16);
+	gf_bs_write_data(bs, (char *) ptr->SystemID, 16);
 	if (ptr->version > 0) {
 		u32 i;
 		gf_bs_write_u32(bs, ptr->KID_count);
 		for (i=0; i<ptr->KID_count; i++) 
-			gf_bs_write_data(bs, ptr->KIDs[i], 16);
+			gf_bs_write_data(bs, (char *) ptr->KIDs[i], 16);
 	}
 	if (ptr->private_data) {
 		gf_bs_write_u32(bs, ptr->private_data_size);
-		gf_bs_write_data(bs, ptr->private_data, ptr->private_data_size);
+		gf_bs_write_data(bs, (char *) ptr->private_data, ptr->private_data_size);
 	} else 
 		gf_bs_write_u32(bs, 0);
 	return GF_OK;
@@ -987,7 +987,7 @@
 
 	ptr->IsEncrypted = gf_bs_read_int(bs, 24);
 	ptr->IV_size = gf_bs_read_u8(bs);
-	gf_bs_read_data(bs, ptr->KID, 16);
+	gf_bs_read_data(bs, (char *) ptr->KID, 16);
 	ptr->size -= 20;
 	return GF_OK;
 }
@@ -1004,7 +1004,7 @@
 
 	gf_bs_write_int(bs, ptr->IsEncrypted, 24);
 	gf_bs_write_u8(bs, ptr->IV_size);
-	gf_bs_write_data(bs, ptr->KID, 16);
+	gf_bs_write_data(bs, (char *) ptr->KID, 16);
 	return GF_OK;
 }
 
@@ -1042,7 +1042,7 @@
 
 	ptr->AlgorithmID = gf_bs_read_int(bs, 24);
 	ptr->IV_size = gf_bs_read_u8(bs);
-	gf_bs_read_data(bs, ptr->KID, 16);
+	gf_bs_read_data(bs, (char *) ptr->KID, 16);
 	ptr->size -= 20;
 	return GF_OK;
 }
@@ -1062,7 +1062,7 @@
 
 	gf_bs_write_int(bs, ptr->AlgorithmID, 24);
 	gf_bs_write_u8(bs, ptr->IV_size);
-	gf_bs_write_data(bs, ptr->KID, 16);
+	gf_bs_write_data(bs, (char *) ptr->KID, 16);
 	return GF_OK;
 }
 
@@ -1103,7 +1103,7 @@
 	if (ptr->flags & 1) {
 		ptr->AlgorithmID = gf_bs_read_int(bs, 24);
 		ptr->IV_size = gf_bs_read_u8(bs);
-		gf_bs_read_data(bs, ptr->KID, 16);
+		gf_bs_read_data(bs, (char *) ptr->KID, 16);
 		ptr->size -= 20;
 	}
 	ptr->sample_count = gf_bs_read_u32(bs);
@@ -1131,7 +1131,7 @@
 	if (ptr->flags & 1) {
 		gf_bs_write_int(bs, ptr->AlgorithmID, 24);
 		gf_bs_write_u8(bs, ptr->IV_size);
-		gf_bs_write_data(bs, ptr->KID, 16);
+		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) {
@@ -1180,11 +1180,11 @@
 	ptr->flags = gf_bs_read_u24(bs);
 	ptr->size -= 4;
 
-	gf_bs_read_data(bs, ptr->SystemID, 16);
+	gf_bs_read_data(bs, (char *) ptr->SystemID, 16);
 	ptr->private_data_size = gf_bs_read_u32(bs);
 	ptr->size -= 20;
 	ptr->private_data = gf_malloc(sizeof(char)*ptr->private_data_size);
-	gf_bs_read_data(bs, ptr->private_data, ptr->private_data_size);
+	gf_bs_read_data(bs, (char *) ptr->private_data, ptr->private_data_size);
 	ptr->size -= ptr->private_data_size;
 	return GF_OK;
 }
@@ -1202,9 +1202,9 @@
 	gf_bs_write_u8(bs, ptr->version);
 	gf_bs_write_u24(bs, ptr->flags);
 
-	gf_bs_write_data(bs, ptr->SystemID, 16);
+	gf_bs_write_data(bs, (char *) ptr->SystemID, 16);
 	gf_bs_write_u32(bs, ptr->private_data_size);
-	gf_bs_write_data(bs, ptr->private_data, ptr->private_data_size);
+	gf_bs_write_data(bs, (char *) ptr->private_data, ptr->private_data_size);
 	return GF_OK;
 }

gpac-0.5.0.svn4296.tar.bz2/src/isomedia/box_code_meta.c -> gpac-0.5.0.svn4668.tar.bz2/src/isomedia/box_code_meta.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/isomedia/box_dump.c -> gpac-0.5.0.svn4668.tar.bz2/src/isomedia/box_dump.c Changed

@@ -480,7 +480,21 @@
 		default:
 			return defa_dump(a, trace);
 		}
-		
+#ifndef GPAC_DISABLE_TTXT
+	case GF_ISOM_BOX_TYPE_VTTC:
+	case GF_ISOM_BOX_TYPE_CTIM:
+	case GF_ISOM_BOX_TYPE_IDEN:
+	case GF_ISOM_BOX_TYPE_STTG:
+	case GF_ISOM_BOX_TYPE_PAYL:
+		return boxstring_dump(a, trace);
+	case GF_ISOM_BOX_TYPE_VTCU:
+		return vtcu_dump(a, trace);
+	case GF_ISOM_BOX_TYPE_VTTE:
+		return vtte_dump(a, trace);
+	case GF_ISOM_BOX_TYPE_WVTT:
+		return wvtt_dump(a, trace);
+#endif
+			
 	default: 
 		return defa_dump(a, trace);
 	}
@@ -871,7 +885,7 @@
 		fprintf(trace, "<HandlerBox Type=\"%s\" Name=\"%s\" ", gf_4cc_to_str(p->handlerType), p->nameUTF8);
 	}
 	fprintf(trace, "reserved1=\"%d\" reserved2=\"", p->reserved1);
-	DumpData(trace, p->reserved2, 12);
+	DumpData(trace, (char *) p->reserved2, 12);
 	fprintf(trace, "\"");
 
 	fprintf(trace, ">\n");
@@ -1689,10 +1703,23 @@
 
 	fprintf(trace, "<HEVCConfigurationBox>\n");
 
-	fprintf(trace, "<HEVCDecoderConfigurationRecord nal_unit_size=\"%d\" configurationVersion=\"%d\" profile_space=\"%d\" profile_idc=\"%d\" constraint_indicator_flags=\"%d\" ",
-					p->config->nal_unit_size, p->config->configurationVersion, p->config->profile_space, p->config->profile_idc, p->config->constraint_indicator_flags);
-	fprintf(trace, "chroma_format=\"%d\" luma_bit_depth=\"%d\" chroma_bit_depth=\"%d\" avgFrameRate=\"%d\" constantFrameRate=\"%d\" numTemporalLayers=\"%d\"",
-		p->config->chromaFormat, p->config->luma_bit_depth, p->config->chroma_bit_depth, p->config->avgFrameRate, p->config->constantFrameRate, p->config->numTemporalLayers);
+	fprintf(trace, "<HEVCDecoderConfigurationRecord nal_unit_size=\"%d\" ", 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, "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);
+	fprintf(trace, "frame_only_constraint_flag=\"%d\" ", p->config->frame_only_constraint_flag);
+	fprintf(trace, "constraint_indicator_flags=\""LLD"\" ", p->config->constraint_indicator_flags);
+	fprintf(trace, "level_idc=\"%d\" ", p->config->level_idc);
+	fprintf(trace, "min_spatial_segmentation_idc=\"%d\" ", p->config->min_spatial_segmentation_idc);
+	fprintf(trace, "parallelismType=\"%d\" ", p->config->parallelismType);
+
+	fprintf(trace, "chroma_format=\"%d\" luma_bit_depth=\"%d\" chroma_bit_depth=\"%d\" avgFrameRate=\"%d\" constantFrameRate=\"%d\" numTemporalLayers=\"%d\" temporalIdNested=\"%d\"",
+		p->config->chromaFormat, p->config->luma_bit_depth, p->config->chroma_bit_depth, p->config->avgFrameRate, p->config->constantFrameRate, p->config->numTemporalLayers, p->config->temporalIdNested);
 
 	fprintf(trace, ">\n");
 
@@ -2419,7 +2446,11 @@
 	p = (GF_TrackFragmentHeaderBox *)a;
 	fprintf(trace, "<TrackFragmentHeaderBox TrackID=\"%d\"", p->trackID);
 
-	fprintf(trace, " BaseDataOffset=\"%s\"", (p->flags & GF_ISOM_MOOF_BASE_OFFSET) ? "moof" : ((p->flags & GF_ISOM_TRAF_BASE_OFFSET) ? "traf" : "file") );
+	if (p->flags & GF_ISOM_TRAF_BASE_OFFSET) {
+		fprintf(trace, " BaseDataOffset=\""LLU"\"", p->base_data_offset);
+	} else {
+		fprintf(trace, " BaseDataOffset=\"%s\"", (p->flags & GF_ISOM_MOOF_BASE_OFFSET) ? "moof" : "moof-or-previous-traf");
+	}
 
 	if (p->flags & GF_ISOM_TRAF_SAMPLE_DESC)
 		fprintf(trace, " SampleDescriptionIndex=\"%d\"", p->sample_desc_index);
@@ -2669,8 +2700,9 @@
 
 static GF_Err gf_isom_dump_ttxt_track(GF_ISOFile *the_file, u32 track, FILE *dump)
 {
-	u32 i, j, count, di, len, nb_descs, shift_offset[20], so_count;
+	u32 i, j, count, di, nb_descs, shift_offset[20], so_count;
 	u64 last_DTS;
+	size_t len;
 	GF_Box *a;
 	Bool has_scroll;
 	char szDur[100];
@@ -2817,7 +2849,7 @@
 				str = txt->text;
 				len = gf_utf8_mbstowcs((u16*)utf16Line, 10000, (const char **) &str);
 			}
-			if (len != (u32) -1) {
+			if (len != (size_t) -1) {
 				utf16Line[len] = 0;
 #ifdef DUMP_OLD_TEXT
 				fprintf(dump, " text=\"\'");
@@ -2996,8 +3028,8 @@
 				len = txt->len;
 			} else {
 				u8 *str = (u8 *) (txt->text);
-				s32 res = gf_utf8_mbstowcs(utf16Line, 10000, (const char **) &str);
-				if (res<0) return GF_NON_COMPLIANT_BITSTREAM;
+				size_t res = gf_utf8_mbstowcs(utf16Line, 10000, (const char **) &str);
+				if (res==(size_t)-1) return GF_NON_COMPLIANT_BITSTREAM;
 				len = (u32) res;
 				utf16Line[len] = 0;
 			}
@@ -3040,14 +3072,15 @@
                 }
 
                 if (!is_new_line) {
-                    u32 sl;
+                    size_t sl;
                     char szChar[30];
                     s16 swT[2], *swz;
                     swT[0] = utf16Line[j];
                     swT[1] = 0;
                     swz= (s16 *)swT;
                     sl = gf_utf8_wcstombs(szChar, 30, (const unsigned short **) &swz);
-                    szChar[sl]=0;
+                    if (sl == (size_t)-1) sl=0;
+					szChar[(u32) sl]=0;
                     fprintf(dump, "%s", szChar);
                 }
                 char_num++;
@@ -3920,7 +3953,7 @@
 			break;
 		default:
 			fprintf(trace, "<DefaultSampleGroupDescriptionEntry size=\"%d\" data=\"", ((GF_DefaultSampleGroupDescriptionEntry*)entry)->length);
-			DumpData(trace, ((GF_DefaultSampleGroupDescriptionEntry*)entry)->data,  ((GF_DefaultSampleGroupDescriptionEntry*)entry)->length);
+			DumpData(trace, (char *) ((GF_DefaultSampleGroupDescriptionEntry*)entry)->data,  ((GF_DefaultSampleGroupDescriptionEntry*)entry)->length);
 			fprintf(trace, "\"/>\n");
 		}
 	}
@@ -3981,7 +4014,7 @@
 	if (!a) return GF_BAD_PARAM;
 
 	fprintf(trace, "<ProtectionSystemHeaderBox SystemID=\"");
-	DumpData(trace, ptr->SystemID, 16);
+	DumpData(trace, (char *) ptr->SystemID, 16);
 	fprintf(trace, "\">\n");
 	DumpBox(a, trace);
 	gf_full_box_dump((GF_Box *)a, trace);
@@ -3990,13 +4023,13 @@
 		u32 i;
 		for (i=0; i<ptr->KID_count; i++) {
 			fprintf(trace, " <PSSHKey KID=\"");
-			DumpData(trace, ptr->KIDs[i], 16);
+			DumpData(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, ptr->private_data, ptr->private_data_size);
+		DumpData(trace, (char *) ptr->private_data, ptr->private_data_size);
 		fprintf(trace, "\"/>\n");
 	}
 	gf_box_dump_done("ProtectionSystemHeaderBox", a, trace);
@@ -4009,7 +4042,7 @@
 	if (!a) return GF_BAD_PARAM;
 
 	fprintf(trace, "<TrackEncryptionBox isEncrypted=\"%d\" IV_size=\"%d\" KID=\"", ptr->IsEncrypted, ptr->IV_size);
-	DumpData(trace, ptr->KID, 16);
+	DumpData(trace, (char *) ptr->KID, 16);
 	fprintf(trace, "\">\n");
 	DumpBox(a, trace);
 	gf_full_box_dump((GF_Box *)a, trace);
@@ -4023,9 +4056,9 @@
 	if (!a) return GF_BAD_PARAM;
 
 	fprintf(trace, "<PIFFProtectionSystemHeaderBox SystemID=\"");
-	DumpDataHex(trace, ptr->SystemID, 16);
+	DumpDataHex(trace, (char *) ptr->SystemID, 16);
 	fprintf(trace, "\" PrivateData=\"");
-	DumpDataHex(trace, ptr->private_data, ptr->private_data_size);
+	DumpDataHex(trace, (char *) ptr->private_data, ptr->private_data_size);
 	fprintf(trace, "\">\n");
 	DumpBox(a, trace);
 	fprintf(trace, "<FullBoxInfo Version=\"%d\" Flags=\"%d\"/>\n", ptr->version, ptr->flags);
@@ -4039,7 +4072,7 @@
 	if (!a) return GF_BAD_PARAM;
 
 	fprintf(trace, "<PIFFTrackEncryptionBox AlgorithmID=\"%d\" IV_size=\"%d\" KID=\"", ptr->AlgorithmID, ptr->IV_size);
-	DumpData(trace, ptr->KID, 16);
+	DumpData(trace,(char *) ptr->KID, 16);
 	fprintf(trace, "\">\n");
 	DumpBox(a, trace);
 	fprintf(trace, "<FullBoxInfo Version=\"%d\" Flags=\"%d\"/>\n", ptr->version, ptr->flags);
@@ -4056,7 +4089,7 @@
 	fprintf(trace, "<PIFFSampleEncryptionBox sampleCount=\"%d\"", ptr->sample_count);
 	if (ptr->flags & 1) {
 		fprintf(trace, " default_AlgorithmID=\"%d\" IV_size=\"%d\" KID=\"", ptr->AlgorithmID, ptr->IV_size);
-		DumpData(trace, ptr->KID, 16);
+		DumpData(trace, (char *) ptr->KID, 16);
 		fprintf(trace, "\"");
 		IV_size = 0;
 	}
@@ -4070,11 +4103,11 @@
 
 			if (cenc_sample) {
 				fprintf(trace, "<PIFFSampleEncryptionEntry IV=\"");
-				DumpDataHex(trace, cenc_sample->IV, IV_size);
+				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, cenc_sample->keyID, 16);
+					DumpDataHex(trace, (char *) cenc_sample->keyID, 16);
 					fprintf(trace, "\"");
 				}
 				fprintf(trace, ">\n");

gpac-0.5.0.svn4296.tar.bz2/src/isomedia/box_funcs.c -> gpac-0.5.0.svn4668.tar.bz2/src/isomedia/box_funcs.c Changed

@@ -187,7 +187,7 @@
 		gf_bs_seek(bs, start+size);
 	} else if (end-start < size) {
 		u32 to_skip = (u32) (size-(end-start));
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Box \"%s\" has %d extra bytes\n", gf_4cc_to_str(type), to_skip));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[iso file] Box \"%s\" has %d extra bytes\n", gf_4cc_to_str(type), to_skip));
 		gf_bs_skip_bytes(bs, to_skip);
 	}
 	*outBox = newBox;
@@ -634,6 +634,17 @@
 #endif
 	case GF_ISOM_BOX_TYPE_RVCC: return rvcc_New();
 
+#ifndef GPAC_DISABLE_TTXT
+	case GF_ISOM_BOX_TYPE_VTCU: return vtcu_New();
+	case GF_ISOM_BOX_TYPE_VTTE: return vtte_New();
+	case GF_ISOM_BOX_TYPE_VTTC: return boxstring_New(GF_ISOM_BOX_TYPE_VTTC);
+	case GF_ISOM_BOX_TYPE_CTIM: return boxstring_New(GF_ISOM_BOX_TYPE_CTIM);
+	case GF_ISOM_BOX_TYPE_IDEN: return boxstring_New(GF_ISOM_BOX_TYPE_IDEN);
+	case GF_ISOM_BOX_TYPE_STTG: return boxstring_New(GF_ISOM_BOX_TYPE_STTG);
+	case GF_ISOM_BOX_TYPE_PAYL: return boxstring_New(GF_ISOM_BOX_TYPE_PAYL);
+	case GF_ISOM_BOX_TYPE_WVTT: return wvtt_New();
+#endif //GPAC_DISABLE_TTXT
+
 	default:
 		a = defa_New();
 		if (a) a->type = boxType;
@@ -938,6 +949,17 @@
 	case GF_ISOM_BOX_TYPE_SUBS: subs_del(a); return;
 	case GF_ISOM_BOX_TYPE_RVCC: rvcc_del(a); return;
 
+#ifndef GPAC_DISABLE_TTXT
+	case GF_ISOM_BOX_TYPE_VTCU: vtcu_del(a); return;
+	case GF_ISOM_BOX_TYPE_VTTE: vtte_del(a); return;
+	case GF_ISOM_BOX_TYPE_VTTC: boxstring_del(a); return;
+	case GF_ISOM_BOX_TYPE_CTIM: boxstring_del(a); return;
+	case GF_ISOM_BOX_TYPE_IDEN: boxstring_del(a); return;
+	case GF_ISOM_BOX_TYPE_STTG: boxstring_del(a); return;
+	case GF_ISOM_BOX_TYPE_PAYL: boxstring_del(a); return;
+	case GF_ISOM_BOX_TYPE_WVTT: wvtt_del(a); return;
+#endif // GPAC_DISABLE_TTXT
+
 	default:
 		defa_del(a);
 		return;
@@ -1198,6 +1220,17 @@
 	case GF_ISOM_BOX_TYPE_RVCC: return rvcc_Read(a, bs);
 	case GF_ISOM_BOX_TYPE_PCRB: return pcrb_Read(a, bs);
 
+#ifndef GPAC_DISABLE_TTXT
+	case GF_ISOM_BOX_TYPE_VTCU: return vtcu_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_VTTE: return vtte_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_VTTC: return boxstring_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_CTIM: return boxstring_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_IDEN: return boxstring_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_STTG: return boxstring_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_PAYL: return boxstring_Read(a, bs);
+	case GF_ISOM_BOX_TYPE_WVTT: return wvtt_Read(a, bs);
+#endif // GPAC_DISABLE_TTXT
+
 	default:
 		return defa_Read(a, bs);
 	}
@@ -1461,6 +1494,17 @@
 	case GF_ISOM_BOX_TYPE_SUBS: return subs_Write(a, bs);
 	case GF_ISOM_BOX_TYPE_RVCC: return rvcc_Write(a, bs); 
 
+#ifndef GPAC_DISABLE_TTXT
+	case GF_ISOM_BOX_TYPE_VTCU: return vtcu_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_VTTE: return vtte_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_VTTC: return boxstring_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_CTIM: return boxstring_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_IDEN: return boxstring_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_STTG: return boxstring_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_PAYL: return boxstring_Write(a, bs);
+	case GF_ISOM_BOX_TYPE_WVTT: return wvtt_Write(a, bs);
+#endif//GPAC_DISABLE_TTXT
+
 	default:
 		return defa_Write(a, bs);
 	}
@@ -1732,6 +1776,17 @@
 	case GF_ISOM_BOX_TYPE_SUBS: return subs_Size(a);
 	case GF_ISOM_BOX_TYPE_RVCC: return rvcc_Size(a);
 
+#ifndef GPAC_DISABLE_TTXT
+	case GF_ISOM_BOX_TYPE_VTCU: return vtcu_Size(a);
+	case GF_ISOM_BOX_TYPE_VTTE: return vtte_Size(a);
+	case GF_ISOM_BOX_TYPE_VTTC: return boxstring_Size(a);
+	case GF_ISOM_BOX_TYPE_CTIM: return boxstring_Size(a);
+	case GF_ISOM_BOX_TYPE_IDEN: return boxstring_Size(a);
+	case GF_ISOM_BOX_TYPE_STTG: return boxstring_Size(a);
+	case GF_ISOM_BOX_TYPE_PAYL: return boxstring_Size(a);
+	case GF_ISOM_BOX_TYPE_WVTT: return wvtt_Size(a);
+#endif // GPAC_DISABLE_TTXT
+
 	default: return defa_Size(a);
 	}
 }

gpac-0.5.0.svn4296.tar.bz2/src/isomedia/data_map.c -> gpac-0.5.0.svn4668.tar.bz2/src/isomedia/data_map.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/isomedia/drm_sample.c -> gpac-0.5.0.svn4668.tar.bz2/src/isomedia/drm_sample.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/isomedia/hint_track.c -> gpac-0.5.0.svn4668.tar.bz2/src/isomedia/hint_track.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/isomedia/isom_intern.c -> gpac-0.5.0.svn4668.tar.bz2/src/isomedia/isom_intern.c Changed

@@ -48,10 +48,10 @@
 
 	//we shall have a MOOV and its MVEX BEFORE any MOOF
 	if (!mov->moov || !mov->moov->mvex) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Error: %s not received before merging frament\n", mov->moov ? "mvex" : "moov" ));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Error: %s not received before merging fragment\n", mov->moov ? "mvex" : "moov" ));
 		return GF_ISOM_INVALID_FILE;
 	}
-	//and all fragments must be continous - we do not throw an error as we may still want to be able to concatenate depednent representation in DASH and
+	//and all fragments must be continous - we do not throw an error as we may still want to be able to concatenate dependent representations in DASH and
 	//we will likely a-have R1(moofSN 1, 3, 5, 7) plus R2(moofSN 2, 4, 6, 8) 
 	if (mov->NextMoofNumber && (mov->NextMoofNumber >= moof->mfhd->sequence_number)) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Warning: wrong sequence number: got %d but last one was %d\n", moof->mfhd->sequence_number, mov->NextMoofNumber));
@@ -118,6 +118,7 @@
 		*bytesMissing = 0;
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 		mov->current_top_box_start = gf_bs_get_position(mov->movieFileMap->bs);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[iso file] Current top box start before parsing %d\n", mov->current_top_box_start));
 #endif
 
 		e = gf_isom_parse_root_box(&a, mov->movieFileMap->bs, bytesMissing, progressive_mode);
@@ -215,7 +216,7 @@
 			case GF_4CC('s', 'i', 's', 'x'):
 			case GF_4CC('r', 'i', 's', 'x'):
 			case GF_4CC('s', 's', 's', 's'):
-				mov->is_index_segment = 1;
+				mov->is_index_segment = GF_TRUE;
 				break;
 			default:
 				break;
@@ -272,7 +273,7 @@
 		case GF_4CC('j','P',' ',' '):
 		{
 			GF_UnknownBox *box = (GF_UnknownBox*)a;
-			u8 *c = box->data;
+			u8 *c = (u8 *) box->data;
 			if ((box->dataSize==4) 
 				&& (GF_4CC(c[0],c[1],c[2],c[3])==(u32)0x0D0A870A)) 
 				 mov->is_jp2 = 1;
@@ -288,7 +289,8 @@
 		}
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-//		mov->current_top_box_start = gf_bs_get_position(mov->movieFileMap->bs);
+		/*remember where we left, in case we append an entire number of movie fragments*/
+		mov->current_top_box_start = gf_bs_get_position(mov->movieFileMap->bs);
 #endif
 	}

gpac-0.5.0.svn4296.tar.bz2/src/isomedia/isom_read.c -> gpac-0.5.0.svn4668.tar.bz2/src/isomedia/isom_read.c Changed

@@ -1618,7 +1618,7 @@
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return GF_BAD_PARAM;
 
-	if (!trak || !trak->editBox ||
+	if (!trak->editBox ||
 		!trak->editBox->editList ||
 		(SegmentIndex > gf_list_count(trak->editBox->editList->entryList)) ||
 		!SegmentIndex)
@@ -2017,8 +2017,9 @@
 
 
 GF_EXPORT
-GF_Err gf_isom_refresh_fragmented(GF_ISOFile *movie, u64 *MissingBytes)
+GF_Err gf_isom_refresh_fragmented(GF_ISOFile *movie, u64 *MissingBytes, const char *new_location)
 {
+	u32 i;
 	u64 prevsize, size;
 #ifdef	GPAC_DISABLE_ISOM_FRAGMENTS
 	return GF_NOT_SUPPORTED;
@@ -2028,6 +2029,17 @@
 
 	/*refresh size*/
 	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;
+	
+		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;
+		}
+	}
+
 	prevsize = gf_bs_get_refreshed_size(movie->movieFileMap->bs);
 	if (prevsize==size) return GF_OK;
 
@@ -2055,8 +2067,11 @@
 			GF_SampleTableBox *stbl = trak->Media->information->sampleTable;
 			trak->sample_count_at_seg_start += stbl->SampleSize->sampleCount;
 			if (trak->sample_count_at_seg_start) {
-				stbl_GetSampleDTS_and_Duration(stbl->TimeToSample, stbl->SampleSize->sampleCount, &dts, &dur);
-				trak->dts_at_seg_start += dts + dur;
+				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) {	\
@@ -2521,7 +2536,7 @@
 				switch (dcd->streamType) {
 				case GF_STREAM_VISUAL:
 					if (dcd->objectTypeIndication==GPAC_OTI_VIDEO_MPEG4_PART2) nb_m4v++;
-					else if (dcd->objectTypeIndication==GPAC_OTI_VIDEO_AVC) nb_avc++;
+					else if ((dcd->objectTypeIndication==GPAC_OTI_VIDEO_AVC) || (dcd->objectTypeIndication==GPAC_OTI_VIDEO_SVC)) nb_avc++;
 					else nb_v++;
 					break;
 				case GF_STREAM_AUDIO:
@@ -2969,4 +2984,14 @@
 	return trak->extractor_mode;
 }
 
+GF_EXPORT
+s32 gf_isom_get_composition_offset_shift(GF_ISOFile *file, u32 track)
+{
+	GF_TrackBox *trak = gf_isom_get_track_from_file(file, track);
+	if (!trak) return 0;
+	if (!trak->Media || !trak->Media->information || !trak->Media->information->sampleTable || !trak->Media->information->sampleTable->CompositionToDecode) return 0;
+	return trak->Media->information->sampleTable->CompositionToDecode->compositionToDTSShift;
+}
+
+
 #endif /*GPAC_DISABLE_ISOM*/

gpac-0.5.0.svn4296.tar.bz2/src/isomedia/isom_store.c -> gpac-0.5.0.svn4668.tar.bz2/src/isomedia/isom_store.c Changed

@@ -44,7 +44,7 @@
 				if (strstr(_free->data, "File Produced with GPAC")) {
 					gf_free(_free->data);
 					_free->data = gf_strdup(GPAC_ISOM_CPRT_NOTICE);
-					_free->dataSize = strlen(_free->data);
+					_free->dataSize = (u32) strlen(_free->data);
 					return GF_OK;
 				}
 			}
@@ -53,7 +53,7 @@
 	a = gf_isom_box_new(GF_ISOM_BOX_TYPE_FREE);
 	if (!a) return GF_OUT_OF_MEM;
 	_free = (GF_FreeSpaceBox *)a;
-	_free->dataSize = strlen(GPAC_ISOM_CPRT_NOTICE) + 1;
+	_free->dataSize = (u32) strlen(GPAC_ISOM_CPRT_NOTICE) + 1;
 	_free->data = gf_strdup(GPAC_ISOM_CPRT_NOTICE);
 	if (!_free->data) return GF_OUT_OF_MEM;
 	return gf_list_add(movie->TopBoxes, _free);
@@ -348,6 +348,8 @@
 	GF_DataMap *map;
 	u32 bytes;
 
+	if (!size) return GF_OK;
+
 	if (size>mw->size) {
 		mw->buffer = (char*)gf_realloc(mw->buffer, size);
 		mw->size = size;
@@ -441,9 +443,10 @@
 						u64 remain = entry->extent_length;
 						while (remain) {
 							u32 size_cache = (remain>4096) ? 4096 : (u32) remain;
-							size_cache = fread(cache_data, sizeof(char), size_cache, src);
-							gf_bs_write_data(bs, cache_data, size_cache);
-							remain -= size_cache;
+							size_t read = fread(cache_data, sizeof(char), size_cache, src);
+							if (read ==(size_t) -1) break;
+							gf_bs_write_data(bs, cache_data, (u32) read);
+							remain -= (u32) read;
 						}
 					} else {
 						gf_bs_write_data(bs, iinf->full_path, iinf->data_len);

gpac-0.5.0.svn4296.tar.bz2/src/isomedia/isom_write.c -> gpac-0.5.0.svn4668.tar.bz2/src/isomedia/isom_write.c Changed

@@ -641,7 +641,7 @@
 		if (od_sample) gf_isom_sample_del(&od_sample);
 	} else {
 		e = Media_AddSample(trak->Media, data_offset, sample, descIndex, 0);
-		if (!e) e = gf_isom_datamap_add_data(trak->Media->information->dataHandler, sample->data, sample->dataLength);
+		if (!e && sample->dataLength) e = gf_isom_datamap_add_data(trak->Media->information->dataHandler, sample->data, sample->dataLength);
 	}
 	if (e) return e;
 
@@ -1241,6 +1241,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Err gf_isom_set_audio_info(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 sampleRate, u32 nbChannels, u8 bitsPerSample)
 {
 	GF_Err e;
@@ -3135,7 +3136,7 @@
 		gf_bs_write_u8(bs, 0xFE);	/*marker*/
 		gf_bs_write_u32(bs, trak->Media->information->sampleTable->groupID);
 		gf_bs_write_u32(bs, trak->Media->information->sampleTable->trackPriority);
-		len = trak->name ? strlen(trak->name) : 0;
+		len = trak->name ? (u32) strlen(trak->name) : 0;
 		gf_bs_write_u32(bs, len);
 		for (j=0; j<len; j++) gf_bs_write_u8(bs, trak->name[j]);
 		gf_bs_get_content(bs, &data, &len);
@@ -3353,6 +3354,10 @@
 			return 0;
 		}
 			break;
+		case GF_ISOM_BOX_TYPE_WVTT:
+            /* TODO */
+            assert(0);
+            break;
 		}
 
 		if (sdesc_index1 && sdesc_index2) break;
@@ -3652,7 +3657,7 @@
 		char szOrig[1024], szLine[1024];
 		strcpy(szOrig, nameUTF8);
 		j=0;
-		len = strlen(szOrig);
+		len = (u32) strlen(szOrig);
 		for (i=0; i<len; i++) {
 			if (szOrig[i] & 0x80) {
 				/*non UTF8 (likely some win-CP)*/

gpac-0.5.0.svn4296.tar.bz2/src/isomedia/media.c -> gpac-0.5.0.svn4668.tar.bz2/src/isomedia/media.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/isomedia/meta.c -> gpac-0.5.0.svn4668.tar.bz2/src/isomedia/meta.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/isomedia/movie_fragments.c -> gpac-0.5.0.svn4668.tar.bz2/src/isomedia/movie_fragments.c Changed

@@ -67,6 +67,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Err gf_isom_finalize_for_fragment(GF_ISOFile *movie, u32 media_segment_type)
 {
 	GF_Err e;
@@ -184,7 +185,7 @@
 	return GF_OK;
 }
 
-
+GF_EXPORT
 GF_Err gf_isom_setup_track_fragment(GF_ISOFile *movie, u32 TrackID, 
 							 u32 DefaultSampleDescriptionIndex,
 							 u32 DefaultSampleDuration,
@@ -716,24 +717,37 @@
 	}
 
 	if (load_mdat_only) {
-		u64 offset;
 		u64 pos = gf_bs_get_position(bs);
 		//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);
-		movie->moof->mdat = gf_malloc(sizeof(char) * movie->moof->mdat_size);
-		if (!movie->moof->mdat) return GF_OUT_OF_MEM;
 
-		offset = movie->segment_start;
 
-		gf_bs_seek(bs, offset);
-		/*write mdat size*/
-		gf_bs_write_u32(bs, (u32) movie->moof->mdat_size);
+		if (movie->segment_bs) {
+			gf_bs_seek(bs, 0);
+			/*write mdat size*/
+			gf_bs_write_u32(bs, (u32) movie->moof->mdat_size);
+			/*and get internal buffer*/
+			gf_bs_seek(bs, movie->moof->mdat_size);
+			gf_bs_get_content(bs, &movie->moof->mdat, &movie->moof->mdat_size);
+
+			gf_bs_del(bs);
+			bs = movie->editFileMap->bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+		} else {
+			u64 offset = movie->segment_start;
+			gf_bs_seek(bs, offset);
+			/*write mdat size*/
+			gf_bs_write_u32(bs, (u32) movie->moof->mdat_size);
 
-		gf_bs_seek(bs, offset);
-		gf_bs_read_data(bs, movie->moof->mdat, movie->moof->mdat_size);
+			movie->moof->mdat = gf_malloc(sizeof(char) * movie->moof->mdat_size);
+			if (!movie->moof->mdat) return GF_OUT_OF_MEM;
+
+			gf_bs_seek(bs, offset);
+			gf_bs_read_data(bs, movie->moof->mdat, movie->moof->mdat_size);
+
+			gf_bs_seek(bs, offset);
+			gf_bs_truncate(bs);
+		}
 
-		gf_bs_seek(bs, offset);
-		gf_bs_truncate(bs);
 		return GF_OK;
 	}
 
@@ -888,13 +902,107 @@
 	return GF_OK;
 }
 
+
+static GF_Err gf_isom_write_styp(GF_ISOFile *movie, Bool last_segment)
+{
+	GF_Err e = GF_OK;
+	/*write STYP if we write to a different file or if we write the last segment*/
+	if (!movie->append_segment && !movie->segment_start && !movie->styp_written) {
+
+		/*modify brands STYP*/
+
+		/*"msix" brand: this is a DASH Initialization Segment*/
+		gf_isom_modify_alternate_brand(movie, GF_4CC('m','s','i','x'), 1);
+		if (last_segment) {
+			/*"lmsg" brand: this is the last DASH Segment*/
+			gf_isom_modify_alternate_brand(movie, GF_4CC('l','m','s','g'), 1);
+		}
+
+		movie->brand->type = GF_ISOM_BOX_TYPE_STYP;
+		e = gf_isom_box_size((GF_Box *) movie->brand);
+		if (e) return e;
+		e = gf_isom_box_write((GF_Box *) movie->brand, movie->editFileMap->bs);
+		if (e) return e;
+
+		movie->styp_written = 1;
+	}
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_isom_flush_fragments(GF_ISOFile *movie, Bool last_segment)
+{
+	GF_BitStream *temp_bs = NULL;
+	GF_Err e;
+		
+	if (!movie || !(movie->FragmentsFlags & GF_ISOM_FRAG_WRITE_READY) ) return GF_BAD_PARAM;
+	if (movie->openMode != GF_ISOM_OPEN_WRITE) return GF_ISOM_INVALID_MODE;
+
+	/*flush our fragment (store in mem)*/
+	if (movie->moof) {
+		e = StoreFragment(movie, 1, 0, NULL);
+		if (e) return e;
+	}
+
+	if (movie->segment_bs) {
+		temp_bs = movie->editFileMap->bs;
+		movie->editFileMap->bs = movie->segment_bs;
+	}
+
+	gf_bs_seek(movie->editFileMap->bs, movie->segment_start);
+	gf_bs_truncate(movie->editFileMap->bs);
+
+	/*write styp to file if needed*/
+	e = gf_isom_write_styp(movie, last_segment);
+	if (e) return e;
+
+	/*write all pending fragments to file*/
+	while (gf_list_count(movie->moof_list)) {
+		s32 offset_diff;
+		u32 moof_size;
+
+		movie->moof = gf_list_get(movie->moof_list, 0);
+		gf_list_rem(movie->moof_list, 0);
+
+		offset_diff = (s32) (gf_bs_get_position(movie->editFileMap->bs) - movie->moof->fragment_offset);
+		movie->moof->fragment_offset = gf_bs_get_position(movie->editFileMap->bs);
+
+		e = StoreFragment(movie, 0, offset_diff, &moof_size);
+
+		gf_isom_box_del((GF_Box *) movie->moof);
+		movie->moof = NULL;
+	}
+
+	/*append mode: store fragment at the end of the regular movie bitstream, and delete the temp bitstream*/
+	if (movie->append_segment) {
+		char bloc[1024];
+		u32 seg_size = (u32) gf_bs_get_size(movie->editFileMap->bs);
+		gf_bs_seek(movie->editFileMap->bs, 0);
+		while (seg_size) {
+			u32 size = gf_bs_read_data(movie->editFileMap->bs, bloc, (seg_size>1024) ? 1024 : seg_size);
+			gf_bs_write_data(movie->movieFileMap->bs, bloc, size);
+			seg_size -= size;
+		}
+		gf_isom_datamap_del(movie->editFileMap);
+		movie->editFileMap = gf_isom_fdm_new_temp(NULL);
+	}
+	movie->segment_start = gf_bs_get_position(movie->editFileMap->bs);
+
+	if (temp_bs) {
+		movie->segment_bs = movie->editFileMap->bs;
+		movie->editFileMap->bs = temp_bs;
+	}
+	return GF_OK;
+}
+
 typedef struct
 {
 	GF_SegmentIndexBox *sidx;
 	u64 start_offset, end_offset;
 } SIDXEntry;
 
-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, u64 *index_start_range, u64 *index_end_range)
+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_SegmentIndexBox *sidx=NULL;
 	GF_SegmentIndexBox *root_sidx=NULL;
@@ -927,13 +1035,33 @@
 	count = gf_list_count(movie->moov->mvex->TrackExList);
 	if (!count) return GF_BAD_PARAM;
 
-	count = gf_list_count(movie->moof_list);
-	if (!count) return GF_OK;
 	/*store fragment*/
 	if (movie->moof) {
 		e = StoreFragment(movie, 1, 0, NULL);
 		if (e) return e;
 	}
+	/*restore final bitstream*/
+	if (movie->segment_bs) {
+		gf_bs_del(movie->editFileMap->bs);
+		movie->editFileMap->bs = movie->segment_bs;
+		movie->segment_bs = NULL;
+	}
+
+	count = gf_list_count(movie->moof_list);
+	if (!count) {
+		/*append segment marker box*/
+		if (segment_marker_4cc) {
+			if (movie->append_segment) {
+				gf_bs_write_u32(movie->movieFileMap->bs, 8);	//write size field
+				gf_bs_write_u32(movie->movieFileMap->bs, segment_marker_4cc); //write box type field
+			} else {
+				gf_bs_write_u32(movie->editFileMap->bs, 8);	//write size field
+				gf_bs_write_u32(movie->editFileMap->bs, segment_marker_4cc); //write box type field
+			}
+		}
+		return GF_OK;
+	}
+
 	gf_bs_seek(movie->editFileMap->bs, movie->segment_start);
 	gf_bs_truncate(movie->editFileMap->bs);
 
@@ -949,24 +1077,8 @@
 		no_sidx = 1;
 	}
 
-	/*write STYP if we write to a different file or if we write the last segment*/
-	if (!movie->append_segment && !movie->segment_start ) {
-
-		/*modify brands STYP*/
-
-		/*"msix" brand: this is a DASH Initialization Segment*/
-		gf_isom_modify_alternate_brand(movie, GF_4CC('m','s','i','x'), 1);
-		if (last_segment) {
-			/*"lmsg" brand: this is the last DASH Segment*/
-			gf_isom_modify_alternate_brand(movie, GF_4CC('l','m','s','g'), 1);
-		}
-
-		movie->brand->type = GF_ISOM_BOX_TYPE_STYP;
-		e = gf_isom_box_size((GF_Box *) movie->brand);
-		if (e) return e;
-		e = gf_isom_box_write((GF_Box *) movie->brand, movie->editFileMap->bs);
-		if (e) return e;
-	}
+	e = gf_isom_write_styp(movie, last_segment);
+	if (e) return e;
 
 	frags_per_subseg = 0;
 	subseg_per_sidx = 0;
@@ -1257,6 +1369,12 @@
 		movie->moof = NULL;
 	}
 
+	/*append segment marker box*/
+	if (segment_marker_4cc) {
+		gf_bs_write_u32(movie->editFileMap->bs, 8);	//write size field
+		gf_bs_write_u32(movie->editFileMap->bs, segment_marker_4cc); //write box type field
+	}
+
 	if (movie->root_sidx) {
 		if (last_segment) {
 			assert(movie->root_sidx_index == movie->root_sidx->nb_refs);
@@ -1331,16 +1449,18 @@
 	return e;
 }
 
+GF_EXPORT
 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, NULL, NULL);
+		return gf_isom_close_segment(movie, 0, 0, 0, 0, 0, 1, 0, NULL, NULL);
 	} else {
 		return StoreFragment(movie, 0, 0, NULL);
 	}
 }
 
-GF_Err gf_isom_start_segment(GF_ISOFile *movie, char *SegName)
+GF_EXPORT
+GF_Err gf_isom_start_segment(GF_ISOFile *movie, char *SegName, Bool memory_mode)
 {
 	GF_Err e;
 	//and only at setup
@@ -1350,12 +1470,14 @@
 	if (gf_list_count(movie->moof_list)) 
 		return GF_BAD_PARAM;
 
+	movie->segment_bs = NULL;
 	movie->append_segment = 0;
 	/*update segment file*/
 	if (SegName) {
 		gf_isom_datamap_del(movie->editFileMap);
 		e = gf_isom_datamap_new(SegName, NULL, GF_ISOM_DATA_MAP_WRITE, & movie->editFileMap);
 		movie->segment_start = 0;
+		movie->styp_written = 0;
 		if (e) return e;
 	} else {
 		assert(gf_list_count(movie->moof_list) == 0);
@@ -1364,10 +1486,16 @@
 		if (movie->movieFileMap)
 			movie->append_segment = 1;
 	}
+
+	/*create a memory bitstream for all file IO until final flush*/
+	if (memory_mode) {
+		movie->segment_bs = movie->editFileMap->bs;
+		movie->editFileMap->bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	}
 	return GF_OK;
 }
 
-
+GF_EXPORT
 GF_Err gf_isom_start_fragment(GF_ISOFile *movie, Bool moof_first)
 {
 	u32 i, count;
@@ -1434,7 +1562,7 @@
 	return size;
 }
 
-
+GF_EXPORT
 GF_Err gf_isom_fragment_add_sample(GF_ISOFile *movie, u32 TrackID, GF_ISOSample *sample, u32 DescIndex, 
 								 u32 Duration, u8 PaddingBits, u16 DegradationPriority, Bool redundant_coding)
 {
@@ -1736,7 +1864,7 @@
     return 0;
 }
 
-
+GF_EXPORT
 GF_Err gf_isom_set_traf_base_media_decode_time(GF_ISOFile *movie, u32 TrackID, u64 decode_time)
 {
 	GF_TrackFragmentBox *traf;

gpac-0.5.0.svn4296.tar.bz2/src/isomedia/sample_descs.c -> gpac-0.5.0.svn4668.tar.bz2/src/isomedia/sample_descs.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/isomedia/stbl_read.c -> gpac-0.5.0.svn4668.tar.bz2/src/isomedia/stbl_read.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/isomedia/stbl_write.c -> gpac-0.5.0.svn4668.tar.bz2/src/isomedia/stbl_write.c Changed

@@ -77,11 +77,16 @@
 		}
 		//we need to split the entry
 		if (ent->sampleCount == 1) {
-			//use this one and adjust...
+			//FIXME - we need more tests with timed text
+#if 0
 			if (stts->w_LastDTS)
 				ent->sampleDelta += (u32) (DTS - stts->w_LastDTS);
 			else
 				ent->sampleDelta = (u32) DTS;
+#else
+			//use this one and adjust...
+			ent->sampleDelta = (u32) (DTS - stts->w_LastDTS);
+#endif
 			ent->sampleCount ++;
 			stts->w_currentSampleNum ++;
 			stts->w_LastDTS = DTS;
@@ -338,7 +343,7 @@
 {
 	u32 i, k;
 	u32 *newSizes;
-	if (!stsz || !size || !sampleNumber) return GF_BAD_PARAM;
+	if (!stsz /*|| !size */ || !sampleNumber) return GF_BAD_PARAM;
 
 	if (sampleNumber > stsz->sampleCount + 1) return GF_BAD_PARAM;
 
@@ -1245,7 +1250,11 @@
 		for (i=0; i<stsz->sampleCount; i++) stsz->sizes[i] = stsz->sampleSize;
 		stsz->sampleSize = 0;
 	}
-	stsz->sizes[stsz->sampleCount-1] += data_size;
+	if (!stsz->sizes) {
+		stsz->sampleSize = data_size;
+	} else {
+		stsz->sizes[stsz->sampleCount-1] += data_size;
+	}
 	return GF_OK;
 }

gpac-0.5.0.svn4296.tar.bz2/src/isomedia/track.c -> gpac-0.5.0.svn4668.tar.bz2/src/isomedia/track.c Changed

@@ -344,6 +344,9 @@
 		return 1;
 	/*Timedtext is NOT an MPEG-4 stream*/
 	default:
+		/*consider xxsm as MPEG-4 handlers*/
+		if ( (((HandlerType>>8) & 0xFF)== 's') && ((HandlerType& 0xFF)== 'm'))
+			return 1;
 		return 0;
 	}
 }
@@ -884,6 +887,10 @@
 			e = LSR_UpdateESD((GF_LASeRSampleEntryBox*)entry, esd);
 			if (e) return e;
 			break;
+		case GF_ISOM_BOX_TYPE_WVTT:
+            /* TODO */
+            assert(0);
+			break;
 			
 		default:
 			//gf_odf_desc_del((GF_Descriptor *) esd);
@@ -901,7 +908,7 @@
 		//OK, check the handler and create the entry
 		switch (trak->Media->handler->handlerType) {
 		case GF_ISOM_MEDIA_VISUAL:
-			if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) {
+			if ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_SVC)){
 				entry_v = (GF_MPEGVisualSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_AVC1);
 				if (!entry_v) return GF_OUT_OF_MEM;
 				e = AVC_HEVC_UpdateESD((GF_MPEGVisualSampleEntryBox*)entry_v, esd);

gpac-0.5.0.svn4296.tar.bz2/src/isomedia/tx3g.c -> gpac-0.5.0.svn4668.tar.bz2/src/isomedia/tx3g.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/laser/lsr_dec.c -> gpac-0.5.0.svn4668.tar.bz2/src/laser/lsr_dec.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/laser/lsr_enc.c -> gpac-0.5.0.svn4668.tar.bz2/src/laser/lsr_enc.c Changed

@@ -257,7 +257,7 @@
 
 static void lsr_write_extension(GF_LASeRCodec *lsr, char *data, u32 len, const char *name)
 {
-	if (!len) len = strlen(name);
+	if (!len) len = (u32) strlen(name);
 	lsr_write_vluimsbf5(lsr, len, name);
 	gf_bs_write_data(lsr->bs, data, len);
 }
@@ -373,7 +373,7 @@
 
 static void lsr_write_byte_align_string(GF_LASeRCodec *lsr, char *str, const char *name)
 {
-	u32 len = str ? strlen(str) : 0;
+	u32 len = str ? (u32) strlen(str) : 0;
 	gf_bs_align(lsr->bs);
 	lsr_write_vluimsbf8(lsr, len, "len");
 	if (len) gf_bs_write_data(lsr->bs, str, len);
@@ -424,7 +424,7 @@
 			sep[0] = 0;
 			lsr_write_byte_align_string(lsr, iri->string, "uri");
 			sep[0] = ',';
-			len = strlen(sep+1);
+			len = (u32) strlen(sep+1);
 			GF_LSR_WRITE_INT(lsr, 1, 1, "hasData");
 			lsr_write_vluimsbf5(lsr, len, "len");
 			gf_bs_write_data(lsr->bs, sep+1, len);
@@ -1052,7 +1052,7 @@
 			switch (att->tag) {
 			case TAG_SVG_ATT_syncMaster: len +=1; break;
 			case TAG_SVG_ATT_requiredFonts:
-				len += 8*strlen(*(SVG_String*)att->data);
+				len += 8 * (u32) strlen(*(SVG_String*)att->data);
 				/*get vluimsbf5 field size with one extra word (4 bits, enough to code string alignment)*/
 				size = lsr_get_vluimsbf5_size(len, 1);
 				cur_bits = gf_bs_get_bit_position(lsr->bs) + lsr->info->cfg.extensionIDBits + size + 5;
@@ -3543,7 +3543,7 @@
 		old_bs = lsr->bs;
 		lsr->bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	}
-	assert(count>=first_implicit);
+	assert(count>= (u32) (first_implicit ? 1 : 0) );
 
 	lsr_write_vluimsbf5(lsr, count-first_implicit, "occ0");

gpac-0.5.0.svn4296.tar.bz2/src/media_tools/av_parsers.c -> gpac-0.5.0.svn4668.tar.bz2/src/media_tools/av_parsers.c Changed

@@ -333,7 +333,7 @@
 		switch (o_type) {
 		case M2V_SEQ_START_CODE:
 			dsi->RAP_stream = 1;
-			gf_bs_read_data(m4v->bs, p, 4);
+			gf_bs_read_data(m4v->bs,  (char *) p, 4);
 			dsi->width = (p[0] << 4) | ((p[1] >> 4) & 0xf);
 			dsi->height = ((p[1] & 0xf) << 8) | p[2];
 
@@ -363,7 +363,7 @@
 			}
 			break;
 		case M2V_EXT_START_CODE:
-			gf_bs_read_data(m4v->bs, p, 4);
+			gf_bs_read_data(m4v->bs,  (char *) p, 4);
 			ext_type = ((p[0] >> 4) & 0xf);
 			if (ext_type == 1) {
 			  dsi->VideoPL = 0x65;
@@ -878,6 +878,7 @@
 
 #ifndef GPAC_DISABLE_AV_PARSERS
 
+GF_EXPORT
 u32 gf_m4a_get_profile(GF_M4ADecSpecInfo *cfg)
 {
 	switch (cfg->base_object_type) {
@@ -1539,6 +1540,7 @@
 	return (u32) (end-start);
 }
 
+GF_EXPORT
 u32 gf_media_nalu_next_start_code(u8 *data, u32 data_len, u32 *sc_size)
 {
 	u32 v, bpos;
@@ -1629,7 +1631,7 @@
 }
 
 /*returns the nal_size without emulation prevention bytes*/
-static u32 avc_emulation_bytes_add_count(unsigned char *buffer, u32 nal_size)
+static u32 avc_emulation_bytes_add_count(char *buffer, u32 nal_size)
 {
 	u32 i = 0, emulation_bytes_count = 0;
 	u8 num_zero = 0;
@@ -1657,7 +1659,7 @@
 	return emulation_bytes_count;
 }
 
-static u32 avc_add_emulation_bytes(const unsigned char *buffer_src, unsigned char *buffer_dst, u32 nal_size) 
+static u32 avc_add_emulation_bytes(const char *buffer_src, char *buffer_dst, u32 nal_size) 
 { 
 
 	u32 i = 0, emulation_bytes_count = 0;
@@ -1727,7 +1729,7 @@
 #endif /*GPAC_UNUSED_FUNC*/
 
 /*nal_size is updated to allow better error detection*/
-static u32 avc_remove_emulation_bytes(const unsigned char *buffer_src, unsigned char *buffer_dst, u32 nal_size) 
+static u32 avc_remove_emulation_bytes(const char *buffer_src, char *buffer_dst, u32 nal_size) 
 { 
 	u32 i = 0, emulation_bytes_count = 0;
 	u8 num_zero = 0; 
@@ -1765,7 +1767,7 @@
 	return nal_size-emulation_bytes_count; 
 } 
 
-s32 gf_media_avc_read_sps(char *sps_data, u32 sps_size, AVCState *avc, u32 subseq_sps, u32 *vui_flag_pos)
+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;
 	u32 ChromaArrayType = 0;
@@ -2035,7 +2037,7 @@
 	return sps_id;
 }
 
-s32 gf_media_avc_read_pps(char *pps_data, u32 pps_size, AVCState *avc)
+s32 gf_media_avc_read_pps(const char *pps_data, u32 pps_size, AVCState *avc)
 {
 	GF_BitStream *bs;
 	char *pps_data_without_emulation_bytes = NULL;
@@ -2099,7 +2101,7 @@
 	return pps_id;
 }
 
-s32 gf_media_avc_read_sps_ext(char *spse_data, u32 spse_size)
+s32 gf_media_avc_read_sps_ext(const char *spse_data, u32 spse_size)
 {
 	GF_BitStream *bs;
 	char *spse_data_without_emulation_bytes = NULL;
@@ -2859,6 +2861,9 @@
 }
 
 
+
+#ifndef GPAC_DISABLE_HEVC
+
 /**********
 HEVC parsing
 **********/
@@ -2894,16 +2899,92 @@
 	}
 }
 
+static Bool parse_short_term_ref_pic_set(GF_BitStream *bs, HEVC_SPS *sps, u32 idx_rps) 
+{
+	u32 i;
+	Bool inter_ref_pic_set_prediction_flag = 0;
+	if (idx_rps != 0)
+		inter_ref_pic_set_prediction_flag = gf_bs_read_int(bs, 1);
+
+	if (inter_ref_pic_set_prediction_flag ) {
+		HEVC_ReferencePictureSets *ref_ps, *rps;
+		u32 delta_idx_minus1 = 0;
+		u32 ref_idx;
+		u32 delta_rps_sign;
+		u32 abs_delta_rps_minus1, nb_ref_pics;
+		s32 deltaRPS;
+	    u32 k = 0, k0 = 0, k1 = 0;
+		if (idx_rps == sps->num_short_term_ref_pic_sets)
+			delta_idx_minus1 = bs_get_ue(bs);
+
+		assert(delta_idx_minus1 <= idx_rps - 1);
+		ref_idx = idx_rps - 1 - delta_idx_minus1;
+		delta_rps_sign = gf_bs_read_int(bs, 1);
+		abs_delta_rps_minus1 = bs_get_ue(bs);
+		deltaRPS = (1 - (delta_rps_sign<<1)) * (abs_delta_rps_minus1 + 1);
+
+		rps = &sps->rps[idx_rps];
+		ref_ps = &sps->rps[ref_idx];
+		nb_ref_pics = ref_ps->num_negative_pics + ref_ps->num_positive_pics;
+		for (i=0; i<=nb_ref_pics; i++) {
+			s32 ref_idc;
+			s32 used_by_curr_pic_flag = gf_bs_read_int(bs, 1);
+			ref_idc = used_by_curr_pic_flag ? 1 : 0;
+			if ( !used_by_curr_pic_flag ) {
+				used_by_curr_pic_flag = gf_bs_read_int(bs, 1);
+				ref_idc = used_by_curr_pic_flag << 1;
+			}
+			if ((ref_idc==1) || (ref_idc== 2)) {
+				s32 deltaPOC = deltaRPS;
+				if (i < nb_ref_pics) 
+					deltaPOC += ref_ps->delta_poc[i];
+				
+				rps->delta_poc[k] = deltaPOC;
+
+				if (deltaPOC < 0)  k0++;
+				else k1++;
+				
+				k++;
+			}
+		}
+		rps->num_negative_pics = k0;
+		rps->num_positive_pics = k1;
+	} else {
+		s32 prev = 0, poc = 0;
+		sps->rps[idx_rps].num_negative_pics = bs_get_ue(bs);
+		sps->rps[idx_rps].num_positive_pics = bs_get_ue(bs);
+		for (i=0; i<sps->rps[idx_rps].num_negative_pics; i++) {
+			u32 delta_poc_s0_minus1 = bs_get_ue(bs);
+			poc = prev - delta_poc_s0_minus1 - 1;
+			prev = poc;
+			sps->rps[idx_rps].delta_poc[i] = poc;
+			/*used_by_curr_pic_s1_flag[ i ] = */gf_bs_read_int(bs, 1);
+		}
+		for (i=0; i<sps->rps[idx_rps].num_positive_pics; i++) {
+			u32 delta_poc_s1_minus1 = bs_get_ue(bs);
+			poc = prev + delta_poc_s1_minus1 + 1;
+			prev = poc;
+			sps->rps[idx_rps].delta_poc[i] = poc;
+			/*used_by_curr_pic_s1_flag[ i ] = */gf_bs_read_int(bs, 1);
+		}
+	}
+	return 1;
+}
+
+#define PARSE_FULL_HEADER	0
 static s32 hevc_parse_slice_segment(GF_BitStream *bs, HEVCState *hevc, HEVCSliceInfo *si) 
 {
+#if PARSE_FULL_HEADER
+	u32 i, j;
+#endif
 	HEVC_PPS *pps;
 	HEVC_SPS *sps;
 	s32 pps_id;
-	Bool dependent_slice_segment_flag = 0;
-	Bool first_slice_segment_in_pic_flag = gf_bs_read_int(bs, 1);
 	Bool RapPicFlag = 0;
 	Bool IDRPicFlag = 0;
 	
+	si->first_slice_segment_in_pic_flag = gf_bs_read_int(bs, 1);
+
 	switch (si->nal_unit_type) {
 	case GF_HEVC_NALU_SLICE_IDR_W_DLP:
 	case GF_HEVC_NALU_SLICE_IDR_N_LP:
@@ -2929,17 +3010,28 @@
 	si->sps = sps;
 	si->pps = pps;
 
-	if (!first_slice_segment_in_pic_flag && pps->dependent_slice_segments_enabled_flag) {
-		dependent_slice_segment_flag = gf_bs_read_int(bs, 1);
+	if (!si->first_slice_segment_in_pic_flag && pps->dependent_slice_segments_enabled_flag) {
+		si->dependent_slice_segment_flag = gf_bs_read_int(bs, 1);
+	} else {
+		si->dependent_slice_segment_flag = 0;
 	}
 
-	{
-		if (!first_slice_segment_in_pic_flag) {
-			/*slice_segment_address = */gf_bs_read_int(bs, sps->bitsSliceSegmentAddress);
-		}
+	if (!si->first_slice_segment_in_pic_flag) {
+		si->slice_segment_address = gf_bs_read_int(bs, sps->bitsSliceSegmentAddress);
+	} else {
+		si->slice_segment_address = 0;
 	}
 	
-	if( !dependent_slice_segment_flag ) {
+	if( !si->dependent_slice_segment_flag ) {
+#if PARSE_FULL_HEADER
+		Bool deblocking_filter_override_flag=0;
+		Bool slice_temporal_mvp_enabled_flag = 0;
+        Bool slice_sao_luma_flag=0;
+		Bool slice_sao_chroma_flag=0;
+		Bool slice_deblocking_filter_disabled_flag=0;
+#endif
+
+		//"slice_reserved_undetermined_flag[]"
 		gf_bs_read_int(bs, pps->num_extra_slice_header_bits);
 
 		si->slice_type = bs_get_ue(bs);
@@ -2954,8 +3046,150 @@
 			si->poc_lsb = 0;
 		} else {
 			si->poc_lsb = gf_bs_read_int(bs, sps->log2_max_pic_order_cnt_lsb);
+
+#if !PARSE_FULL_HEADER
+		}
+	}
+#else
+			if (/*short_term_ref_pic_set_sps_flag =*/gf_bs_read_int(bs, 1) == 0) {
+				Bool ret = parse_short_term_ref_pic_set(bs, sps, sps->num_short_term_ref_pic_sets );
+				if (!ret) return 0;
+			} else if( sps->num_short_term_ref_pic_sets > 1 ) {
+                u32 numbits = 0;
+                s32 short_term_ref_pic_set_idx;
+                while ( (u32) (1 << numbits) < sps->num_short_term_ref_pic_sets)
+                    numbits++;
+                if (numbits > 0)
+                    short_term_ref_pic_set_idx = gf_bs_read_int(bs, numbits);
+                else
+                    short_term_ref_pic_set_idx = 0;
+			}
+			if (sps->long_term_ref_pics_present_flag ) {
+				u8 DeltaPocMsbCycleLt[32];
+				u32 num_long_term_sps = 0;
+	            u32 num_long_term_pics = 0;
+				if (sps->num_long_term_ref_pic_sps > 0 ) {
+					num_long_term_sps = bs_get_ue(bs);
+				}
+				num_long_term_pics = bs_get_ue(bs);
+
+                for (i = 0; i < num_long_term_sps + num_long_term_pics; i++ ) {
+                    if( i < num_long_term_sps ) {
+                        u8 lt_idx_sps = 0;
+                        if (sps->num_long_term_ref_pic_sps > 1)
+                            lt_idx_sps = gf_bs_read_int(bs, gf_get_bit_size(sps->num_long_term_ref_pic_sps) );
+                    } else {
+                        /*PocLsbLt[ i ] = */ gf_bs_read_int(bs, sps->log2_max_pic_order_cnt_lsb);
+                        /*UsedByCurrPicLt[ i ] = */ gf_bs_read_int(bs, 1);
+                    }
+                    if (/*delta_poc_msb_present_flag[ i ] = */ gf_bs_read_int(bs, 1) ) {
+                        if( i == 0 || i == num_long_term_sps )
+                            DeltaPocMsbCycleLt[i] = bs_get_ue(bs);
+                        else
+                            DeltaPocMsbCycleLt[i] = bs_get_ue(bs) + DeltaPocMsbCycleLt[i-1];
+					}
+                }
+			}
+            if (sps->temporal_mvp_enable_flag)
+                slice_temporal_mvp_enabled_flag = gf_bs_read_int(bs, 1);
+		}
+        if (sps->sample_adaptive_offset_enabled_flag) {
+            slice_sao_luma_flag = gf_bs_read_int(bs, 1);
+			slice_sao_chroma_flag = gf_bs_read_int(bs, 1);
+        }
+
+		if (si->slice_type == GF_HEVC_TYPE_P || si->slice_type == GF_HEVC_TYPE_B) {
+            //u32 NumPocTotalCurr;
+			u32 num_ref_idx_l0_active, num_ref_idx_l1_active;
+
+			num_ref_idx_l0_active = pps->num_ref_idx_l0_default_active;
+			num_ref_idx_l1_active = 0;
+			if (si->slice_type == GF_HEVC_TYPE_B)
+                num_ref_idx_l1_active = pps->num_ref_idx_l1_default_active;
+
+			if ( /*num_ref_idx_active_override_flag =*/gf_bs_read_int(bs, 1) ) {
+				num_ref_idx_l0_active = 1 + bs_get_ue(bs);
+				if (si->slice_type == GF_HEVC_TYPE_B)
+					num_ref_idx_l1_active = 1 + bs_get_ue(bs);
+			}
+
+//            if (pps->lists_modification_present_flag && NumPocTotalCurr > 1) {
+	            if (pps->lists_modification_present_flag ) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_CODING, ("[hehv] ref_pic_lists_modification( ) not implemented\n"));
+				return 0;
+			}
+
+			if (si->slice_type == GF_HEVC_TYPE_B)
+				/*mvd_l1_zero_flag=*/gf_bs_read_int(bs, 1);
+			if (pps->cabac_init_present_flag)
+				/*cabac_init_flag=*/gf_bs_read_int(bs, 1);
+
+			if (slice_temporal_mvp_enabled_flag) {
+				Bool collocated_from_l0_flag = 0;
+				if (si->slice_type == GF_HEVC_TYPE_B)
+					collocated_from_l0_flag = gf_bs_read_int(bs, 1);
+				
+				if ( (collocated_from_l0_flag && num_ref_idx_l0_active-1 > 0 ) 
+					|| ( !collocated_from_l0_flag && num_ref_idx_l1_active-1 > 0 )
+				) {
+					/*collocated_ref_idx=*/bs_get_ue(bs);
+				}
+			}
+
+			if ( (pps->weighted_pred_flag && si->slice_type == GF_HEVC_TYPE_P ) 
+				|| ( pps->weighted_bipred_flag && si->slice_type == GF_HEVC_TYPE_B) 
+			) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_CODING, ("[hehv] pred_weight_table not implemented\n"));
+				return 0;
+			}
+			/*five_minus_max_num_merge_cand=*/bs_get_ue(bs);
+		}
+		/*slice_qp_delta = */bs_get_se(bs);
+		if( pps->slice_chroma_qp_offsets_present_flag ) {
+			/*slice_cb_qp_offset=*/bs_get_se(bs);
+			/*slice_cr_qp_offset=*/bs_get_se(bs);
+		}
+		if ( pps->deblocking_filter_override_enabled_flag ) {
+			deblocking_filter_override_flag = gf_bs_read_int(bs, 1);
+		}
+
+		if (deblocking_filter_override_flag) {
+			slice_deblocking_filter_disabled_flag = gf_bs_read_int(bs, 1);
+			if ( !slice_deblocking_filter_disabled_flag) {
+				/*slice_beta_offset_div2=*/ bs_get_se(bs);
+				/*slice_tc_offset_div2=*/bs_get_se(bs);
+			}
+		}
+		if( pps->loop_filter_across_slices_enabled_flag
+			&& ( slice_sao_luma_flag || slice_sao_chroma_flag || !slice_deblocking_filter_disabled_flag )
+		) {
+			/*slice_loop_filter_across_slices_enabled_flag = */gf_bs_read_int(bs, 1);
+		}
+	}
+
+
+	if (pps->tiles_enabled_flag || pps->entropy_coding_sync_enabled_flag ) {
+		u32 num_entry_point_offsets = bs_get_ue(bs);
+		if ( num_entry_point_offsets > 0) {
+            u32 offset = bs_get_ue(bs) + 1;
+            u32 segments = offset >> 4;
+            s32 remain = (offset & 15);
+
+			for (i=0; i<num_entry_point_offsets; i++) {
+                u32 res = 0;
+                for (j=0; j<segments; j++) {
+                    res <<= 16;
+                    res += gf_bs_read_int(bs, 16);
+                }
+                if (remain) {
+                    res <<= remain;
+                    res += gf_bs_read_int(bs, remain);
+                }
+                // entry_point_offset = val + 1; // +1; // +1 to get the size
+            }
 		}
 	}
+#endif //PARSE_FULL_HEADER
 	return 0;
 }
 
@@ -2963,17 +3197,16 @@
 {
 	u32 max_poc_lsb = 1 << (si->sps->log2_max_pic_order_cnt_lsb);
 
-	/* frame_num_offset */
+	/*POC reset for IDR frames, NOT for CRA*/
 	switch (si->nal_unit_type) {
 	case GF_HEVC_NALU_SLICE_IDR_W_DLP:
 	case GF_HEVC_NALU_SLICE_IDR_N_LP:
-	case GF_HEVC_NALU_SLICE_CRA:
 		si->poc_lsb_prev = 0;
 		si->poc_msb_prev = 0;
 		break;
 	}
 	
-	if ((si->poc_lsb < si->poc_lsb_prev) && (si->poc_lsb_prev - si->poc_lsb >= max_poc_lsb / 2) )
+	if ((si->poc_lsb < si->poc_lsb_prev) && (	si->poc_lsb_prev - si->poc_lsb >= max_poc_lsb / 2) )
 		si->poc_msb = si->poc_msb_prev + max_poc_lsb;
 	else if ((si->poc_lsb > si->poc_lsb_prev) && (si->poc_lsb - si->poc_lsb_prev > max_poc_lsb / 2))
 		si->poc_msb = si->poc_msb_prev - max_poc_lsb;
@@ -3000,12 +3233,21 @@
 
 		ptl->profile_compatibility_flag = gf_bs_read_int(bs, 32);
 
-		/*general_reserved_zero_16bits  = */gf_bs_read_int(bs, 16);
+		ptl->general_progressive_source_flag = gf_bs_read_int(bs, 1);
+		ptl->general_interlaced_source_flag = gf_bs_read_int(bs, 1);
+		ptl->general_non_packed_constraint_flag = gf_bs_read_int(bs, 1);
+		ptl->general_frame_only_constraint_flag = gf_bs_read_int(bs, 1);
+
+		ptl->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++) {
-		if (ProfilePresentFlag)
-			ptl->sub_ptl[i].profile_present_flag = gf_bs_read_int(bs, 1);
+        ptl->sub_ptl[i].profile_present_flag = gf_bs_read_int(bs, 1);
 		ptl->sub_ptl[i].level_present_flag = gf_bs_read_int(bs, 1);
 		if (ProfilePresentFlag && ptl->sub_ptl[i].profile_present_flag) {
 			ptl->sub_ptl[i].profile_space = gf_bs_read_int(bs, 2);
@@ -3062,11 +3304,11 @@
 		vps->state = 1;
 	}
 
-	/*vps_temporal_id_nesting_flag = */ gf_bs_read_int(bs, 1);
-	gf_bs_read_int(bs, 2);
-	gf_bs_read_int(bs, 6);
+	/* 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;
-	gf_bs_read_int(bs, 16);
+	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);
 
@@ -3079,85 +3321,16 @@
 }
 
 
-static Bool parse_short_term_ref_pic_set(GF_BitStream *bs, HEVC_SPS *sps, u32 idx_rps) 
-{
-	u32 i;
-	Bool inter_ref_pic_set_prediction_flag = 0;
-	if (idx_rps != 0)
-		inter_ref_pic_set_prediction_flag = gf_bs_read_int(bs, 1);
-
-	if (inter_ref_pic_set_prediction_flag ) {
-		HEVC_ReferencePictureSets *ref_ps, *rps;
-		u32 delta_idx_minus1 = 0;
-		u32 ref_idx;
-		u32 delta_rps_sign;
-		u32 abs_delta_rps_minus1, nb_ref_pics;
-		s32 deltaRPS;
-	    u32 k = 0, k0 = 0, k1 = 0;
-		if (idx_rps == sps->num_short_term_ref_pic_sets)
-			delta_idx_minus1 = bs_get_ue(bs);
-
-		assert(delta_idx_minus1 <= idx_rps - 1);
-		ref_idx = idx_rps - 1 - delta_idx_minus1;
-		delta_rps_sign = gf_bs_read_int(bs, 1);
-		abs_delta_rps_minus1 = bs_get_ue(bs);
-		deltaRPS = (1 - (delta_rps_sign<<1)) * (abs_delta_rps_minus1 + 1);
 
-		rps = &sps->rps[idx_rps];
-		ref_ps = &sps->rps[ref_idx];
-		nb_ref_pics = ref_ps->num_negative_pics + ref_ps->num_positive_pics;
-		for (i=0; i<=nb_ref_pics; i++) {
-			s32 ref_idc;
-			s32 used_by_curr_pic_flag = gf_bs_read_int(bs, 1);
-			ref_idc = used_by_curr_pic_flag ? 1 : 0;
-			if ( !used_by_curr_pic_flag ) {
-				used_by_curr_pic_flag = gf_bs_read_int(bs, 1);
-				ref_idc = used_by_curr_pic_flag << 1;
-			}
-			if ((ref_idc==1) || (ref_idc== 2)) {
-				s32 deltaPOC = deltaRPS;
-				if (i < nb_ref_pics) 
-					deltaPOC += ref_ps->delta_poc[i];
-				
-				rps->delta_poc[k] = deltaPOC;
-
-				if (deltaPOC < 0)  k0++;
-				else k1++;
-				
-				k++;
-			}
-		}
-		rps->num_negative_pics = k0;
-		rps->num_positive_pics = k1;
-	} else {
-		s32 prev = 0, poc = 0;
-		sps->rps[idx_rps].num_negative_pics = bs_get_ue(bs);
-		sps->rps[idx_rps].num_positive_pics = bs_get_ue(bs);
-		for (i=0; i<sps->rps[idx_rps].num_negative_pics; i++) {
-			u32 delta_poc_s0_minus1 = bs_get_ue(bs);
-			poc = prev - delta_poc_s0_minus1 - 1;
-			prev = poc;
-			sps->rps[idx_rps].delta_poc[i] = poc;
-			/*used_by_curr_pic_s1_flag[ i ] = */gf_bs_read_int(bs, 1);
-		}
-		for (i=0; i<sps->rps[idx_rps].num_positive_pics; i++) {
-			u32 delta_poc_s1_minus1 = bs_get_ue(bs);
-			poc = prev + delta_poc_s1_minus1 + 1;
-			prev = poc;
-			sps->rps[idx_rps].delta_poc[i] = poc;
-			/*used_by_curr_pic_s1_flag[ i ] = */gf_bs_read_int(bs, 1);
-		}
-	}
-	return 1;
-}
 
+GF_EXPORT
 s32 gf_media_hevc_read_sps(char *data, u32 size, HEVCState *hevc)
 {
 	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;
+	u8 max_sub_layers_minus1, 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;
@@ -3244,7 +3417,7 @@
 		}
 	}
 	/*asymmetric_motion_partitions_enabled_flag= */ gf_bs_read_int(bs, 1);
-	/*sample_adaptive_offset_enabled_flag= */ gf_bs_read_int(bs, 1);
+	sps->sample_adaptive_offset_enabled_flag = gf_bs_read_int(bs, 1);
 	if (/*pcm_enabled_flag= */ gf_bs_read_int(bs, 1) ) {
 		/*pcm_sample_bit_depth_luma_minus1=*/gf_bs_read_int(bs, 4);
 		/*pcm_sample_bit_depth_chroma_minus1=*/gf_bs_read_int(bs, 4);
@@ -3258,20 +3431,83 @@
 		/*cannot parse short_term_ref_pic_set, skip VUI parsing*/
 		if (!ret) goto exit;
 	}
-	if (/*long_term_ref_pics_present_flag */ gf_bs_read_int(bs, 1) ) {
+	if ( (sps->long_term_ref_pics_present_flag = gf_bs_read_int(bs, 1)) ) {
 		sps->num_long_term_ref_pic_sps = bs_get_ue(bs);
 		for (i=0; i<sps->num_long_term_ref_pic_sps; i++) {
 			/*lt_ref_pic_poc_lsb_sps=*/gf_bs_read_int(bs, sps->log2_max_pic_order_cnt_lsb);
 			/*used_by_curr_pic_lt_sps_flag*/gf_bs_read_int(bs, 1);
 		}
 	}
-	/*sps_temporal_mvp_enable_flag*/gf_bs_read_int(bs, 1);
+	sps->temporal_mvp_enable_flag = gf_bs_read_int(bs, 1);
 	/*strong_intra_smoothing_enable_flag*/gf_bs_read_int(bs, 1);
 	if (/*vui_parameters_present_flag*/gf_bs_read_int(bs, 1)) {
-		//vui param
+
+		sps->aspect_ratio_info_present_flag = gf_bs_read_int(bs, 1);
+		if (sps->aspect_ratio_info_present_flag) {
+			sps->sar_idc = gf_bs_read_int(bs, 8);
+			if (sps->sar_idc == 255) {
+				sps->sar_width = gf_bs_read_int(bs, 16);
+				sps->sar_height = gf_bs_read_int(bs, 16);
+			}
+		}
+
+		if (/*overscan_info_present = */ gf_bs_read_int(bs, 1))
+			/*overscan_appropriate = */ gf_bs_read_int(bs, 1);
+
+		/*video_signal_type_present_flag = */flag = gf_bs_read_int(bs, 1);
+		if (flag) {
+			/*video_format = */gf_bs_read_int(bs, 1);
+			/*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);
+				/* transfer_characteristic = */ gf_bs_read_int(bs, 8);
+				/* matrix_coeffs = */ gf_bs_read_int(bs, 8);
+			}
+		}
+
+		if (/*chroma_loc_info_present_flag = */ gf_bs_read_int(bs, 1)) {
+			/*chroma_sample_loc_type_top_field = */ bs_get_ue(bs);
+			/*chroma_sample_loc_type_bottom_field = */bs_get_ue(bs);
+		}
+
+		/*neutra_chroma_indication_flag = */gf_bs_read_int(bs, 1);
+		/*field_seq_flag = */gf_bs_read_int(bs, 1);
+		/*frame_field_info_present_flag = */gf_bs_read_int(bs, 1);
+
+		if (/*default_display_window_flag=*/gf_bs_read_int(bs, 1)) {
+			/*left_offset = */bs_get_ue(bs);
+			/*right_offset = */bs_get_ue(bs);
+			/*top_offset = */bs_get_ue(bs);
+			/*bottom_offset = */bs_get_ue(bs);
+		}
+
+		sps->has_timing_info = gf_bs_read_int(bs, 1);
+		if (sps->has_timing_info ) {
+			sps->num_units_in_tick = gf_bs_read_int(bs, 32);
+			sps->time_scale = gf_bs_read_int(bs, 32);
+			sps->poc_proportional_to_timing_flag = gf_bs_read_int(bs, 1);
+			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"));
+			}
+		}
+
+		if (/*bitstream_restriction_flag=*/gf_bs_read_int(bs, 1)) {
+			/*tiles_fixed_structure_flag = */gf_bs_read_int(bs, 1);
+			/*motion_vectors_over_pic_boundaries_flag = */gf_bs_read_int(bs, 1);
+			/*restricted_ref_pic_lists_flag = */gf_bs_read_int(bs, 1);
+			/*min_spatial_segmentation_idc = */bs_get_ue(bs);
+			/*max_bytes_per_pic_denom = */bs_get_ue(bs);
+			/*max_bits_per_min_cu_denom = */bs_get_ue(bs);
+			/*log2_max_mv_length_horizontal = */bs_get_ue(bs);
+			/*log2_max_mv_length_vertical = */bs_get_ue(bs);
+		}
 	}
+
 	if (/*sps_extension_flag*/gf_bs_read_int(bs, 1)) {
 		while (gf_bs_available(bs)) {
+			/*sps_extension_data_flag */ gf_bs_read_int(bs, 1);
 		}
 	}
 
@@ -3281,6 +3517,7 @@
 	return sps_id;
 }
 
+GF_EXPORT
 s32 gf_media_hevc_read_pps(char *data, u32 size, HEVCState *hevc)
 {
 	u32 i;
@@ -3311,10 +3548,12 @@
 	hevc->sps_active_idx = pps->sps_id; /*set active sps*/
 	pps->dependent_slice_segments_enabled_flag = gf_bs_read_int(bs, 1);
 
+	pps->output_flag_present_flag = gf_bs_read_int(bs, 1);
+	pps->num_extra_slice_header_bits = gf_bs_read_int(bs, 3);
 	/*sign_data_hiding_flag = */gf_bs_read_int(bs, 1);
-	/*cabac_init_present_flag = */gf_bs_read_int(bs, 1);
-	/*num_ref_idx_l0_default_active_minus1 = */bs_get_ue(bs);
-	/*num_ref_idx_l1_default_active_minus1 = */bs_get_ue(bs);
+	pps->cabac_init_present_flag = gf_bs_read_int(bs, 1);
+	pps->num_ref_idx_l0_default_active = 1 + bs_get_ue(bs);
+	pps->num_ref_idx_l1_default_active = 1 + bs_get_ue(bs);
 	/*pic_init_qp_minus26 = */bs_get_se(bs);
 	/*constrained_intra_pred_flag = */gf_bs_read_int(bs, 1);
 	/*transform_skip_enabled_flag = */gf_bs_read_int(bs, 1);
@@ -3323,46 +3562,45 @@
 
 	/*pic_cb_qp_offset = */bs_get_se(bs);
 	/*pic_cr_qp_offset = */bs_get_se(bs);
-	/*pic_slice_chroma_qp_offsets_present_flag = */gf_bs_read_int(bs, 1);
-	/*weighted_pred_flag = */gf_bs_read_int(bs, 1);
-	/*weighted_bipred_flag = */gf_bs_read_int(bs, 1);
-	pps->output_flag_present_flag = gf_bs_read_int(bs, 1);
+	pps->slice_chroma_qp_offsets_present_flag = gf_bs_read_int(bs, 1);
+	pps->weighted_pred_flag = gf_bs_read_int(bs, 1);
+	pps->weighted_bipred_flag = gf_bs_read_int(bs, 1);
 	/*transquant_bypass_enable_flag = */gf_bs_read_int(bs, 1);
 	pps->tiles_enabled_flag = gf_bs_read_int(bs, 1);
-	/*entropy_coding_sync_enabled_flag = */gf_bs_read_int(bs, 1);
+	pps->entropy_coding_sync_enabled_flag = gf_bs_read_int(bs, 1);
 	if (pps->tiles_enabled_flag) {
-		u32 num_tile_columns_minus1 = bs_get_ue(bs);
-		u32 num_tile_rows_minus1 = bs_get_ue(bs);
+		pps->num_tile_columns = 1 + bs_get_ue(bs);
+		pps->num_tile_rows = 1 + bs_get_ue(bs);
 		pps->uniform_spacing_flag = gf_bs_read_int(bs, 1);
 		if (!pps->uniform_spacing_flag ) {
-			for( i = 0; i < num_tile_columns_minus1; i++ ) {
-				/*column_width_minus1[ i ] = */bs_get_ue(bs);
+			for (i=0; i<pps->num_tile_columns; i++) {
+				pps->column_width[i] = 1 + bs_get_ue(bs);
 			}
-			for( i = 0; i < num_tile_rows_minus1; i++ ) {
-				/*row_height_minus1[ i ] = */bs_get_ue(bs);
+			for (i=0; i<pps->num_tile_rows; i++) {
+				pps->row_height[i] = bs_get_ue(bs);
 			}
 		}
-		/*loop_filter_across_tiles_enabled_flag	 = */gf_bs_read_int(bs, 1);
+		pps->loop_filter_across_tiles_enabled_flag = gf_bs_read_int(bs, 1);
 	}
-	/*loop_filter_across_slices_enabled_flag = */gf_bs_read_int(bs, 1);
+	pps->loop_filter_across_slices_enabled_flag = gf_bs_read_int(bs, 1);
 	if( /*deblocking_filter_control_present_flag = */gf_bs_read_int(bs, 1)  ) {
-		/*deblocking_filter_override_enabled_flag= */gf_bs_read_int(bs, 1);
-		if (/*pic_disable_deblocking_filter_flag= */gf_bs_read_int(bs, 1) ) {
+		pps->deblocking_filter_override_enabled_flag = gf_bs_read_int(bs, 1);
+		if (! /*pic_disable_deblocking_filter_flag= */gf_bs_read_int(bs, 1) ) {
 			/*beta_offset_div2 = */bs_get_se(bs);
 			/*tc_offset_div2 = */bs_get_se(bs);
 		}
 	}
 	if (/*pic_scaling_list_data_present_flag	= */gf_bs_read_int(bs, 1) ) {
 		//scaling_list_data( )
-		assert(0 && "not implemented");
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[HEVC] Parsing of scaling_list_data is not yet supported, stopping scaning of PPS (slice_segment_header_extension_present won't be checked ...\n"));
+		goto exit;
 	}
-	/*lists_modification_present_flag	= */gf_bs_read_int(bs, 1);
+	pps->lists_modification_present_flag = gf_bs_read_int(bs, 1);
 	/*log2_parallel_merge_level_minus2 = */bs_get_ue(bs);
-	pps->num_extra_slice_header_bits = gf_bs_read_int(bs, 3);
 	pps->slice_segment_header_extension_present_flag = gf_bs_read_int(bs, 1);
 	if ( /*pps_extension_flag= */gf_bs_read_int(bs, 1) ) {
 		while (gf_bs_available(bs) ) {
-			//pps_extension_data_flag	u(1)
+			/*pps_extension_data_flag */ gf_bs_read_int(bs, 1);
 		}
 	}
 
@@ -3454,13 +3692,13 @@
 
 		n_state.poc_lsb_prev = hevc->s_info.poc_lsb;
 		n_state.poc_msb_prev = hevc->s_info.poc_msb;
-
 	}
 	if (slice) hevc_compute_poc(&n_state);
 	memcpy(&hevc->s_info, &n_state, sizeof(HEVCSliceInfo));
 	return ret;
 }
 
+#endif //GPAC_DISABLE_HEVC
 
 static u32 AC3_FindSyncCode(u8 *buf, u32 buflen)
 {
@@ -3909,4 +4147,3 @@
 }
 
 #endif /*!defined(GPAC_DISABLE_AV_PARSERS) && !defined (GPAC_DISABLE_OGG)*/
-

gpac-0.5.0.svn4296.tar.bz2/src/media_tools/avilib.c -> gpac-0.5.0.svn4668.tar.bz2/src/media_tools/avilib.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/media_tools/dash_client.c -> gpac-0.5.0.svn4668.tar.bz2/src/media_tools/dash_client.c Changed

@@ -31,7 +31,9 @@
 #include <gpac/internal/isomedia_dev.h>
 #include <string.h>
 
-#ifndef _WIN32_WCE
+#ifdef _WIN32_WCE
+#include <winbase.h>
+#else
 #include <time.h>
 #endif
 
@@ -90,6 +92,7 @@
 	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;
@@ -152,6 +155,8 @@
 
 	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;
 
@@ -175,10 +180,12 @@
 	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;
+	volatile u32 max_cached_segments, nb_cached_segments, max_buffer_segments;
 	segment_cache_entry *cached;
 
 	GF_DASHFileIOSession segment_download;
@@ -195,10 +202,12 @@
 	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;
@@ -254,14 +263,14 @@
 			GF_DASH_Group *group = gf_list_get(dash->groups, i);
 			if (group->buffering) {
 				u32 buffer = 0;
-				*total_buffer += group->cache_duration;
+				*total_buffer += (u32) (group->segment_duration*group->max_buffer_segments*1000);
 				for (j=0; j<group->nb_cached_segments; j++) {
-					buffer += group->cached[i].duration;
+					buffer += group->cached[j].duration;
 				}
-				if (buffer>group->cache_duration) buffer = group->cache_duration;
 				*media_buffered += buffer;
 			}
 		}
+		if (*media_buffered > *total_buffer) *media_buffered  = *total_buffer;
 		*total_buffer /= dash->nb_buffering;
 		*media_buffered /= dash->nb_buffering;
 	}
@@ -272,7 +281,7 @@
 	if (dash->nb_buffering) {
 		dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_BUFFERING, GF_OK);
 
-		if (group->nb_cached_segments>=group->max_cached_segments) 
+		if (group->cached[0].duration && group->nb_cached_segments>=group->max_buffer_segments) 
 			gf_dash_buffer_off(group, dash);
 	}
 }
@@ -295,55 +304,13 @@
 	return 0;
 }
 
-static u64 gf_dash_get_utc_clock()
-{
-	u64 current_time;
-	u32 sec, frac;
-
-#ifndef _WIN32_WCE
-	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);
-
-#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;
-	current_time = mktime(&_t) - t_timezone;
-	}
-#else
-	{
-		s32 val = timezone;
-		current_time = mktime(&_t) - val;
-	}
-#endif
-
-#else
-	current_time = sec - GF_NTP_SEC_1900_TO_1970;
-#endif
-
-	return current_time;
-}
-
-static void gf_dash_group_timeline_setup(GF_MPD *mpd, GF_DASH_Group *group)
+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;
@@ -357,75 +324,100 @@
 		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;
 
-	current_time = group->dash->mpd_fetch_time;
-
-#if 0
-	{
+	if (current_time < mpd->availabilityStartTime) {
+#ifndef _WIN32_WCE
+		time_t gtime;
 		struct tm t1, t2;
-		t1 = * gmtime(&current_time);
-		t2 = * gmtime(&mpd->availabilityStartTime);
+		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
-
-	if (current_time < mpd->availabilityStartTime) current_time = 0;
+		current_time = 0;
+		group->broken_timing = 1;
+		return;
+	}
 	else current_time -= mpd->availabilityStartTime;	
 
-	if (current_time < group->period->start/1000) current_time = 0;
-	else current_time -= group->period->start/1000;
+	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/1000);
+		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/1000;
+		current_time = mpd->media_presentation_duration;
 	}
 #endif
 
-	if (0 && ((s32) mpd->time_shift_buffer_depth>=0)) {
-		shift = mpd->time_shift_buffer_depth/1000;
+	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;
@@ -456,9 +448,29 @@
 	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;
-		group->download_segment_index = shift;
+		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));
 
@@ -471,8 +483,9 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Segment duration unknown - cannot estimate current startNumber\n"));
 	}
 }
-
-void gf_dash_group_check_switch(GF_DASHFileIO *dash_io, GF_DASH_Group *group, Bool download_active)
+//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;
 
@@ -505,6 +518,7 @@
 		group->nb_bw_check = 0;
 	}
 }
+#endif
 
 
 
@@ -529,10 +543,13 @@
 * \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 * mime) {
+static Bool gf_dash_is_m3u8_mime(const char *url, const char * mime) {
 	u32 i;
-	if (!mime)
+	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;
@@ -550,14 +567,19 @@
 */
 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...\n", url));
+	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);
+		*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));
@@ -566,13 +588,15 @@
 	} else {
 		had_sess = 1;
 		if (persistent_mode!=2) {
-			e = dash_io->setup_from_url(dash_io, *sess, url);
+			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:
 
@@ -585,6 +609,8 @@
 				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;
 		}
 	}
@@ -610,6 +636,7 @@
 				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
@@ -621,6 +648,7 @@
 				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;
@@ -630,14 +658,16 @@
 		e = dash_io->run(dash_io, *sess);
 	}
 	switch (e) {
-case GF_IP_CONNECTION_FAILURE:
-case GF_IP_NETWORK_FAILURE:
+	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);
+		*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;
 		}
 
@@ -646,16 +676,18 @@
 			goto retry;
 		}
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] two consecutive failures, aborting the download %s.\n", url));
-		return e;
+		break;
 	}
-case GF_OK:
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Download %s complete\n", url));
-	break;
-default:
-	GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] FAILED to download %s = %s...\n", url, gf_error_to_string(e)));
-	return e;
+	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;
 	}
-	return GF_OK;
+	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)
@@ -896,8 +928,8 @@
 	if (seg_dur_ms) *seg_dur_ms = (u32) (seg_dur * 1000);
 
 	seg_ast += seg_dur;
-	seg_ast += group->period->start/1000;
-	seg_ast += mpd->availabilityStartTime;
+	seg_ast *= 1000;
+	seg_ast += group->period->start + group->ast_at_init;
 	return (u64) seg_ast;
 }
 
@@ -1139,6 +1171,7 @@
 
 	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) {
@@ -1148,14 +1181,15 @@
 		} else {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Playlist %s updated with success\n", purl));
 		}
-		strcpy(mime, dash->dash_io->get_mime(dash->dash_io, dash->mpd_dnload) );
+		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(mime) || strstr(purl, ".m3u8")) {
+		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));
@@ -1164,7 +1198,7 @@
 		gf_free(purl);
 		purl = NULL;
 	}
-	fetch_time = gf_dash_get_utc_clock();
+	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));
@@ -1403,7 +1437,7 @@
 		}
 
 		if (new_mpd->availabilityStartTime != dash->mpd->availabilityStartTime) {
-			gf_dash_group_timeline_setup(new_mpd, group);
+			gf_dash_group_timeline_setup(new_mpd, group, fetch_time);
 		}
 
 		group->maybe_end_of_stream = 0;
@@ -1416,7 +1450,7 @@
 				new_mpd->media_presentation_duration = 0;
 				reset_segment_count = 1;
 			} else {
-				endTime += new_mpd->minimum_update_period/1000;
+				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;
@@ -1450,9 +1484,6 @@
 	dash->mpd = new_mpd;
 	dash->last_update_time = gf_sys_clock();
 	dash->mpd_fetch_time = fetch_time;
-
-//	dash->mpd->minimum_update_period = 3000;
-
 	return GF_OK;
 }
 
@@ -1464,6 +1495,7 @@
 	GF_MPD_Fractional *framerate=NULL;
 #endif
 	u32 k;
+	s32 timeshift;
 	GF_MPD_AdaptationSet *set;
 	GF_MPD_Period *period;
 	u32 nb_segs;
@@ -1511,6 +1543,15 @@
 	/*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)
@@ -1596,7 +1637,7 @@
 
 
 	if (!group->timeline_setup) {
-		gf_dash_group_timeline_setup(mpd, group);
+		gf_dash_group_timeline_setup(mpd, group, 0);
 		group->timeline_setup = 1;
 	}
 
@@ -1969,6 +2010,11 @@
 
 	/*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);
@@ -1976,6 +2022,7 @@
 			return e;
 		}
 		nb_segment_read = 1;
+#endif
 	} else if (!group->bitstream_switching) {
 		group->dont_delete_first_segment = 1;
 	}
@@ -2288,16 +2335,20 @@
 			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Cannot compute default segment duration\n"));
 		}
 
-		group->cache_duration = dash->max_cache_duration * 1000;
-		if (dash->mpd->min_buffer_time)
+		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*/
-			group->max_cached_segments ++;
+			if (group->max_cached_segments<2)
+				group->max_cached_segments ++;
 		}
 
 		group->cached = gf_malloc(sizeof(segment_cache_entry)*group->max_cached_segments);
@@ -2382,7 +2433,7 @@
 	FILE *f=NULL;
 	if (!strncmp(cache_name, "gmem://", 7)) {
 		u32 size;
-		u8 *mem_address;
+		char *mem_address;
 		if (sscanf(cache_name, "gmem://%d@%p", &size, &mem_address) != 2) {
 			return GF_IO_ERR;
 		} 
@@ -2732,6 +2783,59 @@
 	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)
 {
@@ -2824,7 +2928,7 @@
 			/*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 ellapsed since last refresh and min reoad rate is %u)\n", gf_sys_clock() , timer, dash->mpd->minimum_update_period));
+				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;
@@ -2838,8 +2942,8 @@
 				Bool cache_full = 1;
 
 				/*wait if nothing is ready to be downloaded*/
-				if (min_wait) {
-					u32 sleep_for = min_wait/2;
+				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);
 				}
@@ -2932,8 +3036,21 @@
 					/* 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));
-							continue;
+							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 */
@@ -2943,6 +3060,7 @@
 					}
 				}
 			}
+			group->time_at_first_reload_required = 0;
 			gf_mx_p(dash->dl_mutex);
 
 			if (group->force_switch_bandwidth && !dash->auto_switch_count) {
@@ -2962,27 +3080,28 @@
 				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_dash_get_utc_clock();
+				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 > 0) {
-					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 s\n", i+1, gf_sys_clock(), group->download_segment_index + group->start_number, segment_ast, to_wait));
+				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 ellapsed since previous segment download\n", clock_time - 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) 1000*to_wait < min_wait))
-						min_wait = 1000*to_wait;
+					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 sec - requesting it\n", i+1, gf_sys_clock(), group->download_segment_index + group->start_number, segment_ast, -to_wait));
+					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 ellapsed since previous segment download\n", clock_time - 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->dash->mpd->time_shift_buffer_depth) /1000 )
+					if (now < segment_ast + seg_dur_ms + group->time_shift_buffer_depth )
 						in_segment_avail_time = 1;
 				}
 			}
@@ -3016,8 +3135,6 @@
 				}
 
 			} else {
-				u32 total_size, bytes_per_sec;
-
 				group->max_bitrate = 0;
 				group->min_bitrate = (u32)-1;
 				/*use persistent connection for segment downloads*/
@@ -3066,38 +3183,7 @@
 
 				resource_name = dash->dash_io->get_url(dash->dash_io, group->segment_download);
 
-				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;
-					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));
-
-					if (rep->bandwidth < 8*bytes_per_sec) {
-						u32 k;
-						/*find highest bandwidth that fits our bitrate*/
-						GF_MPD_Representation *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 (8*bytes_per_sec > arep->bandwidth) {
-								if (!new_rep) new_rep = arep;
-								else if (arep->bandwidth > new_rep->bandwidth) {
-									new_rep = arep;
-								}
-							}
-						}
-						if (!dash->disable_switching && new_rep && (new_rep!=rep)) {
-							gf_dash_set_group_representation(group, new_rep);
-						}
-					}
-				}
+				dash_do_rate_adaptation(dash, group, rep);
 			}
 
 			if (local_file_name && (e == GF_OK || group->segment_must_be_streamed )) {
@@ -3332,7 +3418,7 @@
 {
 	GF_Err e;
 	GF_DashClient *dash = (GF_DashClient*) getter->udta;
-	GF_DASHFileIOSession *sess = dash->dash_io->create(dash->dash_io, 0, url);
+	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);
@@ -3407,7 +3493,7 @@
 
 		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(mime) || strstr(reloc_url, ".m3u8") || strstr(reloc_url, ".M3U8")) {
+		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));
@@ -3416,6 +3502,12 @@
 			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));
@@ -3435,7 +3527,7 @@
 		if (!f) return GF_URL_ERROR;
 		fclose(f);
 	}
-	dash->mpd_fetch_time = gf_dash_get_utc_clock();
+	dash->mpd_fetch_time = gf_net_get_utc();
 
 	if (dash->is_m3u8) {
 		if (is_local) {
@@ -3540,7 +3632,7 @@
 }
 
 GF_EXPORT
-GF_DashClient *gf_dash_new(GF_DASHFileIO *dash_io, u32 max_cache_duration_sec, u32 auto_switch_count, Bool keep_files, Bool disable_switching, GF_DASHInitialSelectionMode first_select_mode, Bool enable_buffering)
+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);
@@ -3550,8 +3642,10 @@
 	dash->dl_mutex = gf_mx_new("MPD Segment Downloader Mutex");
 	dash->mimeTypeForM3U8Segments = gf_strdup( "video/mp2t" );
 
-	dash->max_cache_duration = max_cache_duration_sec;
+	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;
@@ -3941,6 +4035,42 @@
 	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)

gpac-0.5.0.svn4296.tar.bz2/src/media_tools/dash_segmenter.c -> gpac-0.5.0.svn4668.tar.bz2/src/media_tools/dash_segmenter.c Changed

@@ -28,7 +28,9 @@
 #include <gpac/mpegts.h>
 #include <gpac/config_file.h>
 #include <gpac/network.h>
-#ifndef _WIN32_WCE
+#ifdef _WIN32_WCE
+#include <winbase.h>
+#else
 #include <time.h>
 #endif
 #include <gpac/internal/isomedia_dev.h>
@@ -58,6 +60,11 @@
 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;
@@ -66,8 +73,8 @@
 	Bool use_url_template;
 	Bool use_segment_timeline;
 	u32 single_file_mode;
+	u32 segment_marker_4cc;
 	s32 time_shift_depth;
-	Double subduration;
 	const char *bs_switch_segment_file;
 	Bool inband_param_set;
 
@@ -75,10 +82,9 @@
 	Bool variable_seg_rad_name;
 
 	Bool fragments_start_with_rap;
-	Double fragment_duration;
+	Bool memory_mode;
 
 	GF_Config *dash_ctx;
-
 	const char *tmpdir;
 } GF_DASHSegmenterOptions;
 
@@ -103,7 +109,7 @@
 	/*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 *disable_bs_switching);
+	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*/
@@ -125,7 +131,7 @@
 				if (sep) {	\
 					sep[0] = 0;	\
 					strcpy(szFmt, seg_rad_name+char_template);	\
-					char_template += strlen(seg_rad_name+char_template);	\
+					char_template += (u32) strlen(seg_rad_name+char_template);	\
 					sep[0] = '$';	\
 				}	\
 			}	\
@@ -135,18 +141,18 @@
 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=0;
-	Bool is_index = (seg_type==GF_DASH_TEMPLATE_REPINDEX) ? 1 : 0;
-	Bool is_init = (seg_type==GF_DASH_TEMPLATE_INITIALIZATION) ? 1 : 0;
-	Bool is_template = (seg_type==GF_DASH_TEMPLATE_TEMPLATE) ? 1 : 0;
-	Bool is_init_template = (seg_type==GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE) ? 1 : 0;
-	Bool needs_init=((is_init || is_init_template) && !is_bs_switching) ? 1 : 0;
+	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 = 0;
+		needs_init = GF_FALSE;
 	
 	if (!seg_rad_name) {
 		char *sep;
@@ -162,14 +168,14 @@
 			if (!is_template && !is_init_template && !strnicmp(& seg_rad_name[char_template], "$RepresentationID$", 18)) {
 				char_template+=18;
 				strcat(segment_name, rep_id);
-				needs_init=0;
+				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=0;
+				needs_init=GF_FALSE;
 			}
 			else if (!is_template && !strnicmp(& seg_rad_name[char_template], "$Time", 5)) {
 				EXTRACT_FORMAT(5);
@@ -187,16 +193,16 @@
 				if (is_init || is_init_template) continue;
 				sprintf(tmp, szFmt, segment_number);
 				strcat(segment_name, tmp);
-				has_number=1;
+				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=0;
+					needs_init=GF_FALSE;
 				}
-				char_template += strlen(seg_rad_name + char_template)+1;
+				char_template += (u32) strlen(seg_rad_name + char_template)+1;
 				if (sep) sep[0] = '$';
 			}
 			else if (!strnicmp(& seg_rad_name[char_template], "$Index=", 7)) {
@@ -204,9 +210,9 @@
 				if (sep) sep[0] = 0;
 				if (is_index) {
 					strcat(segment_name, seg_rad_name + char_template+6);
-					needs_init=0;
+					needs_init=GF_FALSE;
 				}
-				char_template += strlen(seg_rad_name + char_template)+1;
+				char_template += (u32) strlen(seg_rad_name + char_template)+1;
 				if (sep) sep[0] = '$';
 			}
 			
@@ -251,7 +257,6 @@
 {
 	GF_ESD *esd;
 	GF_AVCConfig *avcc;
-	GF_AVCConfigSlot *sps;
 	u32 subtype = gf_isom_is_media_encrypted(movie, track, 1);
 	if (!subtype) subtype = gf_isom_get_media_subtype(movie, track, 1);
 
@@ -263,7 +268,7 @@
 			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.%02x", esd->decoderConfig->objectTypeIndication, audio_object_type);
+				sprintf(szCodec, "mp4a.%02x.%01x", esd->decoderConfig->objectTypeIndication, audio_object_type);
 			} else {
 				sprintf(szCodec, "mp4a.%02x", esd->decoderConfig->objectTypeIndication);
 			}
@@ -273,7 +278,7 @@
 			if (esd->decoderConfig->decoderSpecificInfo) {
 				GF_M4VDecSpecInfo dsi;
 				gf_m4v_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
-				sprintf(szCodec, "mp4v.%02x.%02x", esd->decoderConfig->objectTypeIndication, dsi.VideoPL);
+				sprintf(szCodec, "mp4v.%02x.%01x", esd->decoderConfig->objectTypeIndication, dsi.VideoPL);
 			} else
 #endif
 			{
@@ -293,13 +298,7 @@
 	case GF_ISOM_SUBTYPE_AVC4_H264:
 	case GF_ISOM_SUBTYPE_SVC_H264:
 		avcc = gf_isom_avc_config_get(movie, track, 1);
-		sps = gf_list_get(avcc->sequenceParameterSets, 0);
-		if (sps)
-			sprintf(szCodec, "%s.%02x%02x%02x", gf_4cc_to_str(subtype), (u8) sps->data[1], (u8) sps->data[2], (u8) sps->data[3]);
-		else {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[ISOM Tools] AVC/SVC SPS not known - setting codecs string to default value \"%s\"\n", gf_4cc_to_str(subtype) ));
-			sprintf(szCodec, "%s", gf_4cc_to_str(subtype));
-		}
+		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:
@@ -359,7 +358,7 @@
 	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;
+	u32 nb_video, nb_audio, nb_text, nb_scene, mpd_timescale;
 	u8 defaultPadding;
 	u16 defaultDegradationPriority;
 	GF_Err e;
@@ -375,19 +374,19 @@
 	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 = 0;
-	Bool switch_segment = 0;
-	Bool split_seg_at_rap = dash_cfg ? dash_cfg->segments_start_with_rap : 0;
-	Bool split_at_rap = 0;
-	Bool has_rap = 0;
-	Bool next_sample_rap = 0;
-	Bool flush_all_samples = 0;
-	Bool simulation_pass = 0;
-	Bool init_segment_deleted = 0;
-	Bool first_segment_in_timeline = 1;
+	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 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;
@@ -400,19 +399,18 @@
 	char RepURLsSecName[200];
 	const char *opt;
 	Double max_track_duration = 0;
-	Bool bs_switching_is_output = 0;
-	Bool store_dash_params = 0;
-	Bool dash_moov_setup = 0;
-	Bool segments_start_with_sap = 1;
-	Bool first_sample_in_segment = 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 timeline_timescale=1000;
-	Bool audio_only = 1;
-	Bool is_bs_switching = 0;
-	Bool use_url_template = dash_cfg ? dash_cfg->use_url_template : 0;
-	const char *seg_rad_name = dash_cfg ? dash_cfg->seg_rad_name : NULL;
-	const char *seg_ext = dash_cfg ? dash_cfg->seg_ext : NULL;
+	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;
@@ -422,7 +420,7 @@
 	if (!seg_ext) seg_ext = "m4s";
 
 	bs_switch_segment = NULL;
-	if (dash_cfg && dash_cfg->bs_switch_segment_file) {
+	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);
@@ -440,100 +438,93 @@
 	startNumberRewind = 0;
 
 	//create output file
-	if (dash_cfg) {
-
-		/*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;
-				}
+	/*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);
 		}
+		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=1;
-				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);
+	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;
-				}
+			/*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, strlen(szMPDTempLine));
-		}
-		
+	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 {
-		output = gf_isom_open(output_file, GF_ISOM_OPEN_WRITE, NULL);
-		if (!output) return gf_isom_last_error(NULL);
+		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, 0, 0);
+		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*/
@@ -546,32 +537,32 @@
 		gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_MP42, 0);
 	}
 
-	MaxFragmentDuration = (u32) (max_duration_sec * 1000);	
-	MaxSegmentDuration = (u32) (1000 * (dash_cfg ? dash_cfg->segment_duration : max_duration_sec));
+	MaxFragmentDuration = (u32) (dash_cfg->dash_scale * max_duration_sec);	
+	MaxSegmentDuration = (u32) (dash_cfg->dash_scale * dash_cfg->segment_duration);
 
-	if (dash_cfg) {
-		/*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 = 1;
-			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;
-		}
+	/*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;	
 
-	tfref = NULL;
+	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;
 
-	nb_video = nb_audio = nb_text = nb_scene = 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;
@@ -580,7 +571,7 @@
 		if (mtype == GF_ISOM_MEDIA_HINT) continue;
 
 		if (! dash_moov_setup) {
-			e = gf_isom_clone_track(input, i+1, output, 0, &TrackNum);
+			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);
@@ -612,13 +603,17 @@
 			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 = 0;
+		if (mtype != GF_ISOM_MEDIA_AUDIO) audio_only = GF_FALSE;
 
 		//setup fragmenters
 		if (! dash_moov_setup) {
@@ -636,7 +631,7 @@
 									 &defaultDuration, &defaultSize, &defaultDescriptionIndex, &defaultRandomAccess, &defaultPadding, &defaultDegradationPriority);
 		}
 
-		gf_media_get_rfc_6381_codec_name(input, i+1, szCodec);
+		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);
 
@@ -647,16 +642,17 @@
 		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) { 
+		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 = 1;
+			tf->all_sample_raps = GF_TRUE;
 		}
 
 		tf->finalSampleDescriptionIndex = 1;
@@ -675,7 +671,13 @@
 			}
 
 			gf_isom_set_brand_info(output, GF_4CC('i','s','o','5'), 1);
-			gf_isom_modify_alternate_brand(output, GF_4CC('d','a','s','h'), 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) {
@@ -781,12 +783,16 @@
 		nb_samp += count;
 	}
 
+	if (gf_list_count(fragmenters)>1)
+		mpd_timescale = 1000;
 
-	if (!tfref) tfref = gf_list_get(fragmenters, 0);
-	tfref->is_ref_track = 1;
+	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 = 1;
+	if (tfref->all_sample_raps)
+		split_seg_at_rap = GF_TRUE;
 
 
 	if (!dash_moov_setup) {
@@ -796,10 +802,10 @@
 	}
 
 	//if single segment, add msix brand if we use indexes
-	gf_isom_modify_alternate_brand(output, GF_4CC('m','s','i','x'), (dash_cfg && (dash_cfg->single_file_mode==1) && (dash_cfg->subsegs_per_sidx>=0)) ? 1 : 0);
+	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, dash_cfg ? 1 : 0);
+	e = gf_isom_finalize_for_fragment(output, 1);
 	if (e) goto err_exit;
 
 	start_range = 0;
@@ -832,18 +838,18 @@
 	nb_done = 0;
 
 	maxFragDurationOverSegment=0;
-	if (dash_cfg) switch_segment=1;
+	switch_segment=GF_TRUE;
 
-	if (!seg_rad_name) use_url_template = 0;
+	if (!seg_rad_name) use_url_template = GF_FALSE;
 
 	cur_seg=1;
 	fragment_index=1;
 	period_duration = 0;
-	split_at_rap = 0;
-	has_rap = 0;
-	next_sample_rap = 0;
-	flush_all_samples = 0;
-	force_switch_segment = 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;
 
@@ -856,7 +862,7 @@
 			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, strlen(szMPDTempLine));
+			gf_bs_write_data(mpd_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
 		}
 
 		opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "NextSegmentIndex");
@@ -891,38 +897,38 @@
 	while ( (count = gf_list_count(fragmenters)) ) {
 
 		if (switch_segment) {
-			SegmentDuration = 0;
-			switch_segment = 0;
-			first_sample_in_segment = 1;
-
-			if (dash_cfg && dash_cfg->subduration && (segment_start_time + MaxSegmentDuration/2 >= 1000*dash_cfg->subduration)) {
+			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 = gf_realloc(segments_info, sizeof(u32) * (nb_segments_info+1) );
+				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 * timeline_timescale + segment_start_time), bandwidth, cur_seg, dash_cfg->use_segment_timeline);
-					e = gf_isom_start_segment(output, SegmentName);
+					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 / 1000.0);
+					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 = 1;
+						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, strlen(szMPDTempLine));
+						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 );
@@ -931,7 +937,7 @@
 						}
 					}
 				} else {
-					e = gf_isom_start_segment(output, NULL);
+					e = gf_isom_start_segment(output, NULL, dash_cfg->memory_mode);
 				}
 			}
 
@@ -966,27 +972,34 @@
 			s32 roll_distance;
 			u32 SAP_type = 0;
 			/*start with ref*/
-			if (tfref && split_seg_at_rap ) {
-				if (i==0) {
+			if (split_seg_at_rap) {
+				if (tfref && (i==0)) {
 					tf = tfref;
-					has_rap=0;
+					has_rap = GF_FALSE;
 				} else {
-					tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i-1);
-					if (tf == tfref) {
-						tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
+					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=0;
+					has_rap = GF_FALSE;
 			} 
 			if (tf->done) continue;
 
 			//ok write samples
 			while (1) {
-				Bool stop_frag = 0;
-				Bool is_redundant_sample = 0;
+				Bool stop_frag = GF_FALSE;
+				Bool is_redundant_sample = GF_FALSE;
 				u32 split_sample_duration = 0;
 
 				/*first sample*/
@@ -998,7 +1011,7 @@
 					}
 					if (tf->split_sample_dts_shift) {
 						sample->DTS += tf->split_sample_dts_shift;
-						is_redundant_sample = 1;
+						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*/
@@ -1020,29 +1033,37 @@
 				if (next) {
 					defaultDuration = (u32) (next->DTS - sample->DTS);
 				} else {
-					defaultDuration = tf->DefaultDuration;
+ 					defaultDuration = (u32) (gf_isom_get_media_duration(input, tf->OriginalTrack)- sample->DTS);
 				}
 
 				if (tf->splitable) {
 					if (tfref==tf) {
-						u64 frag_dur = (tf->FragmentLength + defaultDuration) * 1000 / tf->TimeScale;
+						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) / 1000 - tf->FragmentLength);
+							defaultDuration = (u32) (tf->TimeScale * (MaxSegmentDuration - SegmentDuration) / dash_cfg->dash_scale - tf->FragmentLength);
 							split_sample_duration -= defaultDuration;
 						}
-					} else if ((tf->last_sample_cts + defaultDuration) * tfref_timescale > tfref->next_sample_dts * tf->TimeScale) {
+					} 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) ( (last_ref_cts * tf->TimeScale)/tfref_timescale - tf->last_sample_cts );
+						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 = 0;
-						if (! SAP_type) segments_start_with_sap = 0;
+						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;
@@ -1116,7 +1137,7 @@
 				if (next && SAP_type) {
 					if (tf==tfref) {
 						if (split_sample_duration) {
-							stop_frag = 1;
+							stop_frag = GF_TRUE;
 						}
 						else if (split_seg_at_rap) {
 							u64 next_sap_time;
@@ -1124,20 +1145,20 @@
 							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)*1000/tf->TimeScale;
-							next_sample_rap = 1;
+							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)*1000/tf->TimeScale;
+								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 = 1;
+									split_at_rap = GF_TRUE;
 									/*force new segment*/
-									force_switch_segment = 1;
-									stop_frag = 1;
+									force_switch_segment = GF_TRUE;
+									stop_frag = GF_TRUE;
 								}
 
 								if (tf->all_sample_raps) {
@@ -1145,8 +1166,8 @@
 									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)*1000 >= MaxFragmentDuration * tf->TimeScale)
-										stop_frag = 1;
+									if ( (tf->FragmentLength + scaler * next_dur) * dash_cfg->dash_scale >= MaxFragmentDuration * tf->TimeScale)
+										stop_frag = GF_TRUE;
 								}
 							}
 						} else if (!has_rap) {
@@ -1155,137 +1176,143 @@
 						}
 					} 
 				} else {
-					next_sample_rap = 0;
+					next_sample_rap = GF_FALSE;
 				}
 
 				if (tf->SampleNum==tf->SampleCount) {
-					stop_frag = 1;
+					stop_frag = GF_TRUE;
 				} else if (tf==tfref) {
 					/*fragmenting on "clock" track: no drift control*/
-					if (!(dash_cfg ? dash_cfg->fragments_start_with_rap : 0) || ( (next && next->IsRAP) || split_at_rap) ) {
-						if (tf->FragmentLength*1000 >= MaxFragmentDuration*tf->TimeScale) {
-							stop_frag = 1;
+					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->last_sample_cts * tfref_timescale >= last_ref_cts * tf->TimeScale)
-						stop_frag = 1;
+					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*1000/tf->TimeScale) {
-						maxFragDurationOverSegment = tf->FragmentLength*1000/tf->TimeScale;
+					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;
+					//if (tf==tfref)
+						//last_ref_cts = tf->last_sample_cts;
 
 					break;
 				}
 			}
 
 			if (tf->SampleNum==tf->SampleCount) {
-				tf->done = 1;
+				tf->done = GF_TRUE;
 				nb_tracks_done++;
 				if (tf == tfref) {
 					tfref = NULL;
-					flush_all_samples = 1;
+					flush_all_samples = GF_TRUE;
 				}
 			}
 		}
 
-		if (dash_cfg) {
+		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;
+		}
 
-			SegmentDuration += maxFragDurationOverSegment;
-			maxFragDurationOverSegment=0;
 
-			/*next fragment will exceed segment length, abort fragment now (all samples RAPs)*/
-			if (tfref && tfref->all_sample_raps && (SegmentDuration + MaxFragmentDuration >= MaxSegmentDuration)) {
-				force_switch_segment = 1;
-			}
+		/*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 (force_switch_segment || ((SegmentDuration >= MaxSegmentDuration) && (!split_seg_at_rap || next_sample_rap))) {
 
-				if (mpd_timeline_bs) {
+			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, strlen(szMPDTempLine));
-						}
-						previous_segment_duration = SegmentDuration;
-						if (first_segment_in_timeline) {
-							sprintf(szMPDTempLine, "     <S t=\""LLU"\" d=\""LLU"\"", (u64) (segment_start_time*timeline_timescale), (u64) SegmentDuration );
-							first_segment_in_timeline = 0;
+				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, "     <S d=\""LLU"\"", (u64) SegmentDuration);
+							sprintf(szMPDTempLine, "/>\n");
 						}
-						gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, strlen(szMPDTempLine));
-						segment_timeline_repeat_count = 0;
-					}	
-				}
-
-				segment_start_time += SegmentDuration;
-				nb_segments++;
-				if (max_segment_duration * 1000 <= SegmentDuration) {
-					max_segment_duration = (Double) (s64) SegmentDuration;
-					max_segment_duration /= 1000;
-				}
-				force_switch_segment=0;
-				switch_segment=1;
-				SegmentDuration=0;
-				split_at_rap = 0;
-				has_rap = 0;
-				/*restore fragment duration*/
-				MaxFragmentDuration = (u32) (max_duration_sec * 1000);
+						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;
+			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 ? 1 : 0, &idx_start_range, &idx_end_range);
-					ref_track_first_dts = (u64) -1;
+				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, 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, strlen(szMPDTempLine));
-							}
-							gf_bs_write_data(mpd_bs, "/>\n", 3);
+				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);
-							}
+						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);
 					}
+				} 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 = 1;
+					split_at_rap = GF_TRUE;
 				}
 			}
 		}
@@ -1297,159 +1324,165 @@
 		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 = 0;
+		simulation_pass = GF_FALSE;
 		/*reset fragmenters*/
 		for (i=0; i<gf_list_count(fragmenters); i++) {
-			tf = gf_list_get(fragmenters, i);
-			tf->done = 0;
+			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;
+			if (tf->is_ref_track)
+				tfref = tf;
 		}
 		goto restart_fragmentation_pass;
 	}
 
-	if (dash_cfg) {
-		/*flush last segment*/
-		if (!switch_segment) {
-			u64 idx_start_range, idx_end_range;
-
-			if (max_segment_duration * 1000 <= SegmentDuration) {
-				max_segment_duration = (Double) (s64) SegmentDuration;
-				max_segment_duration /= 1000;
-			}
-
-			segment_start_time += SegmentDuration;
+	/*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
 
-			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, &idx_start_range, &idx_end_range);
-			nb_segments++;
+		segment_start_time += SegmentDuration;
 
-			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, 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, strlen(szMPDTempLine));
-					}
-					gf_bs_write_data(mpd_bs, "/>\n", 3);
+		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 (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);
-					}
+		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);
 			}
+		} 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, 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, strlen(szMPDTempLine));
+	}
+	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");
 				}
-				if (SegmentDuration) {
-					if (first_segment_in_timeline) {
-						sprintf(szMPDTempLine, "     <S t=\""LLU"\" d=\""LLU"\"/>\n", (u64) (segment_start_time*timeline_timescale), (u64) SegmentDuration );
-						first_segment_in_timeline = 0;
-					} else {
-						sprintf(szMPDTempLine, "     <S d=\""LLU"\"/>\n", (u64) SegmentDuration);
-					}
-					gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, strlen(szMPDTempLine));
+				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, strlen(szMPDTempLine));
 		}
 
-		if (!bandwidth)
-			bandwidth = (u32) (file_size * 8 / file_duration);
+		sprintf(szMPDTempLine, "    </SegmentTimeline>\n");
+		gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
+	}
 
-		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=\"1000\" duration=\"%d\" media=\"%s\" startNumber=\"%d\"", (u32) (max_segment_duration*1000), 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 (!bandwidth)
+		bandwidth = (u32) (file_size * 8 / file_duration);
 
-				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");
-				}
+	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);
 			}
-			/*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");
-				}
+			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");
 			}
 		}
-		else if ((dash_cfg->single_file_mode!=1) && mpd_timeline_bs) {
-			char *mpd_seg_info = NULL;
-			u32 size;
-
-			fprintf(dash_cfg->mpd, "   <SegmentList>\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);
 
-			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");
+			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, "   <Representation ");
+	if (dash_input->representationID) fprintf(dash_cfg->mpd, "id=\"%s\"", dash_input->representationID);
+	else fprintf(dash_cfg->mpd, "id=\"%p\"", output);
 		
-		fprintf(dash_cfg->mpd, " mimeType=\"%s/mp4\" codecs=\"%s\"", audio_only ? "audio" : "video", szCodecs);
-		if (width && height) {
-			fprintf(dash_cfg->mpd, " width=\"%d\" height=\"%d\"", width, height);
+	fprintf(dash_cfg->mpd, " 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);
@@ -1459,99 +1492,100 @@
 			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 (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");
+	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 (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 {
+	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=\"1000\" duration=\"%d\" media=\"%s\" startNumber=\"%d\"", (u32) (max_segment_duration*1000), 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) ) );	
+	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);
 			}
-			fprintf(dash_cfg->mpd, "    <SegmentList timescale=\"1000\" duration=\"%d\"", (u32) (max_segment_duration*1000));	
 			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");
-			}
+			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);
+	} 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) ) );	
 		}
-
-		if (!use_url_template && (dash_cfg->single_file_mode!=1)) {
-			fprintf(dash_cfg->mpd, "    </SegmentList>\n");
+		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);
+	}
 
-		fprintf(dash_cfg->mpd, "   </Representation>\n");
+	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_cfg->dash_ctx) {
-		period_duration += (Double)segment_start_time / 1000;
+	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);
@@ -1743,9 +1777,9 @@
 				}
 			}
 			if (mtype==GF_ISOM_MEDIA_VISUAL) {
-				u32 w1, h1, w2, h2;
+				u32 w1, h1, w2, h2, sap_type;
 				Bool rap, roll;
-				u32 roll_dist, sap_type;
+				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);
@@ -1779,12 +1813,13 @@
 	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 *disable_bs_switching)
+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++) {
@@ -1842,10 +1877,10 @@
 						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_list_get(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_list_get(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;
@@ -1857,12 +1892,12 @@
 						/*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_list_get(avccfg1->sequenceParameterSets, 0);
+								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_list_get(avccfg1->pictureParameterSets, 0);
+								GF_AVCConfigSlot *slc = (GF_AVCConfigSlot *)gf_list_get(avccfg1->pictureParameterSets, 0);
 								gf_list_rem(avccfg1->pictureParameterSets, 0);
 								gf_list_add(avccfg2->pictureParameterSets, slc);
 							}
@@ -1883,7 +1918,7 @@
 				u8 defaultPadding;
 				u16 defaultDegradationPriority;
 
-				gf_isom_clone_track(in, j+1, init_seg, 0, &track);
+				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'):
@@ -1891,9 +1926,15 @@
 				case GF_4CC( 's', 'v', 'c', '1'):
 					if (use_inband_param_set) {
 						gf_isom_avc_set_inband_config(init_seg, track, 1);
-						use_avc3 = 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;
 				}
 
 
@@ -1910,24 +1951,29 @@
 			}
 		}
 		if (!i) {
-			if (use_avc3) {
+			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);
 			}
-			gf_isom_modify_alternate_brand(init_seg, GF_4CC('d','a','s','h'), 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 = 1;
+		*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 = 1;
+		*disable_bs_switching = GF_TRUE;
 		gf_isom_delete(init_seg);
 		gf_delete_file(szInitName);
 		return GF_OK;
@@ -1964,8 +2010,8 @@
 	if (e) return e;
 
 	for (i=input_idx+1; i<nb_dash_inputs; i++) {
-		Bool valid_in_adaptation_set = 1;
-		Bool assign_to_group = 1;
+		Bool valid_in_adaptation_set = GF_TRUE;
+		Bool assign_to_group = GF_TRUE;
 
 		if (dash_inputs[input_idx].period != dash_inputs[i].period) 
 			continue;
@@ -1987,17 +2033,17 @@
 
 		for (j=0; j<in.nb_tracks; j++) {
 			struct __track_import_info *src_tk, *probe_tk;
-			Bool found = 0;
+			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 = 1;
+					found = GF_TRUE;
 					break;
 				}
 			}
 			if (!found) {
-				valid_in_adaptation_set = 0;
-				assign_to_group = 0;
+				valid_in_adaptation_set = GF_FALSE;
+				assign_to_group = GF_FALSE;
 				break;
 			}
 			src_tk = &in.tk_info[j];
@@ -2005,23 +2051,23 @@
 
 			/*make sure we use the same media type*/
 			if (src_tk->type != probe_tk->type) {
-				valid_in_adaptation_set = 0;
-				assign_to_group = 0;
+				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 = 0;
+				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 = 0;
+					valid_in_adaptation_set = GF_FALSE;
 					break;
 				}
 			} else if (src_tk->lang != probe_tk->lang) {
-				valid_in_adaptation_set = 0;
+				valid_in_adaptation_set = GF_FALSE;
 				break;
 			}
 
@@ -2101,7 +2147,7 @@
 
 	u32 subduration;
 	u32 skip_nb_segments;
-	u32 cumulated_duration;
+	u64 duration_at_last_pass;
 
 	GF_SegmentIndexBox *sidx;
 	GF_PcrInfoBox *pcrb;
@@ -2149,6 +2195,8 @@
 	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;
@@ -2157,7 +2205,7 @@
 	u32 last_pat_position;
 	u32 first_pat_position;
 	u32 prev_last_pat_position;
-	Bool first_pat_position_valid;
+	Bool first_pat_position_valid, first_pes_after_last_pat;
 	u32 pat_version;
 
 	/* information about the first CAT found in the subsegment */
@@ -2187,7 +2235,7 @@
 {
 	GF_SIDXReference *ref;
 	sidx->nb_refs++;
-	sidx->refs = gf_realloc(sidx->refs, sidx->nb_refs*sizeof(GF_SIDXReference));
+	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;
@@ -2217,7 +2265,7 @@
 
 	if (index_info->skip_nb_segments) {
 		index_info->skip_nb_segments --;
-		store_segment = 0;
+		store_segment = GF_FALSE;
 	}
 
 	/* determine the end of the current index */
@@ -2323,53 +2371,87 @@
 	
 	/* update the values for the new index*/
 	index_info->base_offset = end_offset;
-	index_info->SAP_type = 0;
-	index_info->first_SAP_PTS = 0;
-	index_info->first_SAP_offset = 0;
-	index_info->first_pes_sap = 0;
-	index_info->nb_pes_in_segment = 0;
+
+	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 = 1;
+		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 = 0;
+		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 = 1;
+		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 = 0;
+		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 = 1;
+		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 = 0;
+		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 = 1;
+		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 = 0;
+		index_info->first_pcr_position_valid = GF_FALSE;
 		index_info->first_pcr_position = 0;
 	}
 
-	index_info->cumulated_duration += duration;
-	if (index_info->subduration && (index_info->cumulated_duration >= index_info->subduration))
+	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 delta_time = (u32)(index_info->last_PTS - index_info->base_PTS);
 	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 (delta_time >= segment_duration) {
+	if (current_duration >= target_duration) {
 		m2ts_sidx_flush_entry(index_info);
 	} 
 }
@@ -2387,11 +2469,33 @@
 		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_list_get(prog->streams, 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 */
@@ -2428,6 +2532,8 @@
 			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) {
@@ -2435,6 +2541,8 @@
 			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) {
@@ -2442,6 +2550,8 @@
 			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) {
@@ -2525,6 +2635,11 @@
 					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
@@ -2539,7 +2654,10 @@
 				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 = 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*/
@@ -2566,7 +2684,7 @@
 	case GF_M2TS_EVT_PES_PCR:
 		pck = par;
 		if (!ts_seg->first_pcr_position_valid) {
-			ts_seg->first_pcr_position_valid = 1;
+			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;
@@ -2584,7 +2702,7 @@
 	}
 	ts_seg->ts = gf_m2ts_demux_new();
 	ts_seg->ts->on_event = dash_m2ts_event_check_pat;
-	ts_seg->ts->notify_pes_timing = 1;
+	ts_seg->ts->notify_pes_timing = GF_TRUE;
 	ts_seg->ts->user = ts_seg;
 
 	gf_f64_seek(ts_seg->src, 0, SEEK_END);
@@ -2595,11 +2713,12 @@
 		/* 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 = fread(data, 1, 188, ts_seg->src);
+			u32 size = (u32) fread(data, 1, 188, ts_seg->src);
 			if (size<188) break;
 
 			gf_m2ts_process_data(ts_seg->ts, data, size);
-			if ((probe_mode ==1) && ts_seg->has_seen_pat) break;
+			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);
@@ -2615,16 +2734,32 @@
 	memset(ts_seg, 0, sizeof(GF_TSSegmenter));
 }
 
-static GF_Err dasher_mp2t_get_components_info(GF_DashSegInput *dash_input, GF_DASHSegmenterOptions *opts)
+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, opts);
+	GF_Err e = dasher_generic_get_components_info(dash_input, dash_opts);
 	if (e) return e;
 
-	e = dasher_get_ts_demux(&ts_seg, dash_input->file_name, 2);
+	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;
 
-	dash_input->duration = (ts_seg.last_PTS + ts_seg.last_frame_duration - ts_seg.first_PTS)/90000.0;
+	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;
@@ -2710,13 +2845,13 @@
 
 			while (!feof(ts_seg.src) && !ts_seg.has_seen_pat) {
 				char data[NB_TSPCK_IO_BYTES];
-				u32 size = fread(data, 1, NB_TSPCK_IO_BYTES, ts_seg.src);
+				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);
@@ -2724,12 +2859,15 @@
 
 		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 = fread(data, 1, NB_TSPCK_IO_BYTES, ts_seg.src);
+		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;
 	}
@@ -2833,7 +2971,7 @@
 		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) (9000*dash_cfg->segment_duration), segment_index, SegName); 
+				fprintf(dash_cfg->mpd, "    <SegmentTemplate timescale=\"90000\" duration=\"%d\" startNumber=\"%d\" media=\"%s\"", (u32) (90000*dash_cfg->segment_duration), segment_index, SegName); 
 				if (!dash_cfg->dash_ctx) {
 					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, 1, IdxName, basename, dash_input->representationID, gf_url_get_resource_name(dash_cfg->seg_rad_name), "six", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
 					fprintf(dash_cfg->mpd, " index=\"%s\"", IdxName); 
@@ -2881,7 +3019,7 @@
 				fprintf(dash_cfg->mpd, "     <SegmentURL mediaRange=\""LLD"-"LLD"\"/>\n", start, start+ref->reference_size-1);
 				start += ref->reference_size;
 			}
-			rewrite_input = 1;
+			rewrite_input = GF_TRUE;
 
 		} else {
 			FILE *src, *dst;
@@ -2920,10 +3058,10 @@
 						if (pos+NB_TSPCK_IO_BYTES >= end) {
 							to_read = (u32) (end-pos);
 						}
-						res = fread(buf, 1, to_read, src);
+						res = (u32) fread(buf, 1, to_read, src);
 						if (res==to_read) {
 							gf_m2ts_restamp(buf, res, pcr_shift, is_pes);
-							res = fwrite(buf, 1, to_read, dst);
+							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));
@@ -2963,7 +3101,7 @@
 		u64 fsize, done;
 		char buf[NB_TSPCK_IO_BYTES];
 
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, 1, 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);
+		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));
@@ -2976,7 +3114,7 @@
 		gf_f64_seek(in, 0, SEEK_SET);
 		done = 0;
 		while (1) {
-			u32 read = fread(buf, 1, NB_TSPCK_IO_BYTES, in);
+			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;
@@ -3004,6 +3142,9 @@
 
 		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);
@@ -3077,10 +3218,13 @@
 
 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)
 {
-#ifndef _WIN32_WCE
-		u32 sec, frac;
-		time_t gtime;
-		struct tm *t;
+	u32 sec, frac;
+#ifdef _WIN32_WCE
+	SYSTEMTIME syst;
+	FILETIME filet;
+#else
+	time_t gtime;
+	struct tm *t;
 #endif
 	u32 h, m, i;
 	Double s;
@@ -3096,19 +3240,35 @@
 	t = gmtime(&gtime);
 	fprintf(mpd, " on %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);
 	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Generating MPD at time %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) );
+#else
+	GetSystemTime(&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) );
 #endif
 	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) {
-#ifndef _WIN32_WCE
-
 		/*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);
@@ -3119,20 +3279,20 @@
 
 		if ((s32)time_shift_depth>=0) {
 			h = (u32) (time_shift_depth/3600);
-			m = (u32) (time_shift_depth-h*60)/60;
+			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-h*60)/60;
+			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-h*60)/60;
+		m = (u32) (mpd_duration/60 - h*60);
 		s = mpd_duration - h*3600 - m*60;
 		fprintf(mpd, " mediaPresentationDuration=\"PT%dH%dM%.2fS\"", h, m, s);
 	}
@@ -3178,13 +3338,13 @@
 	
 	if (period_start || dash_dynamic) {
 		h = (u32) (period_start/3600);
-		m = (u32) (period_start-h*60)/60;
+		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-h*60)/60;
+		m = (u32) (period_duration/60 - h*60);
 		s = period_duration - h*3600 - m*60;
 		fprintf(mpd, " duration=\"PT%dH%dM%.2fS\"", h, m, s);	
 	}
@@ -3281,11 +3441,11 @@
 	return GF_OK;
 }
 
-static GF_Err gf_dasher_init_context(GF_Config *dash_ctx, u32 *dynamic, u32 *timeShiftBufferDepth, const char *periodID)
+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 = 0;
+	Bool first_run = GF_FALSE;
 	u32 sec, frac;
 #ifndef _WIN32_WCE
 	time_t gtime;
@@ -3296,7 +3456,7 @@
 	opt = gf_cfg_get_key(dash_ctx, "DASH", "SessionType");
 	/*first run, init all options*/
 	if (!opt) {
-		first_run = 1;
+		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);
@@ -3348,7 +3508,7 @@
 {
 	Double max_dur = 0;
 	Double safety_dur;
-	Double ms_ellapsed;
+	Double ms_elapsed;
 	u32 i, ntp_sec, frac, prev_sec, prev_frac;
 	const char *opt, *section;
 
@@ -3379,15 +3539,15 @@
 	if (!max_dur) return 0;
 	gf_net_get_ntp(&ntp_sec, &frac);
 
-	ms_ellapsed = frac;
-	ms_ellapsed -= prev_frac;
-	ms_ellapsed /= 0xFFFFFFFF;
-	ms_ellapsed *= 1000;
-	ms_ellapsed += (ntp_sec - prev_sec)*1000;
+	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_ellapsed < (max_dur - safety_dur)*1000 ) {
-		return (u32) (1000*max_dur - ms_ellapsed);
+	if (ms_elapsed < (max_dur - safety_dur)*1000 ) {
+		return (u32) (1000*max_dur - ms_elapsed);
 	}
 	return 0;
 }
@@ -3396,12 +3556,14 @@
 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 ellapsed = 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;
 
@@ -3423,20 +3585,20 @@
 	gf_net_get_ntp(&ntp_sec, &frac);
 
 	if (dash_dynamic==2) {
-		ellapsed = (u32)-1;
+		elapsed = (u32)-1;
 	} else {
-		ellapsed = ntp_sec;
-		ellapsed -= prev_sec;
+		elapsed = ntp_sec;
+		elapsed -= prev_sec;
 		/*check if we need to generate */
-		if (ellapsed < max_dur - safety_dur ) {
+		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 (ellapsed > max_dur) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Generating segments and MPD %g seconds too late\n", ellapsed - (u32) max_dur));
+		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*/
-			ellapsed = max_dur;
+			elapsed = max_dur;
 		}
 	}
 
@@ -3454,7 +3616,7 @@
 			seg_time = atof(MPDTime);
 			seg_time += ast_shift_sec;
 			seg_time += dash_duration + time_shift_depth;
-			seg_time -= ellapsed;
+			seg_time -= elapsed;
 			/*safety gard of one second*/
 			if (seg_time >= -1)
 				break;
@@ -3500,9 +3662,9 @@
 							   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,
+							   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)
+							   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];
@@ -3512,9 +3674,9 @@
 	u32 max_period = 0;
 	u32 cur_group_id = 0;
 	u32 max_sap_type = 0;
-	Bool none_supported = 1;
-	Bool has_mpeg2 = 0;
-	Bool has_role = 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;
@@ -3524,7 +3686,7 @@
 	/*init dash context if needed*/
 	if (dash_ctx) {
 
-		e = gf_dasher_init_context(dash_ctx, &dash_dynamic, &time_shift_depth, NULL);
+		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;
@@ -3570,7 +3732,10 @@
 				strcpy(dash_inputs[i].periodID, "GENID_DEF");
 			}
 		}
-		gf_dash_segmenter_probe_input(&dash_inputs[i]);
+		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;
  	}
@@ -3701,7 +3866,6 @@
 
 	dash_opts.mpd_name = mpdfile;
 	dash_opts.segments_start_with_rap = seg_at_rap;
-	dash_opts.segment_duration = dash_duration;
 	dash_opts.seg_ext = seg_ext;
 	dash_opts.daisy_chain_sidx = daisy_chain_sidx;
 	dash_opts.subsegs_per_sidx = subsegs_per_sidx;
@@ -3709,12 +3873,17 @@
 	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.fragment_duration = frag_duration;
+	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.subduration = subduration;
+	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;
@@ -3826,7 +3995,7 @@
 
 			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, &disable_bs_switching);
+				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;
@@ -3931,13 +4100,3 @@
 
 
 
-#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-GF_EXPORT
-GF_Err gf_media_fragment_file(GF_ISOFile *input, const char *output_file, Double max_duration_sec)
-{
-	return gf_media_isom_segment_file(input, output_file, max_duration_sec, NULL, NULL, 0);
-}
-
-#endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
-
-

gpac-0.5.0.svn4296.tar.bz2/src/media_tools/dsmcc.c -> gpac-0.5.0.svn4668.tar.bz2/src/media_tools/dsmcc.c Changed

@@ -1393,7 +1393,7 @@
 
 static GF_Err dsmcc_biop_get_ior(GF_BitStream* bs,GF_M2TS_DSMCC_IOR* IOR)
 {
-	u32 i,left_lite_component;
+	u32 i,j,left_lite_component;
 	/* IOR */
 	left_lite_component = 0;
 	IOR->type_id_length = gf_bs_read_int(bs,32);
@@ -1545,14 +1545,13 @@
 						}
 		}
 		taggedProfile->LiteComponent = (GF_M2TS_DSMCC_BIOP_LITE_COMPONENT*)gf_calloc(left_lite_component,sizeof(GF_M2TS_DSMCC_BIOP_LITE_COMPONENT));
-		for(i = 0; i<left_lite_component ; i++){
-			taggedProfile->LiteComponent[i].componentId_tag = gf_bs_read_int(bs,32);						
-			taggedProfile->LiteComponent[i].component_data_length = gf_bs_read_int(bs,8);
-			if(taggedProfile->LiteComponent[i].component_data_length != 0){
-				taggedProfile->LiteComponent[i].component_data_byte = (char*)gf_calloc(taggedProfile->ServiceLocation->initialContext_length,sizeof(char));
-				gf_bs_read_data(bs,taggedProfile->LiteComponent[i].component_data_byte,(u32)(taggedProfile->LiteComponent[i].component_data_length));
-			}
-
+		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));
+ 			}
 		}
 
 	}

gpac-0.5.0.svn4296.tar.bz2/src/media_tools/filestreamer.c -> gpac-0.5.0.svn4668.tar.bz2/src/media_tools/filestreamer.c Changed

@@ -85,6 +85,8 @@
 
 	/*base track if this stream contains a media decoding dependancy, 0 otherwise*/
 	u32 base_track;
+
+	Bool first_RTCP_sent;
 };
 
 
@@ -251,12 +253,15 @@
 	time = gf_sys_clock();
 
 	/*init session timeline - all sessions are sync'ed for packet scheduling purposes*/
-	if (!streamer->timelineOrigin)
+	if (!streamer->timelineOrigin) {
 		streamer->timelineOrigin = time*1000;
+		GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[FileStreamer] RTP session %s initialized - time origin set to %d\n", gf_isom_get_filename(streamer->isom), time));
+	}
 
 	track = streamer->stream;
 	while (track) {
 		/*load next AU*/
+		gf_isom_set_nalu_extract_mode(streamer->isom, track->track_num, GF_ISOM_NALU_EXTRACT_LAYER_ONLY);
 		if (!track->au) {
 			if (track->current_au >= track->nb_aus) {
 				Double scale;
@@ -291,6 +296,25 @@
 
 	/*no input data ...*/
 	if( !to_send) return GF_EOS;
+
+	
+	/*we are about to send scalable base: trigger RTCP reports with the same NTP. This avoids
+	NTP drift due to system clock precision which could break sync decoding*/
+	if (!streamer->first_RTCP_sent || (streamer->base_track && streamer->base_track==to_send->track_num)) {
+		u32 ntp_sec, ntp_frac;
+		/*force sending RTCP SR every RAP ? - not really compliant but we cannot perform scalable tuning otherwise*/
+		u32 ntp_type = to_send->au->IsRAP ? 2 : 1;
+		gf_net_get_ntp(&ntp_sec, &ntp_frac);
+		track = streamer->stream;
+		while (track) {
+			u32 ts = (u32) (track->au->DTS + track->au->CTS_Offset + track->ts_offset);
+			gf_rtp_streamer_send_rtcp(track->rtp, GF_TRUE, ts, ntp_type, ntp_sec, ntp_frac);
+			track = track->next;
+		}
+
+		streamer->first_RTCP_sent = 1;
+	}
+
 	min_ts /= 1000;
 
 	if (max_sleep_time) {
@@ -299,6 +323,7 @@
 			return GF_OK;
 	}
 
+
 	/*sleep until TS is mature*/
 	while (1) {
 		diff = ((u32) min_ts) - gf_sys_clock();
@@ -314,11 +339,12 @@
 	}
 
 	/*send packets*/
-
 	dts = to_send->au->DTS + to_send->ts_offset;
 	cts = to_send->au->DTS + to_send->au->CTS_Offset + to_send->ts_offset;
 	duration = gf_isom_get_sample_duration(streamer->isom, to_send->track_num, to_send->current_au);
 
+	GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[FileStreamer] Sending RTP packets for track %d AU %d/%d DTS "LLU" - CTS "LLU" - RTP TS "LLU" - size %d - RAP %d\n", to_send->track_num, to_send->current_au, to_send->nb_aus, to_send->au->DTS, to_send->au->DTS+to_send->au->CTS_Offset, cts, to_send->au->dataLength, to_send->au->IsRAP ) );
+
 	/*unpack nal units*/
 	if (to_send->avc_nalu_size) {
 		Bool au_start, au_end;
@@ -554,6 +580,15 @@
 		if (base_track)
 			streamer->base_track = base_track;
 	}
+
+	/*if scalable coding is found, disable auto RTCP reports and send them ourselves*/
+	if (streamer->base_track) {
+		GF_RTPTrack *track = streamer->stream;
+		while (track) {
+			gf_rtp_streamer_disable_auto_rtcp(track->rtp);
+			track = track->next;
+		}
+	}
 	return streamer;
 
 exit:

gpac-0.5.0.svn4296.tar.bz2/src/media_tools/gpac_ogg.c -> gpac-0.5.0.svn4668.tar.bz2/src/media_tools/gpac_ogg.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/media_tools/html5_media.c Added

@@ -0,0 +1,200 @@
+/*
+*			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-0.5.0.svn4668.tar.bz2/src/media_tools/html5_mse.c Added

@@ -0,0 +1,705 @@
+/*
+*			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-0.5.0.svn4296.tar.bz2/src/media_tools/img.c -> gpac-0.5.0.svn4668.tar.bz2/src/media_tools/img.c Changed

@@ -243,7 +243,7 @@
 {
 	JPGCtx *jpx = (JPGCtx *) cinfo->src;
 	if (num_bytes > (long) jpx->src.bytes_in_buffer) {
-		jpx->skip = num_bytes - jpx->src.bytes_in_buffer;
+		jpx->skip = (s32) (num_bytes - jpx->src.bytes_in_buffer);
 		jpx->src.next_input_byte += jpx->src.bytes_in_buffer;
 		jpx->src.bytes_in_buffer = 0;
 	} else {
@@ -405,7 +405,7 @@
 		png_error(png_ptr, "Read Error");
 	} else {
 		memcpy(data, (char*) ctx->buffer + ctx->pos, length);
-		ctx->pos += length;
+		ctx->pos += (u32) length;
 	}
 }
 static void gf_png_user_error_fn(png_structp png_ptr,png_const_charp error_msg)
@@ -426,7 +426,7 @@
 	int num_trans;
 	png_color_16p trans_color;
  
-	if ((png_size<8) || png_sig_cmp(png, 0, 8) ) return GF_NON_COMPLIANT_BITSTREAM;
+	if ((png_size<8) || png_sig_cmp((png_bytep)png, 0, 8) ) return GF_NON_COMPLIANT_BITSTREAM;
 
 	udta.buffer = png;
 	udta.size = png_size;
@@ -497,7 +497,7 @@
 	stride = png_get_rowbytes(png_ptr, info_ptr);
 	rows = (png_bytepp) gf_malloc(sizeof(png_bytep) * png_get_image_height(png_ptr, info_ptr));
 	for (i=0; i<png_get_image_height(png_ptr, info_ptr); i++) {
-		rows[i] = dst + i*stride;
+		rows[i] = (png_bytep)dst + i*stride;
 	}
 	png_read_image(png_ptr, rows);
 	png_read_end(png_ptr, NULL);
@@ -513,7 +513,7 @@
 {
 	GFpng *p = (GFpng *)png_get_io_ptr(png);
 	memcpy(p->buffer+p->pos, data, sizeof(char)*size);
-	p->pos += size;
+	p->pos += (u32) size;
 }
 void gf_png_flush(png_structp png)
 {
@@ -641,7 +641,7 @@
 	}
 	row_pointers = gf_malloc(sizeof(png_bytep)*height);
 	for (k = 0; k < (s32)height; k++)
-		row_pointers[k] = data + k*stride;
+		row_pointers[k] = (png_bytep) data + k*stride;
 
 	png_write_image(png_ptr, row_pointers);
 	png_write_end(png_ptr, info_ptr);
@@ -688,7 +688,7 @@
     fsize = (u32)gf_f64_tell(f);
     gf_f64_seek(f, 0, SEEK_SET);
     data = gf_malloc(fsize);
-    read = fread(data, sizeof(char), fsize, f);
+    read = (u32) fread(data, sizeof(char), fsize, f);
 	fclose( f );
     if (read != fsize) return GF_IO_ERR;

gpac-0.5.0.svn4296.tar.bz2/src/media_tools/ismacryp.c -> gpac-0.5.0.svn4668.tar.bz2/src/media_tools/ismacryp.c Changed

@@ -89,7 +89,7 @@
 				u32 len, j;
 				char *sKey = att->value;
 				if (!strnicmp(sKey, "0x", 2)) sKey += 2;
-				len = strlen(sKey);
+				len = (u32) strlen(sKey);
 				for (j=0; j<len; j+=2) {
 					char szV[5];
 					u32 v;
@@ -161,7 +161,7 @@
 	if (!info->in_text_header) return;
 
 	tkc = (GF_TrackCryptInfo *) gf_list_last(info->tcis);
-	len = strlen(text);
+	len = (u32) strlen(text);
 	if (len+tkc->TextualHeadersLen > 5000) return;
 
 	if (tkc->TextualHeadersLen) {
@@ -339,7 +339,7 @@
 		/* Decrypt payload */
 		if (ismasamp->flags & GF_ISOM_ISMA_IS_ENCRYPTED) {
 			/*restore IV*/
-			if (!prev_sample_encrypted) resync_IV(mc, ismasamp->IV, tci->salt);
+			if (!prev_sample_encrypted) 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);
@@ -354,7 +354,7 @@
 			end = start + 4;
 			while (remain>4) {
 				if (!end[0] && !end[1] && !end[2] && (end[3]==0x01)) {
-					nalu_size = end - start - 4;
+					nalu_size = (u32) (end - start - 4);
 					start[0] = (nalu_size>>24)&0xFF;
 					start[1] = (nalu_size>>16)&0xFF;
 					start[2] = (nalu_size>>8)&0xFF;
@@ -366,7 +366,7 @@
 				end++;
 				remain--;
 			}
-			nalu_size = end - start - 4;
+			nalu_size = (u32) (end - start - 4);
 			start[0] = (nalu_size>>24)&0xFF;
 			start[1] = (nalu_size>>16)&0xFF;
 			start[2] = (nalu_size>>8)&0xFF;
@@ -506,13 +506,13 @@
 		/*GPAC*/
 		if (!strnicmp(KMS_URI, "(key)", 5)) {
 			char data[100];
-			gf_base64_decode((char*)KMS_URI+5, strlen(KMS_URI)-5, 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, tci.key, tci.salt)) {
+			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;
 			}
@@ -525,7 +525,7 @@
 				continue;
 			}
 			fclose(test);
-			if (gf_ismacryp_gpac_get_info(tci.trackID, (char *) KMS_URI, tci.key, tci.salt) != GF_OK) {
+			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;
 			}
@@ -582,7 +582,7 @@
 		return GF_NOT_SUPPORTED;
 	}
 	if (esd) {
-		if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) avc_size_length = 1;
+		if ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_SVC)) avc_size_length = 1;
 		gf_odf_desc_del((GF_Descriptor*) esd);
 	}
 	if (avc_size_length) {
@@ -651,7 +651,7 @@
 		if ((tci->sel_enc_type==GF_ISMACRYP_SELENC_PREVIEW) && tci->sel_enc_range) {
 			char *szPreview = tci->TextualHeaders + tci->TextualHeadersLen;
 			sprintf(szPreview, "PreviewRange:%d", tci->sel_enc_range);
-			tci->TextualHeadersLen += strlen(szPreview)+1;
+			tci->TextualHeadersLen += (u32) strlen(szPreview)+1;
 		}
 		e = gf_isom_set_oma_protection(mp4, track, 1, 
 			strlen(tci->Scheme_URI) ? tci->Scheme_URI : NULL,
@@ -725,7 +725,7 @@
 		/*isma e&a stores AVC1 in AVC/H264 annex B bitstream fashion, with 0x00000001 start codes*/
 		if (avc_size_length) {
 			u32 done = 0;
-			u8 *d = samp->data;
+			u8 *d = (u8*)samp->data;
 			while (done < samp->dataLength) {
 				u32 nal_size = GF_4CC(d[0], d[1], d[2], d[3]);
 				d[0] = d[1] = d[2] = 0; d[3] = 1;
@@ -736,7 +736,7 @@
 
 		if (isamp->flags & GF_ISOM_ISMA_IS_ENCRYPTED) {
 			/*resync IV*/
-			if (!prev_sample_encryped) resync_IV(mc, BSO, tci->salt);
+			if (!prev_sample_encryped) resync_IV(mc, BSO, (char *) tci->salt);
 			gf_crypt_encrypt(mc, samp->data, samp->dataLength);
 			prev_sample_encryped = 1;
 		} else {

gpac-0.5.0.svn4296.tar.bz2/src/media_tools/isom_hinter.c -> gpac-0.5.0.svn4668.tar.bz2/src/media_tools/isom_hinter.c Changed

@@ -403,7 +403,7 @@
 					if (is_crypted) {
 						/*that's another pain with ISMACryp, even if no B-frames the DTS is signaled...*/
 						if (oti==GPAC_OTI_VIDEO_MPEG4_PART2) force_dts_delta = 22;
-						else if (oti==GPAC_OTI_VIDEO_AVC) {
+						else if ((oti==GPAC_OTI_VIDEO_AVC) || (oti==GPAC_OTI_VIDEO_SVC)) {
 							flags &= ~GP_RTP_PCK_USE_MULTI;
 							force_dts_delta = 22;
 						}
@@ -452,6 +452,8 @@
 			GF_AVCConfig *svcc = gf_isom_svc_config_get(file, TrackNum, 1);
 			required_rate = 90000;	/* "90 kHz clock rate MUST be used"*/
 			hintType = GF_RTP_PAYT_H264_AVC;
+			if (TrackMediaSubType==GF_ISOM_SUBTYPE_SVC_H264)
+				hintType = GF_RTP_PAYT_H264_SVC;
 			streamType = GF_STREAM_VISUAL;
 			avc_nalu_size = avcc ? avcc->nal_unit_size : svcc->nal_unit_size;
 			oti = GPAC_OTI_VIDEO_AVC;
@@ -800,7 +802,7 @@
 		count = write_nalu_config_array(sdpLine, svcc->pictureParameterSets);
 		if (count) strcat(sdpLine, ",");
 	}
-	count = strlen(sdpLine);
+	count = (u32) strlen(sdpLine);
 	if (sdpLine[count-1] == ',')
 		sdpLine[count-1] = 0;
 }
@@ -863,7 +865,7 @@
 		gf_isom_sdp_add_track_line(tkHint->file, tkHint->HintTrack, sdpLine);
 	}
 	/*H264/AVC*/
-	else if (tkHint->rtp_p->rtp_payt == GF_RTP_PAYT_H264_AVC) {
+	else if ((tkHint->rtp_p->rtp_payt == GF_RTP_PAYT_H264_AVC) || (tkHint->rtp_p->rtp_payt == GF_RTP_PAYT_H264_SVC))  {
 		GF_AVCConfig *avcc = gf_isom_avc_config_get(tkHint->file, tkHint->TrackNum, 1);
 		GF_AVCConfig *svcc = gf_isom_svc_config_get(tkHint->file, tkHint->TrackNum, 1);
 		/*TODO - check syntax for SVC (might be some extra signaling)*/
@@ -981,7 +983,7 @@
 			sprintf(sdpLine, "a=rvc-config-predef:%d", esd->decoderConfig->predefined_rvc_config);
 		} else {
 			/*temporary ...*/
-			if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) {
+			if ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_SVC)) {
 				sprintf(sdpLine, "a=rvc-config:%s", "http://download.tsi.telecom-paristech.fr/gpac/RVC/rvc_config_avc.xml");
 			} else {
 				sprintf(sdpLine, "a=rvc-config:%s", "http://download.tsi.telecom-paristech.fr/gpac/RVC/rvc_config_sp.xml");
@@ -1005,14 +1007,14 @@
 	if (!size64) return 0;
 	switch (streamType) {
 	case GF_STREAM_OD:
-		size64 += strlen("data:application/mpeg4-od-au;base64,");
+		size64 += (u32) strlen("data:application/mpeg4-od-au;base64,");
 		break;
 	case GF_STREAM_SCENE:
-		size64 += strlen("data:application/mpeg4-bifs-au;base64,");
+		size64 += (u32) strlen("data:application/mpeg4-bifs-au;base64,");
 		break;
 	default:
 		/*NOT NORMATIVE*/
-		size64 += strlen("data:application/mpeg4-es-au;base64,");
+		size64 += (u32) strlen("data:application/mpeg4-es-au;base64,");
 		break;
 	}
 	if (size64>=255) return 0;
@@ -1103,7 +1105,7 @@
 					esd->decoderConfig->avgBitrate = 0;
 					esd->decoderConfig->bufferSizeDB = samp->dataLength;
 					esd->decoderConfig->maxBitrate = 0;
-					size64 = strlen(sdpLine)+1;
+					size64 = (u32) strlen(sdpLine)+1;
 					esd->URLString = (char*)gf_malloc(sizeof(char) * size64);
 					strcpy(esd->URLString, sdpLine);
 				} else {

gpac-0.5.0.svn4296.tar.bz2/src/media_tools/isom_tools.c -> gpac-0.5.0.svn4668.tar.bz2/src/media_tools/isom_tools.c Changed

@@ -133,7 +133,7 @@
 				u32 bsize = 0;
 				while (bsize<box_size) {
 					u32 to_read = (u32) ((box_size-bsize<1024) ? (box_size-bsize) : 1024);
-					gf_bs_read_data(bs, block, to_read);
+					gf_bs_read_data(bs, (char *) block, to_read);
 					gf_sha1_update(ctx, block, to_read);
 					bsize += to_read;
 				}
@@ -142,7 +142,7 @@
 		} else
 #endif
 		{
-			read = fread(block, 1, 1024, in);
+			read = (u32) fread(block, 1, 1024, in);
 			gf_sha1_update(ctx, block, read);
 			tot += read;
 		}
@@ -556,8 +556,8 @@
 			case GF_ISOM_SUBTYPE_MPEG4:
 				{
 					GF_ESD *esd = gf_isom_get_esd(mp4file, i+1, 1);
-					/*both MPEG4-Video and H264/AVC are supported*/
-					if ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_MPEG4_PART2) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) ) {
+					/*both MPEG4-Video and H264/AVC/SVC are supported*/
+					if ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_MPEG4_PART2) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_SVC)) {
 						nb_vid++;
 					} else {
 						GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[3GPP convert] Video format not supported by 3GP - removing track ID %d\n", gf_isom_get_track_id(mp4file, i+1) ));
@@ -846,8 +846,8 @@
 		gf_bs_write_int(bs, dims.fullRequestHost, 1);
 		gf_bs_write_int(bs, dims.streamType, 1);
 		gf_bs_write_int(bs, dims.containsRedundant, 2);
-		gf_bs_write_data(bs, (char*)dims.textEncoding, strlen(dims.textEncoding)+1);
-		gf_bs_write_data(bs, (char*)dims.contentEncoding, strlen(dims.contentEncoding)+1);
+		gf_bs_write_data(bs, (char*)dims.textEncoding, (u32) strlen(dims.textEncoding)+1);
+		gf_bs_write_data(bs, (char*)dims.contentEncoding, (u32) strlen(dims.contentEncoding)+1);
 		gf_bs_get_content(bs, &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
 		gf_bs_del(bs);
 		return esd;
@@ -1649,8 +1649,6 @@
 	/*rewrite svccfg*/
 	svccfg = gf_odf_avc_cfg_new();
 	svccfg->complete_representation = 1; 
-	e = gf_isom_svc_config_new(file, merge_track, svccfg, NULL, NULL, &di);
-	if (e) goto exit;
 	/*rewrite visual info*/
 	if (!mergeAll)
 	{
@@ -1693,7 +1691,9 @@
 			gf_list_add(svccfg->pictureParameterSets, sl);
 		}
 		if (mergeAll)
+		{
 			gf_isom_svc_config_update(file, merge_track, 1, svccfg, 1);
+		}
 		else
 			gf_isom_svc_config_update(file, merge_track, 1, svccfg, 0);
 		gf_odf_avc_cfg_del(cfg);
@@ -1878,5 +1878,475 @@
 	return e;
 }
 
+GF_EXPORT
+GF_Err gf_media_change_pl(GF_ISOFile *file, u32 track, u32 profile, u32 level)
+{
+	u32 i, count, stype;
+	GF_Err e;
+	GF_AVCConfig *avcc;
+
+	stype = gf_isom_get_media_subtype(file, track, 1);
+	switch (stype) {
+	case GF_ISOM_SUBTYPE_AVC_H264:
+	case GF_ISOM_SUBTYPE_AVC2_H264:
+	case GF_ISOM_SUBTYPE_AVC3_H264:
+	case GF_ISOM_SUBTYPE_AVC4_H264:
+		break;
+	default:
+		return GF_OK;
+	}
+
+	avcc = gf_isom_avc_config_get(file, track, 1);
+	if (level) avcc->AVCLevelIndication = level;
+	if (profile) avcc->AVCProfileIndication = profile;
+	count = gf_list_count(avcc->sequenceParameterSets);
+	for (i=0; i<count; i++) {
+		GF_AVCConfigSlot *slc = gf_list_get(avcc->sequenceParameterSets, i);
+		if (profile) slc->data[1] = profile;
+		if (level) slc->data[3] = level;
+	}
+	e = gf_isom_avc_config_update(file, track, 1, avcc);
+	assert (e == GF_OK);
+	gf_odf_avc_cfg_del(avcc);
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_media_split_hevc_tiles(GF_ISOFile *file)
+{
+	u32 i, j, cur_tile, count, stype, track, nb_tracks, di, nalu_size_length;
+	s32 pps_idx=-1;
+	GF_Err e;
+//	HEVCSliceInfo n_state;
+	HEVCState hevc;
+	u32 *tiles_track;
+	GF_HEVCConfig *hvcc;
+
+	track = 0;
+	for (i=0; i<gf_isom_get_track_count(file); i++) {
+		stype = gf_isom_get_media_subtype(file, i+1, 1);
+		switch (stype) {
+		case GF_ISOM_SUBTYPE_HVC1:
+		case GF_ISOM_SUBTYPE_HEV1:
+
+			if (track) return GF_NOT_SUPPORTED;
+			track = i+1;
+			break;
+		default:
+			break;
+		}
+	}
+	if (!track) return GF_NOT_SUPPORTED;
+
+	hvcc = gf_isom_hevc_config_get(file, track, 1);
+	nalu_size_length = hvcc->nal_unit_size;
+
+	count = gf_list_count(hvcc->param_array);
+	for (i=0; i<count; i++) {
+		GF_HEVCParamArray *ar = gf_list_get(hvcc->param_array, i);
+		if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
+			GF_AVCConfigSlot *sl = gf_list_get(ar->nalus, 0);
+			if (sl)
+				pps_idx = gf_media_hevc_read_pps(sl->data, sl->size, &hevc);
+		}
+	}
+	gf_odf_hevc_cfg_del(hvcc);
+
+
+	if (pps_idx==-1) return GF_BAD_PARAM;
+	if (! hevc.pps[pps_idx].tiles_enabled_flag) return GF_OK;
+
+	nb_tracks = hevc.pps[pps_idx].num_tile_columns * hevc.pps[pps_idx].num_tile_rows;
+	tiles_track = gf_malloc(sizeof(u32) * nb_tracks);
+	for (i=0; i<nb_tracks; i++) {
+		e = gf_isom_clone_track(file, track, file, 0, &tiles_track[i] );
+		if (e) goto err_exit;
+
+		gf_isom_set_track_reference(file, track, GF_4CC('d','o','n','d') , gf_isom_get_track_id(file, tiles_track[i]) );
+	}
+
+	count = gf_isom_get_sample_count(file, track);
+	for (i=0; i<count; i++) {
+		u8 *data;
+		u32 size;
+		GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+		GF_ISOSample *sample = gf_isom_get_sample(file, track, i+1, &di);
+
+	
+		data = sample->data;
+		size = sample->dataLength;
+		sample->data = NULL;
+		sample->dataLength = 0;
+
+		for (j=0; j<nb_tracks; j++) {
+			e = gf_isom_add_sample(file, tiles_track[j], 1, sample);
+			if (e)
+				goto err_exit;
+		}
+		sample->data = data;
+		cur_tile = 0;
+
+		while (size) {
+			u8 nal_type = 0;
+			u32 nalu_size = 0;
+			for (j=0; j<nalu_size_length; j++) {
+				nalu_size = (nalu_size<<8) + data[j];
+			}
+			nal_type = (data[nalu_size_length] & 0x7E) >> 1;
+			switch (nal_type) {
+			case GF_HEVC_NALU_SLICE_TRAIL_N:
+			case GF_HEVC_NALU_SLICE_TRAIL_R:
+			case GF_HEVC_NALU_SLICE_TSA_N:
+			case GF_HEVC_NALU_SLICE_TSA_R:
+			case GF_HEVC_NALU_SLICE_STSA_N:
+			case GF_HEVC_NALU_SLICE_STSA_R:
+			case GF_HEVC_NALU_SLICE_BLA_W_LP:
+			case GF_HEVC_NALU_SLICE_BLA_W_DLP:
+			case GF_HEVC_NALU_SLICE_BLA_N_LP:
+			case GF_HEVC_NALU_SLICE_IDR_W_DLP:
+			case GF_HEVC_NALU_SLICE_IDR_N_LP:
+			case GF_HEVC_NALU_SLICE_CRA:
+			case GF_HEVC_NALU_SLICE_RADL_R:
+			case GF_HEVC_NALU_SLICE_RASL_R:
+				//ret = hevc_parse_slice_segment(bs, hevc, &n_state);
+				e = gf_isom_append_sample_data(file, tiles_track[cur_tile], 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);
+				break;
+			}
+			data += nalu_size + nalu_size_length;
+			size -= nalu_size + nalu_size_length;
+		}
+		gf_free(sample->data);
+		gf_bs_get_content(bs, &sample->data, &sample->dataLength);
+		gf_bs_del(bs);
+
+		e = gf_isom_update_sample(file, track, i+1, sample, 1);
+		if (e) goto err_exit;
+		gf_isom_sample_del(&sample);
+	}
+
+err_exit:
+	gf_free(tiles_track);
+	return e;
+}
+
 #endif /*GPAC_DISABLE_MEDIA_IMPORT*/
 
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+
+typedef struct
+{
+	u32 TrackID;
+	u32 SampleNum, SampleCount;
+	u32 FragmentLength;
+	u32 OriginalTrack;
+	u32 TimeScale, MediaType, DefaultDuration;
+} GF_TrackFragmenter;
+
+GF_EXPORT
+GF_Err gf_media_fragment_file(GF_ISOFile *input, const char *output_file, Double max_duration_sec)
+{
+	u8 NbBits;
+	u32 i, TrackNum, descIndex, j, count;
+	u32 defaultDuration, defaultSize, defaultDescriptionIndex, defaultRandomAccess, nb_samp, nb_done;
+	u8 defaultPadding;
+	u16 defaultDegradationPriority;
+	GF_Err e;
+	const char *tag;
+	u32 tag_len;
+	GF_ISOFile *output;
+	GF_ISOSample *sample, *next;
+	GF_List *fragmenters;
+	u32 MaxFragmentDuration;
+	GF_TrackFragmenter *tf;
+
+	//create output file
+	output = gf_isom_open(output_file, GF_ISOM_OPEN_WRITE, NULL);
+	if (!output) return gf_isom_last_error(NULL);
+
+
+	nb_samp = 0;
+	fragmenters = gf_list_new();
+
+	/*FIXME - ALL THESE SHOULD GO DO A clone_movie item !!*/
+	e = gf_isom_set_brand_info(output, GF_ISOM_BRAND_MP42, 1);
+	if (e) goto err_exit;
+	e = gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_ISOM, 1);
+	if (e) goto err_exit;
+
+	//copy movie desc
+	gf_isom_clone_root_od(input, output);
+	//clone copyright
+	count = gf_isom_get_copyright_count(input);
+	if (count) {
+		const char *lang, *note;
+		for (i=0; i<count; i++) {
+			gf_isom_get_copyright(input, i+1, &lang, &note);
+			gf_isom_set_copyright(output, (char *)lang, (char *)note);
+		}
+	}
+	count = gf_isom_get_chapter_count(input, 0);
+	if (count) {
+		const char *name;
+		u64 time;
+		for (i=0; i<count; i++) {
+			gf_isom_get_chapter(input, 0, i+1, &time, &name);
+			gf_isom_add_chapter(output, 0, time, (char *)name);
+		}
+	}
+
+	if (gf_isom_apple_get_tag(input, 0, &tag, &tag_len) == GF_OK) {
+		for (i=GF_ISOM_ITUNE_ALBUM; i<(u32) GF_ISOM_ITUNE_WRITER; i++) {
+			if (gf_isom_apple_get_tag(input, GF_ISOM_ITUNE_NAME, &tag, &tag_len)==GF_OK)
+				gf_isom_apple_set_tag(output, GF_ISOM_ITUNE_NAME, tag, tag_len);
+		}
+	}
+
+	MaxFragmentDuration = (u32) (max_duration_sec * 1000);
+	//duplicates all tracks
+	for (i=0; i<gf_isom_get_track_count(input); i++) {
+		e = gf_isom_clone_track(input, i+1, output, 0, &TrackNum);
+		if (e) goto err_exit;
+
+		//if few samples don't fragment track
+		count = gf_isom_get_sample_count(input, i+1);
+		if (count<=2) {
+			for (j=0; j<count; j++) {
+				sample = gf_isom_get_sample(input, i+1, j+1, &descIndex);
+				e = gf_isom_add_sample(output, TrackNum, 1, sample);
+				gf_isom_sample_del(&sample);
+				if (e) goto err_exit;
+			}
+		}
+		//otherwise setup fragmented
+		else {
+			gf_isom_get_fragment_defaults(input, i+1,
+										 &defaultDuration, &defaultSize, &defaultDescriptionIndex, &defaultRandomAccess, &defaultPadding, &defaultDegradationPriority);
+			//otherwise setup fragmentation
+			e = gf_isom_setup_track_fragment(output, gf_isom_get_track_id(output, TrackNum),
+						defaultDescriptionIndex, defaultDuration,
+						defaultSize, (u8) defaultRandomAccess,
+						defaultPadding, defaultDegradationPriority);
+			if (e) goto err_exit;
+
+			GF_SAFEALLOC(tf, GF_TrackFragmenter);
+			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;
+			gf_list_add(fragmenters, tf);
+			nb_samp += count;
+		}
+
+		if (gf_isom_is_track_in_root_od(input, i+1)) gf_isom_add_track_to_root_od(output, TrackNum);
+		//copy user data ?
+	}
+
+
+	//flush movie
+	e = gf_isom_finalize_for_fragment(output, 0);
+	if (e) goto err_exit;
+
+	nb_done = 0;
+
+	while ( (count = gf_list_count(fragmenters)) ) {
+
+		e = gf_isom_start_fragment(output, 1);
+		if (e) goto err_exit;
+		//setup some default
+		for (i=0; i<count; i++) {
+			tf = (GF_TrackFragmenter *)gf_list_get(fragmenters, i);
+			if (tf->MediaType == GF_ISOM_MEDIA_VISUAL) {
+				e = gf_isom_set_fragment_option(output, tf->TrackID, GF_ISOM_TRAF_RANDOM_ACCESS, 1);
+				if (e) goto err_exit;
+			}
+		}
+		sample = NULL;
+
+		//process track by track
+		for (i=0; i<count; i++) {
+			tf = (GF_TrackFragmenter *)gf_list_get(fragmenters, i);
+
+			//ok write samples
+			while (1) {
+				if (!sample) {
+					sample = gf_isom_get_sample(input, tf->OriginalTrack, tf->SampleNum + 1, &descIndex);
+				}
+				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 = tf->DefaultDuration;
+				}
+
+				e = gf_isom_fragment_add_sample(output, tf->TrackID, sample, descIndex, defaultDuration, NbBits, 0, 0);
+				if (e) goto err_exit;
+
+				gf_set_progress("ISO File Fragmenting", nb_done, nb_samp);
+				nb_done++;
+
+				gf_isom_sample_del(&sample);
+				sample = next;
+				tf->FragmentLength += defaultDuration;
+				tf->SampleNum += 1;
+
+				//end of track fragment or track
+				if ((tf->SampleNum==tf->SampleCount) || 
+                    /* TODO: should probably test the time position (not only duratino) to avoid drift */
+                    (tf->FragmentLength*1000 >= MaxFragmentDuration*tf->TimeScale)) {
+					gf_isom_sample_del(&next);
+					sample = next = NULL;
+					tf->FragmentLength = 0;
+					break;
+				}
+			}
+			if (tf->SampleNum==tf->SampleCount) {
+				gf_free(tf);
+				gf_list_rem(fragmenters, i);
+				i--;
+				count --;
+			}
+		}
+	}
+
+err_exit:
+	while (gf_list_count(fragmenters)) {
+		tf = (GF_TrackFragmenter *)gf_list_get(fragmenters, 0);
+		gf_free(tf);
+		gf_list_rem(fragmenters, 0);
+	}
+	gf_list_del(fragmenters);
+	if (e) gf_isom_delete(output);
+	else gf_isom_close(output);
+	gf_set_progress("ISO File Fragmenting", nb_samp, nb_samp);
+	return e;
+}
+
+
+GF_EXPORT
+GF_Err gf_media_split_tiles(GF_ISOFile *file)
+{
+#ifdef GPAC_DISABLE_HEVC
+	return GF_NOT_SUPPORTED;
+#else
+	u32 i, j, count, stype, track, nb_tracks, di, nalu_size_length;
+	s32 pps_idx=-1;
+//	GF_Err e;
+//	HEVCSliceInfo n_state;
+	HEVCState hevc;
+	u32 *tiles_track;
+	GF_HEVCConfig *hvcc;
+
+	track = 0;
+	for (i=0; i<gf_isom_get_track_count(file); i++) {
+		stype = gf_isom_get_media_subtype(file, i+1, 1);
+		switch (stype) {
+		case GF_ISOM_SUBTYPE_HVC1:
+		case GF_ISOM_SUBTYPE_HEV1:
+
+			if (track) return GF_NOT_SUPPORTED;
+			track = i+1;
+			break;
+		default:
+			break;
+		}
+	}
+	if (!track) return GF_NOT_SUPPORTED;
+
+	hvcc = gf_isom_hevc_config_get(file, track, 1);
+	nalu_size_length = hvcc->nal_unit_size;
+
+	count = gf_list_count(hvcc->param_array);
+	for (i=0; i<count; i++) {
+		GF_HEVCParamArray *ar = gf_list_get(hvcc->param_array, i);
+		if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
+			GF_AVCConfigSlot *sl = gf_list_get(ar->nalus, 0);
+			if (sl)
+				pps_idx = gf_media_hevc_read_pps(sl->data, sl->size, &hevc);
+		}
+	}
+	gf_odf_hevc_cfg_del(hvcc);
+
+
+	if (pps_idx==-1) return GF_BAD_PARAM;
+	if (! hevc.pps[pps_idx].tiles_enabled_flag) return GF_OK;
+
+	nb_tracks = hevc.pps[pps_idx].num_tile_columns * hevc.pps[pps_idx].num_tile_rows;
+	tiles_track = malloc(sizeof(u32) * nb_tracks);
+	for (i=0; i<nb_tracks; i++) {
+		gf_isom_clone_track(file, track, file, 0, &tiles_track[i] );
+	}
+
+	count = gf_isom_get_sample_count(file, track);
+	for (i=0; i<nb_tracks; i++) {
+		u8 *data;
+		u32 size;
+		GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+		GF_ISOSample *sample = gf_isom_get_sample(file, track, i+1, &di);
+
+	
+		data = sample->data;
+		size = sample->dataLength;
+		sample->data = NULL;
+		sample->dataLength = 0;
+
+		for (j=0; j<nb_tracks; j++) {
+			gf_isom_add_sample(file, tiles_track[i], 1, sample);
+		}
+
+		while (size) {
+			u8 nal_type = 0;
+			u32 nalu_size = 0;
+			for (j=0; j<nalu_size_length; j++) {
+				nalu_size = (nalu_size<<8) + data[j];
+			}
+			nal_type = (data[nalu_size_length] & 0x7E) >> 1;
+			switch (nal_type) {
+			case GF_HEVC_NALU_SLICE_TRAIL_N:
+			case GF_HEVC_NALU_SLICE_TRAIL_R:
+			case GF_HEVC_NALU_SLICE_TSA_N:
+			case GF_HEVC_NALU_SLICE_TSA_R:
+			case GF_HEVC_NALU_SLICE_STSA_N:
+			case GF_HEVC_NALU_SLICE_STSA_R:
+			case GF_HEVC_NALU_SLICE_BLA_W_LP:
+			case GF_HEVC_NALU_SLICE_BLA_W_DLP:
+			case GF_HEVC_NALU_SLICE_BLA_N_LP:
+			case GF_HEVC_NALU_SLICE_IDR_W_DLP:
+			case GF_HEVC_NALU_SLICE_IDR_N_LP:
+			case GF_HEVC_NALU_SLICE_CRA:
+			case GF_HEVC_NALU_SLICE_RADL_R:
+			case GF_HEVC_NALU_SLICE_RASL_R:
+				//ret = hevc_parse_slice_segment(bs, hevc, &n_state);
+				gf_isom_append_sample_data(file, track, data, nalu_size + nalu_size_length);
+				break;
+			default:
+				gf_bs_write_data(bs, data, nalu_size + nalu_size_length);
+				break;
+			}
+			data += nalu_size + nalu_size_length;
+			size -= nalu_size + nalu_size_length;
+		}
+		gf_free(data);
+		gf_bs_get_content(bs, &sample->data, &sample->dataLength);
+		gf_bs_del(bs);
+
+		gf_isom_update_sample(file, track, i+1, sample, 1);
+		gf_isom_sample_del(&sample);
+	}
+
+	return GF_OK;
+#endif //GPAC_DISABLE_HEVC
+
+}
+
+#endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
+

gpac-0.5.0.svn4296.tar.bz2/src/media_tools/m2ts_mux.c -> gpac-0.5.0.svn4668.tar.bz2/src/media_tools/m2ts_mux.c Changed

@@ -192,7 +192,7 @@
 			gf_bs_write_int(bs,	nb_sections-1, 8);
 		}
 
-		gf_bs_write_data(bs, table_payload + offset, section->length - overhead_size);
+		gf_bs_write_data(bs, (char *) table_payload + offset, section->length - overhead_size);
 		offset += section->length - overhead_size;
 	
 		if (use_syntax_indicator) {
@@ -205,7 +205,7 @@
 
 		if (use_syntax_indicator) {
 			u32 CRC;
-			CRC = gf_crc_32(section->data,section->length-CRC_LENGTH); 
+			CRC = gf_crc_32((char *) section->data,section->length-CRC_LENGTH); 
 			section->data[section->length-4] = (CRC >> 24) & 0xFF;
 			section->data[section->length-3] = (CRC >> 16) & 0xFF;
 			section->data[section->length-2] = (CRC >> 8) & 0xFF;
@@ -256,7 +256,7 @@
 }
 
 void gf_m2ts_mux_table_update_mpeg4(GF_M2TS_Mux_Stream *stream, u8 table_id, u16 table_id_extension,
-						   u8 *table_payload, u32 table_payload_length, 
+						   char *table_payload, u32 table_payload_length, 
 						   Bool use_syntax_indicator, Bool private_indicator,
 						   Bool increment_version_number, Bool use_checksum) 
 {
@@ -367,7 +367,7 @@
 		gf_bs_write_data(bs, slhdr, slhdr_size);
 		gf_free(slhdr);
 		/*write sl data*/
-		gf_bs_write_data(bs, table_payload + offset, sl_size);
+		gf_bs_write_data(bs, (char *) table_payload + offset, sl_size);
 		offset += sl_size;
 	
 		if (use_syntax_indicator) {
@@ -380,7 +380,7 @@
 
 		if (use_syntax_indicator) {
 			u32 CRC;
-			CRC = gf_crc_32(section->data,section->length-CRC_LENGTH); 
+			CRC = gf_crc_32((char *) section->data,section->length-CRC_LENGTH); 
 			section->data[section->length-4] = (CRC >> 24) & 0xFF;
 			section->data[section->length-3] = (CRC >> 16) & 0xFF;
 			section->data[section->length-2] = (CRC >> 8) & 0xFF;
@@ -444,7 +444,7 @@
 	return adaptation_length + ADAPTATION_LENGTH_LENGTH;
 }
 
-void gf_m2ts_mux_table_get_next_packet(GF_M2TS_Mux_Stream *stream, u8 *packet)
+void gf_m2ts_mux_table_get_next_packet(GF_M2TS_Mux_Stream *stream, char *packet)
 {
 	GF_BitStream *bs;
 	GF_M2TS_Mux_Table *table;
@@ -534,7 +534,7 @@
 
 
 
-Bool gf_m2ts_stream_process_pat(GF_M2TS_Mux *muxer, GF_M2TS_Mux_Stream *stream)
+u32 gf_m2ts_stream_process_pat(GF_M2TS_Mux *muxer, GF_M2TS_Mux_Stream *stream)
 {
 	if (stream->table_needs_update) { /* generate table payload */
 		GF_M2TS_Mux_Program *prog;
@@ -564,14 +564,14 @@
 	return 0;
 }
 
-Bool gf_m2ts_stream_process_pmt(GF_M2TS_Mux *muxer, GF_M2TS_Mux_Stream *stream)
+u32 gf_m2ts_stream_process_pmt(GF_M2TS_Mux *muxer, GF_M2TS_Mux_Stream *stream)
 {
 	if (stream->table_needs_update) { /* generate table payload */
 		GF_M2TS_Mux_Stream *es;
 		u8 *payload;
 		u32 i;
 		u32 length, nb_streams=0;
-		u32 info_length = 0;
+		u32 info_length = 0, es_info_length = 0;
 		GF_BitStream *bs;
 
 
@@ -651,16 +651,40 @@
 			gf_bs_write_int(bs,	0x7, 3); // reserved
 			gf_bs_write_int(bs,	es->pid, 13);
 			gf_bs_write_int(bs,	0xF, 4); // reserved
-			
-			/* Second Loop Descriptor */
+	
+			/*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;
+			/*another loop descriptors*/
+			if (es->loop_descriptors)
+			{
+				for (i=0; i<gf_list_count(es->loop_descriptors); i++)
+				{
+					GF_M2TSDescriptor *desc = gf_list_get(es->loop_descriptors, i);
+					es_info_length += 2 +desc->data_len;
+				}
+			}
+			gf_bs_write_int(bs,	es_info_length, 12);
+
 			if (stream->program->iod && !(es->ifce->caps & GF_ESI_STREAM_WITHOUT_MPEG4_SYSTEMS)) {
-				gf_bs_write_int(bs,	4, 12); // ES info length = 4 :only SL Descriptor
 				gf_bs_write_int(bs,	GF_M2TS_MPEG4_SL_DESCRIPTOR, 8); 
 				gf_bs_write_int(bs,	2, 8); 
 				gf_bs_write_int(bs,	es->ifce->stream_id, 16);  // mpeg4_esid
-			} else {
-				gf_bs_write_int(bs,	0, 12);
 			}
+
+			if (es->loop_descriptors)
+			{
+				for (i=0; i<gf_list_count(es->loop_descriptors); i++)
+				{
+					GF_M2TSDescriptor *desc = (GF_M2TSDescriptor *)gf_list_get(es->loop_descriptors, i);
+					gf_bs_write_int(bs,	desc->tag, 8); 
+					gf_bs_write_int(bs,	desc->data_len, 8); 
+					gf_bs_write_data(bs, desc->data, desc->data_len);
+				}
+			}
+
 			es = es->next;
 		}
 	
@@ -809,6 +833,11 @@
 
 			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] PID %d: Initializing PCR for program number %d: PCR %d - mux time %d:%09d\n", stream->pid, stream->program->number, stream->program->pcr_init_time, muxer->time.sec, muxer->time.nanosec));
 		} else {
+			/*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;
 			/*don't send until PCR is initialized*/
 			return 0;
 		}
@@ -968,6 +997,12 @@
 		break;
 	}
 
+	if (stream->start_pes_at_rap && (stream->curr_pck.flags & GF_ESI_DATA_AU_RAP)
+		) {
+		stream->program->mux->force_pat_pmt_state = GF_SEG_BOUNDARY_FORCE_PAT;
+		stream->program->mux->force_pat = GF_TRUE;
+	}
+
 	/*rewrite timestamps for PES header*/
 	gf_m2ts_remap_timestamps_for_pes(stream, stream->curr_pck.flags, &stream->curr_pck.dts, &stream->curr_pck.cts);
 
@@ -1021,7 +1056,6 @@
 	return pcr;
 }
 
-
 void gf_m2ts_stream_update_data_following(GF_M2TS_Mux_Stream *stream)
 {
 	Bool ignore_next=0;
@@ -1065,10 +1099,10 @@
 	1- we are asked to start new PES at RAP, just consider we don't have the next AU*/
 	if (stream->start_pes_at_rap && (stream->next_pck_flags & GF_ESI_DATA_AU_RAP) ) {
 		ignore_next=1;
-		stream->program->force_pat_pmt_state = 1;
+//		stream->program->mux->force_pat_pmt_state = GF_SEG_BOUNDARY_START;
 	}
-	/*if we have a RAP about to start on a stream in this program, force all other streams to stop merging cuming data in their current PES*/
-	else if (stream->program->force_pat_pmt_state) {
+	/*if we have a RAP about to start on a stream in this program, force all other streams to stop merging data in their current PES*/
+	else if (stream->program->mux->force_pat_pmt_state) {
 		ignore_next=1;
 	}
 
@@ -1180,7 +1214,6 @@
 	return 1;
 }
 
-u64 last_dts=0;
 static u32 gf_m2ts_stream_get_pes_header_length(GF_M2TS_Mux_Stream *stream)
 {
 	u32 hdr_len, flags;
@@ -1278,10 +1311,10 @@
 	return pes_len+4; // 4 = start code + stream_id
 }
 
-void gf_m2ts_mux_pes_get_next_packet(GF_M2TS_Mux_Stream *stream, u8 *packet)
+void gf_m2ts_mux_pes_get_next_packet(GF_M2TS_Mux_Stream *stream, char *packet)
 {
 	GF_BitStream *bs;
-	Bool needs_pcr, first_pass;
+	Bool needs_pcr, first_pass, is_rap=0;
 	u32 adaptation_field_control, payload_length, payload_to_copy, padding_length, hdr_len, pos, copy_next;
 
 	assert(stream->pid);
@@ -1303,17 +1336,18 @@
 		adaptation_field_control = GF_M2TS_ADAPTATION_NONE;
 		payload_length = 184 - hdr_len;
 		payload_to_copy = padding_length = 0;
-		needs_pcr = (hdr_len && stream->pcr_priority ) ? 1 : 0;
+		is_rap = (hdr_len && (stream->curr_pck.flags & GF_ESI_DATA_AU_RAP)) ? GF_TRUE : GF_FALSE;
+		needs_pcr = (hdr_len && (stream == stream->program->pcr) && (stream->pcr_priority || is_rap) ) ? 1 : 0;
 
 		/*if we forced inserting PAT/PMT before new RAP, also insert PCR here*/
-		if (stream->program->force_pat_pmt_state == 3) {
-			if( stream == stream->program->pcr) {
-				stream->program->force_pat_pmt_state = 0;
+		if (stream->program->mux->force_pat_pmt_state == GF_SEG_BOUNDARY_FORCE_PCR) {
+			if (stream == stream->program->pcr) {
+				stream->program->mux->force_pat_pmt_state = GF_SEG_BOUNDARY_NONE;
 				needs_pcr = 1;
 			}
 		}
 
-		if (needs_pcr) {
+ 		if (needs_pcr) {
 			/*AF headers + PCR*/
 			payload_length -= 8;
 			adaptation_field_control = GF_M2TS_ADAPTATION_AND_PAYLOAD;
@@ -1496,8 +1530,8 @@
 				copy_next = remain;
 			}
 		}
-		else if (stream->program->force_pat_pmt_state==1) {
-			stream->program->force_pat_pmt_state = 2;
+		else if (stream->program->mux->force_pat_pmt_state==GF_SEG_BOUNDARY_START) {
+			stream->program->mux->force_pat_pmt_state = GF_SEG_BOUNDARY_FORCE_PAT;
 			stream->program->mux->force_pat = 1;
 		}
 	}
@@ -1577,6 +1611,67 @@
 	}
 }
 
+static u32 gf_m2ts_stream_get_pid(GF_M2TS_Mux_Program *program, u32 stream_id)
+{
+	GF_M2TS_Mux_Stream *st;
+
+	st = program->streams;
+
+	while (st)
+	{
+		if (st->ifce->stream_id == stream_id)
+			return st->pid;
+		st = st->next;
+	}
+
+	return 0;
+}
+
+
+static void gf_m2ts_stream_add_hierarchy_descriptor(GF_M2TS_Mux_Stream *stream)
+{
+	GF_M2TSDescriptor *desc;
+	GF_BitStream *bs;
+	char *data;
+	u32 data_len;
+
+	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	/*reserved*/
+	gf_bs_write_int(bs, 1, 1);
+	/*temporal_scalability_flag: use the reserved value*/
+	gf_bs_write_int(bs, 1, 1);
+	/*spatial_scalability_flag: use the reserved value*/
+	gf_bs_write_int(bs, 1, 1);
+	/*quality_scalability_flag: use the reserved value*/
+	gf_bs_write_int(bs, 1, 1);
+	/*hierarchy_type: use the rerserved value*/
+	gf_bs_write_int(bs, 0, 4);
+	/*reserved*/
+	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*/
+	gf_bs_write_int(bs, 1, 1);
+	/*reserved*/
+	gf_bs_write_int(bs, 1, 1);
+	/*hierarchy_embedded_layer_index*/
+	gf_bs_write_int(bs, gf_m2ts_stream_get_pid(stream->program, stream->ifce->depends_on_stream) - stream->program->pmt->pid, 6);
+	/*reserved*/
+	gf_bs_write_int(bs, 3, 2);
+	/*hierarchy_channel*/
+	gf_bs_write_int(bs, stream->ifce->stream_id, 6);
+
+	GF_SAFEALLOC(desc, GF_M2TSDescriptor);
+	desc->tag = (u8) GF_M2TS_HIERARCHY_DESCRIPTOR;
+	gf_bs_get_content(bs, &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);
+
+	gf_list_add(stream->loop_descriptors, desc);
+}
+
 GF_EXPORT
 GF_M2TS_Mux_Stream *gf_m2ts_program_stream_add(GF_M2TS_Mux_Program *program, struct __elementary_stream_ifce *ifce, u32 pid, Bool is_pcr, Bool force_pes)
 {
@@ -1586,7 +1681,8 @@
 	stream->ifce = ifce;
 	stream->pid = pid;
 	stream->program = program;
-	if (is_pcr) program->pcr = stream; 
+	if (is_pcr) program->pcr = stream;
+	stream->loop_descriptors = gf_list_new();
 
 	if (program->streams) {
 		/*if PCR keep stream at the begining*/
@@ -1629,7 +1725,13 @@
 			+ 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) 
+			+ 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_MPEG1:
 			stream->mpeg2_stream_type = GF_M2TS_VIDEO_MPEG1;
 			break;
@@ -1804,6 +1906,15 @@
 	}
 	if (st->curr_pck.data) gf_free(st->curr_pck.data);
 	if (st->mx) gf_mx_del(st->mx);
+	if (st->loop_descriptors) {
+		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);
+			gf_free(desc);
+		}
+		gf_list_del(st->loop_descriptors);
+	}
 	gf_free(st);
 }
 
@@ -1932,7 +2043,7 @@
 }
 
 GF_EXPORT
-const char *gf_m2ts_mux_process(GF_M2TS_Mux *muxer, u32 *status)
+const char *gf_m2ts_mux_process(GF_M2TS_Mux *muxer, u32 *status, u32 *usec_till_next)
 {
 	GF_M2TS_Mux_Program *program;
 	GF_M2TS_Mux_Stream *stream, *stream_to_process;
@@ -1940,22 +2051,38 @@
 	u32 now, nb_streams, nb_streams_done;
 	char *ret;
 	u32 res, highest_priority;
+	Bool flush_all_pes = 0;
 
 	nb_streams = nb_streams_done = 0;
 	*status = GF_M2TS_STATE_IDLE;
 
 	now = gf_sys_clock();
-
 	if (muxer->real_time) {
 		if (!muxer->init_sys_time) {
+			//init TS time
+			muxer->time.sec = muxer->time.nanosec = 0;
+			gf_m2ts_time_inc(&muxer->time, (u32) muxer->init_pcr_value, 27000000);
 			muxer->init_sys_time = now;
 			muxer->init_ts_time = muxer->time;
 		} else {
 			u32 diff = now - muxer->init_sys_time;
 			GF_M2TS_Time now = muxer->init_ts_time;
 			gf_m2ts_time_inc(&now, diff, 1000);
-			if (gf_m2ts_time_less(&now, &muxer->time)) 
+			if (gf_m2ts_time_less(&now, &muxer->time)) {
+				if (usec_till_next) {
+					u32 diff = muxer->time.sec - now.sec;
+					diff *= 1000000;
+					if (now.nanosec <= muxer->time.nanosec) {
+						diff += (muxer->time.nanosec - now.nanosec) / 1000;				
+					} else {
+						assert(diff);
+						diff -= 1000000;
+						diff += (1000000000 + muxer->time.nanosec - now.nanosec) / 1000;				
+					}
+					*usec_till_next = diff;
+				}
 				return NULL;
+			}
 		}
 	}
 
@@ -1968,33 +2095,54 @@
 		muxer->needs_reconfig = 0;
 	}
 
-	/*compare PAT and PMT with current mux time
-	if non-fixed rate, current mux time is the time of the last packet sent, time test is still valid - it will however not work
-	if min access unit duration from all streams is greater than the PSI refresh rate*/
-
-	/*PAT*/
-	res = muxer->pat->process(muxer, muxer->pat);
-	if ((res && gf_m2ts_time_less_or_equal(&muxer->pat->time, &time)) || muxer->force_pat) {
-		time = muxer->pat->time;
-		stream_to_process = muxer->pat;
-		muxer->force_pat = 0;
-		/*force sending the PAT regardless of other streams*/
-		goto send_pck;
+	if (muxer->flush_pes_at_rap && muxer->force_pat) {
+		program = muxer->programs;
+		while (program) {
+			stream = program->streams;
+			while (stream) {
+				if (stream->pes_data_remain) {
+					flush_all_pes = 1;
+					break;
+				}
+				stream = stream->next;
+			}
+			program = program->next;
+		}
 	}
 
-	/*PMT, for each program*/
-	program = muxer->programs;
-	while (program) {
-		res = program->pmt->process(muxer, program->pmt);
-		if ((res && gf_m2ts_time_less_or_equal(&program->pmt->time, &time)) || (program->force_pat_pmt_state==2)) {
-			time = program->pmt->time;
-			stream_to_process = program->pmt;
-			if (program->force_pat_pmt_state==2) 
-				program->force_pat_pmt_state = 3;
-			/*force sending the PMT regardless of other streams*/
+	if (!flush_all_pes) {
+
+		/*compare PAT and PMT with current mux time
+		if non-fixed rate, current mux time is the time of the last packet sent, time test is still valid - it will however not work
+		if min access unit duration from all streams is greater than the PSI refresh rate*/
+
+		/*PAT*/
+		res = muxer->pat->process(muxer, muxer->pat);
+		if ((res && gf_m2ts_time_less_or_equal(&muxer->pat->time, &time)) || muxer->force_pat) {
+			time = muxer->pat->time;
+			stream_to_process = muxer->pat;
+			if (muxer->force_pat) {
+				muxer->force_pat = 0;
+				muxer->force_pat_pmt_state = GF_SEG_BOUNDARY_FORCE_PMT;
+			}
+			/*force sending the PAT regardless of other streams*/
 			goto send_pck;
 		}
-		program = program->next;
+
+		/*PMT, for each program*/
+		program = muxer->programs;
+		while (program) {
+			res = program->pmt->process(muxer, program->pmt);
+			if ((res && gf_m2ts_time_less_or_equal(&program->pmt->time, &time)) || (muxer->force_pat_pmt_state==GF_SEG_BOUNDARY_FORCE_PMT)) {
+				time = program->pmt->time;
+				stream_to_process = program->pmt;
+				if (muxer->force_pat_pmt_state==GF_SEG_BOUNDARY_FORCE_PMT) 
+					muxer->force_pat_pmt_state = GF_SEG_BOUNDARY_FORCE_PCR;
+				/*force sending the PMT regardless of other streams*/
+				goto send_pck;
+			}
+			program = program->next;
+		}
 	}
 
 	/*if non-fixed rate, just pick the earliest data on all streams*/
@@ -2010,11 +2158,13 @@
 	program = muxer->programs;
 	while (program) {
 		stream = program->pcr;
-		res = stream->process(muxer, stream);
-		if (res && gf_m2ts_time_less_or_equal(&stream->time, &time)) {
-			time = stream->time;
-			stream_to_process = stream;
-			goto send_pck;
+		if (!flush_all_pes  || (stream->copy_from_next_packets + stream->pes_data_remain) ) {
+			res = stream->process(muxer, stream);
+			if (res && gf_m2ts_time_less_or_equal(&stream->time, &time)) {
+				time = stream->time;
+				stream_to_process = stream;
+				goto send_pck;
+			}
 		}
 		program = program->next;
 	}
@@ -2030,7 +2180,17 @@
 			if (stream != program->pcr) 
 #endif
 			{
+				if (flush_all_pes && !stream->pes_data_remain) {
+					nb_streams++;
+					stream = stream->next;
+					continue;
+				}
+
 				res = stream->process(muxer, stream);
+				/*next is rap on this stream, check flushing of other pes (we could use a goto)*/
+				if (!flush_all_pes && muxer->force_pat)
+					return gf_m2ts_mux_process(muxer, status, usec_till_next);
+
 				if (res && gf_m2ts_time_less_or_equal(&stream->time, &time)) {
 					/*if same priority schedule the earliest data*/
 					if (res>=highest_priority) {
@@ -2102,7 +2262,7 @@
 	if (ret) {
 		muxer->tot_pck_sent++;
 		/*increment time*/
-		if (muxer->fixed_rate) {
+		if (muxer->fixed_rate || muxer->real_time) {
 			gf_m2ts_time_inc(&muxer->time, 1504/*188*8*/, muxer->bit_rate);
 		}
 		/*if a stream was found, use it*/
@@ -2111,9 +2271,9 @@
 		}
 
 		muxer->pck_sent_over_br_window++;
-		if (now - muxer->last_br_time > 500) {
-			u64 size = 8*188*muxer->pck_sent_over_br_window*1000;
-			muxer->avg_br = (u32) (size/(now - muxer->last_br_time));
+		if (now - muxer->last_br_time > 1000) {
+			u64 size = 8*188*muxer->pck_sent_over_br_window;
+			muxer->average_birate_kbps = (u32) (size /(now - muxer->last_br_time));
 			muxer->last_br_time = now;
 			muxer->pck_sent_over_br_window=0;
 		}

gpac-0.5.0.svn4296.tar.bz2/src/media_tools/m3u8.c -> gpac-0.5.0.svn4668.tar.bz2/src/media_tools/m3u8.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/media_tools/media_export.c -> gpac-0.5.0.svn4668.tar.bz2/src/media_tools/media_export.c Changed

@@ -256,9 +256,10 @@
 	char szName[1000], szEXT[10], szNum[1000], *dsi;
 	char *ext_start = NULL;
 	FILE *out;
-	Bool is_stdout=0;
+	Bool is_stdout = GF_FALSE;
 	GF_BitStream *bs;
 	u32 track, i, di, count, m_type, m_stype, dsi_size, is_mj2k;
+    Bool is_wvtt = GF_FALSE;
 
 	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)));
@@ -288,6 +289,7 @@
 				gf_export_message(dumper, GF_OK, "Dumping MPEG-4 Visual sample%s", szNum);
 				break;
 			case GPAC_OTI_VIDEO_AVC:
+			case GPAC_OTI_VIDEO_SVC:
 				strcpy(szEXT, ".264");
 				gf_export_message(dumper, GF_OK, "Dumping MPEG-4 AVC-H264 Visual sample%s", szNum);
 				break;
@@ -398,6 +400,10 @@
 	} else if (m_type==GF_ISOM_MEDIA_FLASH) {
 		gf_export_message(dumper, GF_OK, "Extracting Macromedia Flash Movie sample%s", szNum);
 		strcpy(szEXT, ".swf");
+	} else if (m_stype==GF_ISOM_SUBTYPE_WVTT) {
+		gf_export_message(dumper, GF_OK, "Extracting WebVTT sample%s", szNum);
+		strcpy(szEXT, ".vtt");
+        is_wvtt = GF_TRUE;
 	} else if (m_type==GF_ISOM_MEDIA_HINT) {
 		return gf_export_hint(dumper);
 	} else if (m_stype==GF_4CC('m','j','p','2')) {
@@ -443,8 +449,19 @@
 		bs = gf_bs_from_file(out, GF_BITSTREAM_WRITE);
 		if (is_mj2k) 
 			write_jp2_file(bs, samp->data, samp->dataLength, dsi, dsi_size);
-		else
-			gf_bs_write_data(bs, samp->data, samp->dataLength);
+		else {
+            if (is_wvtt) {
+                GF_Err e;
+                e = gf_webvtt_dump_header(out, dumper->file, track, 1);
+                if (e == GF_OK) {
+                    GF_Err gf_webvtt_dump_iso_sample(FILE *dump, u32 timescale, GF_ISOSample *iso_sample);
+                    u32 timescale = gf_isom_get_media_timescale(dumper->file, track);
+                    gf_webvtt_dump_iso_sample(out, timescale, samp);
+                }
+            } else {
+                gf_bs_write_data(bs, samp->data, samp->dataLength);
+            }
+        }
 		gf_isom_sample_del(&samp);
 		gf_bs_del(bs);
 		
@@ -481,8 +498,19 @@
 		if (dsi) gf_bs_write_data(bs, dsi, dsi_size);
 		if (is_mj2k) 
 			write_jp2_file(bs, samp->data, samp->dataLength, dsi, dsi_size);
-		else
-			gf_bs_write_data(bs, samp->data, samp->dataLength);
+		else {
+            if (is_wvtt) {
+                GF_Err e;
+                e = gf_webvtt_dump_header(out, dumper->file, track, 1);
+                if (e == GF_OK) {
+                    GF_Err gf_webvtt_dump_iso_sample(FILE *dump, u32 timescale, GF_ISOSample *iso_sample);
+                    u32 timescale = gf_isom_get_media_timescale(dumper->file, track);
+                    gf_webvtt_dump_iso_sample(out, timescale, samp);
+                }
+            } else {
+                gf_bs_write_data(bs, samp->data, samp->dataLength);
+            }
+        }
 		gf_isom_sample_del(&samp);
 		gf_set_progress("Media Export", i+1, count);
 		gf_bs_del(bs);
@@ -645,6 +673,7 @@
 	char *dsi;
 	QCPRateTable rtable[8];
 	Bool is_stdout=0;
+    Bool is_webvtt = GF_FALSE;
 
 	dsi_size = 0;
 	dsi = NULL;
@@ -679,14 +708,17 @@
 		case GF_STREAM_VISUAL:
 			switch (dcfg->objectTypeIndication) {
 			case GPAC_OTI_VIDEO_MPEG4_PART2:
-				dsi = dcfg->decoderSpecificInfo->data;
-				dcfg->decoderSpecificInfo->data = NULL;
-				dsi_size = dcfg->decoderSpecificInfo->dataLength;
+				if (dcfg->decoderSpecificInfo) {
+					dsi = dcfg->decoderSpecificInfo->data;
+					dcfg->decoderSpecificInfo->data = NULL;
+					dsi_size = dcfg->decoderSpecificInfo->dataLength;
+				}
 				if (add_ext) 
 					strcat(szName, ".cmp");
 				gf_export_message(dumper, GF_OK, "Extracting MPEG-4 Visual stream to cmp");
 				break;
 			case GPAC_OTI_VIDEO_AVC:
+			case GPAC_OTI_VIDEO_SVC:
 				avccfg = gf_isom_avc_config_get(dumper->file, track, 1);
 				svccfg = gf_isom_svc_config_get(dumper->file, track, 1);
 				if (add_ext) 
@@ -885,6 +917,10 @@
 			gf_export_message(dumper, GF_OK, "Extracting AC3 Audio");
 			if (add_ext) 
 				strcat(szName, ".ac3");
+		} else if (m_stype==GF_ISOM_SUBTYPE_WVTT) {
+			gf_export_message(dumper, GF_OK, "Extracting WebVTT");
+            is_webvtt = GF_TRUE;
+			strcat(szName, ".vtt");
 		} else {
 			if (add_ext) {
 				strcat(szName, ".");
@@ -919,7 +955,12 @@
 
 	if (is_vobsub) return gf_dump_to_vobsub(dumper, szName, track, dsi, dsi_size);
 
-	if (qcp_type>1) {
+	if (is_webvtt) {
+        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));
+    }
+
+    if (qcp_type>1) {
 		if (dumper->flags & GF_EXPORT_USE_QCP) {
 			if (add_ext) 
 				strcat(szName, ".qcp");
@@ -1231,7 +1272,7 @@
 				}
 			}
 		}
-		if (!avccfg && !svccfg && !hevccfg) gf_bs_write_data(bs, samp->data, samp->dataLength);
+		if (!avccfg && !svccfg && !hevccfg &!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;
@@ -1730,7 +1771,7 @@
 	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_MPEG4_PART2) && (esd->decoderConfig->objectTypeIndication!=GPAC_OTI_VIDEO_AVC) && (esd->decoderConfig->objectTypeIndication!=GPAC_OTI_VIDEO_SVC)) ) {
 		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);
 	}
@@ -1761,7 +1802,7 @@
 
 	frame_d = 0;
 	/*AVC - FIXME dump format is probably wrong...*/
-	if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) {
+	if ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_SVC)){
 		gf_isom_get_visual_info(dumper->file, track, 1, &w, &h);
 		v4CC = "h264";
 	} 
@@ -2182,7 +2223,8 @@
 
 void m2ts_export_check(GF_M2TS_Demuxer *ts, u32 evt_type, void *par) 
 {
-	if (evt_type == GF_M2TS_EVT_PAT_REPEAT) ts->user = NULL;
+//	if (evt_type == GF_M2TS_EVT_PAT_REPEAT) ts->user = NULL;
+	if (evt_type == GF_M2TS_EVT_PMT_REPEAT) ts->user = NULL;
 	else if (evt_type == GF_M2TS_EVT_PAT_FOUND) ts->segment_switch = 1;
 }
 void m2ts_export_dump(GF_M2TS_Demuxer *ts, u32 evt_type, void *par) 
@@ -2288,6 +2330,10 @@
 		strcat(szFile, ".hvc");
 		gf_export_message(dumper, GF_OK, "Extracting MPEG-H HEVC Visual stream to hvc");
 		break;
+	case GF_M2TS_VIDEO_SVC:
+		strcat(szFile, ".264");
+		gf_export_message(dumper, GF_OK, "Extracting H264-SVC Visual stream to h264");
+		break;
 	default:
 		strcat(szFile, ".raw");
 		gf_export_message(dumper, GF_OK, "Extracting Unknown stream to raw");

gpac-0.5.0.svn4296.tar.bz2/src/media_tools/media_import.c -> gpac-0.5.0.svn4668.tar.bz2/src/media_tools/media_import.c Changed

@@ -92,7 +92,7 @@
 		gf_m4v_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
 		if (esd) gf_odf_desc_del((GF_Descriptor *) esd);
 
-		if ((dsi.par_num>1) && (dsi.par_num>1))
+		if ((dsi.par_num>1) && (dsi.par_den>1))
 			tk_w = dsi.width * dsi.par_num / dsi.par_den;
 	} else {
 		return GF_OK;
@@ -190,7 +190,7 @@
 	size = (u32) gf_f64_tell(src);
 	gf_f64_seek(src, 0, SEEK_SET);
 	data = (char*)gf_malloc(sizeof(char)*size);
-	size = fread(data, sizeof(char), size, src);
+	size = (u32) fread(data, sizeof(char), size, src);
 	fclose(src);
 
 	/*get image size*/
@@ -218,6 +218,7 @@
 		import->tk_info[0].video_info.width = w;
 		import->tk_info[0].video_info.height = h;
 		import->nb_tracks = 1;
+		gf_free(data);
 		if (dsi) gf_free(dsi);
 		return GF_OK;
 	}
@@ -296,6 +297,115 @@
 	return e;
 }
 
+static GF_Err gf_import_afx_sc3dmc(GF_MediaImporter *import, Bool mult_desc_allowed)
+{
+	GF_Err e;
+	Bool destroy_esd;
+	u32 size, track, di, dsi_len;
+	GF_ISOSample *samp;
+	u8 OTI;
+	char *dsi, *data;
+	FILE *src;
+
+	if (import->flags & GF_IMPORT_PROBE_ONLY) {
+		import->tk_info[0].track_num = 1;
+		import->tk_info[0].type = GF_ISOM_MEDIA_SCENE;
+		import->tk_info[0].media_type = GPAC_OTI_SCENE_AFX;
+		import->tk_info[0].flags = GF_IMPORT_USE_DATAREF | GF_IMPORT_NO_DURATION;
+		import->nb_tracks = 1;
+		return GF_OK;
+	}
+
+	src = gf_f64_open(import->in_name, "rb");
+	if (!src) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
+
+	gf_f64_seek(src, 0, SEEK_END);
+	size = (u32) gf_f64_tell(src);
+	gf_f64_seek(src, 0, SEEK_SET);
+	data = (char*)gf_malloc(sizeof(char)*size);
+	size = (u32) fread(data, sizeof(char), size, src);
+	fclose(src);
+
+	OTI = GPAC_OTI_SCENE_AFX;
+
+	dsi = (char *)gf_malloc(1);
+	dsi_len = 1;
+	dsi[0] = GPAC_AFX_SCALABLE_COMPLEXITY;
+
+	e = GF_OK;
+	destroy_esd = 0;
+	if (!import->esd) {
+		import->esd = gf_odf_desc_esd_new(0);
+		destroy_esd = 1;
+	}
+	/*update stream type/oti*/
+	if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
+	if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
+	import->esd->decoderConfig->streamType = GF_STREAM_SCENE;
+	import->esd->decoderConfig->objectTypeIndication = OTI;
+	import->esd->decoderConfig->bufferSizeDB = size;
+	import->esd->decoderConfig->avgBitrate = 8*size;
+	import->esd->decoderConfig->maxBitrate = 8*size;
+	import->esd->slConfig->timestampResolution = 1000;
+
+	if (dsi) {
+		if (!import->esd->decoderConfig->decoderSpecificInfo) import->esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
+		if (import->esd->decoderConfig->decoderSpecificInfo->data) gf_free(import->esd->decoderConfig->decoderSpecificInfo->data);
+		import->esd->decoderConfig->decoderSpecificInfo->data = dsi;
+		import->esd->decoderConfig->decoderSpecificInfo->dataLength = dsi_len;
+	}
+
+
+	track = 0;
+	if (mult_desc_allowed) 
+		track = gf_isom_get_track_by_id(import->dest, import->esd->ESID);
+	if (!track)
+		track = gf_isom_new_track(import->dest, import->esd->ESID, GF_ISOM_MEDIA_SCENE, 1000);
+	if (!track) {
+		e = gf_isom_last_error(import->dest);
+		goto exit;
+	}
+	gf_isom_set_track_enabled(import->dest, track, 1);
+	if (!import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
+	import->final_trackID = import->esd->ESID;
+
+	e = gf_isom_new_mpeg4_description(import->dest, track, import->esd, (import->flags & GF_IMPORT_USE_DATAREF) ? import->in_name : NULL, NULL, &di);
+	if (e) goto exit;
+	//gf_isom_set_visual_info(import->dest, track, di, w, h);
+	samp = gf_isom_sample_new();
+	samp->IsRAP = 1;
+	samp->dataLength = size;
+	if (import->initial_time_offset) samp->DTS = (u64) (import->initial_time_offset*1000);
+
+	gf_import_message(import, GF_OK, "%s import %s", "SC3DMC", import->in_name);
+
+	/*we must start a track from DTS = 0*/
+	if (!gf_isom_get_sample_count(import->dest, track) && samp->DTS) {
+		/*todo - we could add an edit list*/
+		samp->DTS=0;
+	}
+
+	gf_set_progress("Importing SC3DMC", 0, 1);
+	if (import->flags & GF_IMPORT_USE_DATAREF) {
+		e = gf_isom_add_sample_reference(import->dest, track, di, samp, (u64) 0);
+	} else {
+		samp->data = data;
+		e = gf_isom_add_sample(import->dest, track, di, samp);
+		samp->data = NULL;
+	}
+	gf_set_progress("Importing SC3DMC", 1, 1);
+
+	gf_isom_sample_del(&samp);
+
+exit:
+	gf_free(data);
+	if (import->esd && destroy_esd) {
+		gf_odf_desc_del((GF_Descriptor *) import->esd);
+		import->esd = NULL;
+	}
+	return e;
+}
+
 #ifndef GPAC_DISABLE_AV_PARSERS
 
 GF_Err gf_import_mp3(GF_MediaImporter *import)
@@ -2442,7 +2552,7 @@
 		return GF_IO_ERR;
 	}
 	if (dict && *dict) {
-		err = deflateSetDictionary(&stream, (Bytef *)*dict, strlen(*dict));
+		err = deflateSetDictionary(&stream, (Bytef *)*dict, (u32) strlen(*dict));
 		if (err != Z_OK) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHML import] Error assigning dictionary\n"));
 			deflateEnd(&stream);
@@ -2484,6 +2594,91 @@
 	gf_set_progress("NHML Loading", done, tot);
 }
 
+#define NHML_SCAN_INT(_fmt, _value)	\
+	{\
+	if (strstr(att->value, "0x")) { u32 __i; sscanf(att->value+2, "%x", &__i); _value = __i; }\
+	else if (strstr(att->value, "0X")) { u32 __i; sscanf(att->value+2, "%X", &__i); _value = __i; }\
+	else sscanf(att->value, _fmt, &_value); \
+	}\
+
+
+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)
 {
@@ -2500,7 +2695,7 @@
 	char *ext, szName[1000], szMedia[1000], szMediaTemp[1000], szInfo[1000], szXmlFrom[1000], szXmlTo[1000], *specInfo;
 	GF_GenericSampleDescription sdesc;
 	GF_DOMParser *parser;
-	GF_XMLNode *root, *node;
+	GF_XMLNode *root, *node, *childnode;
 	char *szRootName, *szSampleName, *szImpName;
 
 	szRootName = dims_doc ? "DIMSStream" : "NHNTStream";
@@ -2535,6 +2730,11 @@
 		return e;
 	}
 	root = gf_xml_dom_get_root(parser);
+	if (!root) {
+		e = gf_import_message(import, GF_BAD_PARAM, "Error parsing %s file - no root node found", szImpName);
+		gf_xml_dom_del(parser);
+		return e;
+	}
 
 	mdia = NULL;
 	destroy_esd = 0;
@@ -2560,26 +2760,26 @@
 	timescale = 1000;
 	i=0;
 	while ((att = (GF_XMLAttribute *)gf_list_enum(root->attributes, &i))) {
-		if (!stricmp(att->name, "streamType")) streamType = atoi(att->value);
+		if (!stricmp(att->name, "streamType")) NHML_SCAN_INT("%u", streamType)
 		else if (!stricmp(att->name, "mediaType") && (strlen(att->value)==4)) {
 			mtype = GF_4CC(att->value[0], att->value[1], att->value[2], att->value[3]);
 		}
 		else if (!stricmp(att->name, "mediaSubType") && (strlen(att->value)==4)) {
 			sdesc.codec_tag = GF_4CC(att->value[0], att->value[1], att->value[2], att->value[3]);
 		}
-		else if (!stricmp(att->name, "objectTypeIndication")) oti = atoi(att->value);
-		else if (!stricmp(att->name, "timeScale")) timescale = atoi(att->value);
-		else if (!stricmp(att->name, "width")) sdesc.width = atoi(att->value);
-		else if (!stricmp(att->name, "height")) sdesc.height = atoi(att->value);
-		else if (!stricmp(att->name, "parNum")) par_num = atoi(att->value);
-		else if (!stricmp(att->name, "parDen")) par_den = atoi(att->value);
-		else if (!stricmp(att->name, "sampleRate")) sdesc.samplerate = atoi(att->value);
-		else if (!stricmp(att->name, "numChannels")) sdesc.nb_channels = atoi(att->value);
+		else if (!stricmp(att->name, "objectTypeIndication")) NHML_SCAN_INT("%u", oti)
+		else if (!stricmp(att->name, "timeScale")) NHML_SCAN_INT("%u", timescale)
+		else if (!stricmp(att->name, "width")) NHML_SCAN_INT("%hu", sdesc.width)
+		else if (!stricmp(att->name, "height")) NHML_SCAN_INT("%hu", sdesc.height)
+		else if (!stricmp(att->name, "parNum")) NHML_SCAN_INT("%u", par_num)
+		else if (!stricmp(att->name, "parDen")) NHML_SCAN_INT("%u", par_den)
+		else if (!stricmp(att->name, "sampleRate")) NHML_SCAN_INT("%u", sdesc.samplerate)
+		else if (!stricmp(att->name, "numChannels")) NHML_SCAN_INT("%hu", sdesc.nb_channels)
 		else if (!stricmp(att->name, "baseMediaFile")) strcpy(szMedia, att->value);
 		else if (!stricmp(att->name, "specificInfoFile")) strcpy(szInfo, att->value);
-		else if (!stricmp(att->name, "trackID")) tkID = atoi(att->value);
+		else if (!stricmp(att->name, "trackID")) NHML_SCAN_INT("%u", tkID)
 		else if (!stricmp(att->name, "inRootOD")) inRootOD = (!stricmp(att->value, "yes") );
-		else if (!stricmp(att->name, "DTS_increment")) dts_inc = atoi(att->value);
+		else if (!stricmp(att->name, "DTS_increment")) NHML_SCAN_INT("%u", dts_inc)
 		else if (!stricmp(att->name, "gzipSamples")) do_compress = (!stricmp(att->value, "yes")) ? 1 : 0;
 		else if (!stricmp(att->name, "gzipDictionary")) {
 			u64 d_size;
@@ -2600,22 +2800,22 @@
 		}
 		/*unknow desc related*/
 		else if (!stricmp(att->name, "compressorName")) strcpy(sdesc.compressor_name, att->value);
-		else if (!stricmp(att->name, "codecVersion")) sdesc.version = atoi(att->value);
-		else if (!stricmp(att->name, "codecRevision")) sdesc.revision = atoi(att->value);
+		else if (!stricmp(att->name, "codecVersion")) NHML_SCAN_INT("%hu", sdesc.version)
+		else if (!stricmp(att->name, "codecRevision")) NHML_SCAN_INT("%hu", sdesc.revision)
 		else if (!stricmp(att->name, "codecVendor") && (strlen(att->value)==4)) {
 			sdesc.vendor_code = GF_4CC(att->value[0], att->value[1], att->value[2], att->value[3]);
 		}
-		else if (!stricmp(att->name, "temporalQuality")) sdesc.temporal_quality = atoi(att->value);
-		else if (!stricmp(att->name, "spatialQuality")) sdesc.spatial_quality = atoi(att->value);
-		else if (!stricmp(att->name, "horizontalResolution")) sdesc.h_res = atoi(att->value);
-		else if (!stricmp(att->name, "verticalResolution")) sdesc.v_res = atoi(att->value);
-		else if (!stricmp(att->name, "bitDepth")) sdesc.depth = atoi(att->value);
-		else if (!stricmp(att->name, "bitsPerSample")) sdesc.bits_per_sample = atoi(att->value);
+		else if (!stricmp(att->name, "temporalQuality")) NHML_SCAN_INT("%u", sdesc.temporal_quality)
+		else if (!stricmp(att->name, "spatialQuality")) NHML_SCAN_INT("%u", sdesc.spatial_quality)
+		else if (!stricmp(att->name, "horizontalResolution")) NHML_SCAN_INT("%u", sdesc.h_res)
+		else if (!stricmp(att->name, "verticalResolution")) NHML_SCAN_INT("%u", sdesc.v_res)
+		else if (!stricmp(att->name, "bitDepth")) NHML_SCAN_INT("%hu", sdesc.depth)
+		else if (!stricmp(att->name, "bitsPerSample")) NHML_SCAN_INT("%hu", sdesc.bits_per_sample)
 
 		/*DIMS stuff*/
-		else if (!stricmp(att->name, "profile")) dims.profile = atoi(att->value);
-		else if (!stricmp(att->name, "level")) dims.level = atoi(att->value);
-		else if (!stricmp(att->name, "pathComponents")) dims.pathComponents = atoi(att->value);
+		else if (!stricmp(att->name, "profile")) NHML_SCAN_INT("%c", dims.profile)
+		else if (!stricmp(att->name, "level")) NHML_SCAN_INT("%c", dims.level)
+		else if (!stricmp(att->name, "pathComponents")) NHML_SCAN_INT("%c", dims.pathComponents)
 		else if (!stricmp(att->name, "useFullRequestHost") && !stricmp(att->value, "yes")) dims.fullRequestHost = 1;
 		else if (!stricmp(att->name, "stream_type") && !stricmp(att->value, "secondary")) dims.streamType = 0;
 		else if (!stricmp(att->name, "contains_redundant")) {
@@ -2661,9 +2861,20 @@
 		specInfoSize = (u32) gf_f64_tell(info);
 		specInfo = (char*)gf_malloc(sizeof(char) * specInfoSize);
 		gf_f64_seek(info, 0, SEEK_SET);
-		specInfoSize = fread(specInfo, sizeof(char), specInfoSize, info);
+		specInfoSize = (u32) fread(specInfo, sizeof(char), specInfoSize, info);
 		fclose(info);
 	}
+
+	i=0;
+	while ((node = (GF_XMLNode *) gf_list_enum(root->content, &i))) {
+		if (node->type) continue;
+		if (stricmp(node->name, "DecoderSpecificInfo") ) continue;
+
+		e = nhml_parse_bit_sequence(node, &specInfo, &specInfoSize);
+		break;
+	}
+
+
 	/*compressing samples, remove data ref*/
 	if (do_compress) import->flags &= ~GF_IMPORT_USE_DATAREF;
 
@@ -2720,7 +2931,7 @@
 		/*note we cannot import OD from NHNT*/
 		case GF_STREAM_OD: e = GF_NOT_SUPPORTED; goto exit;
 		case GF_STREAM_INTERACT: mtype = GF_ISOM_MEDIA_SCENE; break;
-		default: mtype = GF_ISOM_MEDIA_ESM; break;
+		default: if (!mtype) mtype = GF_ISOM_MEDIA_ESM; break;
 		}
 
 		track = gf_isom_new_track(import->dest, import->esd->ESID, mtype, timescale);
@@ -2796,7 +3007,7 @@
 	i=0;
 	while ((node = (GF_XMLNode *) gf_list_enum(root->content, &i))) {
 		u32 j, dims_flags;
-		Bool append, compress;
+		Bool append, compress, has_subbs ;
 		if (node->type) continue;
 		if (stricmp(node->name, szSampleName) ) continue;
 
@@ -2856,6 +3067,16 @@
 		if (!(dims_flags & GF_DIMS_UNIT_C)) compress = 0;
 		count++;
 
+		has_subbs = GF_FALSE;
+		j=0;
+		while ((childnode = (GF_XMLNode *) gf_list_enum(node->content, &j))) {
+			if (childnode->type) continue;
+			if (stricmp(childnode->name, "BS") ) continue;
+			has_subbs = GF_TRUE;
+			break;
+		}
+
+
 		if (import->flags & GF_IMPORT_USE_DATAREF) {
 			if (offset) offset = media_done;
 			e = gf_isom_add_sample_reference(import->dest, track, di, samp, offset);
@@ -2869,7 +3090,7 @@
 			GF_BitStream *bs;
 			char *content = gf_xml_dom_serialize(node, 1);
 
-			samp->dataLength = 3 + strlen(content);
+			samp->dataLength = 3 + (u32) strlen(content);
 
 			if (samp->dataLength>max_size) {
 				samp->data = (char*)gf_realloc(samp->data, sizeof(char) * samp->dataLength);
@@ -2886,6 +3107,12 @@
 			if (gf_isom_get_sample_from_dts(import->dest, track, samp->DTS))
 				append = 1;
 
+		} else if (has_subbs) {
+			if (samp->data) gf_free(samp->data );
+			samp->data = 0;
+			samp->dataLength = 0;
+			e = nhml_parse_bit_sequence(node, &samp->data, &samp->dataLength);	
+			max_size = samp->dataLength;
 		} else {
 			Bool close = 0;
 			FILE *f = mdia;
@@ -3183,7 +3410,7 @@
 		}
 
 		if (samp->dataLength){
-			readen = fread( samp->data + 1, sizeof(char), samp->dataLength, mdia);
+			readen = (u32) fread( samp->data + 1, sizeof(char), samp->dataLength, mdia);
 			assert(readen == samp->dataLength);
 		}
 		samp->dataLength += 1;
@@ -3528,7 +3755,7 @@
 			if (load_size>H263_CACHE_SIZE) load_size=H263_CACHE_SIZE;
 			bpos = 0;
 			cache_start = gf_bs_get_position(bs);
-			gf_bs_read_data(bs, h263_cache, (u32) load_size);
+			gf_bs_read_data(bs, (char *) h263_cache, (u32) load_size);
 		}
 		v = (v<<8) | h263_cache[bpos];
 		bpos++;
@@ -4259,7 +4486,7 @@
 			if ((nal_type==GF_AVC_NALU_SVC_PREFIX_NALU) || (nal_type==GF_AVC_NALU_SVC_SLICE)) {
 				u32 res = 0;
 				u8 prio;
-				unsigned char *p = buffer;
+				unsigned char *p = (unsigned char *) buffer;
 				res |= (p[0] & 0x60) ? 0x80000000 : 0; // RefPicFlag
 				res |= 0 ? 0x40000000 : 0;             // RedPicFlag TODO: not supported, would require to parse NAL unit payload
 				res |= (1<=nal_type && nal_type<=5) || (nal_type==GF_AVC_NALU_SVC_PREFIX_NALU) || (nal_type==GF_AVC_NALU_SVC_SLICE) ? 0x20000000 : 0;  // VclNALUnitFlag
@@ -4601,6 +4828,9 @@
 
 static GF_Err gf_import_hevc(GF_MediaImporter *import)
 {
+#ifdef GPAC_DISABLE_HEVC
+	return GF_NOT_SUPPORTED;
+#else
 	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;
 	s32 idx, sei_recovery_frame_count;
@@ -4666,7 +4896,7 @@
 
 	bs = gf_bs_from_file(mdia, GF_BITSTREAM_READ);
 	if (!gf_media_nalu_is_start_code(bs)) {
-		e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Cannot find H264 start code");
+		e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Cannot find HEVC start code");
 		goto exit;
 	}
 
@@ -4761,17 +4991,21 @@
 			}
 			/*if we get twice the same VPS put in the the bitstream and set array_completeness to 0 ...*/
 			if (hevc.vps[idx].state == 2) {
-				copy_size = nal_size;
-				assert(vpss);
-				vpss->array_completeness = 0;
+				if (hevc.vps[idx].crc != gf_crc_32(buffer, nal_size)) {
+					copy_size = nal_size;
+					assert(vpss);
+					vpss->array_completeness = 0;
+				}
 			}
 
 			if (hevc.vps[idx].state==1) {
 				hevc.vps[idx].state = 2;
+				hevc.vps[idx].crc = gf_crc_32(buffer, nal_size);
 
 				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;
 
 				if (!vpss) {
 					GF_SAFEALLOC(vpss, GF_HEVCParamArray);
@@ -4800,13 +5034,12 @@
 			if ((hevc.sps[idx].state & AVC_SPS_PARSED) && !(hevc.sps[idx].state & AVC_SPS_DECLARED)) {
 				hevc.sps[idx].state |= AVC_SPS_DECLARED;
 				add_sps = 1;
+				hevc.sps[idx].crc = gf_crc_32(buffer, nal_size);
 			}
 
-			/*if we get twice the same VPS put in the the bitstream and set array_completeness to 0 ...*/
-			if (hevc.sps[idx].state & AVC_SUBSPS_DECLARED) {
-				if (import->flags & GF_IMPORT_SVC_NONE) {
-					copy_size = 0;
-				} else {
+			/*if we get twice the same SPS put it in the bitstream and set array_completeness to 0 ...*/
+			else if (hevc.sps[idx].state & AVC_SPS_DECLARED) {
+				if (hevc.sps[idx].crc != gf_crc_32(buffer, nal_size)) {
 					copy_size = nal_size;
 					assert(spss);
 					spss->array_completeness = 0;
@@ -4816,33 +5049,26 @@
 			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->constraint_indicator_flags = 0;
-				hevccfg->level_idc = hevc.sps[idx].ptl.level_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;
 
-				/*
-				todo FPS detection
-					
-					timescale = 2 * avc.sps[idx].vui.time_scale;
-					dts_inc =   2 * avc.sps[idx].vui.num_units_in_tick * DeltaTfiDivisorIdx;
-					FPS = (Double)timescale / dts_inc;
-					detect_fps = 0;
-					gf_isom_remove_track(import->dest, track);
-					if (sample_data) gf_bs_del(sample_data);
-					gf_odf_avc_cfg_del(avccfg);
-					avccfg = NULL;
-					gf_free(buffer);
-					buffer = NULL;
-					gf_bs_del(bs);
-					bs = NULL;
-					gf_f64_seek(mdia, 0, SEEK_SET);
-					goto restart_import;
-				}
-			*/
+				//need VUI for these ...
+				//u16 min_spatial_segmentation_idc;
+				//u8 parallelismType;
+				//u16 avgFrameRate;
+				//u8 constantFrameRate;
 
 				if (!spss) {
 					GF_SAFEALLOC(spss, GF_HEVCParamArray);
@@ -4861,7 +5087,7 @@
 
 				if (first_avc) {
 					first_avc = 0;
-					gf_import_message(import, GF_OK, "AVC-H264 import - frame size %d x %d at %02.3f FPS", hevc.sps[idx].width, hevc.sps[idx].height, FPS);
+					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);
 				}
 
 				if ((max_w <= hevc.sps[idx].width) && (max_h <= hevc.sps[idx].height)) {
@@ -4877,16 +5103,19 @@
 				e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Error parsing Picture Param");
 				goto exit;
 			}
-			/*if we get twice the same VPS put in the the bitstream and set array_completeness to 0 ...*/
+			/*if we get twice the same PPS put it in the bitstream and set array_completeness to 0 ...*/
 			if (hevc.pps[idx].state == 2) {
-				copy_size = nal_size;
-				assert(ppss);
-				ppss->array_completeness = 0;
+				if (hevc.pps[idx].crc != gf_crc_32(buffer, nal_size)) {
+					copy_size = nal_size;
+					assert(ppss);
+					ppss->array_completeness = 0;
+				}
 			}
 
 			if (hevc.pps[idx].state==1) {
 				hevc.pps[idx].state = 2;
-
+				hevc.pps[idx].crc = gf_crc_32(buffer, nal_size);
+				
 				if (!ppss) {
 					GF_SAFEALLOC(ppss, GF_HEVCParamArray);
 					ppss->nalus = gf_list_new();
@@ -4905,6 +5134,7 @@
 			}
 			break;
 		case GF_HEVC_NALU_SEI_PREFIX:
+		case GF_HEVC_NALU_SEI_SUFFIX:
 			if (hevc.sps_active_idx != -1) {
 				/*TODO*/
 				//copy_size = gf_media_avc_reformat_sei(buffer, nal_size, &hevc);
@@ -4943,6 +5173,11 @@
 		case GF_HEVC_NALU_SLICE_IDR_N_LP:
 		case GF_HEVC_NALU_SLICE_CRA:
 			is_slice = 1;
+/*			if ((hevc.s_info.slice_segment_address<=100) || (hevc.s_info.slice_segment_address>=200))
+				skip_nal = 1;
+			if (!hevc.s_info.slice_segment_address)
+				skip_nal = 0;
+*/
 			if (! skip_nal) {
 				copy_size = nal_size;
 				switch (hevc.s_info.slice_type) {
@@ -4979,7 +5214,7 @@
 					samp->IsRAP = 1;
 					if (!use_opengop_gdr) {
 						use_opengop_gdr = 1;
-						GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[AVC Import] Forcing non-IDR samples with I slices to be marked as sync points - resulting file will not be ISO conformant\n"));
+						GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[HEVC Import] Forcing non-IDR samples with I slices to be marked as sync points - resulting file will not be ISO conformant\n"));
 					}
 				}
 			}
@@ -4987,8 +5222,6 @@
 			gf_bs_del(sample_data);
 			sample_data = NULL;
 
-
-
 			/*CTS recomuting is much trickier than with MPEG-4 ASP due to b-slice used as references - we therefore
 			store the POC as the CTS offset and update the whole table at the end*/
 			samp->CTS_Offset = last_poc - poc_shift;
@@ -5014,7 +5247,7 @@
 			}
 
 			gf_isom_sample_del(&samp);
-			gf_set_progress("Importing AVC-H264", (u32) (nal_start/1024), (u32) (total_size/1024) );
+			gf_set_progress("Importing HEVC", (u32) (nal_start/1024), (u32) (total_size/1024) );
 			first_nal = 1;
 
 			if (min_poc > last_poc)
@@ -5031,7 +5264,7 @@
 				/*only 8bits, 16bits and 32 bits*/
 				if (size_length+diff_size == 24) diff_size+=8;
 
-				gf_import_message(import, GF_OK, "Adjusting AVC SizeLength to %d bits", size_length+diff_size);
+				gf_import_message(import, GF_OK, "Adjusting HEVC SizeLength to %d bits", size_length+diff_size);
 				gf_media_avc_rewrite_samples(import->dest, track, size_length, size_length+diff_size);
 
 				/*rewrite current sample*/
@@ -5088,7 +5321,7 @@
 							sei_recovery_frame_count = 0;
 							if (use_opengop_gdr == 1) {
 								use_opengop_gdr = 2; /*avoid message flooding*/
-								GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[AVC Import] No valid SEI Recovery Point found although needed - forcing\n"));
+								GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[HEVC Import] No valid SEI Recovery Point found although needed - forcing\n"));
 							}
 						}
 						hevc.sei.recovery_point.valid = 0;
@@ -5180,12 +5413,12 @@
 		/*consume next start code*/
 		nal_start = gf_media_nalu_next_start_code_bs(bs);
 		if (nal_start) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[avc-h264] invalid nal_size (%u)? Skipping "LLU" bytes to reach next start code\n", nal_size, nal_start));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[hevc] invalid nal_size (%u)? Skipping "LLU" bytes to reach next start code\n", nal_size, nal_start));
 			gf_bs_skip_bytes(bs, nal_start);
 		}
 		nal_start = gf_media_nalu_is_start_code(bs);
 		if (!nal_start) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[avc-h264] error: no start code found ("LLU" bytes read out of "LLU") - leaving\n", gf_bs_get_position(bs), gf_bs_get_size(bs)));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[hevc] error: no start code found ("LLU" bytes read out of "LLU") - leaving\n", gf_bs_get_position(bs), gf_bs_get_size(bs)));
 			break;
 		}
 		nal_start = gf_bs_get_position(bs);
@@ -5207,7 +5440,7 @@
 		e = gf_isom_add_sample(import->dest, track, di, samp);
 		if (e) goto exit;
 		gf_isom_sample_del(&samp);
-		gf_set_progress("Importing AVC-H264", (u32) cur_samp, cur_samp+1);
+		gf_set_progress("Importing HEVC", (u32) cur_samp, cur_samp+1);
 		cur_samp++;
 	}
 
@@ -5288,7 +5521,7 @@
 		gf_isom_remove_cts_info(import->dest, track);
 	}
 
-	gf_set_progress("Importing AVC-H264", (u32) cur_samp, cur_samp);
+	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;
@@ -5306,10 +5539,10 @@
 		e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Import results: No SPS or PPS found in the bitstream ! Nothing imported\n");
 	} else {
 		if (nb_sp || nb_si) {
-			gf_import_message(import, GF_OK, "AVC Import results: %d samples - Slices: %d I %d P %d B %d SP %d SI - %d SEI - %d IDR",
+			gf_import_message(import, GF_OK, "HEVC Import results: %d samples - Slices: %d I %d P %d B %d SP %d SI - %d SEI - %d IDR",
 				cur_samp, nb_i, nb_p, nb_b, nb_sp, nb_si, nb_sei, nb_idr);
 		} else {
-			gf_import_message(import, GF_OK, "AVC Import results: %d samples - Slices: %d I %d P %d B - %d SEI - %d IDR",
+			gf_import_message(import, GF_OK, "HEVC Import results: %d samples - Slices: %d I %d P %d B - %d SEI - %d IDR",
 				cur_samp, nb_i, nb_p, nb_b, nb_sei, nb_idr);
 		}
 
@@ -5340,6 +5573,7 @@
 	gf_bs_del(bs);
 	fclose(mdia);
 	return e;
+#endif //GPAC_DISABLE_HEVC
 }
 
 #endif /*GPAC_DISABLE_AV_PARSERS*/
@@ -5353,7 +5587,7 @@
 	if (feof(f_in)) return 0;
 	while (ogg_sync_pageout(oy, oggpage ) != 1 ) {
 		char *buffer = ogg_sync_buffer(oy, OGG_BUFFER_SIZE);
-		u32 bytes = fread(buffer, sizeof(char), OGG_BUFFER_SIZE, f_in);
+		u32 bytes = (u32) fread(buffer, sizeof(char), OGG_BUFFER_SIZE, f_in);
 		ogg_sync_wrote(oy, bytes);
 		if (feof(f_in)) return 1;
 	}
@@ -5895,7 +6129,7 @@
 	gf_f64_seek(src, 0, SEEK_SET);
 	samp->IsRAP = 1;
 	samp->data = (char *)gf_malloc(sizeof(char)*samp->dataLength);
-	readen = fread(samp->data, sizeof(char), samp->dataLength, src);
+	readen = (u32) fread(samp->data, sizeof(char), samp->dataLength, src);
 	assert( readen == samp->dataLength );
 	e = gf_isom_add_sample(import->dest, track, di, samp);
 	gf_isom_sample_del(&samp);
@@ -5970,7 +6204,9 @@
 			else if (st==GF_STREAM_VISUAL) {
 				mtype = GF_ISOM_MEDIA_VISUAL;
 				switch (oti) {
-				case GPAC_OTI_VIDEO_AVC: name = "AVC/H264 Video"; stype = GF_4CC('H','2','6','4'); break;
+				case GPAC_OTI_VIDEO_AVC: 
+				case GPAC_OTI_VIDEO_SVC:
+					name = "AVC/H264 Video"; stype = GF_4CC('H','2','6','4'); 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: 
@@ -6094,8 +6330,11 @@
 	GF_AVCConfig *avccfg;
 	AVCState avc;
 
+#ifndef GPAC_DISABLE_HEVC
 	GF_HEVCConfig *hevccfg;
 	HEVCState hevc;
+#endif //GPAC_DISABLE_HEVC
+
 #endif
 	Bool force_next_au_start;
 	Bool stream_setup;
@@ -6298,6 +6537,7 @@
 	gf_isom_sample_del(&samp);
 }
 
+#ifndef GPAC_DISABLE_HEVC
 static void hevc_cfg_add_nalu(GF_HEVCConfig *hevccfg, u8 nal_type, char *data, u32 data_len)
 {
 	u32 i, count;
@@ -6325,6 +6565,7 @@
 		ar->array_completeness = 0;
 	}
 }
+#endif //GPAC_DISABLE_HEVC
 
 void on_m2ts_import_data(GF_M2TS_Demuxer *ts, u32 evt_type, void *par)
 {
@@ -6411,7 +6652,8 @@
 					tsimp->nb_video++;
 					break;
 				case GF_M2TS_VIDEO_H264:
-					import->tk_info[idx].media_type = GF_4CC('H','2','6','4');
+				case GF_M2TS_VIDEO_SVC:
+					import->tk_info[idx].media_type = (es->stream_type==GF_M2TS_VIDEO_SVC) ? GF_4CC('S','V','C',' ') : GF_4CC('H','2','6','4');
 					import->tk_info[idx].type = GF_ISOM_MEDIA_VISUAL;
 					import->tk_info[idx].lang = pes->lang;
 					import->nb_tracks++;
@@ -6553,7 +6795,15 @@
 				mtype = GF_ISOM_MEDIA_VISUAL;
 				stype = GF_STREAM_VISUAL; 
 				oti = GPAC_OTI_VIDEO_HEVC;
+#ifndef GPAC_DISABLE_HEVC
 				tsimp->hevccfg = gf_odf_hevc_cfg_new();
+#endif //GPAC_DISABLE_HEVC
+				break;
+			case GF_M2TS_VIDEO_SVC:
+				mtype = GF_ISOM_MEDIA_VISUAL;
+				stype = GF_STREAM_VISUAL; 
+				oti = GPAC_OTI_VIDEO_SVC;
+				tsimp->avccfg = gf_odf_avc_cfg_new();
 				break;
 			case GF_M2TS_AUDIO_MPEG1:
 				mtype = GF_ISOM_MEDIA_AUDIO;
@@ -6618,7 +6868,7 @@
 							tsimp->nb_audio_configured++;
 						} else {
 							/*unpack AVC config*/
-							if ((pck->stream->stream_type==GF_M2TS_VIDEO_H264) && !pck->data[0] && !pck->data[1]) {
+							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]);
@@ -6648,7 +6898,7 @@
 			 /* Even if we don't import this stream we need to check the first dts of the program */
 			if (!(pck->stream->flags & GF_M2TS_ES_FIRST_DTS) && is_au_start) {
 				pck->stream->flags |= GF_M2TS_ES_FIRST_DTS;
-				pck->stream->first_dts = (pck->DTS?pck->DTS:pck->PTS);
+				pck->stream->first_dts = (pck->PTS!=pck->DTS) ? pck->DTS : pck->PTS;
 				if (!pck->stream->program->first_dts || pck->stream->program->first_dts > pck->stream->first_dts) {
 					pck->stream->program->first_dts = pck->stream->first_dts;
 
@@ -6743,6 +6993,7 @@
 
 			/*avc data for the current sample is stored in annex-B, as we don't know the size of each nal
 			when called back (depending on PES packetization, the end of the nal could be in following pes)*/
+#ifndef GPAC_DISABLE_HEVC
 			else if (tsimp->hevccfg && !pck->data[0] && !pck->data[1]) {
 				s32 idx;
 				Bool add_sps, is_subseq = 0;
@@ -6827,6 +7078,7 @@
 					tsimp->force_next_au_start = 0;
 				}
 			}
+#endif //GPAC_DISABLE_HEVC
 
 			if (!is_au_start) {
 				e = gf_isom_append_sample_data(import->dest, tsimp->track, (char*)pck->data, pck->data_len);
@@ -6849,7 +7101,7 @@
 			}
 
 			samp = gf_isom_sample_new();
-			samp->DTS = pck->DTS ? pck->DTS : pck->PTS;
+			samp->DTS = pck->DTS;
 			samp->CTS_Offset = (u32) (pck->PTS - samp->DTS);
 
 			if (pck->stream->first_dts==samp->DTS) {
@@ -6859,6 +7111,7 @@
 				case GF_M2TS_VIDEO_MPEG4: gf_import_message(import, GF_OK, "MPEG-4 Video import (TS PID %d)", pck->stream->pid); break;
 				case GF_M2TS_VIDEO_H264: gf_import_message(import, GF_OK, "MPEG-4 AVC/H264 Video import (TS PID %d)", pck->stream->pid); break;
 				case GF_M2TS_VIDEO_HEVC: gf_import_message(import, GF_OK, "MPEG-H HEVC Video import (TS PID %d)", pck->stream->pid); break;
+				case GF_M2TS_VIDEO_SVC: gf_import_message(import, GF_OK, "H264-SVC Video import (TS PID %d)", pck->stream->pid); break;
 				case GF_M2TS_AUDIO_MPEG1: gf_import_message(import, GF_OK, "MPEG-1 Audio import - SampleRate %d Channels %d Language %s (TS PID %d)", pck->stream->aud_sr, pck->stream->aud_nb_ch, gf_4cc_to_str(pck->stream->lang), pck->stream->pid); break;
 				case GF_M2TS_AUDIO_MPEG2: gf_import_message(import, GF_OK, "MPEG-2 Audio import - SampleRate %d Channels %d Language %s (TS PID %d)", pck->stream->aud_sr, pck->stream->aud_nb_ch, gf_4cc_to_str(pck->stream->lang), pck->stream->pid); break;
 				case GF_M2TS_AUDIO_AAC: gf_import_message(import, GF_OK, "MPEG-4 AAC Audio import - SampleRate %d Channels %d Language %s (TS PID %d)", pck->stream->aud_sr, pck->stream->aud_nb_ch, gf_4cc_to_str(pck->stream->lang), pck->stream->pid); break;
@@ -7103,7 +7356,7 @@
 	if (do_import) gf_import_message(import, GF_OK, progress);
 
 	while (!feof(mts)) {
-		size = fread(data, sizeof(char), 188, mts);
+		size = (u32) fread(data, sizeof(char), 188, mts);
 		if (size<188)
 			break;
 
@@ -7588,7 +7841,7 @@
 	FILE *f = gf_f64_open(import->in_name, "rt");
 	if (!f) return GF_URL_ERROR;
 
-	readen = fread(line, 1, 4, f);
+	readen = (u32) fread(line, 1, 4, f);
 	if (readen < 4){
 		e = GF_URL_ERROR;
 		goto err_exit;
@@ -7673,7 +7926,7 @@
 		u32 off = 0;
 		char *sL;
 		while (1) {
-			u32 len = strlen(line);
+			u32 len = (u32) strlen(line);
 			if (!len) break;
 			switch (line[len-1]) {
 			case '\n': case '\t': case '\r': case ' ':
@@ -7965,6 +8218,9 @@
 	/*DIMS*/
 	if (!strnicmp(ext, ".dml", 4) || !stricmp(fmt, "DIMS") )
 		return gf_import_nhml_dims(importer, 1);
+	/*SC3DMC*/
+	if (!strnicmp(ext, ".s3d", 4) || !stricmp(fmt, "SC3DMC") )
+		return gf_import_afx_sc3dmc(importer, 1);
 
 	if (!strnicmp(ext, ".txt", 4) || !strnicmp(ext, ".chap", 5) || !stricmp(fmt, "CHAP") )
 		return gf_media_import_chapters_file(importer);
@@ -7995,38 +8251,6 @@
 }
 
 
-GF_EXPORT
-GF_Err gf_media_change_pl(GF_ISOFile *file, u32 track, u32 profile, u32 level)
-{
-	u32 i, count, stype;
-	GF_Err e;
-	GF_AVCConfig *avcc;
-
-	stype = gf_isom_get_media_subtype(file, track, 1);
-	switch (stype) {
-	case GF_ISOM_SUBTYPE_AVC_H264:
-	case GF_ISOM_SUBTYPE_AVC2_H264:
-	case GF_ISOM_SUBTYPE_AVC3_H264:
-	case GF_ISOM_SUBTYPE_AVC4_H264:
-		break;
-	default:
-		return GF_OK;
-	}
-
-	avcc = gf_isom_avc_config_get(file, track, 1);
-	if (level) avcc->AVCLevelIndication = level;
-	if (profile) avcc->AVCProfileIndication = profile;
-	count = gf_list_count(avcc->sequenceParameterSets);
-	for (i=0; i<count; i++) {
-		GF_AVCConfigSlot *slc = gf_list_get(avcc->sequenceParameterSets, i);
-		if (profile) slc->data[1] = profile;
-		if (level) slc->data[3] = level;
-	}
-	e = gf_isom_avc_config_update(file, track, 1, avcc);
-	assert (e == GF_OK);
-	gf_odf_avc_cfg_del(avcc);
-	return GF_OK;
-}
 
 #endif /*GPAC_DISABLE_MEDIA_IMPORT*/

gpac-0.5.0.svn4296.tar.bz2/src/media_tools/mpd.c -> gpac-0.5.0.svn4668.tar.bz2/src/media_tools/mpd.c Changed

@@ -28,7 +28,9 @@
 #include <gpac/internal/m3u8.h>
 #include <gpac/network.h>
 
-#ifndef _WIN32_WCE
+#ifdef _WIN32_WCE
+#include <winbase.h>
+#else
 /*for mktime*/
 #include <time.h>
 #endif
@@ -95,15 +97,18 @@
 
 static u64 gf_mpd_parse_date(char *attr)
 {
-#ifdef _WIN32_WCE
-	GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] Parsing MPD date (%s) is not supported on Windows CE\n", attr));
-	return 0;
-#else
 	Bool ok = 0;
 	Bool neg_time_zone = 0;
-	u32 year, month, day, h, m;
+	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;
@@ -117,44 +122,67 @@
 		ok = 1;
 	}
 
-	if (ok) {
-		u64 res;
-		struct tm _t;
-		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;
+	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;
-		}
+	{
+	/*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
-		res = mktime(&_t) - timezone;
-#endif
-		if (om || oh) {
-			s32 diff = (60*oh + om)*60;
-			if (neg_time_zone) diff = -diff;
-			res = res + diff;
-		}
-		return res;
-	} else {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[MPD] Failed to parse MPD date %s - format not supported\n", attr));
+	{
+		s32 val = timezone;
+		res = mktime(&_t) - val;
 	}
-	return 0;
 #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;
 }
 
 static u32 gf_mpd_parse_duration(char *duration) {
@@ -322,16 +350,20 @@
 	GF_XMLNode *child;
 	u32 i = 0;
 
-	/*setup some defaults*/
-	seg->timescale = 1;
+	/*infinite by default*/
+	seg->time_shift_buffer_depth = (u32) -1;
 
 	while ( (att = gf_list_enum(root->attributes, &i)) ) {
 		if (!strcmp(att->name, "timescale")) seg->timescale = gf_mpd_parse_int(att->value);
 		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, "timeShiftBufferDepth")) seg->time_shift_buffer_depth = gf_mpd_parse_duration(att->value);
 	}
 
+	if (mpd->type == GF_MPD_TYPE_STATIC) 
+		seg->time_shift_buffer_depth = 0;
+
 	i = 0;
 	while ( (child = gf_list_enum(root->content, &i))) {
 		if (!gf_mpd_valid_child(mpd, child)) continue;
@@ -1162,10 +1194,10 @@
 		update_interval = the_pe->durationInfo;
 		break;
 	case 1:
-		update_interval = the_pe->durationInfo/2;
+		update_interval = (Double)the_pe->durationInfo/2;
 		break;
 	case 2:
-		update_interval = 3*(the_pe->durationInfo/2);
+		update_interval = 3*((Double)the_pe->durationInfo/2);
 		break;
 	default:
 		update_interval = 3*(the_pe->durationInfo);
@@ -1247,7 +1279,7 @@
 					if (strchr("0123456789", template_base[k])) {
 						if (template_ext) {
 							template_ext[0] = 0;
-							template_width = strlen(template_base + k);
+							template_width = (u32) strlen(template_base + k);
 							template_idx_start = atoi(template_base + k);
 							template_ext[0] = '.';
 						}
@@ -1380,8 +1412,8 @@
 			base_url = gf_strdup(pe->url);
 			sep = strrchr(base_url, '/');
 
-			if (pe->codecs && (pe->codecs[0] = '\"')) {
-				u32 len = strlen(pe->codecs);
+			if (pe->codecs && (pe->codecs[0] == '\"')) {
+				u32 len = (u32) strlen(pe->codecs);
 				strncpy(pe->codecs, pe->codecs+1, len-1);
 				pe->codecs[len-2] = 0;
 			}

gpac-0.5.0.svn4296.tar.bz2/src/media_tools/mpeg2_ps.c -> gpac-0.5.0.svn4668.tar.bz2/src/media_tools/mpeg2_ps.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/media_tools/mpegts.c -> gpac-0.5.0.svn4668.tar.bz2/src/media_tools/mpegts.c Changed

@@ -32,6 +32,12 @@
 #include <gpac/internal/media_dev.h>
 #include <gpac/download.h>
 
+
+#ifndef GPAC_DISABLE_STREAMING
+#include <gpac/internal/ietf_dev.h>
+#endif
+
+
 #ifdef GPAC_CONFIG_LINUX
 #include <unistd.h>
 #endif
@@ -63,6 +69,7 @@
 	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_AUDIO_AC3: return "Dolby AC3 Audio";
 	case GF_M2TS_AUDIO_DTS: return "Dolby DTS Audio";
@@ -83,7 +90,7 @@
 	if (!same_pts) pck.flags |= GF_M2TS_PES_PCK_AU_START;
 	pck.DTS = pes->DTS;
 	pck.PTS = pes->PTS;
-	pck.data = data;
+	pck.data = (char *)data;
 	pck.data_len = data_len;
 	pck.stream = pes;
 	ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
@@ -135,7 +142,7 @@
 		/* u32 sctype=0;*/
 		unsigned char *start = (unsigned char *)memchr(data+sc_pos, 0, data_len-sc_pos);
 		if (!start) break;
-		sc_pos = start - data;
+		sc_pos = (u32) (start - data);
 		/*not enough space to test for start code, don't check it*/
 		if (data_len - sc_pos < 5)
 			break;
@@ -164,7 +171,7 @@
 		if (!start_code_found) {
 			if (sc_pos) {
 				if (!esc_code_found) {
-					pck.data = data;
+					pck.data = (char *)data;
 					pck.data_len = sc_pos;
 					pck.flags = 0;
 					ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
@@ -178,16 +185,17 @@
 		} else {
 
 			if (start_code_found==2) {
-				pck.data = data-1;
+				pck.data = (char *)data-1;
 				pck.data[0]=0;
 				pck.data_len = sc_pos+1;
 			} else {
-				pck.data = data;
+				pck.data = (char *)data;
 				pck.data_len = sc_pos;
 			}
 			start_code_found = short_start_code ? 2 : 1;
 
 			if (is_hevc) {
+#ifndef GPAC_DISABLE_HEVC
 				nal_type = (pck.data[4] & 0x7E) >> 1;
 
 				/*check for SPS and update stream info*/
@@ -197,7 +205,7 @@
 					s32 idx;
 					memset(&hevc, 0, sizeof(HEVCState));
 					hevc.sps_active_idx = -1;
-					idx = gf_media_hevc_read_sps(data+4, sc_pos-4, &hevc);
+					idx = gf_media_hevc_read_sps((char *)data+4, sc_pos-4, &hevc);
 
 					if (idx>=0) {
 						pes->vid_w = hevc.sps[idx].width;
@@ -227,7 +235,9 @@
 					ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
 					prev_is_au_delim=0;
 				} 
-				else {
+				else
+#endif //GPAC_DISABLE_HEVC
+				{
 					pck.flags = 0;
 					ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
 					prev_is_au_delim=0;
@@ -237,21 +247,21 @@
 
 				/*check for SPS and update stream info*/
 #ifndef GPAC_DISABLE_AV_PARSERS
-				if (!pes->vid_w && (nal_type==GF_AVC_NALU_SEQ_PARAM)) {
+				if ((nal_type==GF_AVC_NALU_SEQ_PARAM) || (nal_type==GF_AVC_NALU_SVC_SUBSEQ_PARAM)) {
 					AVCState avc;
 					s32 idx;
 					memset(&avc, 0, sizeof(AVCState));
 					avc.sps_active_idx = -1;
-					idx = gf_media_avc_read_sps(data+4, sc_pos-4, &avc, 0, NULL);
+					idx = gf_media_avc_read_sps((char *)data+4, sc_pos-4, &avc, 0, NULL);
 
-					if (idx>=0) {
+					if ((idx>=0) && (pes->vid_w < avc.sps[idx].width) && (pes->vid_h < avc.sps[idx].height)) {
 						pes->vid_w = avc.sps[idx].width;
 						pes->vid_h = avc.sps[idx].height;
 					}
 				}
 #endif
 				/*check AU start type*/
-				if (nal_type==GF_AVC_NALU_ACCESS_UNIT) {
+				if ((nal_type==GF_AVC_NALU_ACCESS_UNIT) || (nal_type==GF_AVC_NALU_VDRD)) {
 					if (!prev_is_au_delim) {
 						if (au_start_in_pes) {
 							/*FIXME - we should check the AVC framerate to update the timing ...*/
@@ -265,13 +275,8 @@
 						ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
 						prev_is_au_delim=1;
 					}
-				} else if (nal_type==GF_AVC_NALU_IDR_SLICE) {
-					pck.flags = GF_M2TS_PES_PCK_RAP;
-					ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
-					prev_is_au_delim=0;
-				} 
-				else {
-					pck.flags = 0;
+				} 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);
 					prev_is_au_delim=0;
 				}
@@ -300,20 +305,31 @@
 
 	if (data_len) {
 		pck.flags = 0;
-		pck.data = data;
+		pck.data = (char *)data;
 		pck.data_len = data_len;
 		if (start_code_found) {
 			if (start_code_found==2) {
-				pck.data = data-1;
+				pck.data = (char *)data-1;
 				pck.data[0]=0;
 				pck.data_len = data_len+1;
 			}
-			nal_type = pck.data[4] & 0x1F;
-			if (nal_type==GF_AVC_NALU_ACCESS_UNIT) {
-				pck.flags = GF_M2TS_PES_PCK_AU_START;
-			} else if (nal_type==GF_AVC_NALU_IDR_SLICE) {
-				pck.flags = GF_M2TS_PES_PCK_RAP;
-			} 
+			if (is_hevc) {
+#ifndef GPAC_DISABLE_HEVC
+				nal_type = (pck.data[4] & 0x7E) >> 1;
+				if (nal_type==GF_HEVC_NALU_ACCESS_UNIT) {
+					pck.flags = GF_M2TS_PES_PCK_AU_START;
+				} else if ((nal_type==GF_HEVC_NALU_SLICE_IDR_W_DLP) || (nal_type==GF_HEVC_NALU_SLICE_IDR_N_LP)) {
+					pck.flags = GF_M2TS_PES_PCK_RAP;
+				} 
+#endif
+			} else {
+				nal_type = pck.data[4] & 0x1F;
+				if (nal_type==GF_AVC_NALU_ACCESS_UNIT) {
+					pck.flags = GF_M2TS_PES_PCK_AU_START;
+				} else if (nal_type==GF_AVC_NALU_IDR_SLICE) {
+					pck.flags = GF_M2TS_PES_PCK_RAP;
+				} 
+			}
 		}
 		if (force_new_au) {
 			pck.flags |= GF_M2TS_PES_PCK_AU_START;
@@ -350,14 +366,14 @@
 	while (sc_pos+4<data_len) {
 		unsigned char *start = (unsigned char*)memchr(data+sc_pos, 0, data_len-sc_pos);
 		if (!start) break;
-		sc_pos = start - (unsigned char*)data;
+		sc_pos = (u32) (start - (unsigned char*)data);
 
 		/*found picture or sequence start_code*/
 		if (!start[1] && (start[2]==0x01)) {
 			if (!start[3] || (start[3]==0xb3) || (start[3]==0xb8)) {
 				Bool new_au;
 				if (sc_pos) {
-					pck.data = data;
+					pck.data = (char *)data;
 					pck.data_len = sc_pos;
 					ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
 					pck.flags = 0;
@@ -408,7 +424,7 @@
 		}
 		sc_pos++;
 	}
-	pck.data = data;
+	pck.data = (char *)data;
 	pck.data_len = data_len;
 	ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
 	/*we consumed all data*/
@@ -453,14 +469,14 @@
 	pck.PTS = PTS;
 	pck.flags = 0;
 
-	if (pes->frame_state && (data[pes->frame_state]==0xFF) && ((data[pes->frame_state+1] & 0xF0) == 0xF0)) {
+	if (pes->frame_state && ((pes->frame_state==data_len) || ((data[pes->frame_state]==0xFF) && ((data[pes->frame_state+1] & 0xF0) == 0xF0)))) {
 		assert(pes->frame_state<=data_len);
 		/*dispatch frame*/
 		pck.stream = pes;
 		pck.DTS = PTS;
 		pck.PTS = PTS;
 		pck.flags = 0;
-		pck.data = data;
+		pck.data = (char *)data;
 		pck.data_len = pes->frame_state;
 		ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
 		first = 0;
@@ -485,7 +501,7 @@
 			pck.DTS = PTS;
 			pck.PTS = PTS;
 			pck.flags = 0;
-			pck.data = data+start;
+			pck.data = (char *)data+start;
 			pck.data_len = sc_pos-start;
 			ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
 			if (pes->frame_state == pck.data_len) {
@@ -503,7 +519,7 @@
 			return data_len-sc_pos;
 		}
 
-		bs = gf_bs_new(data + sc_pos + 1, 9, GF_BITSTREAM_READ);
+		bs = gf_bs_new((char *)data + sc_pos + 1, 9, GF_BITSTREAM_READ);
 		gf_bs_read_int(bs, 4);
 		hdr.is_mp2 = gf_bs_read_int(bs, 1);
 		gf_bs_read_int(bs, 2);
@@ -557,7 +573,7 @@
 			pck.DTS = pck.PTS = PTS;
 		}
 		pck.flags = GF_M2TS_PES_PCK_AU_START | GF_M2TS_PES_PCK_RAP;
-		pck.data = data + sc_pos + hdr_size;
+		pck.data = (char *)data + sc_pos + hdr_size;
 		pck.data_len = hdr.frame_size - hdr_size;
 
 		if (pck.data_len > data_len - sc_pos - hdr_size) {
@@ -582,8 +598,10 @@
 		}
 		first = 0;
 	}
-	/*we consumed all data*/
-	return 0;
+	/*did we consumed all data ?*/
+	if (data_len==sc_pos) return 0;
+	pes->prev_PTS = PTS;
+	return data_len - sc_pos;
 }
 
 static u32 gf_m2ts_reframe_aac_latm(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len)
@@ -620,7 +638,7 @@
 		amux_len <<= 8;
 		amux_len |= data[sc_pos+2];
 
-		bs = gf_bs_new(data+sc_pos+3, amux_len, GF_BITSTREAM_READ);
+		bs = gf_bs_new((char *)data+sc_pos+3, amux_len, GF_BITSTREAM_READ);
 
 		/*use same stream mux*/
 		if (!gf_bs_read_int(bs, 1)) {
@@ -695,14 +713,14 @@
 				pes->buf_len = size;
 				pes->buf = gf_realloc(pes->buf, sizeof(char)*pes->buf_len);
 			}
-			gf_bs_read_data(bs, pes->buf, size);
+			gf_bs_read_data(bs, (char *)pes->buf, size);
 
 			/*dispatch frame*/
 			pck.stream = pes;
 			pck.DTS = pes->PTS;
 			pck.PTS = pes->PTS;
 			pck.flags = GF_M2TS_PES_PCK_AU_START | GF_M2TS_PES_PCK_RAP;
-			pck.data = pes->buf;
+			pck.data = (char *)pes->buf;
 			pck.data_len = size;
 
 			ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
@@ -739,7 +757,7 @@
 	if (remain) {
 		/*dispatch end of prev frame*/
 		pck.DTS = pck.PTS = PTS;
-		pck.data = data;
+		pck.data = (char *)data;
 		pck.data_len = (remain>data_len) ? data_len : remain;
 		ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
 		if (remain>data_len) {
@@ -752,7 +770,7 @@
 		remain=0;
 	}
 
-	pes->frame_state = gf_mp3_get_next_header_mem(data, data_len, &pos);
+	pes->frame_state = gf_mp3_get_next_header_mem((char *)data, data_len, &pos);
 	if (!pes->frame_state) {
 		/*we did not consumed all data*/
 		return data_len;
@@ -769,7 +787,7 @@
 	while (frame_size <= data_len) {
 		/*dispatch frame*/
 		pck.DTS = pck.PTS = PTS;
-		pck.data = data;
+		pck.data = (char *)data;
 		pck.data_len = frame_size;
 		ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
 
@@ -778,7 +796,7 @@
 		data += frame_size;
 		data_len -= frame_size;
 		if (!data_len) break;
-		pes->frame_state = gf_mp3_get_next_header_mem(data, data_len, &pos);
+		pes->frame_state = gf_mp3_get_next_header_mem((char *)data, data_len, &pos);
 		/*resync (ID3 or error)*/
 		if (!pes->frame_state) {
 			/*we did not consumed all data*/
@@ -793,7 +811,7 @@
 	}
 	if (data_len) {
 		pck.DTS = pck.PTS = PTS;
-		pck.data = data;
+		pck.data = (char *)data;
 		pck.data_len = data_len;
 		ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
 		/*update PTS in case we don't get any update*/
@@ -884,7 +902,8 @@
 	gf_free(sf);
 }
 
-void gf_m2ts_es_del(GF_M2TS_ES *es)
+GF_EXPORT
+void gf_m2ts_es_del(GF_M2TS_ES *es, GF_M2TS_Demuxer *ts)
 {
 	gf_list_del_item(es->program->streams, es);
 
@@ -899,6 +918,10 @@
 
 	} else if (es->pid!=es->program->pmt_pid) {
 		GF_M2TS_PES *pes = (GF_M2TS_PES *)es;
+
+		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->prev_data) gf_free(pes->prev_data);
 		if (pes->buf) gf_free(pes->buf);
@@ -969,7 +992,7 @@
 
 		status = 0;
 		/*parse header*/
-		data = sec->section;
+		data = (u8 *)sec->section;
 
 		/*look for proper table*/
 		table_id = data[0];
@@ -1021,7 +1044,7 @@
 		if (has_syntax_indicator) {
 			/*remove crc32*/
 			sec->length -= 4;
-			if (gf_m2ts_crc32_check(data, sec->length)) {
+			if (gf_m2ts_crc32_check((char *)data, sec->length)) {
 				s32 cur_sec_num;
 				t->version_number = (data[5] >> 1) & 0x1f;
 				if (t->last_section_number && t->section_number && (t->version_number != t->last_version_number)) {
@@ -1351,7 +1374,7 @@
 	nb_sections = gf_list_count(sections);
 	for (i=0; i<nb_sections; i++) {
 		section = (GF_M2TS_Section *)gf_list_get(sections, i);
-		sl_pck.data = section->data;
+		sl_pck.data = (char *)section->data;
 		sl_pck.data_len = section->data_size;
 		sl_pck.stream = (GF_M2TS_ES *)es;
 		sl_pck.version_number = version_number;
@@ -1536,7 +1559,7 @@
 			if (tag == GF_M2TS_MPEG4_IOD_DESCRIPTOR) {
 				u32 size;
 				GF_BitStream *iod_bs;
-				iod_bs = gf_bs_new(data+8, len-2, GF_BITSTREAM_READ);
+				iod_bs = gf_bs_new((char *)data+8, len-2, GF_BITSTREAM_READ);
 				if (pmt->program->pmt_iod) gf_odf_desc_del((GF_Descriptor *)pmt->program->pmt_iod);
 				gf_odf_parse_descriptor(iod_bs , (GF_Descriptor **) &pmt->program->pmt_iod, &size);
 				/*remember program number for service/program selection*/
@@ -1574,6 +1597,7 @@
 		GF_M2TS_PES *pes = NULL;
 		GF_M2TS_SECTION_ES *ses = NULL;
 		GF_M2TS_ES *es = NULL;
+		Bool inherit_pcr = 0;
 		u32 pid, stream_type, reg_desc_format;
 
 		stream_type = data[0];
@@ -1581,25 +1605,31 @@
 		desc_len = ((data[3] & 0xf) << 8) | data[4];
 		reg_desc_format = 0;
 
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("stream_type :%d \n",stream_type));
 		switch (stream_type) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("stream_type :%d \n",stream_type));
+			
 		/* PES */
 		case GF_M2TS_VIDEO_MPEG1:
 		case GF_M2TS_VIDEO_MPEG2:
-		case GF_M2TS_AUDIO_MPEG1:
-		case GF_M2TS_AUDIO_MPEG2:
-		case GF_M2TS_AUDIO_AAC:
-		case GF_M2TS_AUDIO_LATM_AAC:
+		case GF_M2TS_VIDEO_DCII:
 		case GF_M2TS_VIDEO_MPEG4:
 		case GF_M2TS_SYSTEMS_MPEG4_PES:
 		case GF_M2TS_VIDEO_H264:
+		case GF_M2TS_VIDEO_SVC:
 		case GF_M2TS_VIDEO_HEVC:
+			inherit_pcr = 1;
+		case GF_M2TS_AUDIO_MPEG1:
+		case GF_M2TS_AUDIO_MPEG2:
+		case GF_M2TS_AUDIO_AAC:
+		case GF_M2TS_AUDIO_LATM_AAC:
 		case GF_M2TS_AUDIO_AC3:
 		case GF_M2TS_AUDIO_DTS:
 		case GF_M2TS_SUBTITLE_DVB:
 			GF_SAFEALLOC(pes, GF_M2TS_PES);
 			pes->cc = -1;
 			pes->flags = GF_M2TS_ES_IS_PES;
+			if (inherit_pcr) 
+				pes->flags |= GF_M2TS_INHERIT_PCR;
 			es = (GF_M2TS_ES *)pes;
 			break;
 		case GF_M2TS_PRIVATE_DATA:
@@ -1734,7 +1764,10 @@
 				case GF_M2TS_DVB_VBI_DATA_DESCRIPTOR:
 					es->stream_type = GF_M2TS_DVB_VBI;
 					break;
-
+				case GF_M2TS_HIERARCHY_DESCRIPTOR:
+					if (pes)
+						pes->depends_on_pid = (data[4] & 0x3F) + es->program->pmt_pid;
+					break;
 				default:
 					GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] skipping descriptor (0x%x) not supported\n", tag));
 					break;
@@ -1770,7 +1803,7 @@
 				gf_free(es);
 				es = NULL;
 			} else {
-				gf_m2ts_es_del(o_es);
+				gf_m2ts_es_del(o_es, ts);
 				ts->ess[es->pid] = NULL;
 			}
 		}
@@ -2055,7 +2088,7 @@
 				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 = pes->data + len;
+					sl_pck.data = (char *)pes->data + len;
 					sl_pck.data_len = pes->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);
@@ -2067,7 +2100,7 @@
 				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] PES payload size %d but received %d bytes\n", (u32) ( 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 (pes->prev_data_len) {
@@ -2120,6 +2153,7 @@
 			pes->flags &= ~GF_M2TS_ES_IGNORE_NEXT_DISCONTINUITY;
 			disc = 0;
 		}
+			disc = 0;
 		if (disc) {
 			if (hdr->payload_start) {
 				if (pes->data) {
@@ -2151,8 +2185,8 @@
 	} else if (pes->pes_len && (pes->data_len + data_size == pes->pes_len + 6)) {
 		/* 6 = startcode+stream_id+length*/
 		/*reassemble pes*/
-		if (pes->data) pes->data = (char*)gf_realloc(pes->data, pes->data_len+data_size);
-		else pes->data = (char*)gf_malloc(data_size);
+		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;
 		/*force discard*/
@@ -2172,10 +2206,10 @@
 	}
 	/*reassemble*/
 	if (pes->data){
-		pes->data = (char*)gf_realloc(pes->data, pes->data_len+data_size);
+		pes->data = (u8*)gf_realloc(pes->data, pes->data_len+data_size);
 		//fprintf(stderr, "[MPEG-2 TS] REALLOC \n");
 	}else{
-		pes->data = (char*)gf_malloc(data_size);
+		pes->data = (u8*)gf_malloc(data_size);
 	}
 	memcpy(pes->data+pes->data_len, data, data_size);
 	pes->data_len += data_size;
@@ -2283,7 +2317,8 @@
 		gf_m2ts_get_adaptation_field(ts, paf, data+5, af_size, hdr.pid);
 		payload_size = 0;
 		/*no payload and no PCR, return*/
-		if (! paf->PCR_flag) return;
+		if (! paf->PCR_flag) 
+			return;
 		break;
 	/*reserved*/
 	case 0:
@@ -2302,6 +2337,37 @@
 		return;
 	} else {
 		es = ts->ess[hdr.pid];
+		if (paf && paf->PCR_flag) {
+			if (!es) {
+				u32 i, j;
+				for(i=0;i<gf_list_count(ts->programs);i++){
+					GF_M2TS_Program *program = (GF_M2TS_Program *)gf_list_get(ts->programs,i);
+					if(program->pcr_pid != hdr.pid) continue;
+					for (j=0; j<gf_list_count(program->streams); j++) {
+						GF_M2TS_PES *pes = (GF_M2TS_PES *) gf_list_get(program->streams, j);
+						if (pes->flags & GF_M2TS_INHERIT_PCR) {
+							ts->ess[hdr.pid] = (GF_M2TS_ES *) pes;
+							break;
+						}
+					}
+					break;
+				}
+				es = ts->ess[hdr.pid];
+			} 
+			if (es) {
+				GF_M2TS_PES_PCK pck;
+				memset(&pck, 0, sizeof(GF_M2TS_PES_PCK));
+				es->program->before_last_pcr_value = es->program->last_pcr_value;
+				es->program->before_last_pcr_value_pck_number = es->program->last_pcr_value_pck_number;
+				es->program->last_pcr_value_pck_number = ts->pck_number;
+				es->program->last_pcr_value = paf->PCR_base * 300 + paf->PCR_ext;
+				if (!es->program->last_pcr_value) es->program->last_pcr_value =  1;
+				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);
+			}
+		}
 
 		/*check for DVB reserved PIDs*/
 		if (!es) {
@@ -2330,19 +2396,7 @@
 			if (pes->reframe && payload_size) gf_m2ts_process_pes(ts, pes, &hdr, data, payload_size, paf);
 		}
 	}
-	if (paf && paf->PCR_flag && es) {
-		GF_M2TS_PES_PCK pck;
-		memset(&pck, 0, sizeof(GF_M2TS_PES_PCK));
-		es->program->before_last_pcr_value = es->program->last_pcr_value;
-		es->program->before_last_pcr_value_pck_number = es->program->last_pcr_value_pck_number;
-		es->program->last_pcr_value_pck_number = ts->pck_number;
-		es->program->last_pcr_value = paf->PCR_base * 300 + paf->PCR_ext;
-		if (!es->program->last_pcr_value) es->program->last_pcr_value =  1;
-		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);
-	}
+
 	return;
 }
 
@@ -2394,7 +2448,7 @@
 			return GF_OK;
 		}
 		/*process*/		
-		gf_m2ts_process_packet(ts, ts->buffer+pos);
+		gf_m2ts_process_packet(ts, (unsigned char *)ts->buffer+pos);
 		pos += 188;
 	}
 	return GF_OK;
@@ -2537,6 +2591,7 @@
 			pes->reframe = gf_m2ts_reframe_mpeg_audio;
 			break;
 		case GF_M2TS_VIDEO_H264:
+		case GF_M2TS_VIDEO_SVC:
 			pes->reframe = gf_m2ts_reframe_avc_h264;
 			break;
 		case GF_M2TS_VIDEO_HEVC:
@@ -2601,7 +2656,7 @@
 	ts->process_dmscc = 1;
 	
 	temp_dir = gf_get_default_cache_directory();														
-	length = strlen(temp_dir);
+	length = (u32) strlen(temp_dir);
 	if(temp_dir[length-1] == GF_PATH_SEPARATOR){
 		temp_dir[length-1] = 0;
 	}
@@ -2627,7 +2682,7 @@
 	if (ts->tdt_tot) gf_m2ts_section_filter_del(ts->tdt_tot);
 
 	for (i=0; i<GF_M2TS_MAX_STREAMS; i++) {
-		if (ts->ess[i]) gf_m2ts_es_del(ts->ess[i]);
+		if (ts->ess[i]) gf_m2ts_es_del(ts->ess[i], ts);
 	}
 	if (ts->buffer) gf_free(ts->buffer);
 	while (gf_list_count(ts->programs)) {
@@ -2697,8 +2752,9 @@
 
 /* DVB fonction */
 
-static u32 TSDemux_DemuxRun(void *_p)
+static u32 gf_m2ts_demuxer_run(void *_p)
 {
+	u32 i;
 	GF_Err e;
 	char data[UDP_BUFFER_SIZE];
 #ifdef GPAC_HAS_LINUX_DVB
@@ -2719,8 +2775,17 @@
 		}
 	} else
 #endif
-	 if (ts->sock) {
+	if (ts->sock) {
+#ifndef GPAC_DISABLE_STREAMING
+		u16 seq_num;
+		GF_RTPReorder *ch = NULL;
+#endif
+		u32 nb_empty=0;
 		Bool first_run, is_rtp;
+		FILE *record_to = NULL;
+		if (ts->record_to) 
+			record_to = gf_f64_open(ts->record_to, "wb");
+		
 		first_run = 1;
 		is_rtp = 0;
 		while (ts->run_state) {
@@ -2728,7 +2793,11 @@
 			/*m2ts chunks by chunks*/
 			e = gf_sk_receive(ts->sock, data, UDP_BUFFER_SIZE, 0, &size);
 			if (!size || e) {
-				gf_sleep(1);
+				nb_empty++;
+				if (nb_empty==1000) {
+					gf_sleep(1);
+					nb_empty=0;
+				}
 				continue;
 			}
 			if (first_run) {
@@ -2736,25 +2805,55 @@
 				/*FIXME: we assume only simple RTP packaging (no CSRC nor extensions)*/
 				if ((data[0] != 0x47) && ((data[1] & 0x7F) == 33) ) {
 					is_rtp = 1;
+#ifndef GPAC_DISABLE_STREAMING
+					ch = gf_rtp_reorderer_new(100, 500);
+#endif
 				}
 			}
 			/*process chunk*/
 			if (is_rtp) {
+#ifndef GPAC_DISABLE_STREAMING
+				char *pck;				
+				seq_num = ((data[2] << 8) & 0xFF00) | (data[3] & 0xFF);				
+				gf_rtp_reorderer_add(ch, (void *) data, size, seq_num);
+
+				pck = (char *) gf_rtp_reorderer_get(ch, &size);
+				if (pck) {
+					gf_m2ts_process_data(ts, pck+12, size-12);                                   
+					if (record_to)
+						fwrite(data+12, size-12, 1, record_to);				
+					gf_free(pck);
+				}
+#else
 				gf_m2ts_process_data(ts, data+12, size-12);
+				if (record_to)
+					fwrite(data+12, size-12, 1, record_to);
+#endif
+
 			} else {
 				gf_m2ts_process_data(ts, data, size);
+				if (record_to)
+					fwrite(data, size, 1, record_to);
 			}
 		}
-	 } else if (ts->dnload) {
+		if (record_to)
+			fclose(record_to);
+
+#ifndef GPAC_DISABLE_STREAMING
+		if (ch)
+			gf_rtp_reorderer_del(ch);
+#endif
+
+	} else if (ts->dnload) {
 		 while (ts->run_state) { 	 
 			 gf_dm_sess_process(ts->dnload); 	 
 			 gf_sleep(1); 	 
 		 }
-	 } else if (ts->file || ts->ts_data_chunk) {
+	 } else {
 		u32 pos = 0;
 		GF_BitStream *ts_bs = NULL;
 
-		if (ts->segment_switch) {
+		if (ts->segment_switch || (!ts->file && !ts->ts_data_chunk) ) {
 			ts->segment_switch = 0;
 			goto next_segment_setup;
 		} 
@@ -2810,27 +2909,32 @@
 				gf_sleep(3000);
             }
 		}
-		if (!gf_bs_available(ts_bs)) {
-			u32 i;
-			for (i=0; i<GF_M2TS_MAX_STREAMS; i++) {
-				if (ts->ess[i]) {
-					if (ts->ess[i]->flags & GF_M2TS_ES_IS_PES) {
-						gf_m2ts_flush_pes(ts, (GF_M2TS_PES *) ts->ess[i]);
-						ts->on_event(ts, GF_M2TS_EVT_EOS, (GF_M2TS_PES *) ts->ess[i]);
-					} 
-				}
-			}
-			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[M2TSDemux] EOS reached\n"));
-		}
 
 next_segment_setup:
-		gf_bs_del(ts_bs);
-		ts_bs = NULL;
+		if (ts_bs) {
+			pos = (u32) gf_bs_get_position(ts_bs);
+			gf_bs_del(ts_bs);
+			ts_bs = NULL;
+		}
 		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;
-			ts->query_next(ts->query_udta, 0, &next_url, &ts->start_byterange, &ts->end_byterange);
+			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) {
-				gf_m2ts_set_segment_switch(ts);
+				/*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;
@@ -2851,33 +2955,45 @@
 			}
 		}
 	}
+
+	for (i=0; i<GF_M2TS_MAX_STREAMS; i++) {
+		if (ts->ess[i]) {
+			if (ts->ess[i]->flags & GF_M2TS_ES_IS_PES) {
+				gf_m2ts_flush_pes(ts, (GF_M2TS_PES *) ts->ess[i]);
+				ts->on_event(ts, GF_M2TS_EVT_EOS, (GF_M2TS_PES *) ts->ess[i]);
+			} 
+		}
+	}
+	GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[M2TSDemux] EOS reached\n"));
+
 	ts->run_state = 2;
 	return 0;
 }
 
-
-static GF_Err TSDemux_SetupLive(GF_M2TS_Demuxer *ts, char *url)
+GF_EXPORT
+GF_Err gf_m2ts_get_socket(const char *url, const char *mcast_ifce_or_mobileip, u32 buf_size, GF_Socket **out_socket)
 {
-	GF_Err e = GF_OK;
 	char *str;
 	u16 port;
+	GF_Err e;
 	u32 sock_type = 0;
 
+	*out_socket=NULL;
+
 	if (!strnicmp(url, "udp://", 6) || !strnicmp(url, "mpegts-udp://", 13)) {
 		sock_type = GF_SOCK_TYPE_UDP;
 	} else if (!strnicmp(url, "mpegts-tcp://", 13) ) {
 		sock_type = GF_SOCK_TYPE_TCP;
 	} else {
-		e = GF_NOT_SUPPORTED;
-		return e;
+		return GF_NOT_SUPPORTED;
 	}
 
 	url = strchr(url, ':');
 	url += 3;
 
-	ts->sock = gf_sk_new(sock_type);
-	if (!ts->sock) { 
-		return e = GF_IO_ERR;
+	*out_socket = gf_sk_new(sock_type);
+	if (! (*out_socket) ) { 
+		return GF_IO_ERR;
 	}
 
 	/*setup port and src*/
@@ -2892,25 +3008,32 @@
 
 	/*do we have a source ?*/
 	if (strlen(url) && strcmp(url, "localhost") ) {
-		const char *mob_ip = NULL;
-		if (ts->MobileIPEnabled){
-			mob_ip = ts->network_type;
-		}			
-
 		if (gf_sk_is_multicast_address(url)) {
-			mob_ip = ts->network_type;
-			gf_sk_setup_multicast(ts->sock, url, port, 0, 0, (char*)mob_ip);
+			e = gf_sk_setup_multicast(*out_socket, url, port, 0, 0, (char*)mcast_ifce_or_mobileip);
 		} else {
-			gf_sk_bind(ts->sock, (char*)mob_ip, port, url, 0, GF_SOCK_REUSE_PORT);
+			e = gf_sk_bind(*out_socket, (char*)mcast_ifce_or_mobileip, port, url, 0, GF_SOCK_REUSE_PORT);
+		}
+		if (e) {
+			gf_sk_del(*out_socket);
+			*out_socket = NULL;
+			return e;
 		}
 	}
 	if (str) str[0] = ':';
 
-	gf_sk_set_buffer_size(ts->sock, 0, UDP_BUFFER_SIZE);
-	gf_sk_set_block_mode(ts->sock, 0);
+	gf_sk_set_buffer_size(*out_socket, 0, buf_size);
+	gf_sk_set_block_mode(*out_socket, 0);
+	return GF_OK;
+}
+
+static GF_Err gf_m2ts_demuxer_setup_live(GF_M2TS_Demuxer *ts, char *url)
+{
+	GF_Err e;
+	e = gf_m2ts_get_socket(url, ts->network_type, UDP_BUFFER_SIZE, &ts->sock);
+	if (e) return e;
 
 	//gf_th_set_priority(ts->th, GF_THREAD_PRIORITY_HIGHEST);
-	return  TSDemux_DemuxPlay(ts);
+	return gf_m2ts_demuxer_play(ts);
 
 }
 
@@ -3101,7 +3224,7 @@
 	return freq;
 }
 
-GF_Err TSDemux_SetupDVB(GF_M2TS_Demuxer *ts, const char *url)
+GF_Err gf_m2ts_demuxer_setup_dvb(GF_M2TS_Demuxer *ts, const char *url)
 {
 	GF_Err e = GF_OK;
 
@@ -3122,38 +3245,40 @@
 		return GF_SERVICE_ERROR;
 	}
 
-	return  TSDemux_DemuxPlay(ts);
+	return  gf_m2ts_demuxer_play(ts);
 }
 
 #endif
 
-static GF_Err TSDemux_SetupFile(GF_M2TS_Demuxer *ts, char *url)
+static GF_Err gf_m2ts_demuxer_setup_file(GF_M2TS_Demuxer *ts, char *url)
 {
-	if (ts->file && !strcmp(ts->filename, url)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[TSDemux] TS file already being processed: %s\n", url));
-		return GF_IO_ERR;
-	}
-	strcpy(ts->filename, url);
-
-	if (!strncmp(url, "gmem://", 7)) {
-		u32 size;
-		void *mem_address;
-		if (sscanf(url, "gmem://%d@%p", &size, &mem_address) != 2)
-			return GF_IO_ERR;
-		ts->ts_data_chunk_size = size;
-		ts->ts_data_chunk = mem_address;
-	} else {
-
-		ts->file = gf_f64_open(url, "rb"); 
-		if (!ts->file) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[TSDemux] Could not open TS file: %s\n", url));		
+	if (url) {
+		if (ts->file && !strcmp(ts->filename, url)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[TSDemux] TS file already being processed: %s\n", url));
 			return GF_IO_ERR;
 		}
 		strcpy(ts->filename, url);
 
-		gf_f64_seek(ts->file, 0, SEEK_END);
-		ts->file_size = gf_f64_tell(ts->file);
+		if (!strncmp(url, "gmem://", 7)) {
+			u32 size;
+			void *mem_address;
+			if (sscanf(url, "gmem://%d@%p", &size, &mem_address) != 2)
+				return GF_IO_ERR;
+			ts->ts_data_chunk_size = size;
+			ts->ts_data_chunk = mem_address;
+		} else {
+
+			ts->file = gf_f64_open(url, "rb"); 
+			if (!ts->file) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[TSDemux] Could not open TS file: %s\n", url));		
+				return GF_IO_ERR;
+			}
+			strcpy(ts->filename, url);
+
+			gf_f64_seek(ts->file, 0, SEEK_END);
+			ts->file_size = gf_f64_tell(ts->file);
 
+		}
 	}
 
 	/* reinitialization for seek */
@@ -3162,27 +3287,20 @@
 
 	ts->start_byterange = ts->end_byterange = 0;
 	if (ts->query_next) {
-		ts->query_next(ts->query_udta, 1, NULL, &ts->start_byterange, &ts->end_byterange);
+		ts->query_next(ts->query_udta, 0, NULL, &ts->start_byterange, &ts->end_byterange, NULL);
 	}
 
 
-	return  TSDemux_DemuxPlay(ts);
+	return  gf_m2ts_demuxer_play(ts);
 
 }
 
 GF_EXPORT
-GF_Err TSDemux_Demux_Setup(GF_M2TS_Demuxer *ts, const char *url, Bool loop)
+GF_Err gf_m2ts_demuxer_setup(GF_M2TS_Demuxer *ts, const char *url, Bool loop)
 {
 	char szURL[2048];
 	char *frag;
 	
-	if(!url){
-	  return GF_IO_ERR;
-	}
-	strcpy(szURL, url);
-	frag = strrchr(szURL, '#');
-	if (frag) frag[0] = 0;
-
 	ts->file_regulate = 0;
 	ts->duration = 0;
 
@@ -3191,26 +3309,34 @@
       GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("Loop Mode activated \n"));
     }
 
+	if (!url) {
+	  return gf_m2ts_demuxer_setup_file(ts, NULL);
+	}
+
+	strcpy(szURL, url);
+	frag = strrchr(szURL, '#');
+	if (frag) frag[0] = 0;
+
 	if (!strnicmp(url, "udp://", 6)
 		|| !strnicmp(url, "mpegts-udp://", 13)
 		|| !strnicmp(url, "mpegts-tcp://", 13)
 		) {
-		return TSDemux_SetupLive(ts, (char *) szURL);
+		return gf_m2ts_demuxer_setup_live(ts, (char *) szURL);
 	}
 #ifdef GPAC_HAS_LINUX_DVB
 	else if (!strnicmp(url, "dvb://", 6)) {
-		return TSDemux_SetupDVB(ts, (char *) szURL);
+		return gf_m2ts_demuxer_setup_dvb(ts, (char *) szURL);
 	}
 #endif
 	else {
-	  return TSDemux_SetupFile(ts, (char *) szURL);
+	  return gf_m2ts_demuxer_setup_file(ts, (char *) szURL);
 	}
 
 	return GF_NOT_SUPPORTED;
 }
 
 GF_EXPORT
-GF_Err TSDemux_CloseDemux(GF_M2TS_Demuxer *ts)
+GF_Err gf_m2ts_demuxer_close(GF_M2TS_Demuxer *ts)
 {
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[TSDemux] Destroying demuxer\n"));
 	if (ts->th) {
@@ -3230,21 +3356,21 @@
 }
 
 GF_EXPORT
-GF_Err TSDemux_DemuxPlay(GF_M2TS_Demuxer *ts){
+GF_Err gf_m2ts_demuxer_play(GF_M2TS_Demuxer *ts){
 
 	/*set the state variable outside the TS thread. If inside, we may get called for shutdown before the TS thread has started
 	and we would overwrite the run_state when entering the TS thread, which would make the thread run forever and the stop() wait forever*/
 	ts->run_state = 1;
 	if(ts->th){
 		/*start playing for tune-in*/
-		return gf_th_run(ts->th, TSDemux_DemuxRun, ts);
+		return gf_th_run(ts->th, gf_m2ts_demuxer_run, ts);
 	}else{
-		return TSDemux_DemuxRun(ts);
+		return gf_m2ts_demuxer_run(ts);
 	}
 
 }
 
-
+GF_EXPORT
 Bool gf_m2ts_probe_file(const char *fileName)
 {
 	char buf[188];
@@ -3269,7 +3395,7 @@
 
 	t = gf_f64_open(fileName, "rb");
 	while (t && count) {
-		u32 read = fread(buf, 1, 188, t);
+		u32 read = (u32) fread(buf, 1, 188, t);
 		if (!read) {
 			count = 0;
 			break;
@@ -3313,13 +3439,13 @@
 	pcr_mod = 0x80000000;
 	pcr_mod*=4;
 	while (done + 188 <= size) {
-		char *pesh;
+		u8 *pesh;
 		u8 *pck;
 		u64 pcr_base=0, pcr_ext=0;
 		u16 pid;
 		u8 adaptation_field, adaptation_field_length;
 
-		pck = buffer+done;
+		pck = (u8*) buffer+done;
 		if (pck[0]!=0x47) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TS Restamp] Invalid sync byte %X\n", pck[0]));
 			return GF_NON_COMPLIANT_BITSTREAM;

gpac-0.5.0.svn4296.tar.bz2/src/media_tools/saf.c -> gpac-0.5.0.svn4668.tar.bz2/src/media_tools/saf.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/media_tools/text_import.c -> gpac-0.5.0.svn4668.tar.bz2/src/media_tools/text_import.c Changed

@@ -45,7 +45,7 @@
 };
 
 #define REM_TRAIL_MARKS(__str, __sep) while (1) {	\
-		u32 _len = strlen(__str);		\
+		u32 _len = (u32) strlen(__str);		\
 		if (!_len) break;	\
 		_len--;				\
 		if (strchr(__sep, __str[_len])) __str[_len] = 0;	\
@@ -53,11 +53,11 @@
 	}	\
 
 
-static s32 gf_text_get_utf_type(FILE *in_src)
+s32 gf_text_get_utf_type(FILE *in_src)
 {
 	u32 readen;
 	unsigned char BOM[5];
-	readen = fread(BOM, sizeof(char), 5, in_src);
+	readen = (u32) fread(BOM, sizeof(char), 5, in_src);
 	if (readen < 1)
 		return -1;
 
@@ -95,12 +95,12 @@
 	if (uni_type>1) {
 		const u16 *sptr;
 		char szUTF[1024];
-		u32 read = fread(szUTF, 1, 1023, test);
+		u32 read = (u32) fread(szUTF, 1, 1023, test);
 		szUTF[read]=0;
 		sptr = (u16*)szUTF;
-		read = gf_utf8_wcstombs(szLine, read, &sptr);
+		read = (u32) gf_utf8_wcstombs(szLine, read, &sptr);
 	} else {
-		val = fread(szLine, 1, 1024, test);
+		val = (u32) fread(szLine, 1, 1024, test);
 		szLine[val]=0;
 	}
 	REM_TRAIL_MARKS(szLine, "\r\n\t ")
@@ -177,7 +177,7 @@
 }
 #endif
 
-static char *gf_text_get_utf8_line(char *szLine, u32 lineSize, FILE *txt_in, s32 unicode_type)
+char *gf_text_get_utf8_line(char *szLine, u32 lineSize, FILE *txt_in, s32 unicode_type)
 {
 	u32 i, j, len;
 	char *sOK;
@@ -189,7 +189,7 @@
 	if (!sOK) return NULL;
 	if (unicode_type<=1) {
 		j=0;
-		len = strlen(szLine);
+		len = (u32) strlen(szLine);
 		for (i=0; i<len; i++) {
 			if (!unicode_type && (szLine[i] & 0x80)) {
 				/*non UTF8 (likely some win-CP)*/
@@ -241,7 +241,7 @@
 		}
 	}
 	sptr = (u16 *)szLine;
-	i = gf_utf8_wcstombs(szLineConv, 1024, (const unsigned short **) &sptr);
+	i = (u32) gf_utf8_wcstombs(szLineConv, 1024, (const unsigned short **) &sptr);
 	szLineConv[i] = 0;
 	strcpy(szLine, szLineConv);
 	/*this is ugly indeed: since input is UTF16-LE, there are many chances the fgets never reads the \0 after a \n*/
@@ -388,13 +388,13 @@
 	end = prev_end = 0;
 	curLine = 0;
 	txt_line = 0;
-	set_start_char = set_end_char = 0;
+	set_start_char = set_end_char = GF_FALSE;
 	char_len = 0;
 	start = 0;
 	nb_samp = 0;
 	samp = gf_isom_new_text_sample();
 
-	first_samp = 1;
+	first_samp = GF_TRUE;
 	while (1) {
 		char *sOK = gf_text_get_utf8_line(szLine, 2048, srt_in, unicode_type);
 
@@ -427,7 +427,7 @@
 				}
 				txt_line = 0;
 				char_len = 0;
-				set_start_char = set_end_char = 0;
+				set_start_char = set_end_char = GF_FALSE;
 				rec.startCharOffset = rec.endCharOffset = 0;
 				gf_isom_text_reset(samp);
 
@@ -484,7 +484,7 @@
 
 		default:
 			/*reset only when text is present*/
-			first_samp = 0;
+			first_samp = GF_FALSE;
 
 			/*go to line*/
 			if (txt_line) {
@@ -493,11 +493,14 @@
 			}
 
 			ptr = (char *) szLine;
-			len = gf_utf8_mbstowcs(uniLine, 5000, (const char **) &ptr);
-			if (len == (u32) -1) {
+			{
+				size_t _len = gf_utf8_mbstowcs(uniLine, 5000, (const char **) &ptr);
+			if (_len == (size_t) -1) {
 				e = gf_import_message(import, GF_CORRUPTED_DATA, "Invalid UTF data (line %d)", curLine);
 				goto exit;
 			}
+			len = (u32) _len;
+			}
 			char_line = 0;
 			i=j=0;
 			rem_styles = 0;
@@ -508,7 +511,7 @@
 					if (set_end_char) {
 						assert(set_start_char);
 						gf_isom_text_add_style(samp, &rec);
-						set_end_char = set_start_char = 0;
+						set_end_char = set_start_char = GF_FALSE;
 						rec.style_flags &= ~rem_styles;
 						rem_styles = 0;
 					}
@@ -519,17 +522,17 @@
 					switch (uniLine[i+1]) {
 					case 'b': case 'B': 
 						rec.style_flags |= GF_TXT_STYLE_BOLD; 
-						set_start_char = 1;
+						set_start_char = GF_TRUE;
 						rec.startCharOffset = char_len + j;
 						break;
 					case 'i': case 'I': 
 						rec.style_flags |= GF_TXT_STYLE_ITALIC; 
-						set_start_char = 1;
+						set_start_char = GF_TRUE;
 						rec.startCharOffset = char_len + j;
 						break;
 					case 'u': case 'U': 
 						rec.style_flags |= GF_TXT_STYLE_UNDERLINED; 
-						set_start_char = 1;
+						set_start_char = GF_TRUE;
 						rec.startCharOffset = char_len + j;
 						break;
 					}
@@ -542,17 +545,17 @@
 					switch (uniLine[i+2]) {
 					case 'b': case 'B': 
 						rem_styles |= GF_TXT_STYLE_BOLD; 
-						set_end_char = 1;
+						set_end_char = GF_TRUE;
 						rec.endCharOffset = char_len + j;
 						break;
 					case 'i': case 'I': 
 						rem_styles |= GF_TXT_STYLE_ITALIC; 
-						set_end_char = 1;
+						set_end_char = GF_TRUE;
 						rec.endCharOffset = char_len + j;
 						break;
 					case 'u': case 'U': 
 						rem_styles |= GF_TXT_STYLE_UNDERLINED; 
-						set_end_char = 1;
+						set_end_char = GF_TRUE;
 						rec.endCharOffset = char_len + j;
 						break;
 					}
@@ -562,8 +565,8 @@
 				/*store style*/
 				if (set_end_char) {
 					gf_isom_text_add_style(samp, &rec);
-					set_end_char = 0;
-					set_start_char = 1;
+					set_end_char = GF_FALSE;
+					set_start_char = GF_TRUE;
 					rec.startCharOffset = char_len + j;
 					rec.style_flags &= ~rem_styles;
 					rem_styles = 0;
@@ -576,8 +579,8 @@
 			/*store last style*/
 			if (set_end_char) {
 				gf_isom_text_add_style(samp, &rec);
-				set_end_char = 0;
-				set_start_char = 1;
+				set_end_char = GF_FALSE;
+				set_start_char = GF_TRUE;
 				rec.startCharOffset = char_len + j;
 				rec.style_flags &= ~rem_styles;
 				rem_styles = 0;
@@ -587,7 +590,7 @@
 			uniText[j] = 0;
 
 			sptr = (u16 *) uniText;
-			len = gf_utf8_wcstombs(szText, 5000, (const u16 **) &sptr);
+			len = (u32) gf_utf8_wcstombs(szText, 5000, (const u16 **) &sptr);
 
 			gf_isom_text_add_text(samp, szText, len);
 			char_len += char_line;
@@ -610,248 +613,133 @@
 	return e;
 }
 
+typedef struct {
+    GF_MediaImporter *import;
+    u32 timescale;
+    u32 track;
+    u32 descriptionIndex;
+} GF_WebVTTISOFlusher;
 
-static GF_Err gf_text_import_webvtt(GF_MediaImporter *import)
+static GF_Err gf_webvtt_import_report(void *user, GF_Err e, char *message, const char *line)
 {
-    FILE                        *vtt_in;
-    u32                         track;
-    u32                         timescale;
-    u32                         i;
-    u32                         count;
-    GF_GenericSubtitleConfig    *cfg;
-    GF_Err                      e;
-    GF_GenericSubtitleSample    *samp;
-    GF_ISOSample                *s;
-    u32                         sh;
-    u32                         sm;
-    u32                         ss;
-    u32                         sms;
-    u32                         eh;
-    u32                         em;
-    u32                         es;
-    u32                         ems;
-    u32                         txt_line;
-    u32                         nb_samp;
-    u32                         duration;
-    Bool                        first_samp;
-    u64                         start;
-    u64                         end;
-    u64                         prev_end;
-    u64                         file_size;
-    u32                         state;
-    u32                         len;
-    u32                         ID;
-    u32                         OCR_ES_ID;
-    s32                         unicode_type;
-    char                        szLine[2048];
-    char                        szSettings[2048];
-    char                        *ptr;
-    unsigned short              uniLine[5000];
-    char                        *sOK;
-    u32                         curCue;
-    char                        *content_encoding = NULL;
-    char                        *xml_schema_loc = NULL;
-    char                        *mime_ns = "text/vtt";
-    Bool                        is_xml = 0;
-
-	vtt_in = gf_f64_open(import->in_name, "rt");
-	gf_f64_seek(vtt_in, 0, SEEK_END);
-	file_size = gf_f64_tell(vtt_in);
-	gf_f64_seek(vtt_in, 0, SEEK_SET);
-
-	unicode_type = gf_text_get_utf_type(vtt_in);
-	if (unicode_type<0) {
-		fclose(vtt_in);
-		return gf_import_message(import, GF_NOT_SUPPORTED, "Unsupported WebVTT UTF encoding");
-	}
+    GF_WebVTTISOFlusher     *flusher = (GF_WebVTTISOFlusher *)user;
+    return gf_import_message(flusher->import, e, message, line);
+}
 
-	cfg = NULL;
+static void gf_webvtt_import_header(void *user, const char *config)
+{
+    GF_WebVTTISOFlusher     *flusher = (GF_WebVTTISOFlusher *)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_webvtt_dump_sample(stdout, samp);
+    s = gf_isom_webvtt_to_sample(samp);
+    if (s) {
+        s->DTS = (u64) (flusher->timescale*gf_webvtt_sample_get_start(samp)/1000);
+        s->IsRAP = 1;
+        gf_isom_add_sample(flusher->import->dest, flusher->track, flusher->descriptionIndex, s);
+        gf_isom_sample_del(&s);
+    }
+    gf_webvtt_sample_del(samp);
+}
+
+static GF_Err gf_text_import_webvtt(GF_MediaImporter *import)
+{
+	GF_Err						e;
+	u32							track;
+	u32							timescale;
+	u32							duration;
+	u32							descIndex;
+	u32							ID;
+	u32							OCR_ES_ID;
+	GF_GenericSubtitleConfig	*cfg;
+	GF_WebVTTParser				*vttparser;
+	GF_WebVTTISOFlusher			flusher;
+
+	cfg	= NULL;
 	if (import->esd) {
-		if (!import->esd->slConfig) {
-			import->esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
-			import->esd->slConfig->predefined = 2;
+		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;
+		timescale =	import->esd->slConfig->timestampResolution;
+		if (!timescale)	timescale =	1000;
 
-		/*explicit text config*/
+		/*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;
+			cfg	= (GF_GenericSubtitleConfig	*) import->esd->decoderConfig->decoderSpecificInfo;
+			import->esd->decoderConfig->decoderSpecificInfo	= NULL;
 		}
 		ID = import->esd->ESID;
-		OCR_ES_ID = import->esd->OCRESID;
+		OCR_ES_ID =	import->esd->OCRESID;
 	} else {
-		timescale = 1000;
-		OCR_ES_ID = ID = 0;
+		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_SUBM, timescale);
-	if (!track) {
-		fclose(vtt_in);
+	if (cfg	&& cfg->timescale) timescale = cfg->timescale;
+	track =	gf_isom_new_track(import->dest,	ID,	GF_ISOM_MEDIA_TEXT,	timescale);
+	if (!track)	{
 		return gf_import_message(import, gf_isom_last_error(import->dest), "Error creating WebVTT track");
 	}
-	gf_isom_set_track_enabled(import->dest, track, 1);
-	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);
+	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 (OCR_ES_ID) gf_isom_set_track_reference(import->dest, track,	GF_ISOM_REF_OCR, OCR_ES_ID);
 
-	/*setup track*/
+	/*setup	track*/
 	if (cfg) {
-		/*set track info*/
-		gf_isom_set_track_layout_info(import->dest, track, cfg->text_width<<16, cfg->text_height<<16, 0, 0, cfg->layer);
+		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_GenericSubtitleSampleDescriptor *sd= (GF_GenericSubtitleSampleDescriptor *)gf_list_get(cfg->sample_descriptions, i);
-			gf_isom_new_generic_subtitle_description(import->dest, track, content_encoding, xml_schema_loc, mime_ns, is_xml, NULL, NULL, &state);
+		count =	gf_list_count(cfg->sample_descriptions);
+		for	(i=0; i<count; i++)	{
+			gf_isom_new_webvtt_description(import->dest, track, NULL, NULL, NULL, &descIndex);
 		}
-		gf_import_message(import, GF_OK, "WebVTT import - text track %d x %d", cfg->text_width, cfg->text_height);
+		gf_import_message(import, GF_OK, "WebVTT import	- text track %d	x %d", cfg->text_width,	cfg->text_height);
 		gf_odf_desc_del((GF_Descriptor *)cfg);
 	} else {
-		u32                     w;
-        u32                     h;
+		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_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_generic_subtitle_description(import->dest, track, content_encoding, xml_schema_loc, mime_ns, is_xml, NULL, NULL, &state);
+		gf_isom_new_webvtt_description(import->dest, track,	NULL, NULL,	NULL, &descIndex);
 		
-        gf_import_message(import, GF_OK, "WebVTT import");
+		gf_import_message(import, GF_OK, "WebVTT import");
 	}
 	gf_text_import_set_language(import, track);
 	duration = (u32) (((Double) import->duration)*timescale/1000.0);
 
-	e           = GF_OK;
-	state       = 0;
-	end         = 0;
-    prev_end    = 0;
-	txt_line    = 0;
-	start       = 0;
-	nb_samp     = 0;
-    curCue      = 0;
-	samp        = gf_isom_new_generic_subtitle_sample();
-
-	sOK = gf_text_get_utf8_line(szLine, 2048, vtt_in, unicode_type);
-    len = strlen(szLine);
-	if (len < 6 || strnicmp(szLine, "WEBVTT", 6)) {
-		e = gf_import_message(import, GF_CORRUPTED_DATA, "Bad WebVTT formatting - expecting WEBVTT file signature", szLine);
-		goto exit;
-	} else if (len > 6) {
-        /* ignore additional text on the same line as WEBVTT file signature */
+    vttparser = gf_webvtt_parser_new();
+    flusher.import = import;
+    flusher.timescale = timescale;
+    flusher.track = track;
+    flusher.descriptionIndex = descIndex;
+    e = gf_webvtt_parser_init(vttparser, import->in_name, &flusher, gf_webvtt_import_report, gf_webvtt_flush_sample_to_iso, gf_webvtt_import_header);
+    if (e != GF_OK) {
+        gf_webvtt_parser_del(vttparser);
+        return gf_import_message(import, GF_NOT_SUPPORTED, "Unsupported WebVTT UTF encoding");
     }
-	gf_isom_generic_subtitle_sample_add_text(samp, szLine, len);
-	txt_line ++;
-    gf_isom_generic_subtitle_sample_add_text(samp, "\n", 1);
-	txt_line ++;
-
-	first_samp = 1;
-	while (1) {
-		sOK = gf_text_get_utf8_line(szLine, 2048, vtt_in, unicode_type);
-		if (sOK) REM_TRAIL_MARKS(szLine, "\r\n\t ")
-		if (!sOK || !strlen(szLine)) {
-			state = 0;
-			if (txt_line) {
-				if (prev_end && (start > prev_end)) {
-					GF_GenericSubtitleSample * empty_samp = gf_isom_new_generic_subtitle_sample();
-					s = gf_isom_generic_subtitle_to_sample(empty_samp);
-					gf_isom_delete_generic_subtitle_sample(empty_samp);
-					s->DTS = (u64) ((timescale*prev_end)/1000);
-					s->IsRAP = 1;
-					e = gf_isom_add_sample(import->dest, track, 1, s);
-					gf_isom_sample_del(&s);
-					nb_samp++;
-				}
-
-				s = gf_isom_generic_subtitle_to_sample(samp);
-				s->DTS = (u64) ((timescale*start)/1000);
-				s->IsRAP = 1;
-				e = gf_isom_add_sample(import->dest, track, 1, s);
-				gf_isom_sample_del(&s);
-				nb_samp++;
-				txt_line = 0;
-				prev_end = end;
-				gf_isom_generic_subtitle_reset(samp);
-
-				//gf_import_progress(import, nb_samp, nb_samp+1);
-				gf_set_progress("Importing WebVTT", gf_f64_tell(vtt_in), file_size);
-				if (duration && (end >= duration)) break;
-			}
-			if (!sOK) break;
-			continue;
-		}
-
-		switch (state) {
-		case 0:
-            if (!strstr(szLine, "-->")) {
-                /*cue id = szLine */
-                state = 1;
-			    gf_isom_generic_subtitle_sample_add_text(samp, szLine, strlen(szLine));
-			    txt_line ++;
-                gf_isom_generic_subtitle_sample_add_text(samp, "\n", 1);
-			    txt_line ++;
-                break;
-            }
-
-        case 1:
-            /* TODO: fix the parsing of time stamps to be compliant */
-			if (sscanf(szLine, "%u:%u:%u.%u --> %u:%u:%u.%u %s", &sh, &sm, &ss, &sms, &eh, &em, &es, &ems, szSettings) < 8) {
-				e = gf_import_message(import, GF_CORRUPTED_DATA, "Error scanning WebVTT cue timing for cue %d", curCue);
-				goto exit;
-			} else {
-                /* ignore cue settings */
-            }
-            curCue++;
-			start = (3600*sh + 60*sm + ss)*1000 + sms;
-			end = (3600*eh + 60*em + es)*1000 + ems;
-			/*make stream start at 0 by inserting a fake AU*/
-			if (first_samp && (start>0)) {
-				s = gf_isom_generic_subtitle_to_sample(samp);
-				s->DTS = 0;
-				gf_isom_add_sample(import->dest, track, 1, s);
-				gf_isom_sample_del(&s);
-				nb_samp++;
-			}
-			gf_isom_generic_subtitle_sample_add_text(samp, szLine, strlen(szLine));
-			txt_line ++;
-            gf_isom_generic_subtitle_sample_add_text(samp, "\n", 1);
-			txt_line ++;
-			state = 2;
-			break;
-
-		default: /*state = 2 */
-			/*reset only when text is present*/
-			first_samp = 0;
-
-			ptr = (char *) szLine;
-			len = gf_utf8_mbstowcs(uniLine, 5000, (const char **) &ptr);
-			if (len == (u32) -1) {
-				e = gf_import_message(import, GF_CORRUPTED_DATA, "Invalid UTF data in cue %d", curCue);
-				goto exit;
-			}
-			gf_isom_generic_subtitle_sample_add_text(samp, szLine, len);
-			txt_line ++;
-            gf_isom_generic_subtitle_sample_add_text(samp, "\n", 1);
-			txt_line ++;
-			break;
-		}
-		if (duration && (start >= duration)) break;
-	}
-
-	gf_isom_delete_generic_subtitle_sample(samp);
-	/*do not add any empty sample at the end since it modifies track duration and is not needed - it is the player job
-	to figure out when to stop displaying the last text sample
-	However update the last sample duration*/
-	gf_isom_set_last_sample_duration(import->dest, track, (u32) (end-start) );
-	gf_set_progress("Importing WebVTT", nb_samp, nb_samp);
-
-exit:
-	if (e) gf_isom_remove_track(import->dest, track);
-	fclose(vtt_in);
-	return e;
+    e = gf_webvtt_parser_parse(vttparser, duration);
+    if (e != GF_OK) {
+        gf_isom_remove_track(import->dest, track);
+    }
+    /*do not add any empty sample at the end since it modifies track duration and is not needed - it is the player job
+    to figure out when to stop displaying the last text sample
+    However update the last sample duration*/
+    gf_isom_set_last_sample_duration(import->dest, track, (u32) gf_webvtt_parser_last_duration(vttparser));
+    gf_webvtt_parser_del(vttparser);
+    return e;
 }
 
 static GF_Err gf_text_import_sub(GF_MediaImporter *import)
@@ -989,7 +877,7 @@
 	start = end = prev_end = 0;
 
 	line = 0;
-	first_samp = 1;
+	first_samp = GF_TRUE;
 	while (1) {
 		char *sOK = gf_text_get_utf8_line(szLine, 2048, sub_in, unicode_type);
 		if (!sOK) break;
@@ -997,7 +885,7 @@
 		REM_TRAIL_MARKS(szLine, "\r\n\t ")
 
 		line++;
-		len = strlen(szLine); 
+		len = (u32) strlen(szLine); 
 		if (!len) continue;
 
 		i=0;
@@ -1036,7 +924,7 @@
 			s->IsRAP = 1;
 			gf_isom_add_sample(import->dest, track, 1, s);
 			gf_isom_sample_del(&s);
-			first_samp = 0;
+			first_samp = GF_FALSE;
 			nb_samp++;
 		}
 
@@ -1048,7 +936,7 @@
 			}
 		}
 		szText[i-j] = 0;
-		gf_isom_text_add_text(samp, szText, strlen(szText) );
+		gf_isom_text_add_text(samp, szText, (u32) strlen(szText) );
 
 		if (prev_end) {
 			GF_TextSample * empty_samp = gf_isom_new_text_sample();
@@ -1146,7 +1034,7 @@
 {
 	u32 i=0;
 	u32 k=0;
-	u32 len = strlen(str);
+	u32 len = (u32) strlen(str);
 	u32 state = 0;
 
 	if (!strip_lines) {
@@ -1244,7 +1132,7 @@
 
 	gf_import_message(import, GF_OK, "Timed Text (GPAC TTXT) Import");
 
-	last_sample_empty = 0;
+	last_sample_empty = GF_FALSE;
 	last_sample_duration = 0;
 	nb_descs = 0;
 	nb_samples = 0;
@@ -1371,7 +1259,7 @@
 			GF_ISOSample *s;
 			GF_TextSample * samp;
 			u32 ts, descIndex;
-			Bool has_text = 0;
+			Bool has_text = GF_FALSE;
 			if (!nb_descs) {
 				e = gf_import_message(import, GF_BAD_PARAM, "Invalid Timed Text file - text stream header not found or empty");
 				goto exit;
@@ -1379,7 +1267,7 @@
 			samp = gf_isom_new_text_sample();
 			ts = 0;
 			descIndex = 1;
-			last_sample_empty = 0;
+			last_sample_empty = GF_FALSE;
 
 			j=0;
 			while ( (att=(GF_XMLAttribute*)gf_list_enum(node->attributes, &j))) {
@@ -1394,11 +1282,11 @@
 				else if (!strcmp(att->name, "sampleDescriptionIndex")) descIndex = atoi(att->value);
 				else if (!strcmp(att->name, "text")) {
 					u32 len;
-					char *str = ttxt_parse_string(import, att->value, 1);
-					len = strlen(str);
+					char *str = ttxt_parse_string(import, att->value, GF_TRUE);
+					len = (u32) strlen(str);
 					gf_isom_text_add_text(samp, str, len);
-					last_sample_empty = len ? 0 : 1;
-					has_text = 1;
+					last_sample_empty = len ? GF_FALSE : GF_TRUE;
+					has_text = GF_TRUE;
 				}
 				else if (!strcmp(att->name, "scrollDelay")) gf_isom_text_set_scroll_delay(samp, (u32) (1000*atoi(att->value)));
 				else if (!strcmp(att->name, "highlightColor")) gf_isom_text_set_highlight_color_argb(samp, ttxt_get_color(import, att->value));
@@ -1410,11 +1298,11 @@
 			while ( (ext=(GF_XMLNode*)gf_list_enum(node->content, &j))) {
 				if (!has_text && (ext->type==GF_XML_TEXT_TYPE)) {
 					u32 len;
-					char *str = ttxt_parse_string(import, ext->name, 0);
-					len = strlen(str);
+					char *str = ttxt_parse_string(import, ext->name, GF_FALSE);
+					len = (u32) strlen(str);
 					gf_isom_text_add_text(samp, str, len);
-					last_sample_empty = len ? 0 : 1;
-					has_text = 1;
+					last_sample_empty = len ? GF_FALSE : GF_TRUE;
+					has_text = GF_TRUE;
 				}
 				if (ext->type) continue;
 
@@ -1670,16 +1558,16 @@
 		if (node->type) continue;
 		if (strcmp(node->name, "sample")) continue;
 
-		isRAP = 0;
+		isRAP = GF_FALSE;
 		duration = 1000;
 		j=0;
 		while ((att=(GF_XMLAttribute *)gf_list_enum(node->attributes, &j))) {
 			if (!strcmp(att->name, "duration")) duration = atoi(att->value);
-			else if (!strcmp(att->name, "keyframe")) isRAP = !stricmp(att->value, "true");
+			else if (!strcmp(att->name, "keyframe")) isRAP = (!stricmp(att->value, "true") ? GF_TRUE : GF_FALSE);
 		}
 		nb_styles = 0;
 		nb_marks = 0;
-		same_style = same_box = 0;
+		same_style = same_box = GF_FALSE;
 		descIndex = 1;
 		j=0;
 		while ((desc=(GF_XMLNode*)gf_list_enum(node->content, &j))) {
@@ -1707,12 +1595,12 @@
 					}
 					else if (!strcmp(att->name, "backgroundColor")) td.back_color = tx3g_get_color(import, att->value);
 					else if (!strcmp(att->name, "displayFlags")) {
-						Bool rev_scroll = 0;
+						Bool rev_scroll = GF_FALSE;
 						if (strstr(att->value, "scroll")) {
 							u32 scroll_mode = 0;
 							if (strstr(att->value, "scrollIn")) td.displayFlags |= GF_TXT_SCROLL_IN;
 							if (strstr(att->value, "scrollOut")) td.displayFlags |= GF_TXT_SCROLL_OUT;
-							if (strstr(att->value, "reverse")) rev_scroll = 1;
+							if (strstr(att->value, "reverse")) rev_scroll = GF_TRUE;
 							if (strstr(att->value, "horizontal")) scroll_mode = rev_scroll ? GF_TXT_SCROLL_RIGHT : GF_TXT_SCROLL_MARQUEE;
 							else scroll_mode = (rev_scroll ? GF_TXT_SCROLL_DOWN : GF_TXT_SCROLL_CREDITS);
 							td.displayFlags |= (scroll_mode<<7) & GF_TXT_SCROLL_DIRECTION;
@@ -1805,7 +1693,7 @@
 				gf_isom_text_has_similar_description(import->dest, track, &td, &descIndex, &same_box, &same_style);
 				if (!descIndex) {
 					gf_isom_new_text_description(import->dest, track, &td, NULL, NULL, &descIndex);
-					same_style = same_box = 1;
+					same_style = same_box = GF_TRUE;
 				}
 
 				for (k=0; k<td.font_count; k++) gf_free(td.fonts[k].fontName);
@@ -1855,8 +1743,8 @@
 									nb_marks++;
 								}
 							} else if (text->type==GF_XML_TEXT_TYPE) {
-								txt_len += strlen(text->name);
-								gf_isom_text_add_text(samp, text->name, strlen(text->name));
+								txt_len += (u32) strlen(text->name);
+								gf_isom_text_add_text(samp, text->name, (u32) strlen(text->name));
 							}
 						}
 						if (styleID && (!same_style || (td.default_style.startCharOffset != styleID))) {
@@ -1964,6 +1852,7 @@
 		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;

gpac-0.5.0.svn4668.tar.bz2/src/media_tools/webvtt.c Added

@@ -0,0 +1,1578 @@
+/*
+ *          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_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;
+    u64 end;
+    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
+    GF_StringBox *id;
+    GF_StringBox *time;
+    GF_StringBox *settings;
+    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) {
+    ISOM_DECL_BOX_ALLOC(GF_StringBox, type);
+    if (string) tmp->string = gf_strdup(string);
+    return (GF_Box *)tmp;
+}
+
+GF_Box *vtcu_New() 
+{
+    ISOM_DECL_BOX_ALLOC(GF_VTTCueBox, GF_ISOM_BOX_TYPE_VTCU);
+    return (GF_Box *)tmp;
+}
+
+GF_Box *vtte_New() {
+    ISOM_DECL_BOX_ALLOC(GF_Box, GF_ISOM_BOX_TYPE_VTTE);
+    return (GF_Box *)tmp;
+}
+
+GF_Box *wvtt_New() 
+{
+    ISOM_DECL_BOX_ALLOC(GF_WebVTTSampleEntryBox, GF_ISOM_BOX_TYPE_WVTT);
+    return (GF_Box *)tmp;
+}
+
+void boxstring_del(GF_Box *s)
+{
+    GF_StringBox *box = (GF_StringBox *)s;
+    if (box->string) gf_free(box->string);
+    gf_free(box);
+}
+
+void vtcu_del(GF_Box *s) 
+{
+    GF_VTTCueBox *box = (GF_VTTCueBox *)s;
+    if (box->id) gf_isom_box_del((GF_Box *)box->id);
+    if (box->settings) gf_isom_box_del((GF_Box *)box->settings);
+    if (box->payload) gf_isom_box_del((GF_Box *)box->payload);
+}
+
+void vtte_del(GF_Box *s)
+{
+    gf_free(s);
+}
+
+void wvtt_del(GF_Box *s)
+{
+    GF_WebVTTSampleEntryBox *wvtt = (GF_WebVTTSampleEntryBox *)s;
+    if (wvtt->config) gf_isom_box_del((GF_Box *)wvtt->config);
+    gf_free(s);
+}
+
+GF_Err boxstring_Read(GF_Box *s, GF_BitStream *bs)
+{
+    GF_StringBox *box = (GF_StringBox *)s;
+    box->string = (char *)gf_malloc((u32)(s->size+1));
+    gf_bs_read_data(bs, box->string, (u32)(s->size));
+    box->string[(u32)(s->size)] = 0;
+    return GF_OK;
+}
+
+static GF_Err vtcu_Add(GF_Box *s, GF_Box *box)
+{
+    GF_VTTCueBox *cuebox = (GF_VTTCueBox *)s;
+    switch(box->type) {
+    case GF_ISOM_BOX_TYPE_CTIM: 
+        cuebox->time = (GF_StringBox *)box;
+        break;
+    case GF_ISOM_BOX_TYPE_IDEN: 
+        cuebox->id = (GF_StringBox *)box;
+        break;
+    case GF_ISOM_BOX_TYPE_STTG: 
+        cuebox->settings = (GF_StringBox *)box;
+        break;
+    case GF_ISOM_BOX_TYPE_PAYL: 
+        cuebox->payload = (GF_StringBox *)box;
+        break;
+    default:
+        return gf_isom_box_add_default(s, box);
+    }
+    return GF_OK;
+}
+
+GF_Err vtcu_Read(GF_Box *s, GF_BitStream *bs)
+{
+    return gf_isom_read_box_list(s, bs, vtcu_Add);
+}
+
+GF_Err vtte_Read(GF_Box *s, GF_BitStream *bs)
+{
+    return gf_isom_read_box_list(s, bs, gf_isom_box_add_default);
+}
+
+static GF_Err wvtt_Add(GF_Box *s, GF_Box *box)
+{
+    GF_WebVTTSampleEntryBox *wvtt = (GF_WebVTTSampleEntryBox *)s;
+    switch(box->type) {
+    case GF_ISOM_BOX_TYPE_VTTC: 
+        wvtt->config = (GF_StringBox *)box;
+        break;
+    default:
+        return gf_isom_box_add_default(s, box);
+    }
+    return GF_OK;
+}
+
+GF_Err wvtt_Read(GF_Box *s, GF_BitStream *bs)
+{
+    GF_WebVTTSampleEntryBox *wvtt = (GF_WebVTTSampleEntryBox *)s;
+    gf_bs_read_data(bs, wvtt->reserved, 6);
+    wvtt->dataReferenceIndex = gf_bs_read_u16(bs);
+    wvtt->size -= 8;
+    return gf_isom_read_box_list(s, bs, wvtt_Add);
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+GF_Err boxstring_Write(GF_Box *s, GF_BitStream *bs)
+{
+    GF_Err e;
+    GF_StringBox *box = (GF_StringBox *)s;
+    e = gf_isom_box_write_header(s, bs);
+    if (e) return e;
+    if (box->string) {
+        gf_bs_write_data(bs, box->string, (u32)(box->size-8));
+    }
+    return e;
+}
+
+GF_Err vtcu_Write(GF_Box *s, GF_BitStream *bs)
+{
+    GF_Err e;
+    GF_VTTCueBox *cuebox = (GF_VTTCueBox *)s;
+    e = gf_isom_box_write_header(s, bs);
+    if (e) return e;
+    if (cuebox->id) {
+        e = gf_isom_box_write((GF_Box *)cuebox->id, bs);
+        if (e) return e;
+    }
+    if (cuebox->settings) {
+        e = gf_isom_box_write((GF_Box *)cuebox->settings, bs);
+        if (e) return e;
+    }
+    if (cuebox->payload) {
+        e = gf_isom_box_write((GF_Box *)cuebox->payload, bs);
+    }
+    return e;
+}
+
+GF_Err vtte_Write(GF_Box *s, GF_BitStream *bs)
+{
+    GF_Err e;
+    e = gf_isom_box_write_header(s, bs);
+    return e;
+}
+
+GF_Err wvtt_Write(GF_Box *s, GF_BitStream *bs)
+{
+    GF_Err e;
+    GF_WebVTTSampleEntryBox *wvtt = (GF_WebVTTSampleEntryBox *)s;
+    e = gf_isom_box_write_header(s, bs);
+    gf_bs_write_data(bs, wvtt->reserved, 6);
+    gf_bs_write_u16(bs, wvtt->dataReferenceIndex);
+
+    if (wvtt->config) gf_isom_box_write((GF_Box *)wvtt->config, bs);
+    return e;
+}
+
+GF_Err boxstring_Size(GF_Box *s)
+{
+    GF_Err e;
+    GF_StringBox *box = (GF_StringBox *)s;
+    e = gf_isom_box_get_size(s);
+    if (e) return e;
+    
+    box->size += strlen(box->string);
+    return GF_OK;
+}
+
+GF_Err vtcu_Size(GF_Box *s)
+{
+    GF_Err e;
+    GF_VTTCueBox *cuebox = (GF_VTTCueBox *)s;
+    e = gf_isom_box_get_size(s);
+    if (e) return e;
+    if (cuebox->id) {
+        e = gf_isom_box_size((GF_Box *)cuebox->id);
+        if (e) return e;
+        cuebox->size += cuebox->id->size;
+    }
+    if (cuebox->settings) {
+        e = gf_isom_box_size((GF_Box *)cuebox->settings);
+        if (e) return e;
+        cuebox->size += cuebox->settings->size;
+    }
+    if (cuebox->payload) {
+        e = gf_isom_box_size((GF_Box *)cuebox->payload);
+        if (e) return e;
+        cuebox->size += cuebox->payload->size;
+    }
+    return GF_OK;
+}
+
+GF_Err vtte_Size(GF_Box *s)
+{
+    return gf_isom_box_get_size(s);
+}
+
+GF_Err wvtt_Size(GF_Box *s)
+{
+    GF_Err e;
+    GF_WebVTTSampleEntryBox *wvtt = (GF_WebVTTSampleEntryBox *)s;
+    e = gf_isom_box_get_size(s);
+    if (e) return e;
+    s->size += 8; // reserved and dataReferenceIndex
+    if (wvtt->config) {
+        e = gf_isom_box_size((GF_Box *)wvtt->config);
+        if (e) return e;
+        wvtt->size += wvtt->config->size;
+    }
+    return e;
+}
+
+static GF_Err webvtt_write_cue(GF_BitStream *bs, GF_WebVTTCue *cue)
+{
+    GF_Err e;
+    GF_VTTCueBox *cuebox;
+    if (!cue) return GF_OK;
+
+    cuebox = (GF_VTTCueBox *)vtcu_New(); 
+    if (cue->id) {
+        cuebox->id = (GF_StringBox *)boxstring_new_with_data(GF_ISOM_BOX_TYPE_IDEN, cue->id);
+    }
+    if (cue->settings) {
+        cuebox->settings = (GF_StringBox *)boxstring_new_with_data(GF_ISOM_BOX_TYPE_STTG, cue->settings);
+    }
+    if (cue->text) {
+        cuebox->payload = (GF_StringBox *)boxstring_new_with_data(GF_ISOM_BOX_TYPE_PAYL, cue->text);
+    }
+
+    e = gf_isom_box_size((GF_Box *)cuebox);
+    if (!e) e = gf_isom_box_write((GF_Box *)cuebox, bs);
+
+    gf_isom_box_del((GF_Box *)cuebox);
+    return e;
+}
+
+GF_ISOSample *gf_isom_webvtt_to_sample(void *s)
+{
+    GF_Err e = GF_OK;
+    GF_ISOSample *res;
+    GF_BitStream *bs;
+    u32 i;
+    GF_WebVTTCue *cue;
+    GF_WebVTTSample *samp = (GF_WebVTTSample *)s;
+    if (!samp) return NULL;
+
+    bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+
+    if (gf_list_count(samp->cues)) {
+        i=0;
+        while ((cue = (GF_WebVTTCue *)gf_list_enum(samp->cues, &i))) {
+            e = webvtt_write_cue(bs, cue);
+            if (e) break;
+        }
+        if (e) {
+            gf_bs_del(bs);
+            return NULL;
+        }
+    } else {
+        GF_Box *cuebox = (GF_Box *)vtte_New();
+        e = gf_isom_box_size((GF_Box *)cuebox);
+        if (!e) e = gf_isom_box_write((GF_Box *)cuebox, bs);
+        gf_isom_box_del((GF_Box *)cuebox);
+        if (e) {
+            gf_bs_del(bs);
+            return NULL;
+        }
+    }
+    res = gf_isom_sample_new();
+    if (!res) {
+        gf_bs_del(bs);
+        return NULL;
+    }
+    gf_bs_get_content(bs, &res->data, &res->dataLength);
+    gf_bs_del(bs);
+    res->IsRAP = 1;
+    return res;
+}
+#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 boxstring_dump(GF_Box *a, FILE * trace)
+{
+    GF_StringBox *sbox = (GF_StringBox *)a;
+    fprintf(trace, "<StringBox string=\"%s\">\n", sbox->string);
+    DumpBox(a, trace);
+    gf_box_dump_done("StringBox", a, trace);
+    return GF_OK;
+}
+
+GF_Err vtcu_dump(GF_Box *a, FILE * trace)
+{
+    GF_VTTCueBox *cuebox = (GF_VTTCueBox *)a;
+    fprintf(trace, "<WebVTTCueBox>\n");
+    DumpBox(a, trace);
+    if (cuebox->id) boxstring_dump((GF_Box *)cuebox->id, trace);
+    if (cuebox->settings) boxstring_dump((GF_Box *)cuebox->settings, trace);
+    if (cuebox->payload) boxstring_dump((GF_Box *)cuebox->payload, trace);
+    gf_box_dump_done("WebVTTCueBox", a, trace);
+    return GF_OK;
+}
+
+GF_Err vtte_dump(GF_Box *a, FILE * trace) 
+{
+    fprintf(trace, "<WebVTTEmptyCueBox>\n");
+    DumpBox(a, trace);
+    gf_box_dump_done("WebVTTEmptyCueBox", a, trace);
+    return GF_OK;
+}
+
+GF_Err wvtt_dump(GF_Box *a, FILE * trace)
+{
+    GF_WebVTTSampleEntryBox *cuebox = (GF_WebVTTSampleEntryBox *)a;
+    fprintf(trace, "<WebVTTSampleEntryBox>\n");
+    DumpBox(a, trace);
+    if (cuebox->config) boxstring_dump((GF_Box *)cuebox->config, trace);
+    gf_box_dump_done("WebVTTSampleEntryBox", a, trace);
+    return GF_OK;
+}
+#endif /* GPAC_DISABLE_ISOM_DUMP */
+
+GF_WebVTTSampleEntryBox *gf_webvtt_isom_get_description(GF_ISOFile *movie, u32 trackNumber, u32 descriptionIndex)
+{
+    GF_WebVTTSampleEntryBox *wvtt;
+    GF_TrackBox *trak;
+    GF_Err e;
+
+    if (!descriptionIndex) return NULL;
+
+    e = CanAccessMovie(movie, GF_ISOM_OPEN_READ);
+    if (e) return NULL;
+    
+    trak = gf_isom_get_track_from_file(movie, trackNumber);
+    if (!trak || !trak->Media) return NULL;
+
+    switch (trak->Media->handler->handlerType) {
+    case GF_ISOM_MEDIA_TEXT:
+        break;
+    default:
+        return NULL;
+    }
+
+    wvtt = (GF_WebVTTSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, descriptionIndex - 1);
+    if (!wvtt) return NULL;
+    switch (wvtt->type) {
+    case GF_ISOM_BOX_TYPE_WVTT:
+        break;
+    default:
+        return NULL;
+    }
+    return wvtt;
+}
+
+GF_Err gf_isom_update_webvtt_description(GF_ISOFile *movie, u32 trackNumber, u32 descriptionIndex, const char *config)
+{
+    GF_Err e;
+    GF_WebVTTSampleEntryBox *wvtt;
+    GF_TrackBox *trak;
+
+    e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+    if (e) return GF_BAD_PARAM;
+    
+    trak = gf_isom_get_track_from_file(movie, trackNumber);
+    if (!trak || !trak->Media) return GF_BAD_PARAM;
+
+    switch (trak->Media->handler->handlerType) {
+    case GF_ISOM_MEDIA_TEXT:
+        break;
+    default:
+        return GF_BAD_PARAM;
+    }
+
+    wvtt = (GF_WebVTTSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, descriptionIndex - 1);
+    if (!wvtt) return GF_BAD_PARAM;
+    switch (wvtt->type) {
+    case GF_ISOM_BOX_TYPE_WVTT:
+        break;
+    default:
+        return GF_BAD_PARAM;
+    }
+    if (wvtt) {
+        trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+
+        wvtt->config = (GF_StringBox *)boxstring_new_with_data(GF_ISOM_BOX_TYPE_VTTC, config);
+    } else {
+        e = GF_BAD_PARAM;
+    }
+    return e;
+}
+
+GF_Err gf_isom_new_webvtt_description(GF_ISOFile *movie, u32 trackNumber, GF_TextSampleDescriptor *desc, char *URLname, char *URNname, u32 *outDescriptionIndex)
+{
+    GF_TrackBox *trak;
+    GF_Err e;
+    u32 dataRefIndex;
+    GF_WebVTTSampleEntryBox *wvtt;
+
+    e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+    if (e) return e;
+    
+    trak = gf_isom_get_track_from_file(movie, trackNumber);
+    if (!trak || !trak->Media) return GF_BAD_PARAM;
+
+    switch (trak->Media->handler->handlerType) {
+    case GF_ISOM_MEDIA_TEXT:
+        break;
+    default:
+        return GF_BAD_PARAM;
+    }
+
+    //get or create the data ref
+    e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+    if (e) return e;
+    if (!dataRefIndex) {
+        e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+        if (e) return e;
+    }
+    trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+
+    wvtt = (GF_WebVTTSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_WVTT);
+    wvtt->dataReferenceIndex = dataRefIndex;
+    gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, wvtt);
+    if (outDescriptionIndex) *outDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
+    return e;
+}
+
+//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*/
+
+/* 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 */
+static GF_WebVTTCue *gf_webvtt_cue_split_at(GF_WebVTTCue *cue, GF_WebVTTTimestamp *time)
+{
+    GF_WebVTTCue *dup_cue;
+
+    cue->split         = GF_TRUE;
+    cue->orig_start    = cue->start;
+    cue->orig_end      = cue->end;
+
+    GF_SAFEALLOC(dup_cue, GF_WebVTTCue);
+    dup_cue->split          = GF_TRUE;
+    dup_cue->start          = *time;
+    dup_cue->end            = cue->end;
+    dup_cue->orig_start     = cue->orig_start;
+    dup_cue->orig_end       = cue->orig_end;
+    dup_cue->id             = gf_strdup(cue->id);
+    dup_cue->settings       = gf_strdup(cue->settings);
+    dup_cue->text           = gf_strdup(cue->text);
+
+    cue->end = *time;
+    return dup_cue;
+}
+
+static GF_Err gf_webvtt_cue_add_property(GF_WebVTTCue *cue, GF_WebVTTCuePropertyType type, char *text_data, u32 text_len)
+{
+    char **prop;
+    u32 len;
+    if (!cue) return GF_BAD_PARAM;
+    if (!text_len) return GF_OK;
+    switch(type)
+    {
+    case WEBVTT_ID:
+        prop = &cue->id;
+        break;
+    case WEBVTT_SETTINGS:
+        prop = &cue->settings;
+        break;
+    case WEBVTT_PAYLOAD:
+        prop = &cue->text;
+        break;
+    case WEBVTT_TIME:
+        prop = &cue->time;
+        break;
+    }
+    if (*prop) {
+        len = (u32) strlen(*prop);
+        *prop = (char*)gf_realloc(*prop, sizeof(char) * (len + text_len + 1) );
+        strcpy(*prop + len, text_data);
+    } else {
+        len = 0;
+        *prop = gf_strdup(text_data);
+    }
+    return GF_OK;
+}
+
+static GF_WebVTTCue *gf_webvtt_cue_new()
+{
+    GF_WebVTTCue *cue;
+    GF_SAFEALLOC(cue, GF_WebVTTCue);
+    return cue;
+}
+
+static void gf_webvtt_cue_del(GF_WebVTTCue * cue)
+{
+    if (cue) {
+        if (cue->id)        gf_free(cue->id);
+        if (cue->settings)  gf_free(cue->settings);
+        if (cue->time)      gf_free(cue->time);
+        if (cue->text)      gf_free(cue->text);
+        gf_free(cue);
+    }
+}
+
+static GF_WebVTTSample *gf_webvtt_sample_new()
+{
+    GF_WebVTTSample *samp;
+    GF_SAFEALLOC(samp, GF_WebVTTSample);
+    if (!samp) return NULL;
+    samp->cues = gf_list_new();
+    return samp;
+}
+
+u64 gf_webvtt_sample_get_start(GF_WebVTTSample * samp)
+{
+    return samp->start;
+}
+
+void gf_webvtt_sample_del(GF_WebVTTSample * samp)
+{
+    while (gf_list_count(samp->cues)) {
+        GF_WebVTTCue *cue = (GF_WebVTTCue *)gf_list_get(samp->cues, 0);
+        gf_list_rem(samp->cues, 0);
+        gf_webvtt_cue_del(cue);
+    }
+    gf_list_del(samp->cues);
+    gf_free(samp);
+}
+
+GF_WebVTTParser *gf_webvtt_parser_new()
+{
+    GF_WebVTTParser *parser;
+    GF_SAFEALLOC(parser, GF_WebVTTParser);
+    parser->samples = gf_list_new();
+    return parser;
+}
+
+extern s32 gf_text_get_utf_type(FILE *in_src);
+
+GF_Err gf_webvtt_parser_init(GF_WebVTTParser *parser, const char *input_file, 
+                                    void *user, GF_Err (*report_message)(void *, GF_Err, char *, const char *),
+                                    void (*on_sample_parsed)(void *, GF_WebVTTSample *),
+                                    void (*on_header_parsed)(void *, const char *))
+{
+    const char *ext;
+    if (parser) {
+        parser->state       = WEBVTT_PARSER_STATE_WAITING_SIGNATURE;
+
+        ext = strrchr(input_file, '.');
+        if (ext) {
+            ext++;
+            if (!strcmp(ext, "srt")) {
+                parser->is_srt = GF_TRUE;
+                parser->state = WEBVTT_PARSER_STATE_WAITING_CUE;
+            }
+        }
+        parser->vtt_in = gf_f64_open(input_file, "rt");
+        gf_f64_seek(parser->vtt_in, 0, SEEK_END);
+        parser->file_size = gf_f64_tell(parser->vtt_in);
+        gf_f64_seek(parser->vtt_in, 0, SEEK_SET);
+
+        parser->unicode_type = gf_text_get_utf_type(parser->vtt_in);
+        if (parser->unicode_type<0) {
+            fclose(parser->vtt_in);
+            return GF_NOT_SUPPORTED;
+        }
+
+        parser->user = user;
+        parser->report_message = report_message;
+        parser->on_sample_parsed = on_sample_parsed;
+        parser->on_header_parsed = on_header_parsed;
+        return GF_OK;
+    }
+    return GF_BAD_PARAM;
+}
+
+void gf_webvtt_parser_reset(GF_WebVTTParser *parser)
+{
+    if (parser) {
+        while (gf_list_count(parser->samples)) {
+            gf_webvtt_sample_del((GF_WebVTTSample *)gf_list_get(parser->samples, 0));
+            gf_list_rem(parser->samples, 0);
+        }
+        if (parser->vtt_in) fclose(parser->vtt_in);
+        parser->file_size = 0;
+        parser->last_duration = 0;
+        parser->on_header_parsed = NULL;
+        parser->on_sample_parsed = NULL;
+        parser->report_message = NULL;
+        parser->state = WEBVTT_PARSER_STATE_WAITING_SIGNATURE;
+        parser->unicode_type = 0;
+        parser->user = NULL;
+        parser->vtt_in = NULL;
+    }
+}
+
+void gf_webvtt_parser_del(GF_WebVTTParser *parser)
+{
+    if (parser) {
+        gf_webvtt_parser_reset(parser);
+        gf_list_del(parser->samples);
+        gf_free(parser);
+    }
+}
+
+u64 gf_webvtt_parser_last_duration(GF_WebVTTParser *parser)
+{
+    if (parser) {
+        return parser->last_duration;
+    } else {
+        return 0;
+    }
+}
+
+Bool gf_webvtt_timestamp_is_zero(GF_WebVTTTimestamp *ts)
+{
+     return (ts->hour == 0 && ts->min == 0 && ts->sec == 0 && ts->ms == 0) ? GF_TRUE : GF_FALSE;
+}
+
+void gf_webvtt_timestamp_set(GF_WebVTTTimestamp *ts, u64 value)
+{
+    u64 tmp;
+    tmp = value;
+    ts->hour = (u32)(tmp/(3600*1000));
+    tmp -= ts->hour*3600*1000;
+    ts->min  = (u32)(tmp/(60*1000));
+    tmp -= ts->min*60*1000;
+    ts->sec  = (u32)(tmp/1000);
+    tmp -= ts->sec*1000;
+    ts->ms   = (u32)tmp;
+}
+
+u64 gf_webvtt_timestamp_get(GF_WebVTTTimestamp *ts)
+{
+    return (3600*ts->hour + 60*ts->min + ts->sec)*1000 + ts->ms;
+}
+
+void gf_webvtt_timestamp_dump(GF_WebVTTTimestamp *ts, FILE *dump, Bool dump_hour)
+{
+    if (dump_hour || ts->hour != 0) {
+        fprintf(dump, "%02u:", ts->hour);
+    }
+
+    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;
+    u64 cue_start;
+    u64 cue_end;
+    u64 sample_end;
+
+    sample_end = 0;
+    cue_start = gf_webvtt_timestamp_get(&cue->start);
+    cue_end   = gf_webvtt_timestamp_get(&cue->end);
+    /* samples in the samples list are contiguous: sample(n)->start == sample(n-1)->end */
+    for (i = 0; i < (s32)gf_list_count(samples); i++) {
+        GF_WebVTTSample *sample;
+        sample = (GF_WebVTTSample *)gf_list_get(samples, i);
+        /* save the sample end in case there are no more samples to test */
+        sample_end = sample->end;
+        if (cue_start < sample->start)
+        {
+            /* cues must be ordered according to their start time, so drop the cue */
+            /* TODO delete the cue */
+            return GF_BAD_PARAM;
+        }
+        else if (cue_start == sample->start && cue_end == sample->end) 
+        {
+            /* if the timing of the new cue matches the sample, no need to split, add the cue to the sample */
+            gf_list_add(sample->cues, cue);
+            /* the cue does not need to processed further */
+            return GF_OK;
+        } 
+        else if (cue_start >= sample->end)
+        {
+            /* flush the current sample */
+            gf_list_del_item(samples, sample);
+            parser->on_sample_parsed(parser->user, sample);
+            sample = NULL;
+            i--;
+            /* process the cue with next sample (if any) or create a new sample */
+            continue;
+        }
+        else if (cue_start >= sample->start) 
+        {
+            u32 j;
+            if (cue_start > sample->start) {
+                /* create a new sample, insert it after the current one */
+                GF_WebVTTSample *new_sample = gf_webvtt_sample_new();
+                new_sample->start = cue_start;
+                new_sample->end = sample->end;
+                gf_list_insert(samples, new_sample, i+1);
+                /* split the cues from the old sample into the new one */
+                for (j = 0; j < gf_list_count(sample->cues); j++) {
+                    GF_WebVTTCue *old_cue = (GF_WebVTTCue *)gf_list_get(sample->cues, j);
+                    GF_WebVTTCue *new_cue = gf_webvtt_cue_split_at(old_cue, &cue->start);
+                    gf_list_add(new_sample->cues, new_cue);
+                }
+                /* adjust the end of the old sample and flush it */
+                sample->end = cue_start;
+                gf_list_del_item(samples, sample);
+                parser->on_sample_parsed(parser->user, sample);
+                sample = NULL;
+                i--;
+                /* process the cue again with this new sample */
+                continue;
+            }
+            if (cue_end > sample->end) {
+                /* the cue is longer than the sample, we split the cue, add one part to the current sample
+                and reevaluate with the last part of the cue */
+                GF_WebVTTCue *old_cue = (GF_WebVTTCue *)gf_list_get(sample->cues, 0);
+                GF_WebVTTCue *new_cue = gf_webvtt_cue_split_at(cue, &old_cue->end);
+                gf_list_add(sample->cues, cue);
+                cue = new_cue;
+                cue_start = sample->end;
+                /* cue_end unchanged */
+                /* process the remaining part of the cue (i.e. the new cue) with the other samples */
+                continue;
+            } else { /* cue_end < sample->end */
+                GF_WebVTTSample *new_sample = gf_webvtt_sample_new();
+                new_sample->start = cue_end;
+                new_sample->end   = sample->end;
+                gf_list_insert(samples, new_sample, i+1);
+                for (j = 0; j < gf_list_count(sample->cues); j++) {
+                    GF_WebVTTCue *old_cue = (GF_WebVTTCue *)gf_list_get(sample->cues, j);
+                    GF_WebVTTCue *new_cue = gf_webvtt_cue_split_at(old_cue, &cue->end);
+                    gf_list_add(new_sample->cues, new_cue);
+                }
+                gf_list_add(sample->cues, cue);
+                sample->end = new_sample->start;
+                /* done with this cue */
+                return GF_OK;
+            }
+        }
+    }
+    /* (a part of) the cue remains (was not overlapping) */
+    if (cue_start > sample_end) {
+        /* if the new cue start is greater than the last sample end, 
+            create an empty sample to fill the gap, flush it */
+        GF_WebVTTSample *esample = gf_webvtt_sample_new();
+        esample->start = sample_end;
+        esample->end   = cue_start;
+        parser->on_sample_parsed(parser->user, esample);
+    }
+    /* if the cue has not been added to a sample, create a new sample for it */
+    {
+        GF_WebVTTSample *sample;
+        sample = gf_webvtt_sample_new();
+        gf_list_add(samples, sample);
+        sample->start = cue_start;
+        sample->end = cue_end;
+        gf_list_add(sample->cues, cue);
+    }
+    return GF_OK;
+}
+
+#define REM_TRAIL_MARKS(__str, __sep) while (1) {	\
+		u32 _len = (u32) strlen(__str);		\
+		if (!_len) break;	\
+		_len--;				\
+		if (strchr(__sep, __str[_len])) { \
+			had_marks = GF_TRUE; \
+			__str[_len] = 0;	\
+		} else break;	\
+	}
+
+extern char *gf_text_get_utf8_line(char *szLine, u32 lineSize, FILE *txt_in, s32 unicode_type);
+
+GF_Err gf_webvtt_parse_timestamp(GF_WebVTTParser *parser, GF_WebVTTTimestamp *ts, const char *line) 
+{
+    u32     len;
+    u32     pos;
+    u32     pos2;
+    u32     value1;
+    u32     value2;
+    u32     value3;
+    u32     value4;
+    Bool    is_hour = GF_FALSE;
+    if (!ts || !line) return GF_BAD_PARAM;
+    len = (u32) strlen(line);
+    if (!len) return GF_BAD_PARAM;
+    pos = 0;
+    if (!(line[pos] >= '0' && line[pos] <= '9')) return GF_BAD_PARAM;
+    value1 = 0;
+    while (pos < len && line[pos] >= '0' && line[pos] <= '9') {
+        value1 = value1*10 + (line[pos]-'0');
+        pos++;
+    }
+    if (pos>2 || value1>59) { 
+        is_hour = GF_TRUE; 
+    }
+    if (pos == len || line[pos] != ':') {
+        return GF_BAD_PARAM;
+    } else {
+        pos++;
+    }
+    value2 = 0;
+    pos2 = 0;
+    while (pos < len && line[pos] >= '0' && line[pos] <= '9') {
+        value2 = value2*10 + (line[pos]-'0');
+        pos++;
+        pos2++;
+        if (pos2 > 2) return GF_BAD_PARAM;
+    }
+    if (is_hour || (pos < len && line[pos] == ':')) {
+        if (pos == len || line[pos] != ':') {
+            return GF_BAD_PARAM;
+        } else {
+            pos++;
+            pos2 = 0;
+            value3 = 0;
+            while (pos < len && line[pos] >= '0' && line[pos] <= '9') {
+                value3 = value3*10 + (line[pos]-'0');
+                pos++;
+                pos2++;
+                if (pos2 > 2) return GF_BAD_PARAM;
+            }
+        }
+    } else {
+        value3 = value2;
+        value2 = value1;
+        value1 = 0;
+    }
+    /* checking SRT syntax for timestamp with , */
+    if (pos == len || (!parser->is_srt && line[pos] != '.') || (parser->is_srt && line[pos] != ',')) {
+        return GF_BAD_PARAM;
+    } else {
+        pos++;
+    }
+    pos2 = 0;
+    value4 = 0;
+    while (pos < len && line[pos] >= '0' && line[pos] <= '9') {
+        value4 = value4*10 + (line[pos]-'0');
+        pos++;
+        pos2++;
+        if (pos2 > 4) return GF_BAD_PARAM;
+    }
+    if (value2>59 || value3 > 59) return GF_BAD_PARAM;
+    ts->hour = value1;
+    ts->min = value2;
+    ts->sec = value3;
+    ts->ms = value4;
+    return GF_OK;
+}
+
+#define SKIP_WHITESPACE \
+    while (pos < len && (line[pos] == ' ' || line[pos] == '\t' || \
+           line[pos] == '\r' || line[pos] == '\f' || line[pos] == '\n')) pos++;
+
+GF_Err gf_webvtt_parser_parse_timings_settings(GF_WebVTTParser *parser, GF_WebVTTCue *cue, char *line, u32 len)
+{
+    GF_Err  e;
+    char *timestamp_string;
+    u32 pos;
+    e = GF_OK;
+    pos = 0;
+    if (!cue || !line || !len) return GF_BAD_PARAM;
+    SKIP_WHITESPACE
+    timestamp_string = line + pos;
+    while (pos < len && line[pos] != ' ' && line[pos] != '\t') pos++;
+    if (pos == len) {
+        e = GF_CORRUPTED_DATA;
+        parser->report_message(parser->user, e, "Error scanning WebVTT cue timing in %s", line);
+        return e;
+    }
+    line[pos] = 0;
+    e = gf_webvtt_parse_timestamp(parser, &cue->start, timestamp_string);
+    if (e) {
+        parser->report_message(parser->user, e, "Bad VTT timestamp formatting %s", timestamp_string);
+        return e;
+    }
+    line[pos] = ' ';
+    SKIP_WHITESPACE
+    if (pos == len) {
+        e = GF_CORRUPTED_DATA;
+        parser->report_message(parser->user, e, "Error scanning WebVTT cue timing in %s", line);
+        return e;
+    }
+    if ( (pos+2)>= len || line[pos] != '-' || line[pos+1] != '-' || line[pos+2] != '>') {
+        e = GF_CORRUPTED_DATA;
+        parser->report_message(parser->user, e, "Error scanning WebVTT cue timing in %s", line);
+        return e;
+    } else {
+        pos += 3;
+        SKIP_WHITESPACE
+        if (pos == len) {
+            e = GF_CORRUPTED_DATA;
+            parser->report_message(parser->user, e, "Error scanning WebVTT cue timing in %s", line);
+            return e;
+        }
+        timestamp_string = line + pos;
+        while (pos < len && line[pos] != ' ' && line[pos] != '\t') pos++;
+        if (pos < len) {
+            line[pos] = 0;
+        }
+        e = gf_webvtt_parse_timestamp(parser, &cue->end, timestamp_string);
+        if (e) {
+            parser->report_message(parser->user, e, "Bad VTT timestamp formatting %s", timestamp_string);
+            return e;
+        }
+        if (pos < len) {
+            line[pos] = ' ';
+        }
+        SKIP_WHITESPACE
+        if (pos < len) {
+            char *settings = line + pos;
+            e = gf_webvtt_cue_add_property(cue, WEBVTT_SETTINGS, settings, (u32) strlen(settings));
+        }
+    }
+    return e;
+}
+
+GF_Err gf_webvtt_parser_parse(GF_WebVTTParser *parser, u32 duration)
+{
+    char            szLine[2048];
+    char            *sOK;
+    u32             len;
+    GF_Err          e;
+    Bool            do_parse = GF_TRUE;
+    GF_WebVTTCue    *cue = NULL;
+    u32             start = 0;
+    u32             end = 0;
+    char            *prevLine = NULL;
+    char            *header = NULL;
+    u32             header_len = 0;
+    Bool            had_marks = GF_FALSE;
+
+    if (!parser) return GF_BAD_PARAM;
+    if (parser->is_srt) {
+        parser->on_header_parsed(parser->user, gf_strdup("WEBVTT\n"));
+    }
+    while (do_parse) {
+        sOK = gf_text_get_utf8_line(szLine, 2048, parser->vtt_in, parser->unicode_type);
+        REM_TRAIL_MARKS(szLine, "\r\n")
+        len = (u32) strlen(szLine);
+        switch (parser->state) {
+        case WEBVTT_PARSER_STATE_WAITING_SIGNATURE:
+            if (!sOK || len < 6 || strnicmp(szLine, "WEBVTT", 6) || (len > 6 && szLine[6] != ' ' && szLine[6] != '\t')) {
+                e = GF_CORRUPTED_DATA;
+                parser->report_message(parser->user, e, "Bad WEBVTT file signature %s", szLine);
+                goto exit;
+            } else {
+                if (had_marks) { szLine[len] = '\n'; len++; }
+                header = gf_strdup(szLine);
+                header_len = len;
+                parser->state = WEBVTT_PARSER_STATE_WAITING_HEADER;
+            }
+            break; /* proceed to next line */
+        case WEBVTT_PARSER_STATE_WAITING_HEADER:
+            if (prevLine) {
+                u32 prev_len = (u32) strlen(prevLine);
+                header = (char *)gf_realloc(header, header_len + prev_len + 1);
+                strcpy(header+header_len,prevLine); 
+                header_len += prev_len;
+                gf_free(prevLine);
+                prevLine = NULL;
+            }
+            if (sOK && len) {
+                if (strstr(szLine, "-->")) {
+                    parser->on_header_parsed(parser->user, header);
+                    /* continue to the next state without breaking */
+                    parser->state = WEBVTT_PARSER_STATE_WAITING_CUE_TIMESTAMP;
+                    /* no break, continue to the next state*/
+                } else {
+                    if (had_marks) { szLine[len] = '\n'; len++; }
+                    prevLine = gf_strdup(szLine);
+                    break; /* proceed to next line */
+                }
+            } else {
+                parser->on_header_parsed(parser->user, header);
+                if (!sOK) {
+                    /* end of file, parsing is done */
+                    do_parse = GF_FALSE;
+                    break;
+                } else {
+                    /* empty line means end of header */
+                    parser->state = WEBVTT_PARSER_STATE_WAITING_CUE;
+                    /* no break, continue to the next state*/
+                }
+            }
+        case WEBVTT_PARSER_STATE_WAITING_CUE:
+            if (sOK && len) {
+                if (strstr(szLine, "-->")) {
+                    parser->state = WEBVTT_PARSER_STATE_WAITING_CUE_TIMESTAMP;
+                    /* continue to the next state without breaking */
+                } else {
+                    /* discard the previous line */
+                    /* should we do something with it ? callback ?*/
+                    if (prevLine) {
+                        gf_free(prevLine);
+                        prevLine = NULL;
+                    }
+                    /* save this new line */
+                    if (had_marks) { szLine[len] = '\n'; len++; }
+                    prevLine = gf_strdup(szLine);
+                    /* stay in the same state */
+                    break;
+                }
+            } else {
+                /* discard the previous line */
+                /* should we do something with it ? callback ?*/
+                if (prevLine) {
+                    gf_free(prevLine);
+                    prevLine = NULL;
+                }
+                if (!sOK) {
+                    do_parse = GF_FALSE;
+                    break;
+                } else {
+                    /* remove empty lines and stay in the same state */
+                    break;
+                }
+            }
+        case WEBVTT_PARSER_STATE_WAITING_CUE_TIMESTAMP:
+            if (sOK && len) {
+                if (cue == NULL) {
+                    cue   = gf_webvtt_cue_new();
+                }
+                if (prevLine) {
+                    gf_webvtt_cue_add_property(cue, WEBVTT_ID, prevLine, (u32) strlen(prevLine));
+                    gf_free(prevLine);
+                    prevLine = NULL;
+                }
+                e = gf_webvtt_parser_parse_timings_settings(parser, cue, szLine, len);
+                if (e) {
+                    if (cue) gf_webvtt_cue_del(cue);
+                    cue = NULL;
+                    parser->state = WEBVTT_PARSER_STATE_WAITING_CUE;
+                } else {
+                    start = (u32)gf_webvtt_timestamp_get(&cue->start);
+                    end   = (u32)gf_webvtt_timestamp_get(&cue->end);
+                    parser->state = WEBVTT_PARSER_STATE_WAITING_CUE_PAYLOAD;
+                }
+            } else {
+                /* not possible */
+                assert(0);
+            }
+            break;
+        case WEBVTT_PARSER_STATE_WAITING_CUE_PAYLOAD:
+            if (sOK && len) {
+                if (had_marks) { szLine[len] = '\n'; len++; }
+                gf_webvtt_cue_add_property(cue, WEBVTT_PAYLOAD, szLine, len);
+                /* remain in the same state as a cue payload can have multiple lines */
+                break;
+            } else {
+                /* end of the current cue */
+                gf_webvtt_add_cue_to_samples(parser, parser->samples, cue);
+                cue = NULL;
+
+                gf_set_progress("Importing WebVTT", gf_f64_tell(parser->vtt_in), parser->file_size);
+                if ((duration && (end >= duration)) || !sOK) {
+                    do_parse = GF_FALSE;
+                    break;
+                } else {
+                    /* empty line, move to next cue */
+                    parser->state = WEBVTT_PARSER_STATE_WAITING_CUE;
+                    break;
+                }
+            }
+        }
+        if (duration && (start >= duration)) { 
+            do_parse = GF_FALSE; 
+            break;
+        }
+    }
+
+
+    /* no more cues to come, flush everything */
+    if (cue) {
+        gf_webvtt_add_cue_to_samples(parser, parser->samples, cue);
+        cue = NULL;
+    }
+    while (gf_list_count(parser->samples) > 0) {
+        GF_WebVTTSample *sample = (GF_WebVTTSample *)gf_list_get(parser->samples, 0);
+        parser->last_duration = sample->end - sample->start;
+        gf_list_rem(parser->samples, 0);
+        parser->on_sample_parsed(parser->user, sample);
+    }
+    gf_set_progress("Importing WebVTT", parser->file_size, parser->file_size);
+    e = GF_OK;
+exit:
+    if (cue) gf_webvtt_cue_del(cue);
+    if (prevLine) gf_free(prevLine);
+    if (header) gf_free(header);
+    return e;
+}
+
+GF_Err gf_webvtt_dump_header(FILE *dump, GF_ISOFile *file, u32 track, u32 index)
+{
+    GF_WebVTTSampleEntryBox *wvtt;
+    wvtt = gf_webvtt_isom_get_description(file, track, index);
+    if (!wvtt) return GF_BAD_PARAM;
+    fprintf(dump, "%s\n", wvtt->config->string);
+    return GF_OK;
+}
+
+GF_Err gf_webvtt_dump_iso_sample(FILE *dump, u32 timescale, GF_ISOSample *iso_sample)
+{
+    GF_Err e;
+    GF_BitStream *bs;
+
+    bs = gf_bs_new(iso_sample->data, iso_sample->dataLength, GF_BITSTREAM_READ);
+    while(gf_bs_available(bs))
+    {
+        GF_Box *box;
+        GF_WebVTTTimestamp ts;
+        e = gf_isom_parse_box(&box, bs);
+        if (e) return e;
+        if (box->type == GF_ISOM_BOX_TYPE_VTCU) {
+            GF_VTTCueBox *cuebox = (GF_VTTCueBox *)box;
+            if (cuebox->id) fprintf(dump, "%s", cuebox->id->string);
+            gf_webvtt_timestamp_set(&ts, (iso_sample->DTS * 1000) / timescale);
+            gf_webvtt_timestamp_dump(&ts, dump, GF_FALSE);
+            fprintf(dump, " --> NEXT");
+            if (cuebox->settings) fprintf(dump, " %s", cuebox->settings->string);
+            fprintf(dump, "\n");
+            if (cuebox->payload) fprintf(dump, "%s", cuebox->payload->string);
+            fprintf(dump, "\n");
+        } else if (box->type == GF_ISOM_BOX_TYPE_VTTE) {
+            gf_webvtt_timestamp_set(&ts, (iso_sample->DTS * 1000) / timescale);
+            gf_webvtt_timestamp_dump(&ts, dump, GF_FALSE);
+            fprintf(dump, " --> NEXT\n\n");
+        }
+        gf_isom_box_del(box);
+    }
+    gf_bs_del(bs);
+    return GF_OK;
+}
+
+GF_List *gf_webvtt_parse_iso_cues(GF_ISOSample *iso_sample, 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);
+    while(gf_bs_available(bs))
+    {
+        GF_Err  e;
+        GF_Box  *box;
+        e = gf_isom_parse_box(&box, bs);
+        if (e) return NULL;
+        if (box->type == GF_ISOM_BOX_TYPE_VTCU) {
+            cuebox = (GF_VTTCueBox *)box;
+            cue   = gf_webvtt_cue_new();
+            gf_list_add(cues, cue);
+            gf_webvtt_timestamp_set(&cue->start, start);
+            if (cuebox->id) {
+                gf_webvtt_cue_add_property(cue, WEBVTT_ID, cuebox->id->string, (u32) strlen(cuebox->id->string));
+            }
+            if (cuebox->settings) {
+                gf_webvtt_cue_add_property(cue, WEBVTT_SETTINGS, cuebox->settings->string, (u32) strlen(cuebox->settings->string));
+            }
+            if (cuebox->payload) {
+                gf_webvtt_cue_add_property(cue, WEBVTT_PAYLOAD, cuebox->payload->string, (u32) strlen(cuebox->payload->string));
+            }
+        }
+        gf_isom_box_del(box);
+    }
+    gf_bs_del(bs);
+    return cues;
+}
+
+GF_Err gf_webvtt_merge_cues(GF_WebVTTParser *parser, u64 start, GF_List *cues)
+{
+    GF_WebVTTSample *wsample;
+    GF_WebVTTSample *prev_wsample;
+    Bool            has_continuation_cue = GF_FALSE;
+
+    assert(gf_list_count(parser->samples) <= 1);
+
+    wsample = gf_webvtt_sample_new();
+    wsample->start = start;
+
+    prev_wsample = (GF_WebVTTSample *)gf_list_last(parser->samples);
+    if (gf_list_count(cues)) {
+        while (gf_list_count(cues)) {
+            GF_WebVTTCue *cue = (GF_WebVTTCue *)gf_list_get(cues, 0);
+            gf_list_rem(cues, 0);
+            /* add the cue to the current sample */
+            gf_list_add(wsample->cues, cue);
+            /* update with the previous sample */
+            if (prev_wsample) {
+                Bool  found = GF_FALSE;
+                while (!found && gf_list_count(prev_wsample->cues)) {
+                    GF_WebVTTCue *old_cue = (GF_WebVTTCue *)gf_list_get(prev_wsample->cues, 0);
+                    gf_list_rem(prev_wsample->cues, 0);
+                    if (
+                        ((!cue->id && !old_cue->id) || (old_cue->id && cue->id && !strcmp(old_cue->id, cue->id))) &&
+                        ((!cue->settings && !old_cue->settings) || (old_cue->settings && cue->settings && !strcmp(old_cue->settings, cue->settings))) &&
+                        ((!cue->text && !old_cue->text) || (old_cue->text && cue->text && !strcmp(old_cue->text, cue->text)))
+                        ) {
+                        /* if it is the same cue, update its start with the initial start */
+                        cue->start = old_cue->start;
+                        has_continuation_cue = GF_TRUE;
+                        found = GF_TRUE;
+                        /* delete the old cue */
+                        gf_webvtt_cue_del(old_cue);
+                    } else {
+                        /* finalize the end cue time */
+                        if (gf_webvtt_timestamp_is_zero(&old_cue->end)) {
+                                gf_webvtt_timestamp_set(&old_cue->end, wsample->start);
+                        }
+                        /* transfer the cue */
+                        if (!has_continuation_cue) {
+                            /* the cue can be safely serialized while keeping the order */
+                            parser->on_cue_read(parser->user, old_cue);
+                        } else {
+                            /* keep the cue in the current sample to respect cue start ordering */
+                            gf_list_add(wsample->cues, old_cue);
+                        }
+                    }
+                }
+            }
+        }
+    }   
+    /* No cue in the current sample */
+    if (prev_wsample) {
+        while (gf_list_count(prev_wsample->cues)) {
+            GF_WebVTTCue *cue = (GF_WebVTTCue *)gf_list_get(prev_wsample->cues, 0);
+            gf_list_rem(prev_wsample->cues, 0);
+            /* finalize the end cue time */
+            if (gf_webvtt_timestamp_is_zero(&cue->end)) {
+                gf_webvtt_timestamp_set(&cue->end, wsample->start);
+            }
+            /* transfer the cue */
+            if (!has_continuation_cue) {
+                /* the cue can be safely serialized while keeping the order */
+                parser->on_cue_read(parser->user, cue);
+            } else {
+                /* keep the cue in the current sample to respect cue start ordering */
+                gf_list_add(wsample->cues, cue);
+            }
+        }
+        gf_webvtt_sample_del(prev_wsample);
+        gf_list_rem_last(parser->samples);
+        prev_wsample = NULL;
+    } else {
+        /* nothing to do */
+    }
+    if (gf_list_count(wsample->cues)) {
+        gf_list_add(parser->samples, wsample);
+    } else {
+        gf_webvtt_sample_del(wsample);
+    }
+    return GF_OK;
+}
+
+GF_Err gf_webvtt_parse_iso_sample(GF_WebVTTParser *parser, u32 timescale, GF_ISOSample *iso_sample, Bool merge)
+{
+    if (merge) {
+        u64             start;
+        GF_List         *cues;
+        start = (iso_sample->DTS * 1000) / timescale;
+        cues = gf_webvtt_parse_iso_cues(iso_sample, start);
+        gf_webvtt_merge_cues(parser, start, cues);
+        gf_list_del(cues);
+    } else {
+        gf_webvtt_dump_iso_sample((FILE *)parser->user, timescale, iso_sample);
+    }
+
+    return GF_OK;
+}
+
+static GF_Err gf_webvtt_parser_dump_finalize(GF_WebVTTParser *parser, u64 duration)
+{
+    GF_WebVTTSample *sample;
+    assert(gf_list_count(parser->samples) <= 1);
+    sample = (GF_WebVTTSample *)gf_list_get(parser->samples, 0);
+    if (sample) {
+        while (gf_list_count(sample->cues)) {
+            GF_WebVTTCue *cue = (GF_WebVTTCue *)gf_list_get(sample->cues, 0);
+            gf_list_rem(sample->cues, 0);
+            if (gf_webvtt_timestamp_is_zero(&cue->end)) {
+                    gf_webvtt_timestamp_set(&cue->end, duration);
+            }
+            parser->on_cue_read(parser->user, cue);
+        }
+        gf_webvtt_sample_del(sample);
+        gf_list_rem(parser->samples, 0);
+    }
+    return GF_OK;
+}
+
+void gf_webvtt_dump_cue(void *user, GF_WebVTTCue *cue)
+{
+    FILE *dump = (FILE *)user;
+    if (!cue || !dump) return;
+    if (cue->id) fprintf(dump, "%s", cue->id);
+    if (cue->start.hour || cue->end.hour) {
+        gf_webvtt_timestamp_dump(&cue->start, dump, GF_TRUE);
+        fprintf(dump, " --> ");
+        gf_webvtt_timestamp_dump(&cue->end, dump, GF_TRUE);
+    } else {
+        gf_webvtt_timestamp_dump(&cue->start, dump, GF_FALSE);
+        fprintf(dump, " --> ");
+        gf_webvtt_timestamp_dump(&cue->end, dump, GF_FALSE);
+    }
+    if (cue->settings) {
+        fprintf(dump, " %s", cue->settings);
+    }
+    fprintf(dump, "\n");
+    if (cue->text) fprintf(dump, "%s", cue->text);
+    fprintf(dump, "\n");
+}
+
+GF_Err gf_webvtt_dump_cues(FILE *dump, GF_List *cues)
+{
+    u32 i;
+    for (i = 0; i < gf_list_count(cues); i++) {
+        GF_WebVTTCue *cue = (GF_WebVTTCue *)gf_list_get(cues, i);
+        gf_webvtt_dump_cue(dump, cue);
+    }
+    return GF_OK;
+}
+
+GF_Err gf_webvtt_dump_sample(FILE *dump, GF_WebVTTSample *samp)
+{
+    fprintf(stdout, "NOTE New WebVTT Sample ("LLD"-"LLD")\n\n", samp->start, samp->end);
+    return gf_webvtt_dump_cues(dump, samp->cues);
+}
+
+GF_Err gf_webvtt_dump_iso_track(GF_MediaExporter *dumper, char *szName, u32 track, Bool merge)
+{
+    GF_Err  e;
+    u32     i;
+    u32     count;
+    u32     timescale;
+    FILE    *out;
+    u32     di;
+    u64     duration;
+    GF_WebVTTParser *parser;
+
+    out = szName ? gf_f64_open(szName, "wt") : stdout;
+    if (!out) return GF_IO_ERR;// gf_export_message(dumper, GF_IO_ERR, "Error opening %s for writing - check disk access & permissions", szName);
+
+    parser = gf_webvtt_parser_new();
+    parser->user = out;
+    parser->on_cue_read = gf_webvtt_dump_cue;
+
+    e = gf_webvtt_dump_header(out, dumper->file, track, 1);
+    if (e) goto exit;
+
+    timescale = gf_isom_get_media_timescale(dumper->file, track);
+
+    count = gf_isom_get_sample_count(dumper->file, track);
+    for (i=0; i<count; i++) {
+        GF_ISOSample *samp = gf_isom_get_sample(dumper->file, track, i+1, &di);
+        if (!samp) {
+            e = gf_isom_last_error(dumper->file);
+            goto exit;
+        }
+        e = gf_webvtt_parse_iso_sample(parser, timescale, samp, merge);
+        if (e) goto exit;
+        //gf_webvtt_dump_iso_sample(out, timescale, samp);
+    }
+    duration = gf_isom_get_media_duration(dumper->file, track);
+    gf_webvtt_parser_dump_finalize(parser, duration);
+
+exit:
+    gf_webvtt_parser_del(parser);
+    if (szName) fclose(out);
+    return e;
+}
+
+#endif /* GPAC_DISABLE_VTT */

gpac-0.5.0.svn4296.tar.bz2/src/odf/descriptors.c -> gpac-0.5.0.svn4668.tar.bz2/src/odf/descriptors.c Changed

@@ -44,6 +44,7 @@
 	case GF_STREAM_OCI: return "OCI";
 	case GF_STREAM_MPEGJ: return "MPEGJ";
 	case GF_STREAM_INTERACT: return "Interaction";
+	case GF_STREAM_FONT: return "Font";
 	case GF_STREAM_TEXT: return "Text";
 	case GF_STREAM_ND_SUBPIC: return "NeroDigital Subpicture";
 	default: return "Unknown";
@@ -460,7 +461,7 @@
 	if (!cfg->deviceName) return GF_OK;
 
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	len = strlen(cfg->deviceName);
+	len = (u32) strlen(cfg->deviceName);
 	gf_bs_write_int(bs, len, 8);
 	for (i=0; i<len; i++) gf_bs_write_int(bs, cfg->deviceName[i], 8);
 	if (!stricmp(cfg->deviceName, "StringSensor")) {
@@ -829,11 +830,24 @@
 	u32 i, count;
 
 	gf_bs_write_int(bs, cfg->configurationVersion, 8);
-	gf_bs_write_int(bs, cfg->profile_space, 3);
+	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->constraint_indicator_flags, 16);
-	gf_bs_write_int(bs, cfg->level_idc, 8);
 	gf_bs_write_int(bs, cfg->profile_compatibility_indications, 32);
+
+	gf_bs_write_int(bs, cfg->progressive_source_flag, 1);
+	gf_bs_write_int(bs, cfg->interlaced_source_flag, 1);
+	gf_bs_write_int(bs, cfg->non_packed_constraint_flag, 1);
+	gf_bs_write_int(bs, cfg->frame_only_constraint_flag, 1);
+	/*only lowest 44 bits used*/
+	gf_bs_write_long_int(bs, cfg->constraint_indicator_flags, 44);
+	gf_bs_write_int(bs, cfg->level_idc, 8);
+	gf_bs_write_int(bs, 0xFF, 4);
+	gf_bs_write_int(bs, cfg->min_spatial_segmentation_idc, 12);
+
+	gf_bs_write_int(bs, 0xFF, 6);
+	gf_bs_write_int(bs, cfg->parallelismType, 2);
+
 	gf_bs_write_int(bs, 0xFF, 6);
 	gf_bs_write_int(bs, cfg->chromaFormat, 2);
 	gf_bs_write_int(bs, 0xFF, 5);
@@ -843,7 +857,7 @@
 	gf_bs_write_int(bs, cfg->avgFrameRate, 16);
 	gf_bs_write_int(bs, cfg->constantFrameRate, 2);
 	gf_bs_write_int(bs, cfg->numTemporalLayers, 3);
-	gf_bs_write_int(bs, 1, 1);
+	gf_bs_write_int(bs, cfg->temporalIdNested, 1);
 	gf_bs_write_int(bs, cfg->nal_unit_size - 1, 2);
 
 	count = gf_list_count(cfg->param_array);
@@ -886,22 +900,37 @@
 	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, 3);
+	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->constraint_indicator_flags = gf_bs_read_int(bs, 16);
-	cfg->level_idc = gf_bs_read_int(bs, 8);
 	cfg->profile_compatibility_indications = 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);
+	cfg->non_packed_constraint_flag = gf_bs_read_int(bs, 1);
+	cfg->frame_only_constraint_flag = gf_bs_read_int(bs, 1);
+	/*only lowest 44 bits used*/
+	cfg->constraint_indicator_flags = gf_bs_read_long_int(bs, 44);
+	cfg->level_idc = gf_bs_read_int(bs, 8);
+	gf_bs_read_int(bs, 4);
+	cfg->min_spatial_segmentation_idc = gf_bs_read_int(bs, 12);
+
+	gf_bs_read_int(bs, 6);
+	cfg->parallelismType = gf_bs_read_int(bs, 2);
+
 	gf_bs_read_int(bs, 6);
 	cfg->chromaFormat = gf_bs_read_int(bs, 2);
 	gf_bs_read_int(bs, 5);
-	cfg->luma_bit_depth = 8 + gf_bs_read_int(bs, 3);
+	cfg->luma_bit_depth = gf_bs_read_int(bs, 3) + 8;
 	gf_bs_read_int(bs, 5);
-	cfg->chroma_bit_depth = 8 + gf_bs_read_int(bs, 3);
+	cfg->chroma_bit_depth = gf_bs_read_int(bs, 3) + 8;
 	cfg->avgFrameRate = gf_bs_read_int(bs, 16);
 	cfg->constantFrameRate = gf_bs_read_int(bs, 2);
 	cfg->numTemporalLayers = gf_bs_read_int(bs, 3);
-	gf_bs_read_int(bs, 1);
+	cfg->temporalIdNested = gf_bs_read_int(bs, 1);
+
 	cfg->nal_unit_size = 1 + gf_bs_read_int(bs, 2);
 
 	count = gf_bs_read_int(bs, 8);
@@ -1043,6 +1072,8 @@
 			return "MPEG-4 Part 2 Video";
 		case GPAC_OTI_VIDEO_AVC:
 			return "MPEG-4 AVC|H264 Video";
+		case GPAC_OTI_VIDEO_SVC:
+			return "MPEG-4 SVC Video";
 		case GPAC_OTI_VIDEO_AVC_PS:
 			return "MPEG-4 AVC|H264 Parameter Set";
 		case GPAC_OTI_MEDIA_FFMPEG:

gpac-0.5.0.svn4296.tar.bz2/src/odf/ipmpx_code.c -> gpac-0.5.0.svn4668.tar.bz2/src/odf/ipmpx_code.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/odf/ipmpx_parse.c -> gpac-0.5.0.svn4668.tar.bz2/src/odf/ipmpx_parse.c Changed

@@ -150,13 +150,13 @@
 	char s[3];
 
 	if (val[0] != '%') {
-		len = *out_data_size = strlen(val);
+		len = *out_data_size = (u32) strlen(val);
 		*out_data = (char*)gf_malloc(sizeof(char) * len);
 		memcpy(*out_data, val, sizeof(char) * len);
 		return;
 	}
 
-	len = strlen(val) / 3;
+	len = (u32) strlen(val) / 3;
 	if (*out_data) gf_free(*out_data);
 	*out_data_size = len;
 	*out_data = (char*)gf_malloc(sizeof(char) * len);
@@ -186,7 +186,7 @@
 	size = (u32) gf_f64_tell(f);
 	gf_f64_seek(f, 0, SEEK_SET);
 	*out_data = (char*)gf_malloc(sizeof(char) * size);
-	size = fread(*out_data, sizeof(char), size, f);
+	size = (u32) fread(*out_data, sizeof(char), size, f);
 	*out_data_size = size;
 	fclose(f);
 }
@@ -237,7 +237,7 @@
 	char szVal[50];
 	u32 i, j, len, v;
 	*eventTypeCount = 0;
-	len = strlen(val);
+	len = (u32) strlen(val);
 	j=0;
 	for (i=0; i<len; i++) {
 		switch (val[i]) {
@@ -268,7 +268,7 @@
 	u16 *data = (u16*)gf_malloc(sizeof(u16) * 100);
 	alloc = 100;
 
-	len = strlen(val);
+	len = (u32) strlen(val);
 	count = j = 0;
 	for (i=0; i<len; i++) {
 		switch (val[i]) {
@@ -608,7 +608,7 @@
 	GF_IPMPX_ByteArray *d;
 	GF_IPMPX_ByteArray **dest;
 	d = (GF_IPMPX_ByteArray*)gf_malloc(sizeof(GF_IPMPX_ByteArray));
-	d->length = strlen(str);
+	d->length = (u32) strlen(str);
 	d->data = (char*)gf_malloc(sizeof(char)*d->length);
 	memcpy(d->data, str, d->length);

gpac-0.5.0.svn4296.tar.bz2/src/odf/odf_code.c -> gpac-0.5.0.svn4668.tar.bz2/src/odf/odf_code.c Changed

@@ -44,19 +44,19 @@
 
 static GFINLINE u32 OD_SizeUTF8String(char *string, Bool isUTF8)
 {
-	if (isUTF8) return 1 + strlen(string);
-	return 1 + 2*gf_utf8_wcslen((const unsigned short *)string);
+	if (isUTF8) return 1 + (u32) strlen(string);
+	return 1 + 2 * (u32) gf_utf8_wcslen((const unsigned short *)string);
 }
 
 static GFINLINE void OD_WriteUTF8String(GF_BitStream *bs, char *string, Bool isUTF8)
 {
 	u32 len;
 	if (isUTF8) {
-		len = strlen(string);
+		len = (u32) strlen(string);
 		gf_bs_write_int(bs, len, 8);
 		gf_bs_write_data(bs, string, len);
 	} else {
-		len = gf_utf8_wcslen((const unsigned short *)string);
+		len = (u32) gf_utf8_wcslen((const unsigned short *)string);
 		gf_bs_write_int(bs, len, 8);
 		gf_bs_write_data(bs, string, len*2);
 	}
@@ -99,7 +99,7 @@
 		gf_bs_write_int(bs, 0, 8);
 		return GF_OK;
 	}		
-	len = strlen(string);
+	len = (u32) strlen(string);
 	if (len > 255) {
 		gf_bs_write_int(bs, 0, 8);
 		gf_bs_write_int(bs, len, 32);
@@ -112,7 +112,7 @@
 
 u32 gf_odf_size_url_string(char *string)
 {
-	u32 len = strlen(string);
+	u32 len = (u32) strlen(string);
 	if (len>255) return len+5;
 	return len+1;
 }
@@ -1420,7 +1420,7 @@
 {
 	if (!sd) return GF_BAD_PARAM;
 	*outSize = 17;
-	if (sd->SegmentName) *outSize += strlen(sd->SegmentName);
+	if (sd->SegmentName) *outSize += (u32) strlen(sd->SegmentName);
 	return GF_OK;
 }
 
@@ -1436,8 +1436,8 @@
 	gf_bs_write_double(bs, sd->startTime);
 	gf_bs_write_double(bs, sd->Duration);
 	if (sd->SegmentName) {
-		gf_bs_write_int(bs, strlen(sd->SegmentName), 8);
-		gf_bs_write_data(bs, sd->SegmentName, strlen(sd->SegmentName));
+		gf_bs_write_int(bs, (u32) strlen(sd->SegmentName), 8);
+		gf_bs_write_data(bs, sd->SegmentName, (u32) strlen(sd->SegmentName));
 	} else {
 		gf_bs_write_int(bs, 0, 8);
 	}
@@ -2011,7 +2011,7 @@
 	if (cid->contentTypeFlag) *outSize += 1;
 
 	if (cid->contentIdentifierFlag) 
-		*outSize += strlen((const char*)cid->contentIdentifier) - 1 - cid->contentTypeFlag;
+		*outSize += (u32) strlen((const char*)cid->contentIdentifier) - 1 - cid->contentTypeFlag;
 	return GF_OK;
 }
 
@@ -2171,9 +2171,9 @@
 	*outSize += 1;
 	if (etd->NonItemText) {
 		if (etd->isUTF8) {
-			nonLen = strlen((const char*)etd->NonItemText);
+			nonLen = (u32) strlen((const char*)etd->NonItemText);
 		} else {
-			nonLen = gf_utf8_wcslen((const unsigned short*)etd->NonItemText);
+			nonLen = (u32) gf_utf8_wcslen((const unsigned short*)etd->NonItemText);
 		}
 	} else {
 		nonLen = 0;
@@ -2221,11 +2221,11 @@
 		OD_WriteUTF8String(bs, tmp->text, etd->isUTF8);
 	}
 	if (etd->NonItemText) {
-		nonLen = strlen((const char*)etd->NonItemText) + 1;
+		nonLen = (u32) strlen((const char*)etd->NonItemText) + 1;
 		if (etd->isUTF8) {
-			nonLen = strlen((const char*)etd->NonItemText);
+			nonLen = (u32) strlen((const char*)etd->NonItemText);
 		} else {
-			nonLen = gf_utf8_wcslen((const unsigned short*)etd->NonItemText);
+			nonLen = (u32) gf_utf8_wcslen((const unsigned short*)etd->NonItemText);
 		}
 	} else {
 		nonLen = 0;
@@ -2458,7 +2458,7 @@
 	}
 	else if (! ipmp->IPMPS_Type) {
 		if (!ipmp->opaque_data) return GF_ODF_INVALID_DESCRIPTOR;
-		*outSize += strlen(ipmp->opaque_data);
+		*outSize += (u32) strlen(ipmp->opaque_data);
 	} else {
 		*outSize += ipmp->opaque_data_size;
 	}
@@ -2492,7 +2492,7 @@
 	}
 	else if (!ipmp->IPMPS_Type) {
 		if (!ipmp->opaque_data) return GF_ODF_INVALID_DESCRIPTOR;
-		gf_bs_write_data(bs, ipmp->opaque_data, strlen(ipmp->opaque_data));
+		gf_bs_write_data(bs, ipmp->opaque_data, (u32) strlen(ipmp->opaque_data));
 	} else {
 		gf_bs_write_data(bs, ipmp->opaque_data, ipmp->opaque_data_size);
 	}
@@ -2784,7 +2784,7 @@
 		gf_bs_write_int(bs, tmp->langCode, 24);
 		gf_bs_write_int(bs, tmp->isUTF8, 1);
 		gf_bs_write_int(bs, 0, 7);		//aligned
-		gf_bs_write_int(bs, strlen(tmp->OCICreatorName) , 8);
+		gf_bs_write_int(bs, (u32) strlen(tmp->OCICreatorName) , 8);
 		OD_WriteUTF8String(bs, tmp->OCICreatorName, tmp->isUTF8);
 	}
 	return GF_OK;
@@ -3305,7 +3305,7 @@
 	if (ipmpt->num_alternate) *outSize += 1 + 16*ipmpt->num_alternate;
 
 	if (ipmpt->tool_url) {
-		u32 s = strlen(ipmpt->tool_url);
+		u32 s = (u32) strlen(ipmpt->tool_url);
 		*outSize += gf_odf_size_field_size(s) - 1 + s;
 	}
 	return GF_OK;
@@ -3331,7 +3331,7 @@
 		gf_bs_write_int(bs, ipmpt->num_alternate, 8);
 		for (i=0;i<ipmpt->num_alternate; i++) gf_bs_write_data(bs, (char*)ipmpt->specificToolID[i], 16);
 	}
-	if (ipmpt->tool_url) gf_ipmpx_write_array(bs, ipmpt->tool_url, strlen(ipmpt->tool_url));
+	if (ipmpt->tool_url) gf_ipmpx_write_array(bs, ipmpt->tool_url, (u32) strlen(ipmpt->tool_url));
 	return GF_OK;
 }

gpac-0.5.0.svn4296.tar.bz2/src/odf/odf_dump.c -> gpac-0.5.0.svn4668.tar.bz2/src/odf/odf_dump.c Changed

@@ -291,6 +291,13 @@
 	EndAttribute(trace, indent, XMTDump);
 }
 
+static void DumpIntForce(FILE *trace, const char *attName, u32  val, u32 indent, Bool XMTDump)
+{
+	StartAttribute(trace, attName, indent, XMTDump);
+	fprintf(trace, "%d", val);
+	EndAttribute(trace, indent, XMTDump);
+}
+
 static void DumpIntHex(FILE *trace, const char *attName, u32  val, u32 indent, Bool XMTDump, Bool single_byte)
 {
 	StartAttribute(trace, attName, indent, XMTDump);
@@ -532,6 +539,12 @@
 		StartElement(trace, "slConfigDescr" , indent, XMTDump, 0);
 		gf_odf_dump_desc(esd->slConfig, trace, indent + (XMTDump ? 1 : 0), XMTDump);
 		EndElement(trace, "slConfigDescr" , indent, XMTDump, 0);
+	}else{
+		StartElement(trace, "slConfigDescr" , indent, XMTDump, 0);
+		StartDescDump(trace, "SLConfigDescriptor", indent, XMTDump);
+		EndAttributes(trace, indent, XMTDump);
+		EndDescDump(trace, "SLConfigDescriptor", indent, XMTDump);
+		EndElement(trace, "slConfigDescr" , indent, XMTDump, 0);
 	}
 	if (esd->ipiPtr) {
 		StartElement(trace, "ipiPtr" , indent, XMTDump, 0);
@@ -950,7 +963,7 @@
 	StartDescDump(trace, "DecoderConfigDescriptor", indent, XMTDump);
 	indent++;
 
-	DumpInt(trace, "objectTypeIndication", dcd->objectTypeIndication, indent, XMTDump);
+	DumpIntForce(trace, "objectTypeIndication", dcd->objectTypeIndication, indent, XMTDump);
 	DumpInt(trace, "streamType", dcd->streamType, indent, XMTDump);
 	DumpInt(trace, "upStream", dcd->upstream, indent, XMTDump);
 	DumpInt(trace, "bufferSizeDB", dcd->bufferSizeDB, indent, XMTDump);

gpac-0.5.0.svn4296.tar.bz2/src/odf/odf_parse.c -> gpac-0.5.0.svn4668.tar.bz2/src/odf/odf_parse.c Changed

@@ -137,7 +137,7 @@
 {
 	u32 i, c;
 	char s[3];
-	u32 len = strlen(val) / 3;
+	u32 len = (u32) strlen(val) / 3;
 	if (*out_data) gf_free(*out_data);
 	*out_data_size = len;
 	*out_data = (char*)gf_malloc(sizeof(char) * len);
@@ -376,7 +376,6 @@
 		GF_BIFSConfig *bcd = (GF_BIFSConfig*)desc;
 		if (!stricmp(val, "auto")) return GF_OK;
 		if (!stricmp(fieldName, "nodeIDbits")) ret += sscanf(val, "%hu", &bcd->nodeIDbits);
-		else if (!stricmp(fieldName, "nodeIDbits")) ret += sscanf(val, "%hu", &bcd->nodeIDbits);
 		else if (!stricmp(fieldName, "routeIDbits")) ret += sscanf(val, "%hu", &bcd->routeIDbits);
 		else if (!stricmp(fieldName, "protoIDbits")) ret += sscanf(val, "%hu", &bcd->protoIDbits);
 		else if (!stricmp(fieldName, "isCommandStream")) { /*GET_BOOL(bcd->isCommandStream)*/ ret = 1; }
@@ -436,7 +435,7 @@
 			} else if (!strlen(val)) ret = 1;
 		}
 		if (!stricmp(fieldName, "src")) {
-			u32 len = strlen("data:application/octet-string,");
+			u32 len = (u32) strlen("data:application/octet-string,");
 			if (strnicmp(val, "data:application/octet-string,", len)) break;
 			val += len;
 			/*only parse true hexa strings*/
@@ -588,7 +587,7 @@
 		{
 			GF_Language *ld = (GF_Language *)desc;
 			if (!stricmp(fieldName, "languageCode")) {
-				u32 li, l = strlen(val);
+				u32 li, l = (u32) strlen(val);
 				ld->langCode = 0;
 				for (li = 0; li < l; li++) {
 					/* Warning: sensitive to big endian, little endian */
@@ -651,7 +650,7 @@
 				bs_start = gf_bs_get_position(bs);
 				/*nb phonems*/
 				gf_bs_write_int(bs, 0, 8);
-				gf_bs_write_data(bs, szItem, strlen(szItem));
+				gf_bs_write_data(bs, szItem, (u32) strlen(szItem));
 				gf_bs_write_int(bs, 0, 8);
 				continue;
 			}

gpac-0.5.0.svn4296.tar.bz2/src/scene_manager/loader_bt.c -> gpac-0.5.0.svn4668.tar.bz2/src/scene_manager/loader_bt.c Changed

@@ -200,7 +200,7 @@
 				}
 				if (wchar==' ') {
 					last_space_pos_stream = gztell(parser->gz_in);
-					last_space_pos = dst - l;
+					last_space_pos = (u32) (dst - l);
 				}
 				dst++;
 				go--;
@@ -209,7 +209,7 @@
 			*dst = 0;
 			/*long line, rewind stream to last space*/
 			if (!go) {
-				u32 rew_pos = gztell(parser->gz_in) - 2*(dst - &l[last_space_pos]);
+				u32 rew_pos = (u32)  (gztell(parser->gz_in) - 2*(dst - &l[last_space_pos]) );
 				gzseek(parser->gz_in, rew_pos, SEEK_SET);
 				l[last_space_pos+1] = 0;
 			}
@@ -259,7 +259,7 @@
 
 		while (1) {
 			char c;
-			u32 len = strlen(parser->line_buffer);
+			u32 len = (u32) strlen(parser->line_buffer);
 			if (!len) break;
 			c = parser->line_buffer[len-1];
 			if (!strchr("\n\r\t", c)) break;
@@ -267,7 +267,7 @@
 		}
 
 
-		parser->line_size = strlen(parser->line_buffer);
+		parser->line_size = (u32) strlen(parser->line_buffer);
 		parser->line_pos = 0;
 		parser->line++;
 
@@ -376,13 +376,13 @@
 					BTDefSymbol *def = (BTDefSymbol *)gf_list_get(parser->def_symbols, i);
 					char *start = strstr(parser->line_buffer, def->name);
 					if (!start) continue;
-					symb_len = strlen(def->name);
+					symb_len = (u32) strlen(def->name);
 					if (!strchr(" \n\r\t,[]{}\'\"", start[symb_len])) continue;
-					val_len = strlen(def->value);
-					copy_len = strlen(start + symb_len) + 1;
+					val_len = (u32) strlen(def->value);
+					copy_len = (u32) strlen(start + symb_len) + 1;
 					memmove(start + val_len, start + symb_len, sizeof(char)*copy_len);
 					memcpy(start, def->value, sizeof(char)*val_len);
-					parser->line_size = strlen(parser->line_buffer);
+					parser->line_size = (u32) strlen(parser->line_buffer);
 					found = 1;
 				}
 				if (!found) break;
@@ -986,7 +986,7 @@
 		if (!gf_bt_check_code(parser, '\"')) {
 			gf_bt_report(parser, GF_BAD_PARAM, "\" expected in Script");
 		}
-		sc->script_text = (unsigned char*)gf_bt_get_string(parser, '\"');
+		sc->script_text = (char*)gf_bt_get_string(parser, '\"');
 	}
 		break;
 	case GF_SG_VRML_SFATTRREF:
@@ -1356,7 +1356,7 @@
 				if (!parser->is_wrl) {
 					/*we ignore 'solid' for MPEG4 box/cone/etc*/
 					if (!strcmp(str, "solid")) {
-						Bool b;
+						SFBool b;
 						gf_bt_parse_bool(parser, "solid", &b);
 						parser->last_error = GF_OK;
 						continue;
@@ -1378,7 +1378,7 @@
 						parser->last_error = gf_node_get_field_by_name(node, str, &info);
 					}
 					else if (!strcmp(str, "enabled")) {
-						Bool b;
+						SFBool b;
 						gf_bt_parse_bool(parser, "collide", &b);
 						parser->last_error = GF_OK;
 						continue;
@@ -1397,7 +1397,7 @@
 					else 
 #endif
 					if (!strcmp(str, "collide")) {
-						Bool b;
+						SFBool b;
 						gf_bt_parse_bool(parser, "enabled", &b);
 						parser->last_error = GF_OK;
 						continue;
@@ -1517,6 +1517,10 @@
 			gf_list_add(parser->scripts, node);
 		}
 	}
+	/*For Ivica: load proto as soon as found when in playback mode*/
+	if ( (parser->load->flags & GF_SM_LOAD_FOR_PLAYBACK) && proto && !parser->parsing_proto) {
+		parser->last_error = gf_sg_proto_load_code(node);
+	}
 	return node;
 
 err:
@@ -3036,6 +3040,15 @@
 				else sc->carousel_period = mux->carousel_period_plus_one - 1;
 			}
 		}
+	} else if (desc->tag==GF_ODF_MUXINFO_TAG) {
+		GF_MuxInfo *mi = (GF_MuxInfo *)desc;
+		if (mi->file_name) {
+			char *res_name = gf_url_concatenate(parser->load->fileName, mi->file_name);
+			if (res_name) {
+				gf_free(mi->file_name);
+				mi->file_name = res_name;
+			}
+		}
 	}
 	return desc;
 }
@@ -3706,7 +3719,7 @@
 	ctx.scene_graph = in_scene;
 	memset(&parser, 0, sizeof(GF_BTParser));
 	parser.line_buffer = node_str;
-	parser.line_size = strlen(node_str);
+	parser.line_size = (u32) strlen(node_str);
 	parser.load = &ctx;
 	parser.top_nodes = gf_list_new();
 	parser.undef_nodes = gf_list_new();

gpac-0.5.0.svn4296.tar.bz2/src/scene_manager/loader_svg.c -> gpac-0.5.0.svn4668.tar.bz2/src/scene_manager/loader_svg.c Changed

@@ -53,7 +53,7 @@
 	GF_SceneLoader *load;
 	GF_Err last_error;
 	GF_SAXParser *sax_parser;
-	Bool has_root;
+	u32 has_root;
 	
 	/* stack of SVG nodes*/
 	GF_List *node_stack;
@@ -141,7 +141,7 @@
 #endif
 	if (e) {
 		parser->last_error = e;
-		gf_xml_sax_suspend(parser->sax_parser, 1);
+		gf_xml_sax_suspend(parser->sax_parser, GF_TRUE);
 	}
 	return e;
 }
@@ -196,7 +196,7 @@
 	u32 i;
 	if (parser->load->ctx && parser->load->ctx->root_od) {
 		for (i=0; i<gf_list_count(parser->load->ctx->root_od->ESDescriptors); i++) {
-			GF_ESD *esd = gf_list_get(parser->load->ctx->root_od->ESDescriptors, i);
+			GF_ESD *esd = (GF_ESD *)gf_list_get(parser->load->ctx->root_od->ESDescriptors, i);
 			if (esd->decoderConfig->streamType==GF_STREAM_SCENE) {
 				GF_LASERConfig *cfg = (GF_LASERConfig *)esd->decoderConfig->decoderSpecificInfo;
 				if (cfg && (cfg->tag==GF_ODF_LASER_CFG_TAG)) {
@@ -269,7 +269,7 @@
 			char *buf64;
 			u64 size64;
 			char *ext;
-			buf64 = gf_malloc((size_t)size*2);
+			buf64 = (char *)gf_malloc((size_t)size*2);
 			size64 = gf_base64_encode(buffer, (u32)size, buf64, (u32)size*2);
 			buf64[size64] = 0;
 			mtype = "application/data";
@@ -279,7 +279,7 @@
 				if (!stricmp(ext, ".jpg") || !stricmp(ext, ".jpeg")) mtype = "image/jpg";
 			}
 			gf_free(iri->string);
-			iri->string = gf_malloc(sizeof(char)*(40+(size_t)size64));
+			iri->string = (char *)gf_malloc(sizeof(char)*(40+(size_t)size64));
 			sprintf(iri->string, "data:%s;base64,%s", mtype, buf64);
 			gf_free(buf64);
 			gf_free(buffer);
@@ -315,7 +315,7 @@
 	gf_free(node_class);
 
 	if (n) {
-		gf_svg_parse_element_id(n, ID, 0);
+		gf_svg_parse_element_id(n, ID, GF_FALSE);
 		gf_list_add(parser->peeked_nodes, n);
 	}
 	return n;
@@ -366,7 +366,7 @@
 		/* if now we have a target, create the xlink:href attribute on the animation element and set it to the found target */
 		if (anim->target) {
 			XMLRI *iri;
-			gf_node_get_attribute_by_tag((GF_Node *)anim->animation_elt, TAG_XLINK_ATT_href, 1, 0, &info);
+			gf_node_get_attribute_by_tag((GF_Node *)anim->animation_elt, TAG_XLINK_ATT_href, GF_TRUE, GF_FALSE, &info);
 			iri = (XMLRI *)info.far_ptr;
 			iri->type = XMLRI_ELEMENTID;
 			iri->target = anim->target;
@@ -376,7 +376,7 @@
 		tag = gf_node_get_tag((GF_Node *)anim->animation_elt);
 		/* get the attribute name attribute if specified */
 		if (anim->type && (tag== TAG_SVG_animateTransform) ) {
-			gf_node_get_attribute_by_tag((GF_Node *)anim->animation_elt, TAG_SVG_ATT_transform_type, 1, 0, &info);
+			gf_node_get_attribute_by_tag((GF_Node *)anim->animation_elt, TAG_SVG_ATT_transform_type, GF_TRUE, GF_FALSE, &info);
 			gf_svg_parse_attribute((GF_Node *)anim->animation_elt, &info, anim->type, 0);
 			switch(*(SVG_TransformType *) info.far_ptr) {
 			case SVG_TRANSFORM_TRANSLATE:
@@ -399,10 +399,10 @@
 				break;
 			default:
 				svg_report(parser, GF_OK, "unknown datatype for animate transform");
-				return 0;
+				return GF_FALSE;
 			}
 		}
-		else if (gf_node_get_attribute_by_tag((GF_Node *)anim->animation_elt, TAG_SVG_ATT_attributeName, 0, 0, &info) == GF_OK) {
+		else if (gf_node_get_attribute_by_tag((GF_Node *)anim->animation_elt, TAG_SVG_ATT_attributeName, GF_FALSE, GF_FALSE, &info) == GF_OK) {
 			SMIL_AttributeName *attname = (SMIL_AttributeName *)info.far_ptr;
 
 			/*parse the attribute name even if the target is not found, because a namespace could be specified and 
@@ -424,9 +424,9 @@
 			}
 
 			/* the target is still not known stay in stage 0 */
-			if (!anim->target) return 0;
+			if (!anim->target) return GF_FALSE;
 
-			gf_node_get_attribute_by_name((GF_Node *)anim->target, attname->name, attname->type, 1, 1, &info);
+			gf_node_get_attribute_by_name((GF_Node *)anim->target, attname->name, attname->type, GF_TRUE, GF_TRUE, &info);
 			/*set the tag value to avoid parsing the name in the anim node_init phase*/
 			attname->tag = info.fieldIndex;
 			attname->type = 0;
@@ -440,37 +440,37 @@
 				return svg_parse_animation(parser, sg, anim, nodeID, 0);
 			} else {
 				svg_report(parser, GF_OK, "Missing attributeName attribute on %s", gf_node_get_name((GF_Node *)anim->animation_elt));
-				return 0;
+				return GF_FALSE;
 			}
 		}
 
 		/* the target is still not known stay in stage 0 */
-		if (!anim->target) return 0;
+		if (!anim->target) return GF_FALSE;
 
 		if (anim->to) {
 			/* now that we have a target, if there is a to value to parse, create the attribute and parse it */
-			gf_node_get_attribute_by_tag((GF_Node *)anim->animation_elt, TAG_SVG_ATT_to, 1, 0, &info);
+			gf_node_get_attribute_by_tag((GF_Node *)anim->animation_elt, TAG_SVG_ATT_to, GF_TRUE, GF_FALSE, &info);
 			gf_svg_parse_attribute((GF_Node *)anim->animation_elt, &info, anim->to, anim_value_type);
 			if (anim_value_type==XMLRI_datatype) 
 				svg_post_process_href(parser, (XMLRI*)((SMIL_AnimateValue *)info.far_ptr)->value);
 		} 
 		if (anim->from) {
 			/* now that we have a target, if there is a from value to parse, create the attribute and parse it */
-			gf_node_get_attribute_by_tag((GF_Node *)anim->animation_elt, TAG_SVG_ATT_from, 1, 0, &info);
+			gf_node_get_attribute_by_tag((GF_Node *)anim->animation_elt, TAG_SVG_ATT_from, GF_TRUE, GF_FALSE, &info);
 			gf_svg_parse_attribute((GF_Node *)anim->animation_elt, &info, anim->from, anim_value_type);
 			if (anim_value_type==XMLRI_datatype) 
 				svg_post_process_href(parser, (XMLRI*)((SMIL_AnimateValue *)info.far_ptr)->value);
 		} 
 		if (anim->by) {
 			/* now that we have a target, if there is a by value to parse, create the attribute and parse it */
-			gf_node_get_attribute_by_tag((GF_Node *)anim->animation_elt, TAG_SVG_ATT_by, 1, 0, &info);
+			gf_node_get_attribute_by_tag((GF_Node *)anim->animation_elt, TAG_SVG_ATT_by, GF_TRUE, GF_FALSE, &info);
 			gf_svg_parse_attribute((GF_Node *)anim->animation_elt, &info, anim->by, anim_value_type);
 			if (anim_value_type==XMLRI_datatype) 
 				svg_post_process_href(parser, (XMLRI*)((SMIL_AnimateValue *)info.far_ptr)->value);
 		} 
 		if (anim->values) {
 			/* now that we have a target, if there is a 'values' value to parse, create the attribute and parse it */
-			gf_node_get_attribute_by_tag((GF_Node *)anim->animation_elt, TAG_SVG_ATT_values, 1, 0, &info);
+			gf_node_get_attribute_by_tag((GF_Node *)anim->animation_elt, TAG_SVG_ATT_values, GF_TRUE, GF_FALSE, &info);
 			gf_svg_parse_attribute((GF_Node *)anim->animation_elt, &info, anim->values, anim_value_type);
 			if (anim_value_type==XMLRI_datatype) {
 				u32 i, count;
@@ -489,25 +489,25 @@
 	if (anim->resolve_stage == 1) {
 		/* Stage 1: parsing the begin values 
 					we go into the next stage only if at least one begin value is resolved */
-		gf_node_get_attribute_by_tag((GF_Node *)anim->animation_elt, TAG_SVG_ATT_begin, 1, 0, &info);
-		if (gf_svg_resolve_smil_times((GF_Node *)anim->animation_elt, anim->target, *(GF_List **)info.far_ptr, 0, nodeID)) {
+		gf_node_get_attribute_by_tag((GF_Node *)anim->animation_elt, TAG_SVG_ATT_begin, GF_TRUE, GF_FALSE, &info);
+		if (gf_svg_resolve_smil_times((GF_Node *)anim->animation_elt, anim->target, *(GF_List **)info.far_ptr, GF_FALSE, nodeID)) {
 			anim->resolve_stage = 2;
 		} else if (force_type!=2) {
-			return 0;
+			return GF_FALSE;
 		}
 	}
 
-	gf_node_get_attribute_by_tag((GF_Node *)anim->animation_elt, TAG_SVG_ATT_end, 1, 0, &info);
-	if (!gf_svg_resolve_smil_times((GF_Node *)anim->animation_elt, anim->target, *(GF_List **)info.far_ptr, 1, nodeID)) {
-		if (force_type!=2) return 0;
+	gf_node_get_attribute_by_tag((GF_Node *)anim->animation_elt, TAG_SVG_ATT_end, GF_TRUE, GF_FALSE, &info);
+	if (!gf_svg_resolve_smil_times((GF_Node *)anim->animation_elt, anim->target, *(GF_List **)info.far_ptr, GF_TRUE, nodeID)) {
+		if (force_type!=2) return GF_FALSE;
 	}
 
 	/*animateMotion needs its children to be parsed before it can be initialized !! */
 	if (force_type || gf_node_get_tag((GF_Node *)anim->animation_elt) != TAG_SVG_animateMotion) {
 		gf_node_init((GF_Node *)anim->animation_elt);
-		return 1;
+		return GF_TRUE;
 	} else {
-		return 0;
+		return GF_FALSE;
 	}
 	
 }
@@ -543,18 +543,18 @@
 		SVG_Element *listener = (SVG_Element *)gf_list_get(parser->defered_listeners, i);
 
 		par = NULL;
-		if (gf_node_get_attribute_by_tag((GF_Node *)listener, TAG_XMLEV_ATT_observer, 0, 0, &info) == GF_OK) {
-			XMLRI *observer = info.far_ptr;
+		if (gf_node_get_attribute_by_tag((GF_Node *)listener, TAG_XMLEV_ATT_observer, GF_FALSE, GF_FALSE, &info) == GF_OK) {
+			XMLRI *observer = (XMLRI *)info.far_ptr;
 			if (observer->type == XMLRI_ELEMENTID) {
 				if (!observer->target && observer->string && !strcmp(observer->string, nodeID) ) {
 					observer->target = gf_sg_find_node_by_name(sg, (char*) nodeID);
 				}
 			}
-			if (observer->type == XMLRI_ELEMENTID) par = observer->target;
+			if (observer->type == XMLRI_ELEMENTID) par = (GF_Node *)observer->target;
 			if (!par) continue;
 		}
-		if (gf_node_get_attribute_by_tag((GF_Node *)listener, TAG_XMLEV_ATT_target, 0, 0, &info) == GF_OK) {
-			XMLRI *target = info.far_ptr;
+		if (gf_node_get_attribute_by_tag((GF_Node *)listener, TAG_XMLEV_ATT_target, GF_FALSE, GF_FALSE, &info) == GF_OK) {
+			XMLRI *target = (XMLRI *)info.far_ptr;
 			if (target->type == XMLRI_ELEMENTID) {
 				if (!target->target) continue;
 				else {
@@ -587,13 +587,13 @@
 	GF_FieldInfo width_info, height_info;
 	u32 svg_w, svg_h;
 	svg_w = svg_h = 0;
-	if (!gf_node_get_attribute_by_tag((GF_Node *)root_svg, TAG_SVG_ATT_width, 0, 0, &width_info)
-		&& !gf_node_get_attribute_by_tag((GF_Node *)root_svg, TAG_SVG_ATT_height, 0, 0, &height_info)) {
-		SVG_Length * w = width_info.far_ptr;
-		SVG_Length * h = height_info.far_ptr;
+	if (!gf_node_get_attribute_by_tag((GF_Node *)root_svg, TAG_SVG_ATT_width, GF_FALSE, GF_FALSE, &width_info)
+		&& !gf_node_get_attribute_by_tag((GF_Node *)root_svg, TAG_SVG_ATT_height, GF_FALSE, GF_FALSE, &height_info)) {
+		SVG_Length * w = (SVG_Length *)width_info.far_ptr;
+		SVG_Length * h = (SVG_Length *)height_info.far_ptr;
 		if (w->type == SVG_NUMBER_VALUE) svg_w = FIX2INT(w->value);
 		if (h->type == SVG_NUMBER_VALUE) svg_h = FIX2INT(h->value);
-		gf_sg_set_scene_size_info(parser->load->scene_graph, svg_w, svg_h, 1);
+		gf_sg_set_scene_size_info(parser->load->scene_graph, svg_w, svg_h, GF_TRUE);
 		if (parser->load->ctx) {
 			parser->load->ctx->scene_width = svg_w;
 			parser->load->ctx->scene_height = svg_h;
@@ -628,7 +628,7 @@
 	
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("[SVG Parsing] Parsing node %s\n", name));
 
-	*has_ns = 0;
+	*has_ns = GF_FALSE;
 	/*parse all att to check for namespaces, to:
 	   - add the prefixed namespaces (xmlns:xxxx='...')
 	   - change the namespace for this element if no prefix (xmlns='...')*/
@@ -649,7 +649,7 @@
 				parser->current_ns = gf_sg_get_namespace_code_from_name(parser->load->scene_graph, att->value);
 			}
 			/* Signal that when ending this element, namespaces will have to be removed */
-			*has_ns = 1;
+			*has_ns = GF_TRUE;
 		}
 		/* FIXME: This should be changed to reflect that xml:id has precedence over id if both are specified with different values */
 		else if (!stricmp(att->name, "id") || !stricmp(att->name, "xml:id")) {
@@ -681,15 +681,15 @@
 
 	/* If this element has an ID, we look in the list of elements already created in advance (in case of reference) to see if it is there,
 	   in which case we will reuse it*/
-	has_id = 0;
+	has_id = GF_FALSE;
 	count = gf_list_count(parser->peeked_nodes);
 	if (count && ID) {
 		for (i=0; i<count;i++) {
-			GF_Node *n = gf_list_get(parser->peeked_nodes, i);
+			GF_Node *n = (GF_Node *)gf_list_get(parser->peeked_nodes, i);
 			const char *n_id = gf_node_get_name(n);
 			if (n_id && !strcmp(n_id, ID)) {
 				gf_list_rem(parser->peeked_nodes, i);
-				has_id = 1;
+				has_id = GF_TRUE;
 				elt = (SVG_Element*)n;
 				break;
 			}
@@ -719,7 +719,7 @@
 	if (parent && elt) gf_node_list_add_child_last( & parent->node->children, (GF_Node*)elt, & parent->last_child);
 
 	/* By default, all elements will need initialization for rendering, except some that will explicitly set it to 0 */
-	needs_init = 1;
+	needs_init = GF_TRUE;
 
 	if (gf_svg_is_animation_tag(tag)) {
 		GF_SAFEALLOC(anim, SVG_DeferedAnimation);
@@ -748,7 +748,7 @@
 		anim->resolve_stage = 1;
 	} else if ((tag == TAG_SVG_script) || (tag==TAG_SVG_handler)) {
 		/* Scripts and handlers don't render and have no initialization phase */
-		needs_init = 0;
+		needs_init = GF_FALSE;
 	}
 
 	ev_event = ev_observer = NULL;
@@ -830,9 +830,9 @@
 				   we create the attribute, parse it and try to do some special process it */
 				GF_FieldInfo info;
 				XMLRI *iri = NULL;
-				if (gf_node_get_attribute_by_tag((GF_Node *)elt, TAG_XLINK_ATT_href, 1, 0, &info)==GF_OK) {
+				if (gf_node_get_attribute_by_tag((GF_Node *)elt, TAG_XLINK_ATT_href, GF_TRUE, GF_FALSE, &info)==GF_OK) {
 					gf_svg_parse_attribute((GF_Node *)elt, &info, att->value, 0);
-					iri = info.far_ptr;
+					iri = (XMLRI *)info.far_ptr;
 
 					/* Embed script if needed or clean data URL with proper mime type */
 					svg_process_media_href(parser, (GF_Node *)elt, iri);
@@ -859,18 +859,18 @@
 		if (ns == GF_XMLNS_LASER) { 
 			/* CHECK: we should probably check the namespace of the attribute here */
 			if (!stricmp(att_name, "scale") ) {
-				if (gf_node_get_attribute_by_tag((GF_Node *)elt, TAG_SVG_ATT_transform, 1, 1, &info)==GF_OK) {
+				if (gf_node_get_attribute_by_tag((GF_Node *)elt, TAG_SVG_ATT_transform, GF_TRUE, GF_TRUE, &info)==GF_OK) {
 					SVG_Point pt;
-					SVG_Transform *mat = info.far_ptr;
+					SVG_Transform *mat = (SVG_Transform *)info.far_ptr;
 					svg_parse_point(&pt, att->value);
 					gf_mx2d_add_scale(&mat->mat, pt.x, pt.y);
 					continue;
 				}
 			} 
 			if (!stricmp(att_name, "translation") ) {
-				if (gf_node_get_attribute_by_tag((GF_Node *)elt, TAG_SVG_ATT_transform, 1, 1, &info)==GF_OK) {
+				if (gf_node_get_attribute_by_tag((GF_Node *)elt, TAG_SVG_ATT_transform, GF_TRUE, GF_TRUE, &info)==GF_OK) {
 					SVG_Point pt;
-					SVG_Transform *mat = info.far_ptr;
+					SVG_Transform *mat = (SVG_Transform *)info.far_ptr;
 					svg_parse_point(&pt, att->value);
 					gf_mx2d_add_translation(&mat->mat, pt.x, pt.y);
 					continue;
@@ -894,7 +894,7 @@
 		/* end of special cases of attributes */
 
 		/* General attribute creation and parsing */
-		if (gf_node_get_attribute_by_name((GF_Node *)elt, att_name, ns, 1, 0, &info)==GF_OK) {
+		if (gf_node_get_attribute_by_name((GF_Node *)elt, att_name, ns, GF_TRUE, GF_FALSE, &info)==GF_OK) {
 #ifndef SKIP_ATTS_PARSING
 			GF_Err e = gf_svg_parse_attribute((GF_Node *)elt, &info, att->value, 0);
 			if (e) {
@@ -952,20 +952,20 @@
 
 		/* this listener listens to the given type of event */
 		type = gf_dom_event_type_by_name(ev_event);
-		gf_node_get_attribute_by_tag(node, TAG_XMLEV_ATT_event, 1, 0, &info);
+		gf_node_get_attribute_by_tag(node, TAG_XMLEV_ATT_event, GF_TRUE, GF_FALSE, &info);
 		((XMLEV_Event *)info.far_ptr)->type = type;
-		gf_node_get_attribute_by_tag((GF_Node *)listener, TAG_XMLEV_ATT_event, 1, 0, &info);
+		gf_node_get_attribute_by_tag((GF_Node *)listener, TAG_XMLEV_ATT_event, GF_TRUE, GF_FALSE, &info);
 		((XMLEV_Event *)info.far_ptr)->type = type;
-		gf_node_get_attribute_by_tag((GF_Node *)listener, TAG_XMLEV_ATT_handler, 1, 0, &info);
+		gf_node_get_attribute_by_tag((GF_Node *)listener, TAG_XMLEV_ATT_handler, GF_TRUE, GF_FALSE, &info);
 		((XMLRI *)info.far_ptr)->target = node;
 
 		if (ev_observer) {
 			/* An observer was specified, so it needs to be used */
-			gf_node_get_attribute_by_tag((GF_Node *)listener, TAG_XMLEV_ATT_observer, 1, 0, &info);
+			gf_node_get_attribute_by_tag((GF_Node *)listener, TAG_XMLEV_ATT_observer, GF_TRUE, GF_FALSE, &info);
 			gf_svg_parse_attribute((GF_Node *)elt, &info, (char*)ev_observer, 0);
 		} else {
 			/* No observer specified, this listener listens with the parent of the handler as the event target */
-			gf_node_get_attribute_by_tag((GF_Node *)listener, TAG_XMLEV_ATT_target, 1, 0, &info);
+			gf_node_get_attribute_by_tag((GF_Node *)listener, TAG_XMLEV_ATT_target, GF_TRUE, GF_FALSE, &info);
 			((XMLRI *)info.far_ptr)->target = parent->node;
 		}
 		/* if the target was found (already parsed), we are fine, otherwise we need to try to find it again, 
@@ -980,7 +980,7 @@
 	if (node_name) {
 		if (!has_id) {
 			/* if the element was already created before this call, we don't need to get a numerical id, we have it already */
-			gf_svg_parse_element_id((GF_Node *)elt, node_name, parser->command_depth ? 1 : 0);
+			gf_svg_parse_element_id((GF_Node *)elt, node_name, parser->command_depth ? GF_TRUE : GF_FALSE);
 		}
 		svg_resolved_refs(parser, parser->load->scene_graph, node_name);
 	}
@@ -990,7 +990,7 @@
 	if (anim) {
 		/*FIXME - we need to parse from/to/values but not initialize the stack*/
 //		if (parser->load->flags & GF_SM_LOAD_FOR_PLAYBACK) {
-			needs_init = 0;
+			needs_init = GF_FALSE;
 			if (svg_parse_animation(parser, parser->load->scene_graph, anim, NULL, 0)) {
 				svg_delete_defered_anim(anim, NULL);
 			} else {
@@ -1010,7 +1010,7 @@
 
 	if (parent && elt) {
 		/*mark parent element as dirty (new child added) and invalidate parent graph for progressive rendering*/
-		gf_node_dirty_set((GF_Node *)parent->node, GF_SG_CHILD_DIRTY, 1);
+		gf_node_dirty_set((GF_Node *)parent->node, GF_SG_CHILD_DIRTY, GF_TRUE);
 		/*request scene redraw*/
 		if (parser->load->scene_graph->NodeCallback) {
 			parser->load->scene_graph->NodeCallback(parser->load->scene_graph->userpriv, GF_SG_CALLBACK_MODIFIED, NULL, NULL);
@@ -1020,35 +1020,35 @@
 	/*If we are in playback mode, we register (reference counting for safe deleting) the listener element with the element that uses it */
 	if ((parser->load->flags & GF_SM_LOAD_FOR_PLAYBACK) && elt && (tag==TAG_SVG_listener)) {
 		GF_FieldInfo info;
-		Bool post_pone = 0;
+		Bool post_pone = GF_FALSE;
 		SVG_Element *par = NULL;
 		SVG_Element *listener = (SVG_Element *)elt;
 
-		if (gf_node_get_attribute_by_tag((GF_Node *)listener, TAG_XMLEV_ATT_observer, 0, 0, &info) == GF_OK) {
-			XMLRI *observer = info.far_ptr;
+		if (gf_node_get_attribute_by_tag((GF_Node *)listener, TAG_XMLEV_ATT_observer, GF_FALSE, GF_FALSE, &info) == GF_OK) {
+			XMLRI *observer = (XMLRI *)info.far_ptr;
 			if (observer->type == XMLRI_ELEMENTID) {
-				if (!observer->target) post_pone = 1;
-				else par = observer->target;
+				if (!observer->target) post_pone = GF_TRUE;
+				else par = (SVG_Element *)observer->target;
 			}
 		}
 
-		if (gf_node_get_attribute_by_tag((GF_Node *)listener, TAG_XMLEV_ATT_target, 0, 0, &info) == GF_OK) {
-			XMLRI *target = info.far_ptr;
+		if (gf_node_get_attribute_by_tag((GF_Node *)listener, TAG_XMLEV_ATT_target, GF_FALSE, GF_FALSE, &info) == GF_OK) {
+			XMLRI *target = (XMLRI *)info.far_ptr;
 			if (!par && (target->type == XMLRI_ELEMENTID)) {
-				if (!target->target) post_pone = 1;
-				else par = target->target;
+				if (!target->target) post_pone = GF_TRUE;
+				else par = (SVG_Element *)target->target;
 			}
 		}
 		/*check handler, create it if not specified*/
-		if (gf_node_get_attribute_by_tag((GF_Node *)listener, TAG_XMLEV_ATT_handler, 1, 0, &info) == GF_OK) {
-			XMLRI *handler = info.far_ptr;
+		if (gf_node_get_attribute_by_tag((GF_Node *)listener, TAG_XMLEV_ATT_handler, GF_TRUE, GF_FALSE, &info) == GF_OK) {
+			XMLRI *handler = (XMLRI *)info.far_ptr;
 			if (!handler->target) {
 				if (!handler->string) handler->target = parent->node;
 			}
 		}
 		/*if event is a key event, register it with root*/
-		if (!par && gf_node_get_attribute_by_tag((GF_Node *)listener, TAG_XMLEV_ATT_event, 0, 0, &info) == GF_OK) {
-			XMLEV_Event *ev = info.far_ptr;
+		if (!par && gf_node_get_attribute_by_tag((GF_Node *)listener, TAG_XMLEV_ATT_event, GF_FALSE, GF_FALSE, &info) == GF_OK) {
+			XMLEV_Event *ev = (XMLEV_Event *)info.far_ptr;
 			if ((ev->type>=GF_EVENT_KEYUP) && (ev->type<=GF_EVENT_TEXTINPUT)) par = (SVG_Element*) listener->sgprivate->scenegraph->RootNode;
 		}
 
@@ -1067,7 +1067,7 @@
 {
 	GF_FieldInfo info;
 	GF_Node *opNode;
-	Bool is_replace = 0;
+	Bool is_replace = GF_FALSE;
 	char *atNode = NULL;
 	char *atAtt = NULL;
 	char *atOperandNode = NULL;
@@ -1103,7 +1103,7 @@
 				field->fieldIndex = 0;
 				field->fieldType = 0;
 			} else {
-				if (gf_node_get_attribute_by_name(parser->command->node, atAtt, parser->current_ns, 0, 0, &info)==GF_OK) {
+				if (gf_node_get_attribute_by_name(parser->command->node, atAtt, parser->current_ns, GF_FALSE, GF_FALSE, &info)==GF_OK) {
 					field = gf_sg_command_field_new(parser->command);
 					field->pos = index;
 					field->fieldIndex = info.fieldIndex;
@@ -1117,7 +1117,7 @@
 		gf_node_register(parser->command->node, NULL);
 		return GF_OK;
 	case GF_SG_LSR_REPLACE:
-		is_replace = 1;
+		is_replace = GF_TRUE;
 	case GF_SG_LSR_ADD:
 	case GF_SG_LSR_INSERT:
 		for (i=0; i<nb_attributes; i++) {
@@ -1348,7 +1348,7 @@
 			/* Create a default AU to behave as other streams (LASeR, BIFS)
 			   but it is left empty, there is no notion of REPLACE Scene or NEw Scene, 
 			   the RAP is the graph */
-			parser->laser_au = gf_sm_stream_au_new(parser->laser_es, 0, 0, 1);
+			parser->laser_au = gf_sm_stream_au_new(parser->laser_es, 0, 0, GF_TRUE);
 		} else {
 			parser->laser_es = gf_list_get(parser->load->ctx->streams, 0);
 			parser->laser_au = gf_list_last(parser->laser_es->AUs);
@@ -1375,13 +1375,15 @@
 			return;
 		}
 		if (!strcmp(name, "sceneUnit") ) {
-			u32 time, rap, i;
-			time = rap = 0;
-			if (!gf_list_count(parser->laser_es->AUs)) rap = 1;
+			u32 time, i;
+			Bool rap;
+			time = 0;
+			rap =  GF_FALSE;
+			if (!gf_list_count(parser->laser_es->AUs)) rap = GF_TRUE;
 			for (i=0; i<nb_attributes;i++) {
 				GF_XMLAttribute *att = (GF_XMLAttribute *) &attributes[i];
 				if (!strcmp(att->name, "time")) time = atoi(att->value);
-				else if (!strcmp(att->name, "rap")) rap = !strcmp(att->value, "yes") ? 1 : 0;
+				else if (!strcmp(att->name, "rap")) rap = !strcmp(att->value, "yes") ? GF_TRUE : GF_FALSE;
 			}
 			/*create new laser unit*/
 			parser->laser_au = gf_sm_stream_au_new(parser->laser_es, time, 0, rap);
@@ -1432,7 +1434,7 @@
 			st->stream_name = gf_strdup(ID);
 
 			/*create new SAF unit*/
-			parser->saf_au = gf_sm_stream_au_new(parser->saf_es, time, 0, 0);
+			parser->saf_au = gf_sm_stream_au_new(parser->saf_es, time, 0, GF_FALSE);
 			odU = (GF_ODUpdate *) gf_odf_com_new(GF_ODF_OD_UPDATE_TAG);
 			gf_list_add(parser->saf_au->commands, odU);
 			od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
@@ -1472,7 +1474,7 @@
 					fprintf(nhml, "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
 					fprintf(nhml, "<NHNTStream version=\"1.0\" timeScale=\"%d\" streamType=\"%d\" objectTypeIndication=\"%d\" inRootOD=\"no\" trackID=\"%d\">\n", ts_res, ST, OTI, st->id);
 					fclose(nhml);
-					mux->delete_file = 1;
+					mux->delete_file = GF_TRUE;
 				}
 			}
 			return;
@@ -1534,7 +1536,7 @@
 		if ((parser->load->type==GF_SM_LOAD_XSR) && !parser->laser_au && !cond) {
 			if (parser->load->flags & GF_SM_LOAD_CONTEXT_READY) {
 				assert(parser->laser_es);
-				parser->laser_au = gf_sm_stream_au_new(parser->laser_es, 0, 0, 0);
+				parser->laser_au = gf_sm_stream_au_new(parser->laser_es, 0, 0, GF_FALSE);
 			} else {
 				svg_report(parser, GF_BAD_PARAM, "LASeR sceneUnit not defined for command %s", name);
 				return;
@@ -1597,7 +1599,7 @@
 		return;
 
 	xmlns = parser->current_ns;
-	has_ns = 0;
+	has_ns = GF_FALSE;
 
 	elt = svg_parse_element(parser, name, name_space, attributes, nb_attributes, parent, &has_ns);
 	if (!elt) {
@@ -1694,13 +1696,13 @@
 #endif
 	{
 		const char *the_name;
-		Bool mismatch = 0;
+		Bool mismatch = GF_FALSE;
 		SVG_Element *node = top->node;
 		/*check node name...*/
 		the_name = gf_node_get_class_name((GF_Node *)node);
 		if (name_space && strstr(the_name, name_space) && strstr(the_name, name) ) {}
 		else if (!strcmp(the_name, name) ) {}
-		else mismatch = 1;
+		else mismatch = GF_TRUE;
 
 		if (mismatch) {
 			if (top->unknown_depth) {
@@ -1781,7 +1783,7 @@
 	SVG_NodeStack *top = (SVG_NodeStack *)gf_list_last(parser->node_stack);
 	SVG_Element *elt = (top ? top->node : NULL);
 	GF_DOMText *text;
-	u32 skip_text;
+	Bool skip_text;
 	u32 tag;
 
 #ifdef SKIP_ALL
@@ -1826,7 +1828,7 @@
 		}
 		return;
 	}
-	skip_text = 1;
+	skip_text = GF_TRUE;
 	switch (tag) {
 	case TAG_DOMFullNode:
 	case TAG_SVG_a:
@@ -1836,16 +1838,16 @@
 	case TAG_SVG_text:
 	case TAG_SVG_tspan:
 	case TAG_SVG_textArea:
-		skip_text = 0;
+		skip_text = GF_FALSE;
 		break;
 	/*for script and handlers only add text if not empty*/
 	case TAG_SVG_handler:
 	case TAG_SVG_script:
 	{
-		u32 i, len = strlen(text_content);
+		u32 i, len = (u32) strlen(text_content);
 		for (i=0; i<len; i++) {
 			if (!strchr(" \n\r\t", text_content[i])) {
-				skip_text = 0;
+				skip_text = GF_FALSE;
 				break;
 			}
 		}
@@ -1884,7 +1886,7 @@
 	parser->sax_parser = gf_xml_sax_new(svg_node_start, svg_node_end, svg_text_content, parser);
 	parser->load = load;
 	load->loader_priv = parser;
-	if (load->ctx) load->ctx->is_pixel_metrics = 1;
+	if (load->ctx) load->ctx->is_pixel_metrics = GF_TRUE;
 
 	/*to cope with old files not signaling XMLNS, add the SVG NS by default*/
 	gf_sg_add_namespace(parser->load->scene_graph, "http://www.w3.org/2000/svg", NULL);
@@ -1911,7 +1913,7 @@
 	/*FIXME - if there still are som defered listeners, we should pass them to the scene graph
 	and wait for the parent to be defined*/
 	while (gf_list_count(parser->defered_listeners)) {
-		GF_Node *l = gf_list_last(parser->defered_listeners);
+		GF_Node *l = (GF_Node *)gf_list_last(parser->defered_listeners);
 		gf_list_rem_last(parser->defered_listeners);
 		/*listeners not resolved are not inserted in the tree - destroy them*/
 		gf_node_register(l, NULL);
@@ -1984,7 +1986,7 @@
 	GF_SVG_Parser *parser = (GF_SVG_Parser *)load->loader_priv;
 
 	if (!parser) {
-		e = gf_sm_load_initialize_svg(load, NULL, 0);
+		e = gf_sm_load_initialize_svg(load, NULL, GF_FALSE);
 		if (e) return e;
 		parser = (GF_SVG_Parser *)load->loader_priv;
 	}
@@ -2034,7 +2036,7 @@
 	GF_SVG_Parser *parser = (GF_SVG_Parser *)load->loader_priv;
 
 	if (!parser) {
-		e = gf_sm_load_initialize_svg(load, str, 0);
+		e = gf_sm_load_initialize_svg(load, str, GF_FALSE);
 		parser = (GF_SVG_Parser *)load->loader_priv;
 	} else {
 		e = gf_xml_sax_parse(parser->sax_parser, str);
@@ -2078,7 +2080,7 @@
 	ctx.scene_graph = in_scene;
 	ctx.type = GF_SM_LOAD_SVG;
 
-	e = gf_sm_load_initialize_svg(&ctx, node_str, 1);
+	e = gf_sm_load_initialize_svg(&ctx, node_str, GF_TRUE);
 	
 	parser = (GF_SVG_Parser *)ctx.loader_priv;
 	node = parser->fragment_root;

gpac-0.5.0.svn4296.tar.bz2/src/scene_manager/loader_xmt.c -> gpac-0.5.0.svn4668.tar.bz2/src/scene_manager/loader_xmt.c Changed

@@ -757,7 +757,7 @@
 
 	/*SF string, no inspection*/
 	if (!is_mf) {
-		len = strlen(str);
+		len = (u32) strlen(str);
 		if (val->buffer) gf_free(val->buffer);
 		val->buffer = NULL;
 		if (len) val->buffer = gf_strdup(str);
@@ -778,14 +778,14 @@
 	else if (str[i]=='\"') strcpy(sep, "\"");
 	/*handle as a single field (old GPAC XMT & any unknown cases...*/
 	else {
-		len = strlen(str);
+		len = (u32) strlen(str);
 		if (val->buffer) gf_free(val->buffer);
 		val->buffer = NULL;
 		if (len) val->buffer = gf_strdup(str);
 		return len;
 	}
 	k = 0;
-	i += strlen(sep);
+	i += (u32) strlen(sep);
 
 	value = gf_strdup(str);
 
@@ -803,7 +803,7 @@
 		}
 	}
 	value[k] = 0;
-	len = strlen(sep) + i;
+	len = (u32) strlen(sep) + i;
 	
 	if (val->buffer) gf_free(val->buffer);
 	val->buffer = NULL;
@@ -858,7 +858,7 @@
 	if (parser->last_error) return res;
 
 	if (val->script_text) gf_free(val->script_text);
-	val->script_text = (unsigned char*)sfstr.buffer;
+	val->script_text = (char*)sfstr.buffer;
 	return res;
 }
 
@@ -1093,10 +1093,11 @@
 			com->RouteID = xmt_get_route(parser, com->unres_name, 0);
 			if (!com->RouteID) {
 				xmt_report(parser, GF_BAD_PARAM, "Cannot resolve GF_Route DEF %s", com->unres_name);
+			} else {
+				com->unresolved = 0;
 			}
 			gf_free(com->unres_name);
 			com->unres_name = NULL;
-			com->unresolved = 0;
 			break;
 		}
 	}
@@ -1844,6 +1845,10 @@
 	if (!parser->parsing_proto && (tag || proto) )
 		gf_node_init(node);
 
+	/*For Ivica: load proto as soon as found when in playback mode*/
+	if ( (parser->load->flags & GF_SM_LOAD_FOR_PLAYBACK) && proto && !parser->parsing_proto) {
+		parser->last_error = gf_sg_proto_load_code(node);
+	}
 	return node;
 }
 
@@ -1911,7 +1916,13 @@
 		else if (!strcmp(att->name, "ES_ID")) xmt_desc_name = att->value;
 		else if (!strcmp(att->name, "OCR_ES_ID")) ocr_ref = att->value;
 		else if (!strcmp(att->name, "dependsOn_ES_ID")) dep_ref = att->value;
-		else {
+		else if ((desc->tag==GF_ODF_MUXINFO_TAG) && (!stricmp(att->name, "fileName") || !stricmp(att->name, "url"))) {
+			char *res_name = gf_url_concatenate(parser->load->fileName, att->value);
+			e = gf_odf_set_field(desc, att->name, res_name ? res_name : att->value);
+			if (e) xmt_report(parser, e, "Warning: %s not a valid attribute for descriptor %s", att->name, name);
+			if (res_name)
+				gf_free(res_name);
+		} else {
 			e = gf_odf_set_field(desc, att->name, att->value);
 			if (e) xmt_report(parser, e, "Warning: %s not a valid attribute for descriptor %s", att->name, name);
 		}
@@ -2683,10 +2694,19 @@
 			else if (!strcmp(name, "Replace") || !strcmp(name, "Insert") || !strcmp(name, "Delete") )  {
 				/*restore parent command if in CommandBuffer*/
 				if (parser->command && parser->command_buffer && parser->command_buffer->buffer) {
+					//empty <Insert>
+					if ((parser->command->tag==GF_SG_ROUTE_INSERT) && !parser->command->fromNodeID) {
+						gf_list_del_item(parser->command_buffer->commandList, parser->command);
+					}
+
 					parser->command = (GF_Command*) parser->command_buffer->buffer;
 					parser->command_buffer->buffer = NULL;
 					parser->command_buffer = NULL;
 				} else {
+					//empty <Insert>
+					if ((parser->command->tag==GF_SG_ROUTE_INSERT) && !parser->command->fromNodeID) {
+						gf_list_del_item(parser->scene_au->commands, parser->command);
+					}
 					parser->command = NULL;
 				}
 			}
@@ -2866,8 +2886,9 @@
 						gf_node_register(node, NULL);
 						gf_node_unregister(node, NULL);
 					} else {
-						gf_node_list_add_child(& gr->children, node);
-						gf_node_register(node, NULL);
+						//node has already been added to its parent with X3d parsing, because of the default container resolving
+//						gf_node_list_add_child(& gr->children, node);
+//						gf_node_register(node, NULL);
 					}
 				}
 			}
@@ -2925,7 +2946,7 @@
 	node = top->node;
 
 	buf = text_content;
-	len = strlen(buf);
+	len = (u32) strlen(buf);
 
 	if (!len) return;
 
@@ -3064,6 +3085,7 @@
 	}
 
 	e = gf_xml_sax_parse_file(parser->sax_parser, (const char *)load->fileName, xmt_progress);
+	if (e==GF_OK) e = parser->last_error;
 
 	xmt_resolve_routes(parser);
 	xmt_resolve_od_links(parser);
@@ -3082,6 +3104,7 @@
 		return load_xmt_initialize(load, str);
 	}
 	e = gf_xml_sax_parse(parser->sax_parser, str);
+	if (e==GF_OK) e = parser->last_error;
 
 	xmt_resolve_routes(parser);
 	xmt_resolve_od_links(parser);

gpac-0.5.0.svn4296.tar.bz2/src/scene_manager/scene_dump.c -> gpac-0.5.0.svn4668.tar.bz2/src/scene_manager/scene_dump.c Changed

@@ -253,7 +253,7 @@
 			fprintf(sdump->trace, "<head>\n");
 			fprintf(sdump->trace, "<meta content=\"X3D File Converted/Dumped by GPAC Version %s\" name=\"generator\"/>\n", GPAC_FULL_VERSION);
 			fprintf(sdump->trace, "</head>\n");
-			fprintf(sdump->trace, "<Scene>\n");
+			fprintf(sdump->trace, " <Scene>\n");
 		} else {
 			fprintf(sdump->trace, "#X3D V3.0\n\n");
 		}
@@ -277,7 +277,7 @@
 		fprintf(sdump->trace, " </Body>\n");
 		fprintf(sdump->trace, "</XMT-A>\n");
 	} else {
-		fprintf(sdump->trace, "</Scene>\n");
+		fprintf(sdump->trace, " </Scene>\n");
 		fprintf(sdump->trace, "</X3D>\n");
 	}
 }
@@ -391,14 +391,16 @@
 
 static void scene_dump_utf_string(GF_SceneDumper *sdump, Bool escape_xml, char *str)
 {
+	size_t _len;
 	u32 len, i;
 	u16 *uniLine;
 	if (!str) return;
-	len = strlen(str);
+	len = (u32) strlen(str);
 	if (!len) return;
 	uniLine = (u16*)gf_malloc(sizeof(u16) * len);
-	len = gf_utf8_mbstowcs(uniLine, len, (const char **) &str);
-	if (len != (u32) (-1)) {
+	_len = gf_utf8_mbstowcs(uniLine, len, (const char **) &str);
+	if (_len != (size_t) (-1)) {
+		len = (u32) _len;
 		for (i=0; i<len; i++) {
 			//if (uniLine[i] == (u16) '\"') fprintf(sdump->trace, "\\");
 			switch (uniLine[i]) {
@@ -546,14 +548,16 @@
 		break;
 	case GF_SG_VRML_SFSCRIPT:
 	{
+		size_t _len;
 		u32 len, i;
 		char *str;
 		u16 *uniLine;
 		str = (char*)((SFScript *)ptr)->script_text;
-		len = strlen(str);
+		len = (u32)strlen(str);
 		uniLine = (u16*)gf_malloc(sizeof(short) * len);
-		len = gf_utf8_mbstowcs(uniLine, len, (const char **) &str);
-		if (len != (u32) -1) {
+		_len = gf_utf8_mbstowcs(uniLine, len, (const char **) &str);
+		if (_len != (size_t) -1) {
+			len = (u32) _len;
 			if (!sdump->XMLDump) fputc('\"', sdump->trace);
 
 			for (i=0; i<len; i++) {
@@ -625,7 +629,7 @@
 			} else if (!strchr(str, '\"')) {
 				fprintf(sdump->trace, "%s", str);
 			} else {
-				u32 i, len = strlen(str);
+				u32 i, len = (u32)strlen(str);
 				for (i=0; i<len; i++) {
 					if (str[i]=='\"') fputc('\\', sdump->trace);
 					fputc(str[i], sdump->trace);
@@ -937,11 +941,11 @@
 	case GF_SG_VRML_MFBOOL: return "Booleans";
 	case GF_SG_VRML_MFINT32: return "Integers";
 	case GF_SG_VRML_MFCOLOR: return "Colors";
-	case GF_SG_VRML_MFVEC2F: return "Vector2s";
+	case GF_SG_VRML_MFVEC2F: return "Vector2Array";
 	case GF_SG_VRML_MFIMAGE: return "Images";
 	case GF_SG_VRML_MFTIME: return "Times";
 	case GF_SG_VRML_MFFLOAT: return "Floats";
-	case GF_SG_VRML_MFVEC3F: return "Vector3s";
+	case GF_SG_VRML_MFVEC3F: return "Vector3Array";
 	case GF_SG_VRML_MFROTATION: return "Rotations";
 	case GF_SG_VRML_MFSTRING: return "Strings";
 	case GF_SG_VRML_MFNODE: return "Nodes";
@@ -952,7 +956,7 @@
 {
 	switch (fieldType) {
 	case GF_SG_VRML_SFBOOL: return "booleanValue";
-	case GF_SG_VRML_SFINT32: return "integerValue";
+	case GF_SG_VRML_SFINT32: return "intValue";
 	case GF_SG_VRML_SFCOLOR: return "colorValue";
 	case GF_SG_VRML_SFVEC2F: return "vector2Value";
 	case GF_SG_VRML_SFIMAGE: return "imageValue";
@@ -962,7 +966,7 @@
 	case GF_SG_VRML_SFROTATION: return "rotationValue";
 	case GF_SG_VRML_SFSTRING: return "stringValue";
 	case GF_SG_VRML_MFBOOL: return "booleanArrayValue";
-	case GF_SG_VRML_MFINT32: return "integerArrayValue";
+	case GF_SG_VRML_MFINT32: return "intArrayValue";
 	case GF_SG_VRML_MFCOLOR: return "colorArrayValue";
 	case GF_SG_VRML_MFVEC2F: return "vector2ArrayValue";
 	case GF_SG_VRML_MFIMAGE: return "imageArrayValue";
@@ -2461,13 +2465,14 @@
 			EndElementHeader(sdump, 1);
 			sdump->indent++;
 		}
-		StartElement(sdump, "Scene");
+		//scene tag is already dumped with X3D header
+		if (!sdump->X3DDump) StartElement(sdump, "Scene");
 		if (!sdump->X3DDump && com->use_names) {
 			StartAttribute(sdump, "USENAMES");
 			fprintf(sdump->trace, "%s", com->use_names ? "true" : "false");
 			EndAttribute(sdump);
 		}
-		EndElementHeader(sdump, 1);
+		if (!sdump->X3DDump) EndElementHeader(sdump, 1);
 		sdump->indent++;
 	} else {
 		if (!sdump->skip_scene_replace) {
@@ -2857,8 +2862,8 @@
 	}
 	if (has_scene_replace && sdump->XMLDump) {
 		sdump->indent--;
-		EndElement(sdump, "Scene", 1);
 		if (!sdump->X3DDump) {
+			EndElement(sdump, "Scene", 1);
 			sdump->indent--;
 			EndElement(sdump, "Replace", 1);
 		}
@@ -2972,7 +2977,7 @@
 		}
 		info.far_ptr = att->data;
 		attValue = gf_svg_dump_attribute((GF_Node*)svg, &info);
-		if (/*strcmp(info.name, "xmlns") &&*/ (info.fieldType = strlen(attValue)))
+		if (/*strcmp(info.name, "xmlns") &&*/ (info.fieldType = (u32) strlen(attValue)))
 			fprintf(sdump->trace, " %s=\"%s\"", info.name, attValue);
 		
 		if (attValue) gf_free(attValue);

gpac-0.5.0.svn4296.tar.bz2/src/scene_manager/scene_engine.c -> gpac-0.5.0.svn4668.tar.bz2/src/scene_manager/scene_engine.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/scene_manager/scene_manager.c -> gpac-0.5.0.svn4668.tar.bz2/src/scene_manager/scene_manager.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/scene_manager/swf_bifs.c -> gpac-0.5.0.svn4668.tar.bz2/src/scene_manager/swf_bifs.c Changed

@@ -851,6 +851,7 @@
 		gf_node_register((GF_Node *) par, (GF_Node *)tr);
 
 		if (use_text) {
+			size_t _len;
 			u16 *str_w, *widestr;
 			char *str;
 			void *ptr;
@@ -883,8 +884,9 @@
 			str_w[j] = 0;
 			str = (char*)gf_malloc(sizeof(char) * (gr->nbGlyphs+2));
 			widestr = str_w;
-			j = gf_utf8_wcstombs(str, sizeof(u8) * (gr->nbGlyphs+1), (const unsigned short **) &widestr);
-			if (j != (u32) -1) {
+			_len = gf_utf8_wcstombs(str, sizeof(u8) * (gr->nbGlyphs+1), (const unsigned short **) &widestr);
+			if (_len != (size_t) -1) {
+				j=(u32) _len;
 				str[j] = 0;
 				gf_sg_vrml_mf_reset(&t->string, GF_SG_VRML_MFSTRING);
 				gf_sg_vrml_mf_append(&t->string, GF_SG_VRML_MFSTRING, &ptr);
@@ -962,12 +964,12 @@
 	SWFFlatText *t;
 	if (!content || is_cdata) return;
 	t = (SWFFlatText *)sax_cbck;
-	len = strlen(content);
+	len = (u32) strlen(content);
 	if (!len) return;
 	t->final = gf_realloc(t->final, sizeof(char)*(t->len+len+1));
 	t->final [t->len] = 0;
 	strcat(t->final, content);
-	t->len = strlen(t->final)+1;
+	t->len = (u32) strlen(t->final)+1;
 }

gpac-0.5.0.svn4296.tar.bz2/src/scene_manager/swf_parse.c -> gpac-0.5.0.svn4668.tar.bz2/src/scene_manager/swf_parse.c Changed

@@ -2013,7 +2013,7 @@
 	read->jpeg_hdr_size = read->size;
 	if (read->size) {
 		read->jpeg_hdr = gf_malloc(sizeof(char)*read->size);
-		swf_read_data(read, read->jpeg_hdr, read->size);
+		swf_read_data(read, (char *) read->jpeg_hdr, read->size);
 	}
 	return GF_OK;
 }
@@ -2057,7 +2057,7 @@
 		size-=2;
 	}
 	buf = gf_malloc(sizeof(u8)*size);
-	swf_read_data(read, buf, size);
+	swf_read_data(read, (char *) buf, size);
 	if (version==1) {
 		gf_fwrite(buf, 1, size, file);
 	} else {
@@ -2089,19 +2089,19 @@
 		GF_BitStream *bs;
 
 		/*decompress jpeg*/
-		bs = gf_bs_new(buf+skip, size-skip, GF_BITSTREAM_READ);
+		bs = gf_bs_new( (char *) buf+skip, size-skip, GF_BITSTREAM_READ);
 		gf_img_parse(bs, &oti, &osize, &w, &h, NULL, NULL);
 		gf_bs_del(bs);
 
 		osize = w*h*4;
 		raw = gf_malloc(sizeof(char)*osize);
 		memset(raw, 0, sizeof(char)*osize);
-		e = gf_img_jpeg_dec(buf+skip, size-skip, &w, &h, &pf, raw, &osize, 4);
+		e = gf_img_jpeg_dec( (char *) buf+skip, size-skip, &w, &h, &pf, raw, &osize, 4);
 		assert(e == GF_OK);
 
 		/*read alpha map and decompress it*/
 		if (size<AlphaPlaneSize) buf = gf_realloc(buf, sizeof(u8)*AlphaPlaneSize);
-		swf_read_data(read, buf, AlphaPlaneSize);
+		swf_read_data(read, (char *) buf, AlphaPlaneSize);
 
 		osize = w*h;
 		dst = gf_malloc(sizeof(char)*osize);
@@ -2121,7 +2121,7 @@
 
 		osize = w*h*4;
 		buf = gf_realloc(buf, sizeof(char)*osize);
-		gf_img_png_enc(raw, w, h, h*4, GF_PIXEL_RGBA, buf, &osize);
+		gf_img_png_enc(raw, w, h, h*4, GF_PIXEL_RGBA, (char *)buf, &osize);
 		
 		file = gf_f64_open(szName, "wb");
 		gf_fwrite(buf, 1, osize, file);

gpac-0.5.0.svn4296.tar.bz2/src/scene_manager/swf_svg.c -> gpac-0.5.0.svn4668.tar.bz2/src/scene_manager/swf_svg.c Changed

@@ -142,21 +142,21 @@
             fprintf(read->svg_output, "transform=\"");
             if (translate.x != 0 || translate.y != 0)
             {
-                fprintf(read->svg_output, "translate(%f, %f) ", translate.x, translate.y);
+                fprintf(read->svg_output, "translate(%f, %f) ", FIX2FLT(translate.x), FIX2FLT(translate.y));
             }
             if (rotate != 0)
             {
-                fprintf(read->svg_output, "rotate(%f) ", rotate);
+                fprintf(read->svg_output, "rotate(%f) ", FIX2FLT(rotate));
             }
             if (scale.x != FIX_ONE || scale.y != FIX_ONE)
             {
-                fprintf(read->svg_output, "scale(%f, %f) ", scale.x, scale.y);
+                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)\" ", mat->m[0], mat->m[3], mat->m[1], mat->m[4], mat->m[2], mat->m[5]);
+            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]) );
         }
     }
 }
@@ -262,6 +262,7 @@
             fprintf(read->svg_output, ">");
             /*convert to UTF-8*/
             {
+				size_t _len;
                 u16     *str_w;
                 u16     *widestr;
                 char    *str;
@@ -274,9 +275,9 @@
                 str_w[j] = 0;
                 str = (char*)gf_malloc(sizeof(char) * (gr->nbGlyphs+2));
                 widestr = str_w;
-                j = gf_utf8_wcstombs(str, sizeof(u8) * (gr->nbGlyphs+1), (const unsigned short **) &widestr);
-                if (j != (u32) -1) {
-                    str[j] = 0;
+                _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);
                 }
             }
@@ -292,7 +293,7 @@
             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], FLT2FIX(gf_divfix(dx, FLT2FIX(gr->fontSize * SWF_TEXT_SCALE))));
+                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");

gpac-0.5.0.svn4296.tar.bz2/src/scene_manager/text_to_bifs.c -> gpac-0.5.0.svn4668.tar.bz2/src/scene_manager/text_to_bifs.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/scenegraph/base_scenegraph.c -> gpac-0.5.0.svn4668.tar.bz2/src/scenegraph/base_scenegraph.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/scenegraph/dom_events.c -> gpac-0.5.0.svn4668.tar.bz2/src/scenegraph/dom_events.c Changed

@@ -77,7 +77,6 @@
 	gf_dom_refresh_event_filter(sg);
 }
 
-
 void gf_sg_register_event_type(GF_SceneGraph *sg, u32 type)
 {
 	if (type & GF_DOM_EVENT_MOUSE) sg->nb_evts_mouse++;
@@ -98,9 +97,14 @@
 {
 	return sg->dom_evt_filter;
 }
+
 u32 gf_node_get_dom_event_filter(GF_Node *node)
 {
-	return node->sgprivate->scenegraph->dom_evt_filter;
+    if (node) {
+        return node->sgprivate->scenegraph->dom_evt_filter;
+    } else {
+        return 0;
+    }
 }
 
 GF_Err gf_sg_listener_add(GF_Node *listener, GF_DOMEventTarget *evt_target)
@@ -118,7 +122,7 @@
 	/*register with NULL parent*/
 	gf_node_register((GF_Node *)listener, NULL);
 
-	if (gf_node_get_attribute_by_tag((GF_Node *)listener, TAG_XMLEV_ATT_event, 0, 0, &info) == GF_OK) {
+	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_sg_register_event_type(listener->sgprivate->scenegraph, gf_dom_event_get_category(type));
 	}
@@ -152,7 +156,7 @@
 	if (!listener || !target) return GF_BAD_PARAM;
 	if (gf_list_del_item(target->evt_list, listener)<0) return GF_BAD_PARAM;
 
-	if (gf_node_get_attribute_by_tag((GF_Node *)listener, TAG_XMLEV_ATT_event, 0, 0, &info) == GF_OK) {
+	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_sg_unregister_event_type(listener->sgprivate->scenegraph, gf_dom_event_get_category(type));
 	}
@@ -235,14 +239,14 @@
 
 	if (!n || (n->sgprivate->tag!=TAG_SVG_handler)) return n;
 
-	if (!n || (gf_node_get_attribute_by_tag(n, TAG_XLINK_ATT_href, 0, 0, &info) != GF_OK)) {
+	if (gf_node_get_attribute_by_tag(n, TAG_XLINK_ATT_href, GF_FALSE, GF_FALSE, &info) != GF_OK) {
 		return n;
 	}
 	iri = (XMLRI *)info.far_ptr;
 	if (!iri->target && iri->string) {
 		iri->target = gf_sg_find_node_by_name(n->sgprivate->scenegraph, iri->string+1);
 	}
-	return dom_evt_get_handler(iri->target);
+	return dom_evt_get_handler((GF_Node *)iri->target);
 }
 
 static void dom_event_process(GF_Node *listen, GF_DOM_Event *event, GF_Node *observer)
@@ -253,7 +257,7 @@
 	case TAG_SVG_listener:
 	{
 		GF_FieldInfo info;
-		if (gf_node_get_attribute_by_tag(listen, TAG_XMLEV_ATT_handler, 0, 0, &info) == GF_OK) {
+		if (gf_node_get_attribute_by_tag(listen, TAG_XMLEV_ATT_handler, GF_FALSE, GF_FALSE, &info) == GF_OK) {
 			XMLRI *iri = (XMLRI *)info.far_ptr;
 
 			if ((iri->type==XMLRI_STRING) && iri->string && !strnicmp(iri->string, "javascript:", 11)) {
@@ -266,7 +270,7 @@
 			if (!iri->target && iri->string) {
 				iri->target = gf_sg_find_node_by_name(listen->sgprivate->scenegraph, iri->string+1);
 			}
-			hdl_node = dom_evt_get_handler(iri->target);
+			hdl_node = dom_evt_get_handler((GF_Node *)iri->target);
 		} else {
 			return;
 		}
@@ -288,7 +292,7 @@
 
 		/*spec is not clear regarding event filtering*/
 #if 0
-		if (gf_node_get_attribute_by_tag(hdl_node, TAG_XMLEV_ATT_event, 0, 0, &info) == GF_OK) {
+		if (gf_node_get_attribute_by_tag(hdl_node, TAG_XMLEV_ATT_event, GF_FALSE, GF_FALSE, &info) == GF_OK) {
 			XMLEV_Event *ev_event = (XMLEV_Event *)info.far_ptr;
 			if (ev_event->type != event->type) return;
 			handler->handle_event(hdl_node, event, observer);
@@ -317,87 +321,94 @@
 	}
 }
 
-static Bool sg_fire_dom_event(GF_DOMEventTarget *et, GF_DOM_Event *event, GF_SceneGraph *sg, GF_Node *n)
+GF_EXPORT
+Bool sg_fire_dom_event(GF_DOMEventTarget *et, GF_DOM_Event *event, GF_SceneGraph *sg, GF_Node *n)
 {
 	if (et) {
-		GF_Node *observer = (et->ptr_type==GF_DOM_EVENT_NODE) ? et->ptr : NULL;
-		u32 i, count, post_count;
-		count = gf_list_count(et->evt_list);
-		for (i=0; i<count; i++) {
-			XMLEV_Event *listened_event;
-			GF_Node *listen = (GF_Node *)gf_list_get(et->evt_list, i);
-
-			switch (listen->sgprivate->tag) {
-			case TAG_SVG_listener:
-			{
-				SVGAllAttributes atts;
-				gf_svg_flatten_attributes((SVG_Element*)listen, &atts);
-				listened_event = atts.event;
-				if (!listened_event) continue;
-
-				if (atts.propagate && (*atts.propagate==XMLEVENT_PROPAGATE_STOP))
-					event->event_phase |= GF_DOM_EVENT_PHASE_CANCEL;
-				if (atts.defaultAction && (*atts.defaultAction==XMLEVENT_DEFAULTACTION_CANCEL))
-					event->event_phase |= GF_DOM_EVENT_PHASE_PREVENT;
-			}
-				break;
-			default:
-				continue;
-			}
-			if (listened_event->type <= GF_EVENT_MOUSEMOVE) event->has_ui_events=1;
-			if (listened_event->type != event->type) continue;
-			if (listened_event->parameter && (listened_event->parameter != event->detail)) continue;
-			event->currentTarget = et;
-			event->consumed	++;
-
-			/*load event cannot bubble and can only be called once (on load :) ), remove it
-			to release some resources*/
-			if (event->type==GF_EVENT_LOAD) {
-				dom_event_process(listen, event, observer);
-				/*delete listener*/
-				//gf_dom_listener_del(listen, et);
-			} else if (n) {
-				assert(n->sgprivate->num_instances);
-				/*protect node*/
-				n->sgprivate->num_instances++;
-				/*exec event*/
-				dom_event_process(listen, event, observer);
-				/*the event has destroyed ourselves, abort propagation
-				THIS IS NOT DOM compliant, the event should propagate on the original target+ancestors path*/
-				if (n->sgprivate->num_instances==1) {
-					/*unprotect node event*/
-					gf_node_unregister(n, NULL);
-					return 0;
-				}
-				n->sgprivate->num_instances--;
-			} else {
-				dom_event_process(listen, event, observer);
-			}
-			/*canceled*/
-			if (event->event_phase & GF_DOM_EVENT_PHASE_CANCEL_ALL) {
-				gf_dom_listener_process_add(sg);
-				return 0;
-			}
-
-			/*if listeners have been removed, update count*/
-			post_count = gf_list_count(et->evt_list);
-			if (post_count < count) {
-				s32 pos = gf_list_find(et->evt_list, listen);
-				if (pos>=0) i = pos;
-				/*FIXME this is not going to work in all cases...*/
-				else i--;
-				count = post_count;
-			}
-		}
-		/*propagation stopped*/
-		if (event->event_phase & (GF_DOM_EVENT_PHASE_CANCEL|GF_DOM_EVENT_PHASE_CANCEL_ALL) ) {
-			gf_dom_listener_process_add(sg);
-			return 0;
-		}
-	}
-	gf_dom_listener_process_add(sg);
-	/*if the current target is a node, we can bubble*/
-	return n ? 1 : 0;
+        if (et->ptr_type==GF_DOM_EVENT_NODE || et->ptr_type == GF_DOM_EVENT_DOCUMENT) { 
+		    GF_Node *observer = NULL;
+		    u32 i, count, post_count;
+            if (et->ptr_type==GF_DOM_EVENT_NODE) {
+                observer = (GF_Node *)et->ptr;
+            }
+		    count = gf_list_count(et->evt_list);
+		    for (i=0; i<count; i++) {
+			    XMLEV_Event *listened_event;
+			    GF_Node *listen = (GF_Node *)gf_list_get(et->evt_list, i);
+
+			    switch (listen->sgprivate->tag) {
+			    case TAG_SVG_listener:
+			    {
+				    SVGAllAttributes atts;
+				    gf_svg_flatten_attributes((SVG_Element*)listen, &atts);
+				    listened_event = atts.event;
+				    if (!listened_event) continue;
+
+				    if (atts.propagate && (*atts.propagate==XMLEVENT_PROPAGATE_STOP))
+					    event->event_phase |= GF_DOM_EVENT_PHASE_CANCEL;
+				    if (atts.defaultAction && (*atts.defaultAction==XMLEVENT_DEFAULTACTION_CANCEL))
+					    event->event_phase |= GF_DOM_EVENT_PHASE_PREVENT;
+			    }
+				    break;
+			    default:
+				    continue;
+			    }
+			    if (listened_event->type <= GF_EVENT_MOUSEMOVE) event->has_ui_events=1;
+			    if (listened_event->type != event->type) continue;
+			    if (listened_event->parameter && (listened_event->parameter != event->detail)) continue;
+			    event->currentTarget = et;
+			    event->consumed	++;
+
+			    /*load event cannot bubble and can only be called once (on load :) ), remove it
+			    to release some resources*/
+			    if (event->type==GF_EVENT_LOAD) {
+				    dom_event_process(listen, event, observer);
+				    /*delete listener*/
+				    //gf_dom_listener_del(listen, et);
+			    } else if (n) {
+				    assert(n->sgprivate->num_instances);
+				    /*protect node*/
+				    n->sgprivate->num_instances++;
+				    /*exec event*/
+				    dom_event_process(listen, event, observer);
+				    /*the event has destroyed ourselves, abort propagation
+				    THIS IS NOT DOM compliant, the event should propagate on the original target+ancestors path*/
+				    if (n->sgprivate->num_instances==1) {
+					    /*unprotect node event*/
+					    gf_node_unregister(n, NULL);
+					    return GF_FALSE;
+				    }
+				    n->sgprivate->num_instances--;
+			    } else {
+				    dom_event_process(listen, event, observer);
+			    }
+			    /*canceled*/
+			    if (event->event_phase & GF_DOM_EVENT_PHASE_CANCEL_ALL) {
+				    gf_dom_listener_process_add(sg);
+				    return GF_FALSE;
+			    }
+
+			    /*if listeners have been removed, update count*/
+			    post_count = gf_list_count(et->evt_list);
+			    if (post_count < count) {
+				    s32 pos = gf_list_find(et->evt_list, listen);
+				    if (pos>=0) i = pos;
+				    /*FIXME this is not going to work in all cases...*/
+				    else i--;
+				    count = post_count;
+			    }
+		    }
+		    /*propagation stopped*/
+		    if (event->event_phase & (GF_DOM_EVENT_PHASE_CANCEL|GF_DOM_EVENT_PHASE_CANCEL_ALL) ) {
+			    gf_dom_listener_process_add(sg);
+			    return GF_FALSE;
+		    }
+	    }
+	    gf_dom_listener_process_add(sg);
+	    /*if the current target is a node, we can bubble*/
+	    return n ? GF_TRUE : GF_FALSE;
+    } 
+    return GF_FALSE;
 }
 
 static void gf_sg_dom_event_bubble(GF_Node *node, GF_DOM_Event *event, GF_List *use_stack, u32 cur_par_idx)
@@ -417,24 +428,32 @@
 		return;
 	}
 	if (cur_par_idx) {
-		GF_Node *used_node = gf_list_get(use_stack, cur_par_idx-1);
+		GF_Node *used_node = (GF_Node *)gf_list_get(use_stack, cur_par_idx-1);
 		/*if the node is a used one, switch to the <use> subtree*/
 		if (used_node==node) {
-			parent = gf_list_get(use_stack, cur_par_idx);
+			parent = (GF_Node *)gf_list_get(use_stack, cur_par_idx);
 			if (cur_par_idx>1) cur_par_idx-=2;
 			else cur_par_idx = 0;
 			/*if no events attached,bubble by default*/
-			if (parent->sgprivate->interact && !sg_fire_dom_event(parent->sgprivate->interact->dom_evt, event, node->sgprivate->scenegraph, parent)) return;
+			if (parent->sgprivate->interact) {
+				Bool can_bubble = 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);
 			return;
 		}
 	}
 	/*if no events attached,bubble by default*/
-	if (parent->sgprivate->interact && !sg_fire_dom_event(parent->sgprivate->interact->dom_evt, event, node->sgprivate->scenegraph, parent)) return;
+	if (parent->sgprivate->interact) {
+		Bool can_bubble;
+		can_bubble = 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);
 }
 
-
 void gf_sg_dom_stack_parents(GF_Node *node, GF_List *stack)
 {
 	if (!node) return;
@@ -450,7 +469,8 @@
 	Bool prev_bub;
 	GF_DOMEventTarget cur_target;
 	u32 cur_par_idx;
-	if (!node || !event) return 0;
+	Bool can_bubble = GF_FALSE;
+	if (!node || !event) return GF_FALSE;
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("[DOM Events    ] Graph %p Time %f - Firing event  %s.%s\n", gf_node_get_graph(node), gf_node_get_scene_time(node), gf_node_get_log_name(node), gf_dom_event_get_name(event->type)));
 
 	/*flush any pending add_listener
@@ -472,7 +492,7 @@
 	/*capture phase - not 100% sure, the actual capture phase should be determined by the std using the DOM events
 	SVGT doesn't use this phase, so we don't add it for now.*/
 	if (0) {
-		Bool aborted = 0;
+		Bool aborted = GF_FALSE;
 		u32 i, count;
 		GF_List *parents;
 		event->event_phase = GF_DOM_EVENT_PHASE_CAPTURE;
@@ -487,12 +507,12 @@
 
 			/*event has been canceled*/
 			if (event->event_phase & (GF_DOM_EVENT_PHASE_CANCEL|GF_DOM_EVENT_PHASE_CANCEL_ALL) ) {
-				aborted = 1;
+				aborted = GF_TRUE;
 				break;
 			}
 		}
 		gf_list_del(parents);
-		if (aborted) return 1;
+		if (aborted) return GF_TRUE;
 	}
 	/*target phase*/
 	event->event_phase = GF_DOM_EVENT_PHASE_AT_TARGET;
@@ -507,10 +527,12 @@
 	prev_use_stack = sg->use_stack ;
 	prev_bub = sg->abort_bubbling;
 	sg->use_stack = use_stack;
-	sg->abort_bubbling = 0;
+	sg->abort_bubbling = GF_FALSE;
 
-	if ( (!node->sgprivate->interact || sg_fire_dom_event(node->sgprivate->interact->dom_evt, event, node->sgprivate->scenegraph, node)) 
-		&& event->bubbles) {
+	if (node->sgprivate->interact) {
+		can_bubble = sg_fire_dom_event(node->sgprivate->interact->dom_evt, event, node->sgprivate->scenegraph, node);
+	}
+	if ( (!node->sgprivate->interact || can_bubble) && event->bubbles) {
 		/*bubbling phase*/
 		event->event_phase = GF_DOM_EVENT_PHASE_BUBBLE;
 		gf_sg_dom_event_bubble(node, event, use_stack, cur_par_idx);
@@ -518,7 +540,7 @@
 	sg->use_stack = prev_use_stack;
 	sg->abort_bubbling = prev_bub;
 
-	return event->consumed ? 1 : 0;
+	return event->consumed ? GF_TRUE : GF_FALSE;
 }
 
 GF_EXPORT
@@ -537,13 +559,13 @@
 	/*don't register the listener, this will be done when adding to the node events list*/
 
 	if (handler) {
-		if (gf_node_get_attribute_by_tag(handler, TAG_XMLEV_ATT_event, 0, 0, &info)==GF_OK) {
+		if (gf_node_get_attribute_by_tag(handler, TAG_XMLEV_ATT_event, GF_FALSE, GF_FALSE, &info)==GF_OK) {
 			event_type = ((XMLEV_Event *)info.far_ptr)->type;
 			event_parameter = ((XMLEV_Event *)info.far_ptr)->parameter;
 		}
 	} else {
 		handler = gf_node_new(node->sgprivate->scenegraph, TAG_SVG_handler);
-		gf_node_get_attribute_by_tag(handler, TAG_XMLEV_ATT_event, 1, 0, &info);
+		gf_node_get_attribute_by_tag(handler, TAG_XMLEV_ATT_event, GF_TRUE, GF_FALSE, &info);
 		((XMLEV_Event *)info.far_ptr)->type = event_type;
 		((XMLEV_Event *)info.far_ptr)->parameter = event_parameter;
 
@@ -552,14 +574,14 @@
 		gf_node_list_add_child_last(& ((GF_ParentNode *)listener)->children, (GF_Node*)handler, &last);
 	}
 	
-	gf_node_get_attribute_by_tag((GF_Node*)listener, TAG_XMLEV_ATT_event, 1, 0, &info);
+	gf_node_get_attribute_by_tag((GF_Node*)listener, TAG_XMLEV_ATT_event, GF_TRUE, GF_FALSE, &info);
 	((XMLEV_Event *)info.far_ptr)->type = event_type;
 	((XMLEV_Event *)info.far_ptr)->parameter = event_parameter;
 
-	gf_node_get_attribute_by_tag((GF_Node*)listener, TAG_XMLEV_ATT_handler, 1, 0, &info);
+	gf_node_get_attribute_by_tag((GF_Node*)listener, TAG_XMLEV_ATT_handler, GF_TRUE, GF_FALSE, &info);
 	((XMLRI *)info.far_ptr)->target = handler;
 
-	gf_node_get_attribute_by_tag((GF_Node*)listener, TAG_XMLEV_ATT_target, 1, 0, &info);
+	gf_node_get_attribute_by_tag((GF_Node*)listener, TAG_XMLEV_ATT_target, GF_TRUE, GF_FALSE, &info);
 	((XMLRI *)info.far_ptr)->target = node;
 	
 	gf_node_dom_listener_add((GF_Node *) node, (GF_Node *) listener);
@@ -580,9 +602,9 @@
 static void gf_smil_handle_event(GF_Node *timed_elt, GF_FieldInfo *info, GF_DOM_Event *evt, Bool is_end)
 {
 	SMIL_Time *resolved, *proto;
-	Double scene_time = gf_node_get_scene_time(evt->target);
+	Double scene_time = gf_node_get_scene_time((GF_Node *)evt->target);
 	GF_List *times = *(GF_List **)info->far_ptr;
-	u32 found = 0;
+	u32 found = GF_FALSE;
 	u32 i, j, count = gf_list_count(times);
 
 	/*remove all previously instantiated times that are in the past
@@ -648,7 +670,7 @@
 	info.name = "begin";
 	info.far_ptr = ((SVGTimedAnimBaseElement *)timed_elt)->timingp->begin;
 	info.fieldType = SMIL_Times_datatype;
-	gf_smil_handle_event(timed_elt, &info, evt, 0);
+	gf_smil_handle_event(timed_elt, &info, evt, GF_FALSE);
 }
 
 static void gf_smil_handle_event_end(GF_Node *hdl, GF_DOM_Event *evt, GF_Node *observer)
@@ -659,7 +681,7 @@
 	info.name = "end";
 	info.far_ptr = ((SVGTimedAnimBaseElement *)timed_elt)->timingp->end;
 	info.fieldType = SMIL_Times_datatype;
-	gf_smil_handle_event((GF_Node *)timed_elt, &info, evt, 1);
+	gf_smil_handle_event((GF_Node *)timed_elt, &info, evt, GF_TRUE);
 }
 
 static void gf_smil_setup_event_list(GF_Node *node, GF_List *l, Bool is_begin)
@@ -674,13 +696,13 @@
 		if (!t->element && t->element_id) continue;
 		if (t->event.type==GF_EVENT_BEGIN) {
 			t->event.type=GF_EVENT_BEGIN_EVENT;
-			t->is_absolute_event = 1;
+			t->is_absolute_event = GF_TRUE;
 		} else if (t->event.type==GF_EVENT_END) {
 			t->event.type=GF_EVENT_END_EVENT;
-			t->is_absolute_event = 1;
+			t->is_absolute_event = GF_TRUE;
 		} else if (t->event.type==GF_EVENT_REPEAT) {
 			t->event.type=GF_EVENT_REPEAT_EVENT;
-			t->is_absolute_event = 1;
+			t->is_absolute_event = GF_TRUE;
 		} 
 
 		/*create a new listener*/
@@ -710,10 +732,10 @@
 void gf_smil_setup_events(GF_Node *node)
 {
 	GF_FieldInfo info;
-	if (gf_node_get_attribute_by_tag(node, TAG_SVG_ATT_begin, 0, 0, &info) == GF_OK)
-		gf_smil_setup_event_list(node, * (GF_List **)info.far_ptr, 1);
-	if (gf_node_get_attribute_by_tag(node, TAG_SVG_ATT_end, 0, 0, &info) == GF_OK)
-		gf_smil_setup_event_list(node, * (GF_List **)info.far_ptr, 0);
+	if (gf_node_get_attribute_by_tag(node, TAG_SVG_ATT_begin, GF_FALSE, GF_FALSE, &info) == GF_OK)
+		gf_smil_setup_event_list(node, * (GF_List **)info.far_ptr, GF_TRUE);
+	if (gf_node_get_attribute_by_tag(node, TAG_SVG_ATT_end, GF_FALSE, GF_FALSE, &info) == GF_OK)
+		gf_smil_setup_event_list(node, * (GF_List **)info.far_ptr, GF_FALSE);
 }
 
 GF_EXPORT
@@ -738,6 +760,7 @@
 	gf_node_list_add_child_last(&((GF_ParentNode *)parent)->children, (GF_Node*)text, NULL);
 	return text;
 }
+
 GF_DOMText *gf_dom_new_text_node(GF_SceneGraph *sg)
 {
 	GF_DOMText *text;
@@ -757,7 +780,7 @@
 	if ((n->sgprivate->tag==TAG_DOMText) && ((GF_DOMText*)n)->textContent) {
 		/*if ( ((GF_DOMText*)n)->type == GF_DOM_TEXT_REGULAR) */{
 			res = gf_strdup(((GF_DOMText*)n)->textContent);
-			len = strlen(res);
+			len = (u32) strlen(res);
 		}
 	}
 
@@ -765,10 +788,10 @@
 	while (list) {
 		char *t = gf_dom_flatten_textContent(list->node);
 		if (t) {
-			u32 sub_len = strlen(t);
-			res = gf_realloc(res, sizeof(char)*(len+sub_len+1));
+			size_t sub_len = strlen(t);
+			res = (char *)gf_realloc(res, sizeof(char)*(len+sub_len+1));
 			if (!len) res[0] = 0;
-			len += sub_len;
+			len += (u32)sub_len;
 			strcat(res, t);
 			gf_free(t);
 		}
@@ -790,7 +813,6 @@
 	return text;
 }
 
-
 GF_DOMUpdates *gf_dom_add_update_node(GF_Node *parent)
 {
 	GF_DOMUpdates *update;

gpac-0.5.0.svn4296.tar.bz2/src/scenegraph/dom_smjs.c -> gpac-0.5.0.svn4668.tar.bz2/src/scenegraph/dom_smjs.c Changed

@@ -23,6 +23,7 @@
  *
  */
 
+#include <gpac/setup.h>
 #include <gpac/internal/scenegraph_dev.h>
 
 /*base SVG type*/
@@ -46,6 +47,7 @@
 #endif /* XP_UNIX */
 #endif
 
+#include <gpac/html5_media.h>
 #include <gpac/internal/smjs_api.h>
 
 
@@ -53,7 +55,7 @@
 {
 	if (scene->script_action)
 		return scene->script_action(scene->script_action_cbck, type, node, param);
-	return 0;
+	return GF_FALSE;
 }
 
 static GFINLINE GF_SceneGraph *xml_get_scenegraph(JSContext *c)
@@ -61,7 +63,7 @@
 	GF_SceneGraph *scene;
 	JSObject *global = JS_GetGlobalObject(c);
 	assert(global);
-	scene = SMJS_GET_PRIVATE(c, global);
+	scene = (GF_SceneGraph *)SMJS_GET_PRIVATE(c, global);
 	assert(scene);
 	return scene;
 }
@@ -118,7 +120,9 @@
 
 	GF_JSClass storageClass;
 
-	void *(*get_element_class)(GF_Node *n);
+    GF_JSClass htmlMediaElementClass;
+
+    void *(*get_element_class)(GF_Node *n);
 	void *(*get_document_class)(GF_SceneGraph *n);
 	GF_List *handlers;
 } GF_DOMRuntime;
@@ -138,12 +142,12 @@
 {
 	if (info) {
 		if (child_modif) {
-			gf_node_dirty_set(n, GF_SG_CHILD_DIRTY, 0);
+			gf_node_dirty_set(n, GF_SG_CHILD_DIRTY, GF_FALSE);
 		}
 #ifndef GPAC_DISABLE_SVG
 		else {
 			u32 flag = gf_svg_get_modification_flags((SVG_Element *)n, info);
-			gf_node_dirty_set(n, flag, 0);
+			gf_node_dirty_set(n, flag, GF_FALSE);
 		}
 #endif
 	}
@@ -174,6 +178,15 @@
 	DEF_EXC(INVALID_ACCESS_ERR);
 	DEF_EXC(VALIDATION_ERR);
 	DEF_EXC(TYPE_MISMATCH_ERR);
+	DEF_EXC(SECURITY_ERR);
+	DEF_EXC(NETWORK_ERR);
+	DEF_EXC(ABORT_ERR);
+	DEF_EXC(URL_MISMATCH_ERR);
+	DEF_EXC(QUOTA_EXCEEDED_ERR);
+	DEF_EXC(TIMEOUT_ERR);
+	DEF_EXC(INVALID_NODE_TYPE_ERR);
+	DEF_EXC(DATA_CLONE_ERR);
+	DEF_EXC(SECURITY_ERR);
 #undef  DEF_EXC
 
 	//JS_AliasProperty(c, global, "DOMException", "e");
@@ -194,14 +207,14 @@
 
 GF_Node *dom_get_node(JSContext *c, JSObject *obj)
 {
-	GF_Node *n = obj ? SMJS_GET_PRIVATE(c, obj) : NULL;
+	GF_Node *n = (obj ? (GF_Node *)SMJS_GET_PRIVATE(c, obj) : NULL);
 	if (n && n->sgprivate) return n;
 	return NULL;
 }
 
 GF_Node *dom_get_element(JSContext *c, JSObject *obj)
 {
-	GF_Node *n = SMJS_GET_PRIVATE(c, obj);
+	GF_Node *n = (GF_Node *)SMJS_GET_PRIVATE(c, obj);
 	if (!n || !n->sgprivate) return NULL;
 	if (n->sgprivate->tag==TAG_DOMText) return NULL;
 	return n;
@@ -209,7 +222,7 @@
 
 GF_SceneGraph *dom_get_doc(JSContext *c, JSObject *obj)
 {
-	GF_SceneGraph *sg = SMJS_GET_PRIVATE(c, obj);
+	GF_SceneGraph *sg = (GF_SceneGraph *)SMJS_GET_PRIVATE(c, obj);
 	if (sg && !sg->__reserved_null) return sg;
 	return NULL;
 }
@@ -246,7 +259,7 @@
 
 	sg = n->sgprivate->scenegraph;
 	/*if parent doc is not a scene (eg it is a doc being parsed/constructed from script, don't root objects*/
-	set_rooted = sg->reference_count ? 0 : 1;
+	set_rooted = sg->reference_count ? GF_FALSE : GF_TRUE;
 
 	if (n->sgprivate->interact && n->sgprivate->interact->js_binding && n->sgprivate->interact->js_binding->node) {
 		if (set_rooted && (gf_list_find(sg->objects, n->sgprivate->interact->js_binding->node)<0)) {
@@ -268,6 +281,10 @@
 	new_obj = JS_NewObject(c, & _class->_class, 0, 0);
 	SMJS_SET_PRIVATE(c, new_obj, n);
 
+    if (n->sgprivate->tag == TAG_SVG_video || n->sgprivate->tag == TAG_SVG_audio)
+    {
+        html_media_element_js_init(c, new_obj, n);
+    }
 	if (!n->sgprivate->interact) GF_SAFEALLOC(n->sgprivate->interact, struct _node_interactive_ext);
 	if (!n->sgprivate->interact->js_binding) {
 		GF_SAFEALLOC(n->sgprivate->interact->js_binding, struct _node_js_binding);
@@ -484,7 +501,7 @@
 
 /*dom event listener*/
 
-#define JS_DOM3_EVEN_TARGET_INTERFACE	\
+#define JS_DOM3_EVENT_TARGET_INTERFACE	\
 	SMJS_FUNCTION_SPEC("addEventListenerNS", dom_event_add_listener, 4),	\
 	SMJS_FUNCTION_SPEC("removeEventListenerNS", dom_event_remove_listener, 4),	\
 	SMJS_FUNCTION_SPEC("addEventListener", dom_event_add_listener, 3),		\
@@ -498,7 +515,7 @@
 		SVG_handlerElement *handler = (SVG_handlerElement *)node;
 		if (handler->js_context && handler->js_fun_val) {
 			/*unprotect the function*/
-			gf_js_remove_root(handler->js_context, &(handler->js_fun_val), GF_JSGC_VAL);
+			gf_js_remove_root((JSContext *)handler->js_context, &(handler->js_fun_val), GF_JSGC_VAL);
 			handler->js_fun_val=0;
 			gf_list_del_item(dom_rt->handlers, handler);
 		}
@@ -597,7 +614,7 @@
 			if (handler->js_fun_val) {
 				handler->js_context = c;
 				/*protect the function - we don't know how it was passed to us, so prevent it from being GCed*/
-				gf_js_add_root(handler->js_context, &handler->js_fun_val, GF_JSGC_VAL);
+				gf_js_add_root((JSContext *)handler->js_context, &handler->js_fun_val, GF_JSGC_VAL);
 				handler->sgprivate->UserCallback = dom_handler_remove;
 				gf_list_add(dom_rt->handlers, handler);
 			}
@@ -606,16 +623,16 @@
 	}
 
 	/*create attributes if needed*/
-	gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_event, 1, 0, &info);
+	gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_event, GF_TRUE, GF_FALSE, &info);
 	((XMLEV_Event*)info.far_ptr)->type = evtType;
-	gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_handler, 1, 0, &info);
+	gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_handler, GF_TRUE, GF_FALSE, &info);
 	((XMLRI*)info.far_ptr)->target = (GF_Node*)handler;
 	if (n) {
-		gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_target, 1, 0, &info);
+		gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_target, GF_TRUE, GF_FALSE, &info);
 		((XMLRI*)info.far_ptr)->target = n;
 	}
 
-	gf_node_get_attribute_by_tag((GF_Node*)handler, TAG_XMLEV_ATT_event, 1, 0, &info);
+	gf_node_get_attribute_by_tag((GF_Node*)handler, TAG_XMLEV_ATT_event, GF_TRUE, GF_FALSE, &info);
 	((XMLEV_Event*)info.far_ptr)->type = evtType;
 
 	if (callback) gf_dom_add_text_node((GF_Node *)handler, gf_strdup(callback));
@@ -718,13 +735,13 @@
 		GF_FieldInfo info;
 		GF_DOMText *txt;
 		SVG_handlerElement *hdl;
-		GF_Node *el = gf_list_get(target->evt_list, i);
+		GF_Node *el = (GF_Node *)gf_list_get(target->evt_list, i);
 
-		gf_node_get_attribute_by_tag(el, TAG_XMLEV_ATT_event, 0, 0, &info);
+		gf_node_get_attribute_by_tag(el, TAG_XMLEV_ATT_event, GF_FALSE, GF_FALSE, &info);
 		if (!info.far_ptr) continue;
 		if (((XMLEV_Event*)info.far_ptr)->type != evtType) continue;
 
-		gf_node_get_attribute_by_tag(el, TAG_XMLEV_ATT_handler, 0, 0, &info);
+		gf_node_get_attribute_by_tag(el, TAG_XMLEV_ATT_handler, GF_FALSE, GF_FALSE, &info);
 		if (!info.far_ptr) continue;
 		hdl = (SVG_handlerElement *) ((XMLRI*)info.far_ptr)->target;
 		if (!hdl) continue;
@@ -776,24 +793,24 @@
 	GF_ParentList *par = n->sgprivate->parents;
 	if (n->sgprivate->scenegraph != parent->sgprivate->scenegraph) {
 		dom_throw_exception(c, GF_DOM_EXC_WRONG_DOCUMENT_ERR);
-		return 0;
+		return GF_FALSE;
 	}
 	while (par) {
 		if (par->node==parent) {
 			dom_throw_exception(c, GF_DOM_EXC_HIERARCHY_REQUEST_ERR);
-			return 0;
+			return GF_FALSE;
 		}
 		if (!check_dom_parents(c, par->node, parent))
-			return 0;
+			return GF_FALSE;
 		par = par->next;
 	}
-	return 1;
+	return GF_TRUE;
 }
 
 static void dom_node_inserted(JSContext *c, GF_Node *n, GF_Node *parent, s32 pos)
 {
 	GF_ParentNode *old_parent;
-	Bool do_init = 0;
+	Bool do_init = GF_FALSE;
 
 	/*if node is already in graph, remove it from its parent*/
 	old_parent = (GF_ParentNode*)gf_node_get_parent(n, 0);
@@ -804,12 +821,12 @@
 		gf_node_unregister(n, (GF_Node*)old_parent);
 		n->sgprivate->num_instances--;
 	} else {
-		do_init = (n->sgprivate->UserCallback || n->sgprivate->UserPrivate) ? 0 : 1;
+		do_init = (n->sgprivate->UserCallback || n->sgprivate->UserPrivate) ? GF_FALSE : GF_TRUE;
 
 	}
 	/*node is being inserted - if node has a valid binding, re-root it if needed*/
 	if (n->sgprivate->interact && n->sgprivate->interact->js_binding) {
-		JSObject *nobj = n->sgprivate->interact->js_binding->node;
+		JSObject *nobj = (JSObject *)n->sgprivate->interact->js_binding->node;
 		if (nobj && (gf_list_find(n->sgprivate->scenegraph->objects, nobj)<0) ) {
 			const char *name = gf_node_get_name(n);
 			if (name) {
@@ -845,7 +862,7 @@
 	/*node is being re-inserted, activate it in case*/
 	if (!old_parent) gf_node_activate(n);
 
-	dom_node_changed(parent, 1, NULL);
+	dom_node_changed(parent, GF_TRUE, NULL);
 }
 
 static JSBool SMJS_FUNCTION(xml_node_insert_before)
@@ -945,7 +962,7 @@
 	dom_node_inserted(c, new_node, n, -1);
 
 	/*whenever we remove a node from the tree, call GC to cleanup the JS binding if any. Not doing so may screw up node IDs*/
-	n->sgprivate->scenegraph->svg_js->force_gc = 1;
+	n->sgprivate->scenegraph->svg_js->force_gc = GF_TRUE;
 
 	SMJS_SET_RVAL( argv[0] );
 	return JS_TRUE;
@@ -976,9 +993,9 @@
 		return dom_throw_exception(c, GF_DOM_EXC_NOT_FOUND_ERR);
 	}
 	SMJS_SET_RVAL( argv[0]);
-	dom_node_changed(n, 1, NULL);
+	dom_node_changed(n, GF_TRUE, NULL);
 	/*whenever we remove a node from the tree, call GC to cleanup the JS binding if any. Not doing so may screw up node IDs*/
-	n->sgprivate->scenegraph->svg_js->force_gc = 1;
+	n->sgprivate->scenegraph->svg_js->force_gc = GF_TRUE;
 	return JS_TRUE;
 }
 
@@ -991,7 +1008,7 @@
 	SMJS_ARGS
 	n = dom_get_node(c, obj);
 	if (!n) return JS_TRUE;
-	deep = argc ? JSVAL_TO_BOOLEAN(argv[0]) : 0;
+	deep = argc ? (JSVAL_TO_BOOLEAN(argv[0]) ? GF_TRUE : GF_FALSE) : GF_FALSE;
 
 	clone = gf_node_clone(n->sgprivate->scenegraph, n, NULL, "", deep);
 	SMJS_SET_RVAL( dom_node_construct(c, clone) );
@@ -1063,7 +1080,7 @@
 			GF_DOMFullAttribute *datt = (GF_DOMFullAttribute*)att;
 			if (datt->name && !strncmp(datt->name, "xmlns", 5)) {
 				char *xmlns = *(DOM_String *) datt->data;
-				u32 crc = gf_crc_32(xmlns, strlen(xmlns));
+				u32 crc = gf_crc_32(xmlns, (u32) strlen(xmlns));
 				if (tag==crc) return xmlns;
 			}
 		}
@@ -1188,11 +1205,11 @@
 	/*"previousSibling"*/
 	case 7:
 		/*works for doc as well since n is NULL*/
-		*vp = dom_node_get_sibling(c, n, 1, 0);
+		*vp = dom_node_get_sibling(c, n, GF_TRUE, GF_FALSE);
 		return JS_TRUE;
 	/*"nextSibling"*/
 	case 8:
-		*vp = dom_node_get_sibling(c, n, 0, 0);
+		*vp = dom_node_get_sibling(c, n, GF_FALSE, GF_FALSE);
 		return JS_TRUE;
 	/*"attributes"*/
 	case 9:
@@ -1276,10 +1293,10 @@
 		}
 		return JS_TRUE;
 	case 18:/*previousElementSibling*/
-		*vp = dom_node_get_sibling(c, n, 1, 1);
+		*vp = dom_node_get_sibling(c, n, GF_TRUE, GF_TRUE);
 		return JS_TRUE;
 	case 19:/*nextElementSibling*/
-		*vp = dom_node_get_sibling(c, n, 0, 1);
+		*vp = dom_node_get_sibling(c, n, GF_FALSE, GF_TRUE);
 		return JS_TRUE;
 
 	}
@@ -1292,7 +1309,7 @@
 	GF_FieldInfo info;
 	gf_dom_set_textContent(n, text);
 
-	gf_node_dirty_set(n, GF_SG_CHILD_DIRTY, 0);
+	gf_node_dirty_set(n, GF_SG_CHILD_DIRTY, GF_FALSE);
 	memset(&info, 0, sizeof(GF_FieldInfo));
 	info.fieldIndex = (u32) -1;
 	gf_node_changed(n, &info);
@@ -1318,7 +1335,7 @@
 			GF_DOMText *txt = (GF_DOMText *)n;
 			if (txt->textContent) gf_free(txt->textContent);
 			txt->textContent = js_get_utf8(c, *vp);
-			dom_node_changed(n, 1, NULL);
+			dom_node_changed(n, GF_TRUE, NULL);
 		}
 		/*we only support element and sg in the Node interface, no set*/
 		return JS_TRUE;
@@ -1496,13 +1513,13 @@
 
 static void xml_doc_gather_nodes(GF_ParentNode *node, char *name, DOMNodeList *nl)
 {
-	Bool bookmark = 1;
+	Bool bookmark = GF_TRUE;
 	GF_ChildNodeItem *child;
 	const char *node_name;
 	if (!node) return;
 	if (name) {
 		node_name = gf_node_get_class_name((GF_Node*)node);
-		if (strcmp(node_name, name)) bookmark = 0;
+		if (strcmp(node_name, name)) bookmark = GF_FALSE;
 	}
 	if (bookmark) {
 		gf_node_register((GF_Node*)node, NULL);
@@ -1653,13 +1670,13 @@
 		u32 ns_code = 0;
 		if (ns) {
 			ns_code = gf_sg_get_namespace_code_from_name(n->sgprivate->scenegraph, ns);
-			if (!ns_code) ns_code = gf_crc_32(ns, strlen(ns));
+			if (!ns_code) ns_code = gf_crc_32(ns, (u32) strlen(ns));
 		}
 		else {
 			ns_code = gf_xml_get_element_namespace(n);
 		}
 
-		if (gf_node_get_attribute_by_name(n, name, ns_code, 0, 0, &info)==GF_OK) {
+		if (gf_node_get_attribute_by_name(n, name, ns_code, GF_FALSE, GF_FALSE, &info)==GF_OK) {
 			char *szAtt = gf_svg_dump_attribute(n, &info);
 			SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(c, szAtt) ) );
 			if (szAtt) gf_free(szAtt);
@@ -1714,7 +1731,7 @@
 		if (ns) ns_code = gf_sg_get_namespace_code_from_name(n->sgprivate->scenegraph, ns);
 		else ns_code = gf_sg_get_namespace_code(n->sgprivate->scenegraph, NULL);
 
-		if (gf_node_get_attribute_by_name(n, name, ns_code, 0, 0, &info)==GF_OK) {
+		if (gf_node_get_attribute_by_name(n, name, ns_code, GF_FALSE, GF_FALSE, &info)==GF_OK) {
 			SMJS_SET_RVAL( BOOLEAN_TO_JSVAL(JS_TRUE) );
 			goto exit;
 		}
@@ -1774,14 +1791,14 @@
 			if (att->data) gf_free(att->data);
 			gf_free(att->name);
 			gf_free(att);
-			dom_node_changed(n, 0, NULL);
+			dom_node_changed(n, GF_FALSE, NULL);
 			goto exit;
 		} else if (tag==att->tag) {
 			if (prev) prev->next = att->next;
 			else node->attributes = att->next;
 			gf_svg_delete_attribute_value(att->data_type, att->data, n->sgprivate->scenegraph);
 			gf_free(att);
-			dom_node_changed(n, 0, NULL);
+			dom_node_changed(n, GF_FALSE, NULL);
 			goto exit;
 		}
 		prev = att;
@@ -1803,12 +1820,12 @@
 		GF_DOMText *text;
 		GF_Node *listen = gf_dom_listener_get(n, i);
 
-		gf_node_get_attribute_by_tag(listen, TAG_XMLEV_ATT_event, 0, 0, &info);
+		gf_node_get_attribute_by_tag(listen, TAG_XMLEV_ATT_event, GF_FALSE, GF_FALSE, &info);
 		if (!info.far_ptr || (((XMLEV_Event*)info.far_ptr)->type != evtType)) continue;
 
 		/* found a listener for this event, override the handler 
 		TODO: FIX this, there may be a listener/handler already set with JS, why overriding ? */
-		gf_node_get_attribute_by_tag(listen, TAG_XMLEV_ATT_handler, 0, 0, &info);
+		gf_node_get_attribute_by_tag(listen, TAG_XMLEV_ATT_handler, GF_FALSE, GF_FALSE, &info);
 		assert(info.far_ptr);
 		handler = (SVG_handlerElement *) ((XMLRI*)info.far_ptr)->target;
 		text = (GF_DOMText*)handler->children->node;
@@ -1832,7 +1849,7 @@
 		if ((att->tag==TAG_DOM_ATT_any) && !strcmp(att->name, attribute_name)) {
 			if (att->data) gf_free(att->data);
 			att->data = gf_strdup(attribute_content);
-			dom_node_changed((GF_Node *)node, 0, NULL);
+			dom_node_changed((GF_Node *)node, GF_FALSE, NULL);
 			return;
 		}
 		prev = att;
@@ -1847,19 +1864,13 @@
 	return;
 }
 
-static void gf_svg_set_attribute(GF_Node *n, char * ns, char *name, char *val)
+void gf_svg_set_attributeNS(GF_Node *n, u32 ns_code, char *name, char *val)
 {
 	GF_FieldInfo info;
 	u32 anim_value_type = 0;
-	u32 ns_code = 0;
-	if (ns) {
-		ns_code = gf_sg_get_namespace_code_from_name(n->sgprivate->scenegraph, ns);
-	} else {
-		ns_code = gf_xml_get_element_namespace(n);
-	}
 
 	if (!strcmp(name, "attributeName")) {
-		if (gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_attributeName, 0, 0, &info) == GF_OK) {
+		if (gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_attributeName, GF_FALSE, GF_FALSE, &info) == GF_OK) {
 			SMIL_AttributeName *attname = (SMIL_AttributeName *)info.far_ptr;
 
 			/*parse the attribute name even if the target is not found, because a namespace could be specified and 
@@ -1881,7 +1892,7 @@
 	}
 
 	if ((n->sgprivate->tag == TAG_SVG_animateTransform) && (strstr(name, "from") || strstr(name, "to")) ) {
-		if (gf_node_get_attribute_by_tag((GF_Node *)n, TAG_SVG_ATT_transform_type, 1, 0, &info) != GF_OK) {
+		if (gf_node_get_attribute_by_tag((GF_Node *)n, TAG_SVG_ATT_transform_type, GF_TRUE, GF_FALSE, &info) != GF_OK) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_SCRIPT, ("Cannot retrieve attribute 'type' from animateTransform\n"));
 			return;
 		}
@@ -1898,12 +1909,12 @@
 		}
 	}
 
-	if (gf_node_get_attribute_by_name(n, name, ns_code,  1, 1, &info)==GF_OK) {
+	if (gf_node_get_attribute_by_name(n, name, ns_code,  GF_TRUE, GF_TRUE, &info)==GF_OK) {
 		GF_Err e;
 		if (!strcmp(name, "from") || !strcmp(name, "to") || !strcmp(name, "values") ) {
 			GF_FieldInfo attType;
 			SMIL_AttributeName *attname;
-			if (gf_node_get_attribute_by_tag((GF_Node *)n, TAG_SVG_ATT_attributeName, 0, 0, &attType) != GF_OK) {
+			if (gf_node_get_attribute_by_tag((GF_Node *)n, TAG_SVG_ATT_attributeName, GF_FALSE, GF_FALSE, &attType) != GF_OK) {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_SCRIPT, ("Cannot retrieve attribute 'attributeName'\n"));
 				return;
 			}
@@ -1912,7 +1923,7 @@
 			if (!attname->type && attname->name) {
 				GF_Node *anim_target = gf_smil_anim_get_target(n);
 				if (anim_target) {
-					gf_node_get_attribute_by_name((GF_Node *)anim_target, attname->name, attname->type, 0, 0, &attType);
+					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));
@@ -1928,17 +1939,28 @@
 
 		if (info.fieldType==SVG_ID_datatype) {
 			char *idname = *(SVG_String*)info.far_ptr;
-			gf_svg_parse_element_id(n, idname, 0);
+			gf_svg_parse_element_id(n, idname, GF_FALSE);
 		}
 		if (info.fieldType==XMLRI_datatype) {
-			gf_node_dirty_set(n, GF_SG_SVG_XLINK_HREF_DIRTY, 0);
+			gf_node_dirty_set(n, GF_SG_SVG_XLINK_HREF_DIRTY, GF_FALSE);
 		}
-		dom_node_changed(n, 0, &info);
+		dom_node_changed(n, GF_FALSE, &info);
 		return;
 	}
 }
 
-static JSBool SMJS_FUNCTION(xml_element_set_attribute)
+void gf_svg_set_attribute(GF_Node *n, char * ns, char *name, char *val)
+{
+	u32 ns_code = 0;
+	if (ns) {
+		ns_code = gf_sg_get_namespace_code_from_name(n->sgprivate->scenegraph, ns);
+	} else {
+		ns_code = gf_xml_get_element_namespace(n);
+	}
+	gf_svg_set_attributeNS(n, ns_code, name, val);
+}
+
+JSBool SMJS_FUNCTION(xml_element_set_attribute)
 {
 	u32 idx;
 	char *name, *val, *ns, *_val;
@@ -2070,10 +2092,10 @@
 	if (argc==2) {
 		if (!JSVAL_CHECK_STRING(argv[1])) return JS_TRUE;
 		name = SMJS_CHARS(c, argv[1]);
-		is_id = (JSVAL_TO_BOOLEAN(argv[2])==JS_TRUE) ? 1 : 0;
+		is_id = (JSVAL_TO_BOOLEAN(argv[2])==JS_TRUE) ? GF_TRUE : GF_FALSE;
 	} else {
 		name = SMJS_CHARS(c, argv[0]);
-		is_id = (JSVAL_TO_BOOLEAN(argv[1])==JS_TRUE) ? 1 : 0;
+		is_id = (JSVAL_TO_BOOLEAN(argv[1])==JS_TRUE) ? GF_TRUE : GF_FALSE;
 	}
 	gf_node_get_name_and_id(n, &node_id);
 	if (node_id && is_id) {
@@ -2136,7 +2158,7 @@
 			char *str = js_get_utf8(c, *vp);
 			txt->textContent = str ? str : gf_strdup("" );
 		}
-		dom_node_changed((GF_Node*)txt, 0, NULL);
+		dom_node_changed((GF_Node*)txt, GF_FALSE, NULL);
 		return JS_TRUE;
 	/*the rest is read-only*/
 	}
@@ -2146,7 +2168,7 @@
 static JSBool SMJS_FUNCTION(event_stop_propagation)
 {
 	SMJS_OBJ
-	GF_DOM_Event *evt = SMJS_GET_PRIVATE(c, obj);
+	GF_DOM_Event *evt = (GF_DOM_Event *)SMJS_GET_PRIVATE(c, obj);
 	if (!evt) return JS_TRUE;
 	evt->event_phase |= GF_DOM_EVENT_PHASE_CANCEL;
 	return JS_TRUE;
@@ -2154,7 +2176,7 @@
 static JSBool SMJS_FUNCTION(event_stop_immediate_propagation)
 {
 	SMJS_OBJ
-	GF_DOM_Event *evt = SMJS_GET_PRIVATE(c, obj);
+	GF_DOM_Event *evt = (GF_DOM_Event *)SMJS_GET_PRIVATE(c, obj);
 	if (!evt) return JS_TRUE;
 	evt->event_phase |= GF_DOM_EVENT_PHASE_CANCEL_ALL;
 	return JS_TRUE;
@@ -2162,7 +2184,7 @@
 static JSBool SMJS_FUNCTION(event_prevent_default)
 {
 	SMJS_OBJ
-	GF_DOM_Event *evt = SMJS_GET_PRIVATE(c, obj);
+	GF_DOM_Event *evt = (GF_DOM_Event *)SMJS_GET_PRIVATE(c, obj);
 	if (!evt) return JS_TRUE;
 	evt->event_phase |= GF_DOM_EVENT_PHASE_PREVENT;
 	return JS_TRUE;
@@ -2171,7 +2193,7 @@
 static SMJS_FUNC_PROP_GET( event_getProperty)
 
 	JSString *s;
-	GF_DOM_Event *evt = SMJS_GET_PRIVATE(c, obj);
+	GF_DOM_Event *evt = (GF_DOM_Event *)SMJS_GET_PRIVATE(c, obj);
 	if (evt==NULL) return JS_TRUE;
 	if (SMJS_ID_IS_INT(id)) {
 		switch (SMJS_ID_TO_INT(id)) {
@@ -2199,6 +2221,8 @@
 			case GF_DOM_EVENT_DOCUMENT:
 				*vp = dom_document_construct(c, (GF_SceneGraph *) evt->currentTarget->ptr);
 				break;
+            default:
+                break;
 			}
 			return JS_TRUE;
 		/*eventPhase */
@@ -2231,8 +2255,8 @@
 			char szData[5];;
 			txt[0] = evt->detail;
 			txt[1] = 0;
-			srcp = txt;
-			len = gf_utf8_wcstombs(szData, 5, &srcp);
+			srcp = (const u16 *) txt;
+			len = (u32) gf_utf8_wcstombs(szData, 5, &srcp);
 			szData[len] = 0;
 			s = JS_NewStringCopyZ(c, szData);
 			*vp = STRING_TO_JSVAL( s );
@@ -2351,9 +2375,13 @@
 	GF_DownloadSession *sess;
 	char *data;
 	u32 size;
+	JSObject *arraybuffer; 
 	GF_Err ret_code;
 	u32 html_status;
 	char *statusText;
+	u32 timeout;
+	u32 responseType;
+	Bool withCredentials;
 
 	GF_SAXParser *sax;
 	GF_List *node_stack;
@@ -2418,7 +2446,7 @@
 			}
 			/*append value*/
 			else {
-				char *new_val = gf_malloc(sizeof(char) * (strlen(ctx->headers[nb_hdr+1])+strlen(val)+3));
+				char *new_val = (char *)gf_malloc(sizeof(char) * (strlen(ctx->headers[nb_hdr+1])+strlen(val)+3));
 				sprintf(new_val, "%s, %s", ctx->headers[nb_hdr+1], val);
 				gf_free(ctx->headers[nb_hdr+1]);
 				ctx->headers[nb_hdr+1] = new_val;
@@ -2431,7 +2459,7 @@
 	if (ctx->headers) {
 		while (ctx->headers[nb_hdr]) nb_hdr+=2;
 	}
-	ctx->headers = gf_realloc(ctx->headers, sizeof(char*)*(nb_hdr+3));
+	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;
@@ -2456,7 +2484,7 @@
 	if (ctx->recv_headers) {
 		while (ctx->recv_headers[nb_hdr]) nb_hdr+=2;
 	}
-	ctx->recv_headers = gf_realloc(ctx->recv_headers, sizeof(char*)*(nb_hdr+3));
+	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;
@@ -2486,8 +2514,9 @@
 		gf_dm_sess_del(tmp);
 	}
 	if (ctx->data) {
-		gf_free(ctx->data);
+		if (!ctx->arraybuffer) gf_free(ctx->data);
 		ctx->data = NULL;
+		ctx->arraybuffer = NULL;
 	}
 	if (ctx->statusText) {
 		gf_free(ctx->statusText);
@@ -2516,10 +2545,10 @@
 	}
 	ctx->document = NULL;
 	ctx->size = 0;
-	ctx->async = 0;
+	ctx->async = GF_FALSE;
 	ctx->readyState = 0;
 	ctx->cur_header = 0;
-	ctx->ret_code = 0;
+	ctx->ret_code = GF_OK;
 	ctx->html_status = 0;
 }
 
@@ -2554,21 +2583,21 @@
 	GF_Node *n;
 	jsval rval;
 	
-	gf_sg_lock_javascript(ctx->c, 1);
+	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*/
 
 
-	gf_sg_lock_javascript(ctx->c, 0);
+	gf_sg_lock_javascript(ctx->c, GF_FALSE);
 
 	/*Flush BIFS eventOut events*/
 #ifndef GPAC_DISABLE_VRML
-	scene = JS_GetContextPrivate(ctx->c);
+	scene = (GF_SceneGraph *)JS_GetContextPrivate(ctx->c);
 	/*this is a scene, we look for a node (if scene is used, this is DOM-based scripting not VRML*/
 	if (scene->__reserved_null == 0) return;
-	n = JS_GetContextPrivate(ctx->c);
+	n = (GF_Node *)JS_GetContextPrivate(ctx->c);
 	gf_js_vrml_flush_event_out(n, (GF_ScriptPriv *)n->sgprivate->UserPrivate);
 #endif
 }
@@ -2622,10 +2651,10 @@
 	SMJS_FREE(c, val);
 
 	/*async defaults to true*/
-	ctx->async = 1;
+	ctx->async = GF_TRUE;
 	if (argc>2) {
 		val = NULL;
-		ctx->async = (JSVAL_TO_BOOLEAN(argv[2])==JS_TRUE) ? 1 : 0;
+		ctx->async = (JSVAL_TO_BOOLEAN(argv[2])==JS_TRUE) ? GF_TRUE : GF_FALSE;
 		if (argc>3) {
 			if (!JSVAL_CHECK_STRING(argv[3])) return JS_TRUE;
 			/*TODO*/
@@ -2710,7 +2739,7 @@
 static void xml_http_sax_end(void *sax_cbck, const char *node_name, const char *name_space)
 {
 	XMLHTTPContext *ctx = (XMLHTTPContext *)sax_cbck;
-	GF_DOMFullNode *par = gf_list_last(ctx->node_stack);
+	GF_DOMFullNode *par = (GF_DOMFullNode *)gf_list_last(ctx->node_stack);
 	if (par) {
 		/*depth mismatch*/
 		if (strcmp(par->name, node_name)) return;
@@ -2720,12 +2749,12 @@
 static void xml_http_sax_text(void *sax_cbck, const char *content, Bool is_cdata)
 {
 	XMLHTTPContext *ctx = (XMLHTTPContext *)sax_cbck;
-	GF_DOMFullNode *par = gf_list_last(ctx->node_stack);
+	GF_DOMFullNode *par = (GF_DOMFullNode *)gf_list_last(ctx->node_stack);
 	if (par) {
 		u32 i, len;
 		GF_DOMText *txt;
 		/*basic check, remove all empty text nodes*/
-		len = strlen(content);
+		len = (u32) strlen(content);
 		for (i=0; i<len; i++) {
 			if (!strchr(" \n\r\t", content[i])) break;
 		}
@@ -2740,13 +2769,13 @@
 
 static void xml_http_on_data(void *usr_cbk, GF_NETIO_Parameter *parameter)
 {
-	Bool locked = 0;
+	Bool locked = GF_FALSE;
 	XMLHTTPContext *ctx = (XMLHTTPContext *)usr_cbk;
 
 	/*make sure we can grab JS and the session is not destroyed*/
 	while (ctx->sess) {
 		if (gf_sg_try_lock_javascript(ctx->c) ){
-			locked = 1;
+			locked = GF_TRUE;
 			break;
 		}
 		gf_sleep(1);
@@ -2754,12 +2783,12 @@
 	/*if session not set, we've had an abort*/
 	if (!ctx->sess){
 		if (locked)
-			gf_sg_lock_javascript(ctx->c, 0);
+			gf_sg_lock_javascript(ctx->c, GF_FALSE);
 		return;
 	}
 
 	assert( locked );
-	gf_sg_lock_javascript(ctx->c, 0);
+	gf_sg_lock_javascript(ctx->c, GF_FALSE);
 
 	switch (parameter->msg_type) {
 	case GF_NETIO_SETUP:
@@ -2770,9 +2799,10 @@
 		return;
 	case GF_NETIO_WAIT_FOR_REPLY:
 		/*reset send() state (data, current header) and prepare recv headers*/
-		if (ctx->data) gf_free(ctx->data);
+		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) {
@@ -2806,7 +2836,7 @@
 	case GF_NETIO_GET_CONTENT:
 		if (ctx->data) {
 			parameter->data = ctx->data;
-			parameter->size = strlen(ctx->data);
+			parameter->size = (u32) strlen(ctx->data);
 		}
 		return;
 	case GF_NETIO_PARSE_HEADER:
@@ -2842,7 +2872,7 @@
 				}
 			}
 #endif
-			ctx->data = gf_realloc(ctx->data, sizeof(char)*(ctx->size+parameter->size+1));
+			ctx->data = (char *)gf_realloc(ctx->data, sizeof(char)*(ctx->size+parameter->size+1));
 			memcpy(ctx->data + ctx->size, parameter->data, sizeof(char)*parameter->size);
 			ctx->size += parameter->size;
 			ctx->data[ctx->size] = 0;
@@ -2851,7 +2881,7 @@
 	case GF_NETIO_DATA_TRANSFERED:
 		if (ctx->sax) {
 #if !USE_PROGRESSIVE_SAX
-			gf_xml_sax_init(ctx->sax, ctx->data);
+			gf_xml_sax_init(ctx->sax, (unsigned char *) ctx->data);
 #endif
 		}
 		/* No return, go till the end of the function */
@@ -2917,8 +2947,12 @@
 	}
 
 	/*reset previous text*/
-	if (ctx->data) gf_free(ctx->data);
-
+	if (ctx->data && !ctx->arraybuffer) {
+		gf_free(ctx->data);
+		ctx->data = NULL;
+		ctx->size = 0;
+		ctx->arraybuffer = NULL;
+	}
 	ctx->data = data ? gf_strdup(data) : NULL;
 	SMJS_FREE(c, data);
 
@@ -2939,9 +2973,10 @@
 		u64 fsize;
 		FILE * xmlf;
 		
-		if (ctx->data) gf_free(ctx->data);
+		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) {
@@ -2966,7 +3001,7 @@
 		fsize = gf_f64_tell(xmlf);
 		gf_f64_seek(xmlf, 0, SEEK_SET);
 		
-		ctx->data = gf_malloc(sizeof(char)*(size_t)(fsize+1));
+		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;
@@ -3085,6 +3120,7 @@
 	ctx = (XMLHTTPContext *)SMJS_GET_PRIVATE(c, obj);
 	if (!ctx) return JS_TRUE;
 
+	s = NULL;
 	if (SMJS_ID_IS_INT(id)) {
 		switch (SMJS_ID_TO_INT(id)) {
 		/*onreadystatechange*/
@@ -3097,7 +3133,8 @@
 			return JS_TRUE;
 		/*readyState*/
 		case 1:
-			*vp = INT_TO_JSVAL(ctx->readyState); return JS_TRUE;
+			*vp = INT_TO_JSVAL(ctx->readyState); 
+			return JS_TRUE;
 		/*responseText*/
 		case 2:
 			if (ctx->readyState<3) return JS_TRUE;
@@ -3117,9 +3154,32 @@
 				*vp = JSVAL_VOID;
 			}
 			return JS_TRUE;
+		/*response*/
+		case 10:
+			if (ctx->readyState<3) return JS_TRUE;
+			if (ctx->data) {
+				switch(ctx->responseType)
+				{
+				case 0:
+					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);
+					*vp = OBJECT_TO_JSVAL( ctx->arraybuffer );
+					break;
+				default:
+					/*other	types not supported	*/
+					*vp = JSVAL_VOID;
+				}
+			} else {
+				*vp = JSVAL_VOID;
+			}
+			return JS_TRUE;
 		/*status*/
 		case 4:
-			*vp = INT_TO_JSVAL(ctx->html_status); return JS_TRUE;
+			*vp = INT_TO_JSVAL(ctx->html_status); 
+			return JS_TRUE;
 		/*statusText*/
 		case 5:
 			if (ctx->statusText) {
@@ -3129,6 +3189,61 @@
 				*vp = JSVAL_VOID;
 			}
 			return JS_TRUE;
+        /*timeout*/
+		case 6:
+			*vp = INT_TO_JSVAL(ctx->timeout); 
+			return JS_TRUE;
+		/* withCredentials */
+        case 7:
+			*vp = BOOLEAN_TO_JSVAL(ctx->withCredentials ? JS_TRUE : JS_FALSE); 
+			return JS_TRUE;
+        /* upload */
+		case 8:
+			/* TODO */
+			return JS_TRUE;
+        /* responseType */
+		case 9:
+			switch (ctx->responseType)
+            {
+            case 0:
+				s = JS_NewStringCopyZ(c, "");
+                break;
+            case 1:
+				s = JS_NewStringCopyZ(c, "arraybuffer");
+                break;
+            case 2:
+				s = JS_NewStringCopyZ(c, "blob");
+                break;
+            case 3:
+				s = JS_NewStringCopyZ(c, "document");
+                break;
+            case 4:
+				s = JS_NewStringCopyZ(c, "json");
+                break;
+            case 5:
+				s = JS_NewStringCopyZ(c, "text");
+                break;
+            case 6:
+				s = JS_NewStringCopyZ(c, "stream");
+                break;
+            }
+			*vp = STRING_TO_JSVAL( s );
+			return JS_TRUE;
+		case 100:
+			*vp = INT_TO_JSVAL(0);
+			return JS_TRUE;
+		case 101:
+			*vp = INT_TO_JSVAL(1);
+			return JS_TRUE;
+		case 102:
+			*vp = INT_TO_JSVAL(2);
+			return JS_TRUE;
+		case 103:
+			*vp = INT_TO_JSVAL(3);
+			return JS_TRUE;
+		case 104:
+			*vp = INT_TO_JSVAL(4);
+			return JS_TRUE;
 		default:
 			return JS_TRUE;
 		}
@@ -3147,28 +3262,59 @@
 		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;
 			break;
+        /*timeout*/
+		case 6:
+			ctx->timeout = JSVAL_TO_INT(*vp);
+			return JS_TRUE;
+		/* withCredentials */
+        case 7:
+			ctx->withCredentials = (JSVAL_TO_BOOLEAN(*vp) == JS_TRUE ? GF_TRUE : GF_FALSE);
+			return JS_TRUE;
+        /* responseType */
+		case 9:
+            { 
+                char *str = SMJS_CHARS(c, *vp);
+	            if (!str) return JS_TRUE;
+                if (!strcmp(str, "")) {
+                    ctx->responseType = 0;
+                } else if (!strcmp(str, "arraybuffer")) {
+                    ctx->responseType = 1;
+                } else if (!strcmp(str, "blob")) {
+                    ctx->responseType = 2;
+                } else if (!strcmp(str, "document")) {
+                    ctx->responseType = 3;
+                } else if (!strcmp(str, "json")) {
+                    ctx->responseType = 4;
+                } else if (!strcmp(str, "text")) {
+                    ctx->responseType = 5;
+                } else if (!strcmp(str, "stream")) {
+                    ctx->responseType = 6;
+                }
+                break;
+			    return JS_TRUE;
+            }
 		/*all other properties are read-only*/
 		default:
 			return JS_TRUE;
 		}
-		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;
 	}
 	return JS_TRUE;
 }
@@ -3282,11 +3428,11 @@
 		switch (SMJS_ID_TO_INT(id)) {
 		/*value*/
 		case 0:
-			readonly = 0;
+			readonly = GF_FALSE;
 			att = (GF_DOMFullAttribute*) n->attributes;
 			while (att) {
-				if (att->name && !strcmp(att->name, "readOnly") && att->data && !strcmp(att->data, "true")) {
-					readonly = 1;
+				if (att->name && !strcmp(att->name, "readOnly") && att->data && !strcmp((const char *)att->data, "true")) {
+					readonly = GF_TRUE;
 					break;
 				}
 				att = (GF_DOMFullAttribute*) att->next;
@@ -3313,7 +3459,7 @@
 			evt.bubbles = 1;
 			evt.relatedNode = (GF_Node*)n;
 			gf_dom_event_fire((GF_Node*)n, &evt);
-			n->sgprivate->scenegraph->modified = 1;
+			n->sgprivate->scenegraph->modified = GF_TRUE;
 			break;
 		/*propertyType*/
 		case 2:
@@ -3330,29 +3476,29 @@
 
 Bool dcci_prop_lookup(GF_DOMFullNode *n, char *ns, char *name, Bool deep, Bool first)
 {
-	Bool ok = 1;
+	Bool ok = GF_TRUE;
 	GF_ChildNodeItem *child = n->children;
 	/*ns mismatch*/
 	if (strcmp(ns, "*") && n->ns && strcmp(ns, gf_sg_get_namespace(n->sgprivate->scenegraph, n->ns) ))
-		ok = 0;
+		ok = GF_FALSE;
 	/*name mismatch*/
 	if (strcmp(name, "*") && n->name && strcmp(name, n->name))
-		ok = 0;
+		ok = GF_FALSE;
 
 	/*"Some DCCIProperty nodes may not have a value"*/
-	if (ok) return 1;
+	if (ok) return GF_TRUE;
 
 	/*not found*/
-	if (!first && !deep) return 0;
+	if (!first && !deep) return GF_FALSE;
 
 	while (child) {
 		if (child->node && (child->node->sgprivate->tag==TAG_DOMFullNode)) {
-			ok = dcci_prop_lookup((GF_DOMFullNode *)child->node, ns, name, deep, 0);
-			if (ok) return 1;
+			ok = dcci_prop_lookup((GF_DOMFullNode *)child->node, ns, name, deep, GF_FALSE);
+			if (ok) return GF_TRUE;
 		}
 		child = child->next;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 static JSBool SMJS_FUNCTION(dcci_has_property)
@@ -3371,8 +3517,8 @@
 	ns = SMJS_CHARS(c, argv[0]);
 	name = SMJS_CHARS(c, argv[1]);
 
-	deep = JSVAL_TO_BOOLEAN(argv[2]) ? 1 : 0;
-	deep = dcci_prop_lookup(n, ns, name, deep, 1);
+	deep = JSVAL_TO_BOOLEAN(argv[2]) ? GF_TRUE : GF_FALSE;
+	deep = dcci_prop_lookup(n, ns, name, deep, GF_TRUE);
 	SMJS_SET_RVAL( BOOLEAN_TO_JSVAL(deep ? JS_TRUE : JS_FALSE) );
 	SMJS_FREE(c, ns);
 	SMJS_FREE(c, name);
@@ -3381,14 +3527,14 @@
 
 void dcci_prop_collect(DOMNodeList *nl, GF_DOMFullNode *n, char *ns, char *name, Bool deep, Bool first)
 {
-	Bool ok = 1;
+	Bool ok = GF_TRUE;
 	GF_ChildNodeItem *child = n->children;
 	/*ns mismatch*/
 	if (strcmp(ns, "*") && n->ns && strcmp(ns, gf_sg_get_namespace(n->sgprivate->scenegraph, n->ns) ))
-		ok = 0;
+		ok = GF_FALSE;
 	/*name mismatch*/
 	if (strcmp(name, "*") && n->name && strcmp(name, n->name))
-		ok = 0;
+		ok = GF_FALSE;
 
 	/*"Some DCCIProperty nodes may not have a value"*/
 	if (ok) {
@@ -3403,7 +3549,7 @@
 
 	while (child) {
 		if (child->node && (child->node->sgprivate->tag==TAG_DOMFullNode)) {
-			dcci_prop_collect(nl, (GF_DOMFullNode *)child->node, ns, name, 1, 0);
+			dcci_prop_collect(nl, (GF_DOMFullNode *)child->node, ns, name, GF_TRUE, GF_FALSE);
 		}
 		child = child->next;
 	}
@@ -3428,10 +3574,10 @@
 	ns = SMJS_CHARS(c, argv[0]);
 	name = SMJS_CHARS(c, argv[1]);
 	/*todo - DCCI prop filter*/
-	deep = JSVAL_TO_BOOLEAN(argv[3]) ? 1 : 0;
+	deep = JSVAL_TO_BOOLEAN(argv[3]) ? GF_TRUE : GF_FALSE;
 
 	GF_SAFEALLOC(nl, DOMNodeList);
-	dcci_prop_collect(nl, n, ns, name, deep, 1);
+	dcci_prop_collect(nl, n, ns, name, deep, GF_TRUE);
 	new_obj = JS_NewObject(c, &dom_rt->domNodeListClass._class, 0, 0);
 	SMJS_SET_PRIVATE(c, new_obj, nl);
 	SMJS_SET_RVAL( OBJECT_TO_JSVAL(new_obj) );
@@ -3584,7 +3730,7 @@
 			SMJS_FUNCTION_SPEC("normalizeDocument",			xml_dom3_not_implemented, 0),
 			SMJS_FUNCTION_SPEC("renameNode",					xml_dom3_not_implemented, 3),
 			/*eventTarget interface*/
-			JS_DOM3_EVEN_TARGET_INTERFACE
+			JS_DOM3_EVENT_TARGET_INTERFACE
 			/*DocumentEvent interface*/
 			SMJS_FUNCTION_SPEC("createEvent",					xml_dom3_not_implemented, 1),
 			SMJS_FUNCTION_SPEC(0, 0, 0)
@@ -3629,7 +3775,7 @@
 			SMJS_FUNCTION_SPEC("setAttributeNodeNS",			xml_dom3_not_implemented, 1),
 			SMJS_FUNCTION_SPEC("setIdAttributeNode",			xml_dom3_not_implemented, 2),
 			/*eventTarget interface*/
-			JS_DOM3_EVEN_TARGET_INTERFACE
+			JS_DOM3_EVENT_TARGET_INTERFACE
 			SMJS_FUNCTION_SPEC(0, 0, 0)
 		};
 
@@ -3765,10 +3911,23 @@
 		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("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(0, 0, 0, 0, 0)
+		};
+		JSPropertySpec xmlHTTPRequestStaticClassProps[] = {
 			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 		};
 		JSFunctionSpec xmlHTTPRequestClassFuncs[] = {
@@ -3781,7 +3940,7 @@
 			/*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, 0, 0);
+		GF_JS_InitClass(c, global, 0, &dom_rt->xmlHTTPRequestClass, xml_http_constructor, 0, xmlHTTPRequestClassProps, xmlHTTPRequestClassFuncs, xmlHTTPRequestStaticClassProps, 0);
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[DOMCore] XMLHttpRequest class initialized\n"));
 	}
 
@@ -3829,20 +3988,24 @@
 			dcci_root = dom_base_node_construct(c, &dom_rt->DCCIClass, dcci->RootNode);
 			JS_DefineProperty(c, global, "DCCIRoot", dcci_root, 0, 0, JSPROP_READONLY | JSPROP_PERMANENT );
 
-			dcci->dcci_doc = 1;
+			dcci->dcci_doc = GF_TRUE;
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[DOMCore] DCCI class initialized\n"));
 		}
 	}
 }
 
+void html_media_element_js_finalize(JSContext *c, GF_Node *n);
+
 void dom_js_pre_destroy(JSContext *c, GF_SceneGraph *sg, GF_Node *n)
 {
 	u32 i, count;
-
-
 	if (n) {
+        if (n->sgprivate->tag == TAG_SVG_video || n->sgprivate->tag == TAG_SVG_audio)
+        {
+            html_media_element_js_finalize(c, n);
+        }
 		if (n->sgprivate->interact && n->sgprivate->interact->js_binding && n->sgprivate->interact->js_binding->node) {
-			JSObject *obj = n->sgprivate->interact->js_binding->node;
+			JSObject *obj = (JSObject *)n->sgprivate->interact->js_binding->node;
 			SMJS_SET_PRIVATE(c, obj, NULL);
 			n->sgprivate->interact->js_binding->node=NULL;
 			if (gf_list_del_item(sg->objects, obj)>=0) {
@@ -3856,7 +4019,7 @@
 	but not inserted in the graph*/
 	while (gf_list_count(sg->objects)) {
 		GF_Node *n;
-		JSObject *obj = gf_list_get(sg->objects, 0);
+		JSObject *obj = (JSObject *)gf_list_get(sg->objects, 0);
 		n = dom_get_node(c, obj);
 		if (n) {
 			SMJS_SET_PRIVATE(c, obj, NULL);
@@ -3873,7 +4036,7 @@
 		/*if same context and same document, discard handler*/
 		if ( (handler->js_context==c) && (!sg || (handler->sgprivate->scenegraph==sg)) ) {
 			/*unprotect the function*/
-			gf_js_remove_root(handler->js_context, &(handler->js_fun_val), GF_JSGC_VAL);
+			gf_js_remove_root((JSContext *)handler->js_context, &(handler->js_fun_val), GF_JSGC_VAL);
 			handler->js_fun_val=0;
 			handler->js_context=0;
 			gf_list_rem(dom_rt->handlers, i);
@@ -3996,26 +4159,26 @@
 static void xml_reload_node_start(void *sax_cbck, const char *node_name, const char *name_space, const GF_XMLAttribute *attributes, u32 nb_attributes)
 {
 	GF_DOM_Event evt;
-	Bool is_root = 0;
-	Bool modified = 0;
-	Bool atts_modified = 0;
-	Bool new_node = 0;
+	Bool is_root = GF_FALSE;
+	Bool modified = GF_FALSE;
+	Bool atts_modified = GF_FALSE;
+	Bool new_node = GF_FALSE;
 	u32 i;
 	GF_DOMFullAttribute *prev = NULL;
 	GF_DOMFullNode *par = NULL;
 	XMLReloadContext *ctx = (XMLReloadContext *)sax_cbck;
 	GF_DOMFullNode *node;
 
-	node = gf_list_last(ctx->node_stack);
+	node = (GF_DOMFullNode *)gf_list_last(ctx->node_stack);
 	if (!node) {
-		is_root = 1;
+		is_root = GF_TRUE;
 		node = (GF_DOMFullNode *) ctx->document->RootNode;
 	}
 
 	if (is_root) {
-		Bool same_node = 1;
-		if (strcmp(node->name, node_name)) same_node = 0;
-		if (node->ns && name_space && strcmp(gf_sg_get_namespace(node->sgprivate->scenegraph, node->ns), name_space)) same_node = 0;
+		Bool same_node = GF_TRUE;
+		if (strcmp(node->name, node_name)) same_node = GF_FALSE;
+		if (node->ns && name_space && strcmp(gf_sg_get_namespace(node->sgprivate->scenegraph, node->ns), name_space)) same_node = GF_FALSE;
 
 		if (!same_node) {
 			if (node->name) gf_free(node->name);
@@ -4025,17 +4188,17 @@
 				gf_sg_add_namespace(node->sgprivate->scenegraph, (char *) name_space, NULL);
 				node->ns = gf_sg_get_namespace_code_from_name(node->sgprivate->scenegraph, (char*)name_space);
 			}
-			modified = 1;
+			modified = GF_TRUE;
 		}
 	} else {
 		GF_ChildNodeItem *child = node->children;
 		node = NULL;
 		/*locate the node in the children*/
 		while (child) {
-			Bool same_node = 1;
+			Bool same_node = GF_TRUE;
 			node = (GF_DOMFullNode*)child->node;
-			if (strcmp(node->name, node_name)) same_node = 0;
-			if (node->ns && name_space && strcmp(gf_sg_get_namespace(node->sgprivate->scenegraph, node->ns), name_space)) same_node = 0;
+			if (strcmp(node->name, node_name)) same_node = GF_FALSE;
+			if (node->ns && name_space && strcmp(gf_sg_get_namespace(node->sgprivate->scenegraph, node->ns), name_space)) same_node = GF_FALSE;
 			if (same_node) {
 				break;
 			}
@@ -4043,7 +4206,7 @@
 			child = child->next;
 		}
 		if (!node) {
-			modified = 1;
+			modified = GF_TRUE;
 
 			/*create the new node*/
 			node = (GF_DOMFullNode *) gf_node_new(ctx->document, TAG_DOMFullNode);
@@ -4053,10 +4216,10 @@
 				node->ns = gf_sg_get_namespace_code(node->sgprivate->scenegraph, (char *)name_space);
 			}
 
-			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);
 			gf_node_list_add_child(&par->children, (GF_Node*)node);
-			new_node = 1;
+			new_node = GF_TRUE;
 		}
 	}
 	gf_list_add(ctx->node_stack, node);
@@ -4065,30 +4228,30 @@
 		u32 count = 0;
 		GF_DOMFullAttribute *att = (GF_DOMFullAttribute *)node->attributes;
 		while (att) {
-			Bool found = 0;
+			Bool found = GF_FALSE;
 			for (i=0; i<nb_attributes; i++) {
 				if (!stricmp(attributes[i].name, "xml:id")) {
 					const char *id = gf_node_get_name((GF_Node*)node);
 					if (!id || strcmp(id, attributes[i].value))
-						modified = 1;
+						modified = GF_TRUE;
 				} else if (!strcmp(att->name, attributes[i].name)) {
-					found = 1;
-					if (strcmp(att->data, attributes[i].value)) {
-						atts_modified = 1;
+					found = GF_TRUE;
+					if (strcmp((const char *)att->data, attributes[i].value)) {
+						atts_modified = GF_TRUE;
 						gf_free(att->data);
 						att->data = gf_strdup(attributes[i].value);
 					}
 				}
 			}
 			if (!found) {
-				modified = 1;
+				modified = GF_TRUE;
 				break;
 			}
 			count++;
 			att = (GF_DOMFullAttribute *)att->next;
 		}
 		if (count != nb_attributes)
-			modified = 1;
+			modified = GF_TRUE;
 	}
 
 
@@ -4119,7 +4282,7 @@
 				prev = att;
 			}
 		}
-		atts_modified = 1;
+		atts_modified = GF_TRUE;
 	}
 
 	if (atts_modified || new_node) {
@@ -4134,7 +4297,7 @@
 static void xml_reload_node_end(void *sax_cbck, const char *node_name, const char *name_space)
 {
 	XMLReloadContext *ctx = (XMLReloadContext *)sax_cbck;
-	GF_DOMFullNode *par = gf_list_last(ctx->node_stack);
+	GF_DOMFullNode *par = (GF_DOMFullNode *)gf_list_last(ctx->node_stack);
 	if (par) {
 		/*depth mismatch*/
 		if (strcmp(par->name, node_name)) return;
@@ -4148,11 +4311,11 @@
 	GF_ChildNodeItem *child;
 	GF_DOMText *txt = NULL;
 	XMLReloadContext *ctx = (XMLReloadContext *)sax_cbck;
-	GF_DOMFullNode *par = gf_list_last(ctx->node_stack);
+	GF_DOMFullNode *par = (GF_DOMFullNode *)gf_list_last(ctx->node_stack);
 	if (!par) return;
 
 	/*basic check, remove all empty text nodes*/
-	len = strlen(content);
+	len = (u32) strlen(content);
 	for (i=0; i<len; i++) {
 		if (!strchr(" \n\r\t", content[i])) break;
 	}

gpac-0.5.0.svn4668.tar.bz2/src/scenegraph/html5_media_smjs.c Added

@@ -0,0 +1,1515 @@
+/*
+ *          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-0.5.0.svn4668.tar.bz2/src/scenegraph/html5_mse_smjs.c Added

@@ -0,0 +1,784 @@
+/*
+ *          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-0.5.0.svn4296.tar.bz2/src/scenegraph/svg_attributes.c -> gpac-0.5.0.svn4668.tar.bz2/src/scenegraph/svg_attributes.c Changed

@@ -161,6 +161,17 @@
 	{ GF_EVENT_MEDIA_RATECHANGE, "ratechange", GF_DOM_EVENT_MEDIA },
 	{ GF_EVENT_MEDIA_VOLUME_CHANGED, "volumechange", GF_DOM_EVENT_MEDIA },
 
+	/* Media Source Events */
+	{ 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_ADD_SOURCE_BUFFER, "addsourcebuffer", GF_DOM_EVENT_MEDIASOURCE },
+	{ GF_EVENT_HTML_MSE_REMOVE_SOURCE_BUFFER, "removesourcebuffer", GF_DOM_EVENT_MEDIASOURCE },
+
 	/*GPAC internals*/
 	{ GF_EVENT_SCENE_ATTACHED, "gpac_scene_attached", GF_DOM_EVENT_DOM },
 	{ GF_EVENT_VP_RESIZE, "gpac_vp_changed", GF_DOM_EVENT_DOM },
@@ -2075,7 +2086,7 @@
 	}
     if (unit) {
         if (!unit_len) unit_len = 2;
-        unit_pos = unit - value_string;
+        unit_pos = (u32) (unit - value_string);
         /* setting the first unit character to 0 for the svg_parse_number method to finish */
         c = value_string[unit_pos];
         value_string[unit_pos] = 0;
@@ -2442,8 +2453,8 @@
 
 	while (1) {
 		tmp = strchr(str, ';');
-		if (tmp) len = tmp-str;
-		else len = strlen(str);
+		if (tmp) len = (u32) (tmp-str);
+		else len = (u32) strlen(str);
 		memcpy(value_string, str, len);
 		while (value_string[len - 1] == ' ' && len > 0) len--;
 		value_string[len] = 0;
@@ -2680,7 +2691,7 @@
 	SVG_Coordinate *c;
 	u32 i = 0;
 	char *str = value_string;
-	u32 len = strlen(str);
+	u32 len = (u32) strlen(str);
 
 	while (gf_list_count(values)) {
 		c = (SVG_Coordinate*)gf_list_get(values, 0);
@@ -2730,7 +2741,7 @@
 {
 	u32 i = 0, j;
 	char *str = value_string;
-	u32 len = strlen(str);
+	u32 len = (u32) strlen(str);
 	while (i < len) {
 		SVG_Point *p;
 		GF_SAFEALLOC(p, SVG_Point)
@@ -2757,7 +2768,7 @@
     u32 read_chars;
 	u32 i = 0;
 	char *str = value_string;
-	u32 len = strlen(str);
+	u32 len = (u32) strlen(str);
 	while (i < len) {
 		Fixed *f;
 		GF_SAFEALLOC(f, Fixed)
@@ -2828,7 +2839,7 @@
 		UnitArray *vals = &(value->array);
 		GF_List *values = gf_list_new();
 		u32 i = 0;
-		u32 len = strlen(value_string);
+		u32 len = (u32) strlen(value_string);
 		char *str = value_string;
 		while (i < len) {
 			SVG_Length *f;
@@ -3087,7 +3098,7 @@
 
 		/*change all special chars in spaces*/
 		i=0;
-		len = strlen(attribute_content);
+		len = (u32) strlen(attribute_content);
 		while (i<len) {
 			if (strchr("\r\n\t", attribute_content[i]))
 				attribute_content[i] = ' ';
@@ -3424,7 +3435,7 @@
 	while (*one_style == ' ') one_style++;
 	c = strchr(one_style, ':');
 	if (!c) return;
-	attributeNameLen = (c - one_style);
+	attributeNameLen = (u32) (c - one_style);
 	sep = one_style[attributeNameLen];
 	one_style[attributeNameLen] = 0;
 	while (strchr("\r\n\t ", one_style[0]))
@@ -4348,7 +4359,7 @@
 		break;
 	case SVG_SpreadMethod_datatype:
 		if (intVal==SVG_SPREAD_REFLECT) return gf_strdup("reflect");
-		else if (intVal==SVG_SPREAD_REFLECT) return gf_strdup("repeat");
+		else if (intVal==SVG_SPREAD_REPEAT) return gf_strdup("repeat");
 		else return gf_strdup("pad");
 		break;
 
@@ -4398,7 +4409,7 @@
 			char *szT;
 			XMLRI *iri = (XMLRI *)gf_list_get(l, i);
 			szT = svg_dump_iri(iri);
-			len = strlen(szT);
+			len = (u32) strlen(szT);
 			if (len) {
 				attVal = gf_realloc(attVal, sizeof(char)*(len+strlen(attVal)+ (i ? 2 : 1) ));
 				if (i) strcat(attVal, " ");
@@ -5867,8 +5878,8 @@
 		char *res;
 		SVG_String *s_a = (SVG_String *)a->far_ptr;
 		SVG_String *s_b = (SVG_String *)b->far_ptr;
-		u32 len_a = strlen(*s_a);
-		u32 len_b = strlen(*s_b);
+		u32 len_a = (u32) strlen(*s_a);
+		u32 len_b = (u32) strlen(*s_b);
 		len_a = FIX2INT(alpha * len_a);
 		len_b = FIX2INT(beta * len_b);
 		len = len_a + len_b + 1;
@@ -6086,7 +6097,7 @@
 	case SVG_ContentType_datatype:
 	case DOM_String_datatype:
 		if (* (SVG_String *)a->far_ptr) gf_free(* (SVG_String *)a->far_ptr);
-		* (SVG_String *)a->far_ptr = gf_strdup(*(SVG_String *)b->far_ptr);
+			* (SVG_String *)a->far_ptr = *(SVG_String *)b->far_ptr ? gf_strdup(*(SVG_String *)b->far_ptr) : NULL;
 		return GF_OK;
 
 	case SVG_FontFamily_datatype:

gpac-0.5.0.svn4296.tar.bz2/src/scenegraph/svg_smjs.c -> gpac-0.5.0.svn4668.tar.bz2/src/scenegraph/svg_smjs.c Changed

@@ -68,7 +68,7 @@
 
 jsval dom_node_get_sibling(JSContext *c, GF_Node *n, Bool is_prev, Bool elt_only);
 
-
+void html_media_init_js_api(GF_SceneGraph *scene);
 
 #define _ScriptMessage(_sg, _msg) {\
 			GF_JSAPIParam par;	\
@@ -81,7 +81,7 @@
 {
 	if (scene->script_action)
 		return scene->script_action(scene->script_action_cbck, type, node, param);
-	return 0;
+	return GF_FALSE;
 }
 
 typedef struct
@@ -144,7 +144,7 @@
 	SMJS_OBJ
 	SMJS_ARGS
 	if ((argc!=1) || !GF_JS_InstanceOf(c, obj, &svg_rt->globalClass, NULL)) return JS_TRUE;
-	sg = SMJS_GET_PRIVATE(c, obj);
+	sg = (GF_SceneGraph *)SMJS_GET_PRIVATE(c, obj);
 	par.uri.url = SMJS_CHARS(c, argv[0]);
 	par.uri.nb_params = 0;
 	ScriptAction(sg, GF_JSAPI_OP_LOAD_URL, sg->RootNode, &par);
@@ -188,7 +188,7 @@
 	SMJS_OBJ
 	SMJS_ARGS
 	if ((argc!=1) || !GF_JS_InstanceOf(c, obj, &svg_rt->globalClass, NULL)) return JS_TRUE;
-	sg = SMJS_GET_PRIVATE(c, obj);
+	sg = (GF_SceneGraph *)SMJS_GET_PRIVATE(c, obj);
 	if (!sg) return JS_TRUE;
 
 	if (JSVAL_IS_STRING(argv[0])) {
@@ -232,7 +232,7 @@
 	if (!GF_JS_InstanceOf(c, obj, &svg_rt->globalClass, NULL) )
 		return JS_TRUE;
 
-	sg = SMJS_GET_PRIVATE(c, obj);
+	sg = (GF_SceneGraph *)SMJS_GET_PRIVATE(c, obj);
 	if (SMJS_ID_IS_INT(id)) {
 		switch (SMJS_ID_TO_INT(id)) {
 		/*namespaceURI*/
@@ -261,7 +261,7 @@
 		char *fname = SMJS_CHARS(c, argv[0]);
 		if (!fname) return JS_TRUE;
 		while (strchr(" \t\n\r", fname[0])) fname++;
-		len = strlen(fname);
+		len = (u32) strlen(fname);
 		while (len && strchr(" \t\n\r", fname[len-1])) len--;
 		sep = fname[len];
 		fname[len] = 0;
@@ -288,9 +288,9 @@
 	/*find current node in the use stack - if found, return the use element*/
 	count = gf_list_count(n->sgprivate->scenegraph->use_stack);
 	for (i=count; i>0; i-=2) {
-		t = gf_list_get(n->sgprivate->scenegraph->use_stack, i-2);
+		t = (GF_Node *)gf_list_get(n->sgprivate->scenegraph->use_stack, i-2);
 		if (t==n) {
-			GF_Node *use = gf_list_get(n->sgprivate->scenegraph->use_stack, i-1);
+			GF_Node *use = (GF_Node *)gf_list_get(n->sgprivate->scenegraph->use_stack, i-1);
 			GF_Node *par_use = get_corresponding_use(use);
 			return par_use ? par_use : use;
 		}
@@ -354,7 +354,7 @@
 		if (n->sgprivate->tag!=TAG_SVG_svg) return JS_TRUE;
 		if (ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_GET_TRANSLATE, (GF_Node *)n, &par)) {
 			JSObject *r = JS_NewObject(c, &svg_rt->pointClass._class, 0, 0);
-			pointCI *rc = gf_malloc(sizeof(pointCI));
+			pointCI *rc = (pointCI *)gf_malloc(sizeof(pointCI));
 			rc->x = FIX2FLT(par.pt.x);
 			rc->y = FIX2FLT(par.pt.y);
 			rc->sg = n->sgprivate->scenegraph;
@@ -367,7 +367,7 @@
 		if (n->sgprivate->tag!=TAG_SVG_svg) return JS_TRUE;
 		if (ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_GET_VIEWPORT, (GF_Node *)n, &par)) {
 			JSObject *r = JS_NewObject(c, &svg_rt->rectClass._class, 0, 0);
-			rectCI *rc = gf_malloc(sizeof(rectCI));
+			rectCI *rc = (rectCI *)gf_malloc(sizeof(rectCI));
 			rc->x = FIX2FLT(par.rc.x);
 			rc->y = FIX2FLT(par.rc.y);
 			rc->w = FIX2FLT(par.rc.width);
@@ -432,11 +432,11 @@
 				u32 nid = gf_node_get_id(n);
 				if (!nid) nid = gf_sg_get_next_available_node_id(n->sgprivate->scenegraph);
 				gf_node_set_id(n, nid, id);
-				if (gf_node_get_attribute_by_tag(n, TAG_XML_ATT_id, 1, 0, &info)==GF_OK) {
+				if (gf_node_get_attribute_by_tag(n, TAG_XML_ATT_id, GF_TRUE, GF_FALSE, &info)==GF_OK) {
 					if (*(DOM_String *)info.far_ptr) gf_free(*(DOM_String *)info.far_ptr);
 					*(DOM_String *)info.far_ptr = gf_strdup(id);
 				}
-				if (gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_id, 1, 0, &info)==GF_OK) {
+				if (gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_id, GF_TRUE, GF_FALSE, &info)==GF_OK) {
 					if (*(DOM_String *)info.far_ptr) gf_free(*(DOM_String *)info.far_ptr);
 					*(DOM_String *)info.far_ptr = gf_strdup(id);
 				}
@@ -558,12 +558,12 @@
 
 JSBool SMJS_FUNCTION(svg_udom_smil_begin)
 {
-	return svg_udom_smil_time_insert(SMJS_CALL_ARGS, 0);
+	return svg_udom_smil_time_insert(SMJS_CALL_ARGS, GF_FALSE);
 }
 
 JSBool SMJS_FUNCTION(svg_udom_smil_end)
 {
-	return svg_udom_smil_time_insert(SMJS_CALL_ARGS, 1);
+	return svg_udom_smil_time_insert(SMJS_CALL_ARGS, GF_TRUE);
 }
 
 /*TODO*/
@@ -796,7 +796,7 @@
 
 	SMJS_SET_RVAL( JSVAL_VOID );
 
-	e = gf_node_get_attribute_by_name(n, szName, 0, 1, 1, &info);
+	e = gf_node_get_attribute_by_name(n, szName, 0, GF_TRUE, GF_TRUE, &info);
 	SMJS_FREE(c, szName);
 	if (e != GF_OK) return JS_TRUE;
 
@@ -841,7 +841,7 @@
 	if (e != GF_OK) return JS_TRUE;
 
 	if (info.fieldType==SVG_Transform_datatype) {
-		GF_Matrix2D *mx = gf_malloc(sizeof(GF_Matrix2D));
+		GF_Matrix2D *mx = (GF_Matrix2D *)gf_malloc(sizeof(GF_Matrix2D));
 		mO = JS_NewObject(c, &svg_rt->matrixClass._class, 0, 0);
 		gf_mx2d_init(*mx);
 		gf_mx2d_copy(*mx, ((SVG_Transform*)info.far_ptr)->mat);
@@ -905,7 +905,7 @@
 	if (e != GF_OK) return JS_TRUE;
 
 	if (info.fieldType==SVG_PathData_datatype) {
-		SMJS_SET_RVAL( OBJECT_TO_JSVAL( svg_new_path_object(c, info.far_ptr) ) );
+		SMJS_SET_RVAL( OBJECT_TO_JSVAL( svg_new_path_object(c, (SVG_PathData *)info.far_ptr) ) );
 		return JS_TRUE;
 	}
 	return JS_TRUE;
@@ -1016,7 +1016,7 @@
 
 	if (e) return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
 
-	dom_node_changed(n, 0, &info);
+	dom_node_changed(n, GF_FALSE, &info);
 
 	return JS_TRUE;
 }
@@ -1060,7 +1060,7 @@
 		SVG_Number *val;
 		SVG_Coordinates *l = (SVG_Coordinates *)info.far_ptr;
 		while (gf_list_count(*l)) {
-			val = gf_list_get(*l, 0);
+			val = (SVG_Number *)gf_list_get(*l, 0);
 			gf_list_rem(*l, 0);
 			gf_free(val);
 		}
@@ -1073,7 +1073,7 @@
 	default:
 		return JS_TRUE;
 	}
-	dom_node_changed(n, 0, &info);
+	dom_node_changed(n, GF_FALSE, &info);
 	return JS_TRUE;
 }
 JSBool SMJS_FUNCTION(svg_udom_set_matrix_trait)
@@ -1104,7 +1104,7 @@
 
 	if (info.fieldType==SVG_Transform_datatype) {
 		gf_mx2d_copy(((SVG_Transform*)info.far_ptr)->mat, *mx);
-		dom_node_changed(n, 0, NULL);
+		dom_node_changed(n, GF_FALSE, NULL);
 		return JS_TRUE;
 	}
 	return JS_TRUE;
@@ -1141,7 +1141,7 @@
 		v->y = FLT2FIX(rc->y);
 		v->width = FLT2FIX(rc->w);
 		v->height = FLT2FIX(rc->h);
-		dom_node_changed(n, 0, NULL);
+		dom_node_changed(n, GF_FALSE, NULL);
 		return JS_TRUE;
 	}
 	return JS_TRUE;
@@ -1247,7 +1247,7 @@
 		col->red = FLT2FIX(rgb->r / 255.0f);
 		col->green = FLT2FIX(rgb->g / 255.0f);
 		col->blue = FLT2FIX(rgb->b / 255.0f);
-		dom_node_changed(n, 0, &info);
+		dom_node_changed(n, GF_FALSE, &info);
 		return JS_TRUE;
 	}
 	case SVG_Paint_datatype:
@@ -1258,7 +1258,7 @@
 		paint->color.red = FLT2FIX(rgb->r / 255.0f);
 		paint->color.green = FLT2FIX(rgb->g / 255.0f);
 		paint->color.blue = FLT2FIX(rgb->b / 255.0f);
-		dom_node_changed(n, 0, &info);
+		dom_node_changed(n, GF_FALSE, &info);
 		return JS_TRUE;
 	}
 	}
@@ -1272,11 +1272,11 @@
 	GF_Node *n = dom_get_element(c, obj);
 	if (!n || argc) return JS_TRUE;
 
-	par.bbox.is_set = 0;
+	par.bbox.is_set = GF_FALSE;
 	if (ScriptAction(n->sgprivate->scenegraph, get_screen ? GF_JSAPI_OP_GET_SCREEN_BBOX : GF_JSAPI_OP_GET_LOCAL_BBOX, (GF_Node *)n, &par) ) {
 		if (par.bbox.is_set) {
 			JSObject *rO = JS_NewObject(c, &svg_rt->rectClass._class, 0, 0);
-			rectCI *rc = gf_malloc(sizeof(rectCI));
+			rectCI *rc = (rectCI *)gf_malloc(sizeof(rectCI));
 			rc->sg = NULL;
 			rc->x = FIX2FLT(par.bbox.min_edge.x);
 			/*BBox is in 3D coord system style*/
@@ -1294,11 +1294,11 @@
 }
 JSBool SMJS_FUNCTION(svg_udom_get_local_bbox)
 {
-	return svg_get_bbox(SMJS_CALL_ARGS, 0);
+	return svg_get_bbox(SMJS_CALL_ARGS, GF_FALSE);
 }
 JSBool SMJS_FUNCTION(svg_udom_get_screen_bbox)
 {
-	return svg_get_bbox(SMJS_CALL_ARGS, 1);
+	return svg_get_bbox(SMJS_CALL_ARGS, GF_TRUE);
 }
 
 JSBool SMJS_FUNCTION(svg_udom_get_screen_ctm)
@@ -1310,7 +1310,7 @@
 
 	if (ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_GET_TRANSFORM, (GF_Node *)n, &par)) {
 		JSObject *mO = JS_NewObject(c, &svg_rt->matrixClass._class, 0, 0);
-		GF_Matrix2D *mx = gf_malloc(sizeof(GF_Matrix2D));
+		GF_Matrix2D *mx = (GF_Matrix2D *)gf_malloc(sizeof(GF_Matrix2D));
 		gf_mx2d_from_mx(mx, &par.mx);
 		SMJS_SET_PRIVATE(c, mO, mx);
 		SMJS_SET_RVAL( OBJECT_TO_JSVAL(mO) );
@@ -1553,7 +1553,7 @@
 
 	if (!GF_JS_InstanceOf(c, obj, &svg_rt->rgbClass, NULL) ) return JS_TRUE;
 	if (SMJS_ID_IS_INT(id)) {
-		rgbCI *col = SMJS_GET_PRIVATE(c, obj);
+		rgbCI *col = (rgbCI *)SMJS_GET_PRIVATE(c, obj);
 		if (!col) return JS_TRUE;
 		switch (SMJS_ID_TO_INT(id)) {
 		case 0: *vp = INT_TO_JSVAL(col->r); return JS_TRUE;
@@ -1569,7 +1569,7 @@
 
 	if (!GF_JS_InstanceOf(c, obj, &svg_rt->rgbClass, NULL) ) return JS_TRUE;
 	if (SMJS_ID_IS_INT(id)) {
-		rgbCI *col = SMJS_GET_PRIVATE(c, obj);
+		rgbCI *col = (rgbCI *)SMJS_GET_PRIVATE(c, obj);
 		if (!col) return JS_TRUE;
 		switch (SMJS_ID_TO_INT(id)) {
 		case 0: col->r = JSVAL_TO_INT(*vp); return JS_TRUE;
@@ -1586,7 +1586,7 @@
 
 	if (!GF_JS_InstanceOf(c, obj, &svg_rt->rectClass, NULL) ) return JS_TRUE;
 	if (SMJS_ID_IS_INT(id)) {
-		rectCI *rc = SMJS_GET_PRIVATE(c, obj);
+		rectCI *rc = (rectCI *)SMJS_GET_PRIVATE(c, obj);
 		if (!rc) return JS_TRUE;
 		if (rc->sg) {
 			GF_JSAPIParam par;
@@ -1611,7 +1611,7 @@
 	if (!GF_JS_InstanceOf(c, obj, &svg_rt->rectClass, NULL) ) return JS_TRUE;
 	if (SMJS_ID_IS_INT(id)) {
 		jsdouble d;
-		rectCI *rc = SMJS_GET_PRIVATE(c, obj);
+		rectCI *rc = (rectCI *)SMJS_GET_PRIVATE(c, obj);
 		if (!rc) return JS_TRUE;
 		JS_ValueToNumber(c, *vp, &d);
 		switch (SMJS_ID_TO_INT(id)) {
@@ -1629,7 +1629,7 @@
 
 	if (!GF_JS_InstanceOf(c, obj, &svg_rt->pointClass, NULL) ) return JS_TRUE;
 	if (SMJS_ID_IS_INT(id)) {
-		pointCI *pt = SMJS_GET_PRIVATE(c, obj);
+		pointCI *pt = (pointCI *)SMJS_GET_PRIVATE(c, obj);
 		if (!pt) return JS_TRUE;
 		if (pt->sg) {
 			GF_JSAPIParam par;
@@ -1650,7 +1650,7 @@
 	if (!GF_JS_InstanceOf(c, obj, &svg_rt->pointClass, NULL) ) return JS_TRUE;
 	if (SMJS_ID_IS_INT(id)) {
 		jsdouble d;
-		pointCI *pt = SMJS_GET_PRIVATE(c, obj);
+		pointCI *pt = (pointCI *)SMJS_GET_PRIVATE(c, obj);
 		if (!pt) return JS_TRUE;
 		JS_ValueToNumber(c, *vp, &d);
 		switch (SMJS_ID_TO_INT(id)) {
@@ -1709,7 +1709,7 @@
 
 static void pathCI_finalize(JSContext *c, JSObject *obj)
 {
-	pathCI *p = SMJS_GET_PRIVATE(c, obj);
+	pathCI *p = (pathCI *)SMJS_GET_PRIVATE(c, obj);
 	if (p) {
 		if (p->pts) gf_free(p->pts);
 		if (p->tags) gf_free(p->tags);
@@ -1721,7 +1721,7 @@
 
 	if (!GF_JS_InstanceOf(c, obj, &svg_rt->pathClass, NULL) ) return JS_TRUE;
 	if (SMJS_ID_IS_INT(id)) {
-		pathCI *p = SMJS_GET_PRIVATE(c, obj);
+		pathCI *p = (pathCI *)SMJS_GET_PRIVATE(c, obj);
 		if (!p) return JS_TRUE;
 		switch (SMJS_ID_TO_INT(id)) {
 		case 0: *vp = INT_TO_JSVAL(p->nb_coms); return JS_TRUE;
@@ -1737,7 +1737,7 @@
 	SMJS_OBJ
 	SMJS_ARGS
 	if (!GF_JS_InstanceOf(c, obj, &svg_rt->pathClass, NULL) ) return JS_TRUE;
-	p = SMJS_GET_PRIVATE(c, obj);
+	p = (pathCI *)SMJS_GET_PRIVATE(c, obj);
 	if (!p) return JS_TRUE;
 	if ((argc!=1) || !JSVAL_IS_INT(argv[0])) return JS_TRUE;
 	idx = JSVAL_TO_INT(argv[0]);
@@ -1842,7 +1842,7 @@
 		case 5: orig_pts+=1; break;
 		}
 	}
-	p->pts = gf_realloc(p->pts, sizeof(ptCI)*(nb_pts+orig_pts));
+	p->pts = (ptCI *)gf_realloc(p->pts, sizeof(ptCI)*(nb_pts+orig_pts));
 	return orig_pts;
 }
 static JSBool SMJS_FUNCTION(svg_path_move_to)
@@ -1853,7 +1853,7 @@
 	SMJS_OBJ
 	SMJS_ARGS
 	if (!GF_JS_InstanceOf(c, obj, &svg_rt->pathClass, NULL) ) return JS_TRUE;
-	p = SMJS_GET_PRIVATE(c, obj);
+	p = (pathCI *)SMJS_GET_PRIVATE(c, obj);
 	if (!p) return JS_TRUE;
 	if ((argc!=2) || !JSVAL_IS_NUMBER(argv[0]) || !JSVAL_IS_NUMBER(argv[1])) return JS_TRUE;
 	JS_ValueToNumber(c, argv[0], &x);
@@ -1861,7 +1861,7 @@
 	nb_pts = svg_path_realloc_pts(p, 1);
 	p->pts[nb_pts].x = (Float) x;
 	p->pts[nb_pts].y = (Float) y;
-	p->tags = gf_realloc(p->tags, sizeof(u8)*(p->nb_coms+1) );
+	p->tags = (u8 *)gf_realloc(p->tags, sizeof(u8)*(p->nb_coms+1) );
 	p->tags[p->nb_coms] = 0;
 	p->nb_coms++;
 	return JS_TRUE;
@@ -1874,7 +1874,7 @@
 	SMJS_OBJ
 	SMJS_ARGS
 	if (!GF_JS_InstanceOf(c, obj, &svg_rt->pathClass, NULL) ) return JS_TRUE;
-	p = SMJS_GET_PRIVATE(c, obj);
+	p = (pathCI *)SMJS_GET_PRIVATE(c, obj);
 	if (!p) return JS_TRUE;
 	if ((argc!=2) || !JSVAL_IS_NUMBER(argv[0]) || !JSVAL_IS_NUMBER(argv[1])) return JS_TRUE;
 	JS_ValueToNumber(c, argv[0], &x);
@@ -1882,7 +1882,7 @@
 	nb_pts = svg_path_realloc_pts(p, 1);
 	p->pts[nb_pts].x = (Float) x;
 	p->pts[nb_pts].y = (Float) y;
-	p->tags = gf_realloc(p->tags, sizeof(u8)*(p->nb_coms+1) );
+	p->tags = (u8 *)gf_realloc(p->tags, sizeof(u8)*(p->nb_coms+1) );
 	p->tags[p->nb_coms] = 1;
 	p->nb_coms++;
 	return JS_TRUE;
@@ -1896,7 +1896,7 @@
 	SMJS_OBJ
 	SMJS_ARGS
 	if (!GF_JS_InstanceOf(c, obj, &svg_rt->pathClass, NULL) ) return JS_TRUE;
-	p = SMJS_GET_PRIVATE(c, obj);
+	p = (pathCI *)SMJS_GET_PRIVATE(c, obj);
 	if (!p) return JS_TRUE;
 	if ((argc!=4) || !JSVAL_IS_NUMBER(argv[0]) || !JSVAL_IS_NUMBER(argv[1]) || !JSVAL_IS_NUMBER(argv[2]) || !JSVAL_IS_NUMBER(argv[3])) return JS_TRUE;
 	JS_ValueToNumber(c, argv[0], &x1);
@@ -1906,7 +1906,7 @@
 	nb_pts = svg_path_realloc_pts(p, 2);
 	p->pts[nb_pts].x = (Float) x1; p->pts[nb_pts].y = (Float) y1;
 	p->pts[nb_pts+1].x = (Float) x2; p->pts[nb_pts+1].y = (Float) y2;
-	p->tags = gf_realloc(p->tags, sizeof(u8)*(p->nb_coms+1) );
+	p->tags = (u8 *)gf_realloc(p->tags, sizeof(u8)*(p->nb_coms+1) );
 	p->tags[p->nb_coms] = 4;
 	p->nb_coms++;
 	return JS_TRUE;
@@ -1919,7 +1919,7 @@
 	SMJS_OBJ
 	SMJS_ARGS
 	if (!GF_JS_InstanceOf(c, obj, &svg_rt->pathClass, NULL) ) return JS_TRUE;
-	p = SMJS_GET_PRIVATE(c, obj);
+	p = (pathCI *)SMJS_GET_PRIVATE(c, obj);
 	if (!p) return JS_TRUE;
 	if ((argc!=6) || !JSVAL_IS_NUMBER(argv[0]) || !JSVAL_IS_NUMBER(argv[1]) || !JSVAL_IS_NUMBER(argv[2]) || !JSVAL_IS_NUMBER(argv[3]) || !JSVAL_IS_NUMBER(argv[4]) || !JSVAL_IS_NUMBER(argv[5])) return JS_TRUE;
 	JS_ValueToNumber(c, argv[0], &x1);
@@ -1932,7 +1932,7 @@
 	p->pts[nb_pts].x = (Float) x1; p->pts[nb_pts].y = (Float) y1;
 	p->pts[nb_pts+1].x = (Float) x2; p->pts[nb_pts+1].y = (Float) y2;
 	p->pts[nb_pts+2].x = (Float) x; p->pts[nb_pts+2].y = (Float) y;
-	p->tags = gf_realloc(p->tags, sizeof(u8)*(p->nb_coms+1) );
+	p->tags = (u8 *)gf_realloc(p->tags, sizeof(u8)*(p->nb_coms+1) );
 	p->tags[p->nb_coms] = 2;
 	p->nb_coms++;
 	return JS_TRUE;
@@ -1942,10 +1942,10 @@
 	pathCI *p;
 	SMJS_OBJ
 	if (!GF_JS_InstanceOf(c, obj, &svg_rt->pathClass, NULL) ) return JS_TRUE;
-	p = SMJS_GET_PRIVATE(c, obj);
+	p = (pathCI *)SMJS_GET_PRIVATE(c, obj);
 	if (!p) return JS_TRUE;
 	if (argc) return JS_TRUE;
-	p->tags = gf_realloc(p->tags, sizeof(u8)*(p->nb_coms+1) );
+	p->tags = (u8 *)gf_realloc(p->tags, sizeof(u8)*(p->nb_coms+1) );
 	p->tags[p->nb_coms] = 6;
 	p->nb_coms++;
 	return JS_TRUE;
@@ -1955,7 +1955,7 @@
 
 	GF_Matrix2D *mx;
 	if (!GF_JS_InstanceOf(c, obj, &svg_rt->matrixClass, NULL) ) return JS_TRUE;
-	mx = SMJS_GET_PRIVATE(c, obj);
+	mx = (GF_Matrix2D *)SMJS_GET_PRIVATE(c, obj);
 	if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
 
 	if (!mx) return JS_TRUE;
@@ -1975,7 +1975,7 @@
 	jsdouble d;
 	GF_Matrix2D *mx;
 	if (!GF_JS_InstanceOf(c, obj, &svg_rt->matrixClass, NULL) ) return JS_TRUE;
-	mx = SMJS_GET_PRIVATE(c, obj);
+	mx = (GF_Matrix2D *)SMJS_GET_PRIVATE(c, obj);
 	if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
 
 	JS_ValueToNumber(c, *vp, &d);
@@ -1996,7 +1996,7 @@
 	SMJS_OBJ
 	SMJS_ARGS
 	if (!GF_JS_InstanceOf(c, obj, &svg_rt->matrixClass, NULL) ) return JS_TRUE;
-	mx = SMJS_GET_PRIVATE(c, obj);
+	mx = (GF_Matrix2D *)SMJS_GET_PRIVATE(c, obj);
 	if (!mx || (argc!=1)) return JS_TRUE;
 	if (!JSVAL_IS_INT(argv[0])) return JS_TRUE;
 	switch (JSVAL_TO_INT(argv[0])) {
@@ -2017,12 +2017,12 @@
 	SMJS_OBJ
 	SMJS_ARGS
 	if (!GF_JS_InstanceOf(c, obj, &svg_rt->matrixClass, NULL) ) return JS_TRUE;
-	mx1 = SMJS_GET_PRIVATE(c, obj);
+	mx1 = (GF_Matrix2D *)SMJS_GET_PRIVATE(c, obj);
 	if (!mx1 || (argc!=1)) return JS_TRUE;
 	if (!JSVAL_IS_OBJECT(argv[0])) return JS_TRUE;
 	mat = JSVAL_TO_OBJECT(argv[0]);
 	if (!GF_JS_InstanceOf(c, mat, &svg_rt->matrixClass, NULL) ) return JS_TRUE;
-	mx2 = SMJS_GET_PRIVATE(c, mat);
+	mx2 = (GF_Matrix2D *)SMJS_GET_PRIVATE(c, mat);
 	if (!mx2) return JS_TRUE;
 	gf_mx2d_add_matrix(mx1, mx2);
 	SMJS_SET_RVAL( OBJECT_TO_JSVAL(obj) );
@@ -2034,7 +2034,7 @@
 	GF_Matrix2D *mx1;
 	SMJS_OBJ
 	if (!GF_JS_InstanceOf(c, obj, &svg_rt->matrixClass, NULL) ) return JS_TRUE;
-	mx1 = SMJS_GET_PRIVATE(c, obj);
+	mx1 = (GF_Matrix2D *)SMJS_GET_PRIVATE(c, obj);
 	if (!mx1) return JS_TRUE;
 	gf_mx2d_inverse(mx1);
 	SMJS_SET_RVAL( OBJECT_TO_JSVAL(obj) );
@@ -2048,7 +2048,7 @@
 	SMJS_OBJ
 	SMJS_ARGS
 	if (!GF_JS_InstanceOf(c, obj, &svg_rt->matrixClass, NULL) ) return JS_TRUE;
-	mx1 = SMJS_GET_PRIVATE(c, obj);
+	mx1 = (GF_Matrix2D *)SMJS_GET_PRIVATE(c, obj);
 	if (!mx1 || (argc!=2)) return JS_TRUE;
 	JS_ValueToNumber(c, argv[0], &x);
 	JS_ValueToNumber(c, argv[1], &y);
@@ -2068,7 +2068,7 @@
 	SMJS_OBJ
 	SMJS_ARGS
 	if (!GF_JS_InstanceOf(c, obj, &svg_rt->matrixClass, NULL) ) return JS_TRUE;
-	mx1 = SMJS_GET_PRIVATE(c, obj);
+	mx1 = (GF_Matrix2D *)SMJS_GET_PRIVATE(c, obj);
 	if (!mx1 || (argc!=1)) return JS_TRUE;
 	JS_ValueToNumber(c, argv[0], &scale);
 	gf_mx2d_init(mx2);
@@ -2085,7 +2085,7 @@
 	SMJS_OBJ
 	SMJS_ARGS
 	if (!GF_JS_InstanceOf(c, obj, &svg_rt->matrixClass, NULL) ) return JS_TRUE;
-	mx1 = SMJS_GET_PRIVATE(c, obj);
+	mx1 = (GF_Matrix2D *)SMJS_GET_PRIVATE(c, obj);
 	if (!mx1 || (argc!=1)) return JS_TRUE;
 	JS_ValueToNumber(c, argv[0], &angle);
 	gf_mx2d_init(mx2);
@@ -2098,7 +2098,7 @@
 jsval svg_udom_new_rect(JSContext *c, Fixed x, Fixed y, Fixed width, Fixed height)
 {
 	JSObject *r = JS_NewObject(c, &svg_rt->rectClass._class, 0, 0);
-	rectCI *rc = gf_malloc(sizeof(rectCI));
+	rectCI *rc = (rectCI *)gf_malloc(sizeof(rectCI));
 	rc->x = FIX2FLT(x);
 	rc->y = FIX2FLT(y);
 	rc->w = FIX2FLT(width);
@@ -2111,7 +2111,7 @@
 jsval svg_udom_new_point(JSContext *c, Fixed x, Fixed y)
 {
 	JSObject *p = JS_NewObject(c, &svg_rt->pointClass._class, 0, 0);
-	pointCI *pt = gf_malloc(sizeof(pointCI));
+	pointCI *pt = (pointCI *)gf_malloc(sizeof(pointCI));
 	pt->x = FIX2FLT(x);
 	pt->y = FIX2FLT(y);
 	pt->sg = NULL;
@@ -2119,11 +2119,17 @@
 	return OBJECT_TO_JSVAL(p);
 }
 
+void *html_get_element_class(GF_Node *n);
+
 void *svg_get_element_class(GF_Node *n)
 {
 	if (!n) return NULL;
-	if ((n->sgprivate->tag>=GF_NODE_RANGE_FIRST_SVG) && (n->sgprivate->tag<=GF_NODE_RANGE_LAST_SVG))
+	if ((n->sgprivate->tag>=GF_NODE_RANGE_FIRST_SVG) && (n->sgprivate->tag<=GF_NODE_RANGE_LAST_SVG)) {
+        if (n->sgprivate->tag == TAG_SVG_video || n->sgprivate->tag == TAG_SVG_audio) {
+            return html_get_element_class(n);
+        }
 		return &svg_rt->svgElement;
+    }
 	return NULL;
 }
 void *svg_get_document_class(GF_SceneGraph *sg)
@@ -2171,7 +2177,7 @@
 	dom_js_load(scene, scene->svg_js->js_ctx, scene->svg_js->global);
 
 	/*user-defined extensions*/
-	gf_sg_load_script_extensions(scene, scene->svg_js->js_ctx, scene->svg_js->global, 0);
+	gf_sg_load_script_extensions(scene, scene->svg_js->js_ctx, scene->svg_js->global, GF_FALSE);
 
 	svg_define_udom_exception(scene->svg_js->js_ctx, scene->svg_js->global);
 
@@ -2367,11 +2373,11 @@
 		utf8_script = szFuncName;
 	}
 
-	gf_sg_lock_javascript(sg->svg_js->js_ctx, 1);
+	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);
 	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, strlen(utf8_script), 0, 0, &rval);
+	ret = JS_EvaluateScript(sg->svg_js->js_ctx, sg->svg_js->global, utf8_script, (u32) strlen(utf8_script), 0, 0, &rval);
 	SMJS_SET_PRIVATE(sg->svg_js->js_ctx, sg->svg_js->event, prev_event);
 
 	if (ret==JS_FALSE) {
@@ -2385,11 +2391,11 @@
 
 	if (sg->svg_js->force_gc) {
 		gf_sg_js_call_gc(sg->svg_js->js_ctx);
-		sg->svg_js->force_gc = 0;
+		sg->svg_js->force_gc = GF_FALSE;
 	}
-	gf_sg_lock_javascript(sg->svg_js->js_ctx, 0);
+	gf_sg_lock_javascript(sg->svg_js->js_ctx, GF_FALSE);
 
-	return (ret==JS_FALSE) ? 0 : 1;
+	return (ret==JS_FALSE) ? GF_FALSE : GF_TRUE;
 }
 
 static void svg_script_predestroy(GF_Node *n, void *eff, Bool is_destroy)
@@ -2408,7 +2414,7 @@
 			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, 1);
+				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);
@@ -2436,7 +2442,7 @@
 		return GF_SCRIPT_ERROR;
 	}
 
-	gf_sg_lock_javascript(svg_js->js_ctx, 1);
+	gf_sg_lock_javascript(svg_js->js_ctx, GF_TRUE);
 
 	if (!svg_rt) {
 		GF_SAFEALLOC(svg_rt, GF_SVGuDOM);
@@ -2455,10 +2461,13 @@
 	/*load SVG & DOM APIs*/
 	svg_init_js_api(sg);
 
+    /* HTML */
+    html_media_init_js_api(sg);
+
 	svg_js->script_execute = svg_script_execute;
 	svg_js->handler_execute = svg_script_execute_handler;
 
-	gf_sg_lock_javascript(svg_js->js_ctx, 0);
+	gf_sg_lock_javascript(svg_js->js_ctx, GF_FALSE);
 
 	return GF_OK;
 }
@@ -2484,7 +2493,7 @@
 	FILE *jsf;
 	char *jsscript;
 	u32 fsize;
-	Bool success = 1;
+	Bool success = GF_TRUE;
 	JSBool ret;
 	jsval rval;
 	GF_SVGJS *svg_js;
@@ -2504,13 +2513,13 @@
 			gf_free(abs_url);
 		}
 	}
-	if (!jsf) return 0;
+	if (!jsf) return GF_FALSE;
 
 	gf_f64_seek(jsf, 0, SEEK_END);
 	fsize = (u32) gf_f64_tell(jsf);
 	gf_f64_seek(jsf, 0, SEEK_SET);
-	jsscript = gf_malloc(sizeof(char)*(size_t)(fsize+1));
-	fsize = fread(jsscript, sizeof(char), (size_t)fsize, jsf);
+	jsscript = (char *)gf_malloc(sizeof(char)*(size_t)(fsize+1));
+	fsize = (u32) fread(jsscript, sizeof(char), (size_t)fsize, jsf);
 	fclose(jsf);
 	jsscript[fsize] = 0;
 
@@ -2518,20 +2527,20 @@
 	if (script->sgprivate->tag==TAG_SVG_handler) {
 		GF_DOMText *txt = gf_dom_add_text_node(script, jsscript);
 		txt->type = GF_DOM_TEXT_INSERTED;
-		return 1;
+		return GF_TRUE;
 	}
 
-	gf_sg_lock_javascript(svg_js->js_ctx, 1);
+	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);
 
 	if (svg_js->force_gc) {
 		gf_sg_js_call_gc(svg_js->js_ctx);
-		svg_js->force_gc = 0;
+		svg_js->force_gc = GF_FALSE;
 	}
-	gf_sg_lock_javascript(svg_js->js_ctx, 0);
+	gf_sg_lock_javascript(svg_js->js_ctx, GF_FALSE);
 
-	if (ret==JS_FALSE) success = 0;
+	if (ret==JS_FALSE) success = GF_FALSE;
 	gf_dom_listener_process_add(script->sgprivate->scenegraph);
 
 	gf_free(jsscript);
@@ -2563,7 +2572,7 @@
 		node->sgprivate->UserCallback = svg_script_predestroy;
 	}
 	/*if href download the script file*/
-	if (gf_node_get_attribute_by_tag(node, TAG_XLINK_ATT_href, 0, 0, &href_info) == GF_OK) {
+	if (gf_node_get_attribute_by_tag(node, TAG_XLINK_ATT_href, GF_FALSE, GF_FALSE, &href_info) == GF_OK) {
 		GF_DownloadManager *dnld_man;
 		GF_JSAPIParam par;
 		char *url;
@@ -2609,7 +2618,7 @@
 	else if (node->sgprivate->tag == TAG_SVG_script) {
 		txt = svg_get_text_child(node);
 		if (!txt) return;
-		ret = JS_EvaluateScript(svg_js->js_ctx, svg_js->global, txt->textContent, strlen(txt->textContent), 0, 0, &rval);
+		ret = JS_EvaluateScript(svg_js->js_ctx, svg_js->global, txt->textContent, (u32) strlen(txt->textContent), 0, 0, &rval);
 		if (ret==JS_FALSE) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("SVG: Invalid script\n") );
 		}
@@ -2641,15 +2650,15 @@
 
 	/*LASeR hack for encoding scripts without handler - node is a listener in this case, not a handler*/
 	if (utf8_script) {
-		if (!node) return 0;
+		if (!node) return GF_FALSE;
 		hdl = NULL;
 	} else {
 		if (!hdl->js_fun && !hdl->js_fun_val && !hdl->evt_listen_obj) {
 			txt = svg_get_text_child(node);
-			if (!txt) return 0;
+			if (!txt) return GF_FALSE;
 		}
 		/*not sure about this (cf test struct-use-205-t.svg)*/
-		if (!node->sgprivate->parents) return 0;
+		if (!node->sgprivate->parents) return GF_FALSE;
 	}
 
 	svg_js = node->sgprivate->scenegraph->svg_js;
@@ -2676,19 +2685,19 @@
 	}
 #endif
 
-	gf_sg_lock_javascript(svg_js->js_ctx, 1);
-	prev_event = SMJS_GET_PRIVATE(svg_js->js_ctx, svg_js->event);
+	gf_sg_lock_javascript(svg_js->js_ctx, GF_TRUE);
+	prev_event = (GF_DOM_Event *)SMJS_GET_PRIVATE(svg_js->js_ctx, svg_js->event);
 	/*break loops*/
 	if (prev_event && (prev_event->type==event->type) && (prev_event->target==event->target)) {
-		gf_sg_lock_javascript(svg_js->js_ctx, 0);
-		return 0;
+		gf_sg_lock_javascript(svg_js->js_ctx, GF_FALSE);
+		return GF_FALSE;
 	}
 	SMJS_SET_PRIVATE(svg_js->js_ctx, svg_js->event, event);
 
-	svg_js->in_script = 1;
+	svg_js->in_script = GF_TRUE;
 
 	/*if an observer is being specified, use it*/
-	if (hdl && hdl->evt_listen_obj) __this = hdl->evt_listen_obj;
+	if (hdl && hdl->evt_listen_obj) __this = (JSObject *)hdl->evt_listen_obj;
 	/*compile the jsfun if any - 'this' is the associated observer*/
 	else __this = observer ? JSVAL_TO_OBJECT( dom_element_construct(svg_js->js_ctx, observer) ) : svg_js->global;
 	if (txt && hdl && !hdl->js_fun) {
@@ -2697,7 +2706,7 @@
 	}
 
 	if (utf8_script) {
-		ret = JS_EvaluateScript(svg_js->js_ctx, __this, utf8_script, strlen(utf8_script), 0, 0, &rval);
+		ret = JS_EvaluateScript(svg_js->js_ctx, __this, utf8_script, (u32) strlen(utf8_script), 0, 0, &rval);
 	} 
 	else if (hdl->js_fun || hdl->js_fun_val || hdl->evt_listen_obj) {
 		JSObject *evt;
@@ -2713,7 +2722,7 @@
 			jsval funval = (jsval) hdl->js_fun_val;
 			ret = JS_CallFunctionValue(svg_js->js_ctx, __this, funval, 1, argv, &rval);
 		} else {
-			ret = JS_CallFunctionName(svg_js->js_ctx, hdl->evt_listen_obj, "handleEvent", 1, argv, &rval);
+			ret = JS_CallFunctionName(svg_js->js_ctx, (JSObject *)hdl->evt_listen_obj, "handleEvent", 1, argv, &rval);
 		}
 	}
 	else if (JS_LookupProperty(svg_js->js_ctx, svg_js->global, txt->textContent, &fval) && !JSVAL_IS_VOID(fval) ) {
@@ -2721,7 +2730,7 @@
 			ret = JS_FALSE;
 	}
 	else {
-		ret = JS_EvaluateScript(svg_js->js_ctx, __this, txt->textContent, strlen(txt->textContent), 0, 0, &rval);
+		ret = JS_EvaluateScript(svg_js->js_ctx, __this, txt->textContent, (u32) strlen(txt->textContent), 0, 0, &rval);
 	}
 
 	/*check any pending exception if outer-most event*/
@@ -2734,12 +2743,12 @@
 	if (txt && hdl) hdl->js_fun=0;
 
 	while (svg_js->force_gc) {
-		svg_js->force_gc = 0;
+		svg_js->force_gc = GF_FALSE;
 		gf_sg_js_call_gc(svg_js->js_ctx);
 	}
-	svg_js->in_script = 0;
+	svg_js->in_script = GF_FALSE;
 
-	gf_sg_lock_javascript(svg_js->js_ctx, 0);
+	gf_sg_lock_javascript(svg_js->js_ctx, GF_FALSE);
 
 #ifdef DUMP_DEF_AND_ROOT
 	if ((event->type==GF_EVENT_CLICK) || (event->type==GF_EVENT_MOUSEOVER)) {
@@ -2758,9 +2767,9 @@
 
 	if (ret==JS_FALSE) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("SVG: Invalid handler textContent\n" ));
-		return 0;
+		return GF_FALSE;
 	}
-	return 1;
+	return GF_TRUE;
 }
 
 #endif

gpac-0.5.0.svn4296.tar.bz2/src/scenegraph/vrml_proto.c -> gpac-0.5.0.svn4668.tar.bz2/src/scenegraph/vrml_proto.c Changed

@@ -40,7 +40,10 @@
 	/*make sure we don't define a proto already defined in this scope*/
 	if (!unregistered) {
 		tmp = gf_sg_find_proto(inScene, ProtoID, name);
-		if (tmp) return NULL;
+		if (tmp) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[Scenegraph] PROTO %s redefined - skipping loading\n", name));
+			return NULL;
+		}
 	}
 
 	GF_SAFEALLOC(tmp, GF_Proto)
@@ -450,7 +453,7 @@
 			if (orig->sgprivate->tag == TAG_ProtoNode) {
 				if (gf_sg_proto_field_is_sftime_offset(orig, &field_orig))
 					*((SFTime *)field.far_ptr) += inScene->GetSceneTime(inScene->userpriv);
-			} else if (!stricmp(field_orig.name, "startTime") || !stricmp(field_orig.name, "startTime") ) {
+			} else if (!stricmp(field.name, "startTime") || !stricmp(field_orig.name, "startTime") ) {
 				*((SFTime *)field.far_ptr) += inScene->GetSceneTime(inScene->userpriv);
 			}
 			break;
@@ -683,6 +686,11 @@
 /*		assert(route->is_setup);
 		if ((route->FromField.eventType == GF_SG_EVENT_OUT) || (route->FromField.eventType == GF_SG_EVENT_IN) ) continue;
 */		
+
+		if (route->is_setup) {
+			if ((route->ToField.eventType == GF_SG_EVENT_IN) && (route->FromField.eventType == GF_SG_EVENT_IN) ) continue;
+		}
+
 		if ((route->ToNode->sgprivate->tag==TAG_MPEG4_Script) 
 #ifndef GPAC_DISABLE_X3D
 			|| (route->ToNode->sgprivate->tag==TAG_X3D_Script)

gpac-0.5.0.svn4296.tar.bz2/src/scenegraph/vrml_route.c -> gpac-0.5.0.svn4668.tar.bz2/src/scenegraph/vrml_route.c Changed

@@ -30,6 +30,7 @@
 
 #ifndef GPAC_DISABLE_VRML
 
+GF_Route* gf_sg_route_exists(GF_SceneGraph *sg, GF_Node *fromNode, u32 fromField, GF_Node *toNode, u32 toField);
 
 GF_EXPORT
 GF_Route *gf_sg_route_new(GF_SceneGraph *sg, GF_Node *fromNode, u32 fromField, GF_Node *toNode, u32 toField)
@@ -37,6 +38,9 @@
 	GF_Route *r;
 	if (!sg || !toNode || !fromNode) return NULL;
 
+	if ( (r = gf_sg_route_exists(sg, fromNode, fromField, toNode, toField)) )
+		return r;
+
 	GF_SAFEALLOC(r, GF_Route)
 	if (!r) return NULL;
 	r->FromNode = fromNode;
@@ -52,6 +56,19 @@
 	return r;
 }
 
+GF_Route* gf_sg_route_exists(GF_SceneGraph *sg, GF_Node *fromNode, u32 fromField, GF_Node *toNode, u32 toField)
+{
+	u32 i = 0;
+	GF_Route* rt;
+	if ( !fromNode->sgprivate->interact || !fromNode->sgprivate->interact->routes )
+		return NULL;
+
+	while ( (rt = (GF_Route*)gf_list_enum(fromNode->sgprivate->interact->routes, &i) )) {
+		if ( rt->FromField.fieldIndex == fromField && rt->ToNode == toNode && rt->ToField.fieldIndex == toField )
+			return rt;
+	}
+	return NULL;
+}
 
 void gf_sg_route_del(GF_Route *r)
 {
@@ -226,7 +243,7 @@
 }
 
 /*send event out of proto - all ISed fields are ignored*/
-static void gf_node_event_out_proto(GF_Node *node, u32 FieldIndex)
+void gf_node_event_out_proto(GF_Node *node, u32 FieldIndex)
 {
 	u32 i;
 	GF_Route *r;
@@ -258,6 +275,14 @@
 			if (r->FromField.eventType == GF_SG_EVENT_OUT) return 0;
 			if (r->ToField.eventType == GF_SG_EVENT_OUT) return 0;
 		}
+		if (r->IS_route && ((r->ToNode->sgprivate->tag==TAG_MPEG4_Script) 
+#ifndef GPAC_DISABLE_X3D
+			|| (r->ToNode->sgprivate->tag==TAG_X3D_Script)
+#endif
+			) && ((r->ToField.eventType==GF_SG_EVENT_IN) /*|| (r->ToField.eventType==GF_SG_EVENT_FIELD)*/)
+			&& r->FromField.eventType==GF_SG_EVENT_IN) {
+				return 0;
+		}
 	}
 #ifndef GPAC_DISABLE_LOG
 	if (r->IS_route) {
@@ -337,10 +362,14 @@
 	//check if ISed or not - this will notify the node of any changes
 	else {
 		gf_sg_proto_propagate_event(r->ToNode, r->ToField.fieldIndex, r->FromNode);
+		/*if not an ISed field, propagate (otherwise ROUTE is executed just below)*/
+		if (r->ToField.eventType != GF_SG_EVENT_EXPOSED_FIELD)
+			gf_sg_proto_propagate_event(r->ToNode, r->ToField.fieldIndex, r->FromNode);
 		/*only happen on proto, an eventOut may route to an eventOut*/
 		if (r->IS_route && r->ToField.eventType==GF_SG_EVENT_OUT) 
 			gf_node_event_out(r->ToNode, r->ToField.fieldIndex);
 	}
+
 	/*and signal routes on exposed fields if field changed*/
 	if (r->ToField.eventType == GF_SG_EVENT_EXPOSED_FIELD){
 		if (r->IS_route)

gpac-0.5.0.svn4296.tar.bz2/src/scenegraph/vrml_smjs.c -> gpac-0.5.0.svn4668.tar.bz2/src/scenegraph/vrml_smjs.c Changed

@@ -103,16 +103,22 @@
 #if !defined(__GNUC__)
 # if defined(_WIN32_WCE)
 #  pragma comment(lib, "js32")
+# elif defined (_WIN64)
+#  pragma comment(lib, "js")
 # elif defined (WIN32)
-#  pragma comment(lib, "js32")
+#  pragma comment(lib, "js")
 # endif
 #endif
 
 /*define this macro to force Garbage Collection after each input to JS (script initialize/shutdown and all eventIn) 
 on latest SM, GC will crash if called from a different thread than the thread creating the contex, no clue why
+
+for iOS don't force GC (better performances according to Ivica)
 */
-#if (JS_VERSION<180)
-#define FORCE_GC
+#if !defined(GPAC_IPHONE)
+# if (JS_VERSION<180)
+#  define FORCE_GC
+# endif
 #endif
 
 
@@ -880,35 +886,51 @@
 	}
 	/*route to object*/
 	else {
-		GF_RouteToFunction *r;
+		u32 i = 0;
+		const char *fun_name;
+		GF_RouteToFunction *r = NULL;
 		if (!JSVAL_IS_OBJECT(argv[3]) || !JS_ObjectIsFunction(c, JSVAL_TO_OBJECT(argv[3])) ) return JS_FALSE;
 
-		GF_SAFEALLOC(r, GF_RouteToFunction)
-		if (!r) return JS_FALSE;
-		r->FromNode = n1;
-		r->FromField.fieldIndex = f_id1;
-		gf_node_get_field(r->FromNode, f_id1, &r->FromField);
-
-		r->ToNode = (GF_Node*)JS_GetScript(c);
-		r->ToField.fieldType = GF_SG_VRML_SCRIPT_FUNCTION;
-		r->ToField.on_event_in = on_route_to_object;
-		r->ToField.eventType = GF_SG_EVENT_IN;
-		r->ToField.far_ptr = NULL;
-		r->ToField.name = JS_GetFunctionName( JS_ValueToFunction(c, argv[3] ) );
-
-		r->obj = JSVAL_TO_OBJECT( argv[2] ) ;
-//		gf_js_add_root(c, & r->obj);
-
-		r->fun = argv[3];
-//		gf_js_add_root(c, &r->fun);
-
-		r->is_setup = 1;
-		r->graph = n1->sgprivate->scenegraph;
-
-		if (!n1->sgprivate->interact) GF_SAFEALLOC(n1->sgprivate->interact, struct _node_interactive_ext);
-		if (!n1->sgprivate->interact->routes) n1->sgprivate->interact->routes = gf_list_new();
-		gf_list_add(n1->sgprivate->interact->routes, r);
-		gf_list_add(n1->sgprivate->scenegraph->Routes, r);
+		fun_name = JS_GetFunctionName( JS_ValueToFunction(c, argv[3] ) );
+		if (fun_name && n1->sgprivate->interact && n1->sgprivate->interact->routes ) {
+			while ( (r = (GF_RouteToFunction*)gf_list_enum(n1->sgprivate->interact->routes, &i) )) {
+				if ( (r->FromNode == n1) 
+				&& (r->FromField.fieldIndex == f_id1)
+				&& (r->ToNode == (GF_Node*)JS_GetScript(c))
+				&& !stricmp(r->ToField.name, fun_name)
+			)
+					break;
+			}
+		}
+
+		if ( !r ) {
+			GF_SAFEALLOC(r, GF_RouteToFunction)
+			if (!r) return JS_FALSE;
+			r->FromNode = n1;
+			r->FromField.fieldIndex = f_id1;
+			gf_node_get_field(r->FromNode, f_id1, &r->FromField);
+
+			r->ToNode = (GF_Node*)JS_GetScript(c);
+			r->ToField.fieldType = GF_SG_VRML_SCRIPT_FUNCTION;
+			r->ToField.on_event_in = on_route_to_object;
+			r->ToField.eventType = GF_SG_EVENT_IN;
+			r->ToField.far_ptr = NULL;
+			r->ToField.name = fun_name;
+
+			r->obj = JSVAL_TO_OBJECT( argv[2] ) ;
+	//		gf_js_add_root(c, & r->obj);
+
+			r->fun = argv[3];
+	//		gf_js_add_root(c, &r->fun);
+
+			r->is_setup = 1;
+			r->graph = n1->sgprivate->scenegraph;
+
+			if (!n1->sgprivate->interact) GF_SAFEALLOC(n1->sgprivate->interact, struct _node_interactive_ext);
+			if (!n1->sgprivate->interact->routes) n1->sgprivate->interact->routes = gf_list_new();
+			gf_list_add(n1->sgprivate->interact->routes, r);
+			gf_list_add(n1->sgprivate->scenegraph->Routes, r);
+		}
 	}
 
 	return JS_TRUE;
@@ -1144,6 +1166,8 @@
 	return JS_TRUE;
 }
 
+void gf_node_event_out_proto(GF_Node *node, u32 FieldIndex);
+
 void Script_FieldChanged(JSContext *c, GF_Node *parent, GF_JSField *parent_owner, GF_FieldInfo *field)
 {
 	GF_ScriptPriv *priv;
@@ -1176,9 +1200,11 @@
 			return;
 		}
 		/*field has changed, set routes...*/
-		if (parent->sgprivate->tag == TAG_ProtoNode)
+		if (parent->sgprivate->tag == TAG_ProtoNode) {
 			gf_sg_proto_propagate_event(parent, field->fieldIndex, (GF_Node*)JS_GetScript(c));
-		else {
+			/* Node exposedField can also be routed to another field */
+			gf_node_event_out_proto(parent, field->fieldIndex);
+		}else{
 			gf_node_event_out(parent, field->fieldIndex);
 			gf_node_changed_internal(parent, field, 0);
 		}
@@ -1273,7 +1299,7 @@
 	case GF_SG_VRML_SFCOLOR:
 	{
 		SFColor val = * ((SFColor *) f_ptr);
-		sprintf(temp, "%f %f %f", val.red, val.green, val.blue);
+		sprintf(temp, "%f %f %f", FIX2FLT(val.red), FIX2FLT(val.green), FIX2FLT(val.blue));
 		strcat(str, temp);
 		break;
 	}
@@ -1791,7 +1817,7 @@
 			pixels = (MFInt32 *) ((GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(*vp)))->field.far_ptr;
 			if (sfi->pixels) gf_free(sfi->pixels);
 			len = sfi->width*sfi->height*sfi->numComponents;
-			sfi->pixels = (char *) gf_malloc(sizeof(char)*len);
+			sfi->pixels = (unsigned char *) gf_malloc(sizeof(char)*len);
 			len = MAX(len, pixels->count);
 			for (i=0; i<len; i++) sfi->pixels[i] = (u8) pixels->vals[i];
 			changed = 1;
@@ -4336,6 +4362,8 @@
 	GF_FieldInfo t_info;
 	GF_ScriptPriv *priv;
 	u32 i;
+	uintN attr;
+	JSBool found;
 	priv = node->sgprivate->UserPrivate;
 
 	/*no support for change of static fields*/
@@ -4353,7 +4381,8 @@
 	gf_sg_lock_javascript(priv->js_ctx, 1);
 
 	//locate function
-	if (! JS_LookupProperty(priv->js_ctx, priv->js_obj, sf->name, &fval) || JSVAL_IS_VOID(fval)) {
+	if (!JS_LookupProperty(priv->js_ctx, priv->js_obj, sf->name, &fval) || JSVAL_IS_VOID(fval) ||
+		!JS_GetPropertyAttributes(priv->js_ctx, priv->js_obj, sf->name, &attr, &found) || found != JS_TRUE ){
 		gf_sg_lock_javascript(priv->js_ctx, 0);
 		return;
 	}
@@ -4402,6 +4431,8 @@
 	JSBool ret;
 	jsval rval, fval;
 	GF_ScriptPriv *priv = (GF_ScriptPriv *) script->sgprivate->UserPrivate;
+	uintN attr;
+	JSBool found;
 
 	jsf = gf_f64_open(file, "rb");
 	if (!jsf) return 0;
@@ -4414,14 +4445,15 @@
 	fclose(jsf);
 	jsscript[fsize] = 0;
 
-	ret = JS_EvaluateScript(priv->js_ctx, priv->js_obj, jsscript, sizeof(char)*(size_t)fsize, 0, 0, &rval);
+	ret = JS_EvaluateScript(priv->js_ctx, priv->js_obj, jsscript, (u32) (sizeof(char)*fsize), 0, 0, &rval);
 	if (ret==JS_FALSE) success = 0;
 
-	if (success && primary_script && JS_LookupProperty(priv->js_ctx, priv->js_obj, "initialize", &fval)) {
-		if (! JSVAL_IS_VOID(fval)) {
+	if (success && primary_script
+		&& JS_LookupProperty(priv->js_ctx, priv->js_obj, "initialize", &fval) && !JSVAL_IS_VOID(fval)
+		&& JS_GetPropertyAttributes(priv->js_ctx, priv->js_obj, "initialize", &attr, &found) && found == JS_TRUE) {
+		
 			JS_CallFunctionValue(priv->js_ctx, priv->js_obj, fval, 0, NULL, &rval);
 			gf_js_vrml_flush_event_out((GF_Node *)script, priv);
-		}
 	}
 	gf_free(jsscript);
 	return success;
@@ -4504,6 +4536,8 @@
 	jsval rval, fval;
 	M_Script *script = (M_Script *)node;
 	GF_ScriptPriv *priv = (GF_ScriptPriv *) node->sgprivate->UserPrivate;
+	uintN attr;
+	JSBool found;
 
 	if (!priv || priv->is_loaded) return;
 	if (!script->url.count) return;
@@ -4566,13 +4600,14 @@
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[VRML JS] Evaluating script %s\n", str));
 
 #if 1
-	ret = JS_EvaluateScript(priv->js_ctx, priv->js_obj, str, strlen(str), 0, 0, &rval);
+	ret = JS_EvaluateScript(priv->js_ctx, priv->js_obj, str, (u32) strlen(str), 0, 0, &rval);
 	if (ret==JS_TRUE) {
 		/*call initialize if present*/
-		if (JS_LookupProperty(priv->js_ctx, priv->js_obj, "initialize", &fval) && !JSVAL_IS_VOID(fval))
+		if (JS_LookupProperty(priv->js_ctx, priv->js_obj, "initialize", &fval) && !JSVAL_IS_VOID(fval)
+			&& JS_GetPropertyAttributes(priv->js_ctx, priv->js_obj, "initialize", &attr, &found) && found == JS_TRUE)
+			
 			JS_CallFunctionValue(priv->js_ctx, priv->js_obj, fval, 0, NULL, &rval);
-
-		gf_js_vrml_flush_event_out(node, priv);
+			gf_js_vrml_flush_event_out(node, priv);
 	}
 #endif

gpac-0.5.0.svn4296.tar.bz2/src/scenegraph/vrml_tools.c -> gpac-0.5.0.svn4668.tar.bz2/src/scenegraph/vrml_tools.c Changed

@@ -82,7 +82,10 @@
 	field.eventType = GF_SG_EVENT_EXPOSED_FIELD;
 	field.fieldType = GF_SG_VRML_MFNODE;
 	field.NDTtype = -1;
-	field.fieldIndex = 2;
+	if ( node->sgprivate->tag == TAG_MPEG4_Transform )
+		field.fieldIndex = 3;
+	else
+		field.fieldIndex = 2;
 	field.far_ptr = & n->children;
 	gf_node_event_out(node, field.fieldIndex);
 	gf_node_changed(node, &field);
@@ -121,7 +124,10 @@
 	field.eventType = GF_SG_EVENT_EXPOSED_FIELD;
 	field.fieldType = GF_SG_VRML_MFNODE;
 	field.NDTtype = -1;
-	field.fieldIndex = 2;
+	if ( node->sgprivate->tag == TAG_MPEG4_Transform )
+		field.fieldIndex = 3;
+	else
+		field.fieldIndex = 2;
 	field.far_ptr = & n->children;
 	gf_node_event_out(node, field.fieldIndex);
 	gf_node_changed(node, &field);
@@ -1265,7 +1271,7 @@
 		if (((SFScript*)dest)->script_text) gf_free(((SFScript*)dest)->script_text);		
 		((SFScript*)dest)->script_text = NULL;
 		if ( ((SFScript*)orig)->script_text)
-			((SFScript *)dest)->script_text = (u8*)gf_strdup( (char*) ((SFScript*)orig)->script_text );
+			((SFScript *)dest)->script_text = (char *)gf_strdup( (char*) ((SFScript*)orig)->script_text );
 		break;

gpac-0.5.0.svn4296.tar.bz2/src/scenegraph/xml_ns.c -> gpac-0.5.0.svn4668.tar.bz2/src/scenegraph/xml_ns.c Changed

@@ -729,7 +729,7 @@
 		SVGAttribute *last_att = NULL;
 		GF_DOMFullAttribute *att = (GF_DOMFullAttribute *) ((SVG_Element*)node)->attributes;
 		if (xmlns_code) ns = gf_sg_get_namespace_qname(node->sgprivate->scenegraph, xmlns_code);
-		if (ns) len = strlen(ns);
+		if (ns) len = (u32) strlen(ns);
 
 		while (att) {
 			if (((u32) att->tag == TAG_DOM_ATT_any) && 
@@ -1036,7 +1036,7 @@
 		char cache[1024];
 		gf_f64_seek(f, 0, SEEK_SET);
 		while (fsize) {
-			u32 read = fread(cache, 1, 1024, f);
+			u32 read = (u32) fread(cache, 1, 1024, f);
 			fsize -= read;
 			if (memcmp(cache, data+offset, sizeof(char)*read)) break;
 			offset+=read;
@@ -1064,7 +1064,7 @@
 
 	/*handle "data:" scheme when cache is specified*/
 	strcpy(szFile, cache_dir);
-	data_size = strlen(szFile);
+	data_size = (u32) strlen(szFile);
 	if (szFile[data_size-1] != GF_PATH_SEPARATOR) {
 		szFile[data_size] = GF_PATH_SEPARATOR;
 		szFile[data_size+1] = 0;
@@ -1094,17 +1094,17 @@
 	sep = strchr(iri->string, ';');
 	if (!strncmp(sep, ";base64,", 8)) {
 		sep += 8;
-		data_size = 2*strlen(sep);
+		data_size = 2 * (u32) strlen(sep);
 		data = (char*)gf_malloc(sizeof(char)*data_size);
 		if (!data) return GF_OUT_OF_MEM;
-		data_size = gf_base64_decode(sep, strlen(sep), data, data_size);
+		data_size = gf_base64_decode(sep, (u32) strlen(sep), data, data_size);
 	}
 	else if (!strncmp(sep, ";base16,", 8)) {
-		data_size = 2*strlen(sep);
+		data_size = 2 * (u32) strlen(sep);
 		data = (char*)gf_malloc(sizeof(char)*data_size);
 		if (!data) return GF_OUT_OF_MEM;
 		sep += 8;
-		data_size = gf_base16_decode(sep, strlen(sep), data, data_size);
+		data_size = gf_base16_decode(sep, (u32) strlen(sep), data, data_size);
 	}
 	if (!data_size) return GF_OK;

gpac-0.5.0.svn4296.tar.bz2/src/terminal/channel.c -> gpac-0.5.0.svn4668.tar.bz2/src/terminal/channel.c Changed

@@ -38,7 +38,7 @@
 	if (ch->BufferOn) {
 		ch->BufferOn = 0;
 		gf_clock_buffer_off(ch->clock);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d: buffering off at STB %d (OTB %d) (nb buffering on clock: %d)\n", ch->esd->ESID, gf_term_get_time(ch->odm->term), gf_clock_time(ch->clock), ch->clock->Buffering));
+		GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d: buffering off at STB %d (OTB %d) (nb buffering on clock: %d)\n", ch->esd->ESID, gf_term_get_time(ch->odm->term), gf_clock_time(ch->clock), ch->clock->Buffering));
 	}
 }
 
@@ -53,7 +53,7 @@
 	if (!ch->BufferOn) {
 		ch->BufferOn = 1;
 		gf_clock_buffer_on(ch->clock);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d: buffering on at %d (nb buffering on clock: %d)\n", ch->esd->ESID, gf_term_get_time(ch->odm->term), ch->clock->Buffering));
+		GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d: buffering on at %d (nb buffering on clock: %d)\n", ch->esd->ESID, gf_term_get_time(ch->odm->term), ch->clock->Buffering));
 	}
 }
 
@@ -77,7 +77,8 @@
 
 	ch->ts_offset = 0;
 	ch->seed_ts = 0;
-
+	ch->min_ts_inc = 0;
+	ch->min_computed_cts = 0;
 	ch_buffer_off(ch);
 
 	if (ch->buffer) gf_free(ch->buffer);
@@ -122,6 +123,7 @@
 	if (!esd->slConfig->OCRResolution) esd->slConfig->OCRResolution = esd->slConfig->timestampResolution;
 
 	tmp->ts_res = esd->slConfig->timestampResolution;
+	tmp->recompute_dts = esd->slConfig->no_dts_signaling;
 
 	tmp->ocr_scale = 0;
 	if (esd->slConfig->OCRResolution) {
@@ -153,6 +155,7 @@
 	if (!ch->esd->slConfig->OCRResolution) ch->esd->slConfig->OCRResolution = ch->esd->slConfig->timestampResolution;
 
 	ch->ts_res = ch->esd->slConfig->timestampResolution;
+	ch->recompute_dts = ch->esd->slConfig->no_dts_signaling;
 	ch->ocr_scale = 0;
 	if (ch->esd->slConfig->OCRResolution) {
 		ch->ocr_scale = 1000;
@@ -386,7 +389,7 @@
 			if (ch->clock->speed != FIX_ONE) {
 				ch->BufferTime = FIX2INT( gf_divfix( INT2FIX(ch->AU_buffer_last->DTS - ch->AU_buffer_first->DTS) , ch->clock->speed)) ;
 			}
-		} else {
+		} else {	
 			ch->BufferTime = 0;
 		}
 	}
@@ -462,7 +465,7 @@
 		ch->AU_buffer_last = au;
 		ch->AU_Count = 1;
 	} else {
-		if (ch->AU_buffer_last->DTS<=au->DTS) {
+		if (!ch->recompute_dts && (ch->AU_buffer_last->DTS<=au->DTS)) {
 			ch->AU_buffer_last->next = au;
 			ch->AU_buffer_last = ch->AU_buffer_last->next;
 		}
@@ -470,32 +473,103 @@
 		HOWEVER, we must recompute a monotone increasing DTS in case the decoder does perform frame reordering
 		in which case the DTS is used for presentation time!!*/
 		else if (ch->esd->decoderConfig->streamType!=GF_STREAM_AUDIO) {
-#if 0
-			GF_DBUnit *au_prev, *ins_au;
-			u32 DTS;
-#endif
-			au->DTS = 0;
 			/*append AU*/
 			ch->AU_buffer_last->next = au;
 			ch->AU_buffer_last = ch->AU_buffer_last->next;
 
+			if (ch->recompute_dts) {
 #if 0
-			GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] Media deinterleaving OD %d ch %d\n", ch->esd->ESID, ch->odm->OD->objectDescriptorID));
-
-			DTS = au->DTS;
-			au_prev = ch->AU_buffer_first;
-			/*locate first AU in buffer with DTS greater than new unit CTS*/
-			while (au_prev->next && (au_prev->DTS < DTS) ) au_prev = au_prev->next;
-			/*remember insertion point*/
-			ins_au = au_prev;
-			/*shift all following frames DTS*/
-			while (au_prev->next) {
-				au_prev->next->DTS = au_prev->DTS;
-				au_prev = au_prev->next;
-			}
-			/*and apply*/
-			ins_au->DTS = DTS;
+				if (au->DTS > au->CTS)
+					au->DTS = au->CTS;
+
+#else
+				au->CTS = au->DTS = ch->CTS;
+
+#if 0
+				GF_DBUnit *au_prev, *ins_au;
+				u32 DTS, dts_shift;
+				u32 minDIFF = (u32) -1;
+				u32 minCTS = (u32) -1;
+				DTS = (u32) -1;
+
+
+				/*compute min CTS and min CTS diff */
+				au_prev = ch->AU_buffer_first;
+				while (au_prev->next) {
+					s32 TS_diff;
+					if (au_prev->CTS > au_prev->next->CTS) {
+						TS_diff = au_prev->CTS - au_prev->next->CTS;
+					} else {
+						TS_diff = au_prev->next->CTS - au_prev->CTS;
+					}
+					if (TS_diff && (TS_diff<minDIFF)) 
+						minDIFF = TS_diff;
+					
+					if (au_prev->DTS < minCTS)
+						minCTS = au_prev->CTS;
+
+					au_prev = au_prev->next;
+				}
+				ch->min_ts_inc = minDIFF;
+				if (!ch->min_computed_cts) {
+					ch->min_computed_cts = au->CTS;
+				}
+
+
+				GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] Media deinterleaving OD %d ch %d\n", ch->odm->OD->objectDescriptorID, ch->esd->ESID));
+
+				dts_shift = 0;
+				DTS = au->DTS;
+				au_prev = ch->AU_buffer_first;
+				/*locate first AU in buffer with DTS greater than new unit CTS*/
+				while (au_prev->next && (au_prev->DTS < DTS) ) {
+					if (au_prev->DTS > au_prev->CTS) {
+						u32 au_dts_shift = au_prev->DTS - au_prev->CTS;
+						if (au_dts_shift > dts_shift) dts_shift = au_dts_shift;
+					}
+					au_prev = au_prev->next;
+				}
+				/*remember insertion point*/
+				ins_au = au_prev;
+				/*shift all following frames DTS*/
+				while (au_prev->next) {
+					au_prev->next->DTS = au_prev->DTS;
+					if (au_prev->next->DTS > au_prev->next->CTS) {
+						u32 au_dts_shift = au_prev->next->DTS - au_prev->next->CTS;
+						if (au_dts_shift > dts_shift ) dts_shift = au_dts_shift;
+					}
+					au_prev = au_prev->next;
+				}
+				/*and apply*/
+				ins_au->DTS = DTS;
+				if (ins_au->DTS > ins_au->CTS) {
+					u32 au_dts_shift = ins_au->DTS - ins_au->CTS;
+					if (au_dts_shift > dts_shift ) dts_shift = au_dts_shift;
+				}
+				
+				if (dts_shift) {
+					au_prev = ch->AU_buffer_first;
+					/*locate first AU in buffer with DTS greater than new unit CTS*/
+					while (au_prev ) {
+						if (au_prev->DTS > dts_shift) {
+							au_prev->DTS -= dts_shift;
+						} else {
+							au_prev->DTS = 0;
+						}
+						/*FIXME - there is still a bug in DTS recomputation ...*/
+//						assert(au_prev->DTS<= au_prev->CTS);
+						if (au_prev->DTS> au_prev->CTS)
+							au_prev->DTS = au_prev->CTS;
+						au_prev = au_prev->next;
+					}
+				}
+#endif
+
 #endif
+
+			} else {
+				au->DTS = 0;
+			}
 		} else {
 			GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] Audio deinterleaving OD %d ch %d\n", ch->esd->ESID, ch->odm->OD->objectDescriptorID));
 			/*de-interleaving of AUs*/
@@ -731,8 +805,9 @@
 void gf_es_receive_sl_packet(GF_ClientService *serv, GF_Channel *ch, char *payload, u32 payload_size, GF_SLHeader *header, GF_Err reception_status)
 {
 	GF_SLHeader hdr;
-	u32 nbAU, OldLength, size, AUSeqNum;
+	u32 nbAU, OldLength, size;
 	Bool EndAU, NewAU;
+	Bool init_ts = 0;
 
 	if (ch->bypass_sl_and_db) {
 		GF_SceneDecoder *sdec;
@@ -907,24 +982,19 @@
 		NewAU = 1;
 		ch->NextIsAUStart = 0;
 		ch->skip_carousel_au = 0;
-
-		/*if we have a pending AU, add it*/
-		if (ch->buffer) {
-			if (ch->esd->slConfig->useAccessUnitEndFlag) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_SYNC, ("[SyncLayer] ES%d: missed end of AU (DTS %d)\n", ch->esd->ESID, ch->DTS));
-			}
-			if (ch->codec_resilient) {
-				if (!ch->IsClockInit && !ch->skip_time_check_for_pending) gf_es_check_timing(ch);
-				Channel_DispatchAU(ch, 0);
-			} else {
-				gf_free(ch->buffer);
-				ch->buffer = NULL;
-				ch->AULength = 0;
-				ch->len = ch->allocSize = 0;
-			}
-		}
 		ch->skip_time_check_for_pending = 0;
-		AUSeqNum = hdr.AU_sequenceNumber;
+		init_ts = 1;
+	}
+	/*if not first packet but about to force a clock init, do init timestamps*/
+	else if (!ch->IsClockInit) {
+		/*don't process anything until the clock is initialized*/
+		if (ch->esd->dependsOnESID && !gf_es_owns_clock(ch)) 
+			return;
+		if (hdr.compositionTimeStampFlag)
+			init_ts = 1;
+	}
+
+	if (init_ts) {
 		/*Get CTS */
 		if (ch->esd->slConfig->useTimestampsFlag) {
 			if (hdr.compositionTimeStampFlag) {
@@ -972,6 +1042,7 @@
 				ch->no_timestamps = 1;
 			}
 		} else {
+			u32 AUSeqNum = hdr.AU_sequenceNumber;
 			/*use CU duration*/
 			if (!ch->IsClockInit)
 				ch->DTS = ch->CTS = ch->ts_offset;
@@ -993,6 +1064,10 @@
 				ch->CTS += nbAU * ch->esd->slConfig->CUDuration;
 			}
 		}
+	}
+
+	if (hdr.accessUnitStartFlag) {
+		u32 AUSeqNum = hdr.AU_sequenceNumber;
 
 		/*if the AU Length is carried in SL, get its size*/
 		if (ch->esd->slConfig->AULength > 0) {
@@ -1093,6 +1168,23 @@
 		}
 	}
 
+
+	/*if we had a previous buffer, add or discard it, depending on codec resilience*/
+	if (hdr.accessUnitStartFlag && ch->buffer) {
+		if (ch->esd->slConfig->useAccessUnitEndFlag) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_SYNC, ("[SyncLayer] ES%d: missed end of AU (DTS %d)\n", ch->esd->ESID, ch->DTS));
+		}
+		if (ch->codec_resilient) {
+			if (!ch->IsClockInit && !ch->skip_time_check_for_pending) gf_es_check_timing(ch);
+			Channel_DispatchAU(ch, 0);
+		} else {
+			gf_free(ch->buffer);
+			ch->buffer = NULL;
+			ch->AULength = 0;
+			ch->len = ch->allocSize = 0;
+		}
+	}
+
 	/*update the RAP marker on a packet base (to cope with AVC/H264 NALU->AU reconstruction)*/
 	if (hdr.randomAccessPointFlag) ch->IsRap = 1;
 
@@ -1102,7 +1194,8 @@
 	if (ch->AULength == OldLength + payload_size) EndAU = 1;
 	if (EndAU) ch->NextIsAUStart = 1;
 
-	if (EndAU && !ch->IsClockInit && !ch->skip_time_check_for_pending) {
+	/*init clock if end of AU or if header is valid*/
+	if ((EndAU || init_ts) && !ch->IsClockInit && !ch->skip_time_check_for_pending) {
 		ch->skip_time_check_for_pending = 0;
 		gf_es_check_timing(ch);
 	}
@@ -1196,7 +1289,6 @@
 
 	if (EndAU) Channel_DispatchAU(ch, hdr.au_duration);
 
-
 	gf_es_lock(ch, 0);
 }
 
@@ -1229,12 +1321,15 @@
 		/*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->first_au_fetched && ch->BufferOn) return NULL;
+		if (ch->BufferOn) {
+			if (ch->first_au_fetched || !ch->AU_buffer_first || !ch->AU_buffer_first->next)
+				return NULL;
+		}
 		return ch->AU_buffer_first;
 	}
 
 	/*pull from stream - resume clock if needed*/
-	ch_buffer_off(ch);
+	if (!ch->MinBuffer) ch_buffer_off(ch);
 
 	memset(&slh, 0, sizeof(GF_SLHeader));
 
@@ -1244,6 +1339,18 @@
 	case GF_EOS:
 		gf_es_on_eos(ch);
 		return NULL;
+	case GF_BUFFER_TOO_SMALL:
+		if (ch->MinBuffer) {
+			//if we have a composition buffer, only trigger buffering when no more data is available in the CB
+			if (ch->odm->codec && ch->odm->codec->CB && ch->odm->codec->CB->UnitCount<=1) {
+				gf_term_service_media_event(ch->odm, GF_EVENT_MEDIA_PROGRESS);
+				ch_buffer_on(ch);
+			} else if (!ch->odm->codec || !ch->odm->codec->CB) {
+				gf_term_service_media_event(ch->odm, GF_EVENT_MEDIA_PROGRESS);
+				ch_buffer_on(ch);
+			}
+		}
+		return NULL;
 	case GF_OK:
 		break;
 	default:
@@ -1287,6 +1394,7 @@
 				return NULL;
 			}
 		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d - Dispatch Pull AU DTS %d - CTS %d - size %d time %d - UTC "LLU" ms\n", ch->esd->ESID, ch->DTS, ch->CTS, ch->AU_buffer_pull->dataLength, gf_clock_real_time(ch->clock), gf_net_get_utc() ));
 	}
 
 	/*this may happen in file streaming when data has not arrived yet, in which case we discard the AU*/
@@ -1298,6 +1406,11 @@
 	ch->AU_buffer_pull->DTS = (u32) ch->DTS;
 	ch->AU_buffer_pull->PaddingBits = ch->padingBits;
 	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);
+	}
 	return ch->AU_buffer_pull;
 }
 
@@ -1333,7 +1446,8 @@
 			ch->AU_buffer_pull->data = NULL;
 			ch->AU_buffer_pull->dataLength = 0;
 		}
-		ch->first_au_fetched = 1;
+		if (!ch->esd->dependsOnESID)
+			ch->first_au_fetched = 1;
 		return;
 	}
 
@@ -1343,10 +1457,16 @@
 		gf_es_lock(ch, 0);
 		return;
 	}
-	ch->first_au_fetched = 1;
+	if (!ch->esd->dependsOnESID)
+		ch->first_au_fetched = 1;
 
 	au = ch->AU_buffer_first;
+//	ch->min_computed_cts = au->CTS;
 	ch->AU_buffer_first = au->next;
+
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[ODM%d] ES%d Droping AU CTS %d\n", ch->odm->OD->objectDescriptorID, ch->esd->ESID, au->CTS));
+
 	au->next = NULL;
 	gf_db_unit_del(au);
 	ch->AU_Count -= 1;
@@ -1356,6 +1476,7 @@
 	}
 	if (!ch->AU_buffer_first) ch->AU_buffer_last = NULL;
 
+
 	Channel_UpdateBufferTime(ch);
 
 	/*if we get under our limit, rebuffer EXCEPT WHEN EOS is signaled*/
@@ -1410,6 +1531,7 @@
 /*performs final setup upon connection confirm*/
 void gf_es_on_connect(GF_Channel *ch)
 {
+	const char *sOpt;
 	Bool can_buffer;
 	GF_NetworkCommand com;
 
@@ -1462,24 +1584,24 @@
 	}
 	/*buffer setup*/
 	ch->MinBuffer = ch->MaxBuffer = 0;
+	/*set default values*/
+	com.buffer.max = com.buffer.min = 0;
 	if (can_buffer) {
-		const char *sOpt;
-		com.command_type = GF_NET_CHAN_BUFFER;
-		com.base.on_channel = ch;
-
-		/*set default values*/
 		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);
+	}
 
-		if (gf_term_service_command(ch->service, &com) == GF_OK) {
-			ch->MinBuffer = com.buffer.min;
-			ch->MaxBuffer = com.buffer.max;
-		}
+	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;
 	}
+
 	if (ch->esd->decoderConfig->streamType == GF_STREAM_PRIVATE_SCENE &&
 		ch->esd->decoderConfig->objectTypeIndication == GPAC_OTI_PRIVATE_SCENE_EPG) { 
 		ch->bypass_sl_and_db = 1;

gpac-0.5.0.svn4296.tar.bz2/src/terminal/clock.c -> gpac-0.5.0.svn4668.tar.bz2/src/terminal/clock.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/terminal/decoder.c -> gpac-0.5.0.svn4668.tar.bz2/src/terminal/decoder.c Changed

@@ -152,6 +152,7 @@
 			break;
 		default:
 			min = max = 0;
+			break;
 		}
 		if ((codec->type==GF_STREAM_AUDIO) && (max<2)) max = 2;
 
@@ -302,6 +303,87 @@
 	}
 }
 
+static void MediaDecoder_GetNextAU(GF_Codec *codec, GF_Channel **activeChannel, GF_DBUnit **nextAU)
+{
+	GF_Channel *ch;
+	GF_DBUnit *AU;
+	u32 count, minDTS, i;
+	count = gf_list_count(codec->inChannels);
+	*nextAU = NULL;
+	*activeChannel = NULL;
+
+	if (!count) return;
+
+	minDTS = 0;
+	
+	/*browse from base to top layer*/
+	for (i=0;i<count;i++) {
+		ch = (GF_Channel*)gf_list_get(codec->inChannels, i);
+
+		if ((codec->type==GF_STREAM_OCR) && ch->IsClockInit) {
+			/*check duration - we assume that scalable OCR streams are just pure nonsense...*/
+			if (ch->is_pulling && codec->odm->duration) {
+				if (gf_clock_time(codec->ck) > codec->odm->duration)
+					gf_es_on_eos(ch);
+			}
+			return;
+		}
+
+		AU = gf_es_get_au(ch);
+		if (!AU) {
+			if (! (*activeChannel)) *activeChannel = ch;
+			continue;
+		}
+
+		/*aggregate all AUs with the same timestamp on the base AU and delete the upper layers)*/
+		if (! *nextAU) {
+			if (ch->esd->dependsOnESID) {
+				gf_es_drop_au(ch);
+				continue;
+			}
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d#CH%d AU CTS %d selected as first layer\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, AU->CTS));
+			*nextAU = AU;
+			*activeChannel = ch;
+			minDTS = AU->DTS;
+		} else if (AU->DTS == minDTS) {
+			GF_DBUnit *baseAU = *nextAU;
+			assert(baseAU);
+
+			baseAU->data = gf_realloc(baseAU->data, baseAU->dataLength + AU->dataLength);
+			memcpy(baseAU->data + baseAU->dataLength , AU->data, AU->dataLength);
+			baseAU->dataLength += AU->dataLength;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d#CH%d AU CTS %d reaggregated on base layer %d\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, AU->CTS, (*activeChannel)->esd->ESID));
+			gf_es_drop_au(ch);
+			ch->first_au_fetched = 1;
+		} else {
+			break;
+		}
+	}
+
+	if (codec->is_reordering && *nextAU && codec->first_frame_dispatched) {
+		if ((*activeChannel)->esd->slConfig->no_dts_signaling) {
+			u32 CTS = (*nextAU)->CTS;
+			/*reordering !!*/
+			u32 prev_ts_diff;
+			u32 diff = 0;
+			if (codec->recomputed_cts && (codec->recomputed_cts > (*nextAU)->CTS)) {
+				diff = codec->recomputed_cts - CTS;
+			}
+
+			prev_ts_diff = (CTS > codec->last_unit_cts) ? (CTS - codec->last_unit_cts) : (codec->last_unit_cts - CTS);			
+			if (!diff) diff = prev_ts_diff;
+			else if (prev_ts_diff && (prev_ts_diff < diff) ) diff = prev_ts_diff;
+
+			if (!codec->min_au_duration || (diff < codec->min_au_duration)) 
+				codec->min_au_duration = diff;
+		} else {
+			codec->min_au_duration = 0;
+			/*FIXME - we're breaking sync (couple of frames delay)*/
+			(*nextAU)->CTS = (*nextAU)->DTS;
+		}
+	}
+}
+
 /*scalable browsing of input channels: find the AU with the lowest DTS on all input channels*/
 static void Decoder_GetNextAU(GF_Codec *codec, GF_Channel **activeChannel, GF_DBUnit **nextAU)
 {
@@ -314,7 +396,7 @@
 
 	if (!count) return;
 
-	minDTS = (u32) -1;
+	minDTS = 0;
 	/*reverse browsing to make sure we fill enhancement before base layer*/
 	for (i=count;i>0;i--) {
 		ch = (GF_Channel*)gf_list_get(codec->inChannels, i-1);
@@ -336,16 +418,12 @@
 
 		/*we use <= to make sure we first fetch data on base layer if same
 		DTS (which is possible in spatial scalability)*/
-		if (AU->DTS <= minDTS) {
+		if (!minDTS || (AU->DTS == minDTS)) {
 			minDTS = AU->DTS;
 			*activeChannel = ch;
 			*nextAU = AU;
 		}
 	}
-
-	/*FIXME - we're breaking sync (couple of frames delay)*/
-	if (codec->is_reordering && *nextAU)
-		(*nextAU)->CTS = (*nextAU)->DTS;
 }
 
 
@@ -365,7 +443,7 @@
 	"frame dropping" is done by preventing the compositor from redrawing after an update and decoding following AU
 	so that the compositor is always woken up once all late systems AUs are decoded. This flag is overriden when
 	seeking*/
-	check_next_unit = (codec->odm->term->flags & GF_TERM_SYSDEC_RESYNC) ? 1 : 0;
+	check_next_unit = (codec->odm->term->flags & GF_TERM_DROP_LATE_FRAMES) ? 1 : 0;
 
 check_unit:
 
@@ -583,19 +661,35 @@
 
 static GFINLINE GF_Err UnlockCompositionUnit(GF_Codec *dec, GF_CMUnit *CU, u32 cu_size)
 {
+
 	/*temporal scalability disabling: if we already rendered this, no point getting further*/
+/*
 	if (CU->TS < dec->CB->LastRenderedTS) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[ODM] CU (TS %d) later than last frame drawn (TS %d) - droping\n", CU->TS, dec->CB->LastRenderedTS));
 		cu_size = 0;
 	}
 
+*/
+
+	if (dec->is_reordering) {
+		/*first dispatch from decoder, store CTS*/
+		if (!dec->first_frame_dispatched) {
+			dec->recomputed_cts = CU->TS;
+			dec->first_frame_dispatched = 1;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d reordering mode - first frame dispatch - CTS %d - min TS diff %d\n", dec->decio->module_name, dec->odm->OD->objectDescriptorID, dec->recomputed_cts, dec->min_au_duration));
+		} else if (dec->min_au_duration) {
+			dec->recomputed_cts += dec->min_au_duration;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d reordering mode - original CTS %d recomputed CTS %d - min TS diff %d\n", dec->decio->module_name, dec->odm->OD->objectDescriptorID, CU->TS, dec->recomputed_cts, dec->min_au_duration));
+			CU->TS = dec->recomputed_cts;
+		}
+	}
 	/*unlock the CB*/
 	gf_cm_unlock_input(dec->CB, CU, cu_size, dec->is_reordering);
 	return GF_OK;
 }
 
 
-static GF_Err ResizeCompositionBuffer(GF_Codec *dec, u32 NewSize)
+GF_Err gf_codec_resize_composition_buffer(GF_Codec *dec, u32 NewSize)
 {
 	if (!dec || !dec->CB) return GF_BAD_PARAM;
 
@@ -646,6 +740,7 @@
 	GF_CMUnit *CU;
 	GF_DBUnit *AU;
 	GF_Channel *ch, *prev_ch;
+	Bool drop_late_frames = 0;
 	u32 mmlevel, cts;
 	u32 first, entryTime, now, obj_time, unit_size;
 	GF_MediaDecoder *mdec = (GF_MediaDecoder*)codec->decio;
@@ -657,9 +752,16 @@
 	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) 
+		drop_late_frames = 1;
 
 	/*fetch next AU in DTS order for this codec*/
-	Decoder_GetNextAU(codec, &ch, &AU);
+	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*/
@@ -697,12 +799,8 @@
 	}
 	/*we are still flushing our CB - keep the current pending AU and wait for CB resize*/
 	if (codec->force_cb_resize) {
-		if (codec->CB->UnitCount>1) {
-			return GF_OK;
-		}
-		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] ODM%d: Resizing output buffer %d -> %d\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, codec->CB->UnitSize, codec->force_cb_resize));
-		ResizeCompositionBuffer(codec, codec->force_cb_resize);
-		codec->force_cb_resize=0;
+		/*we cannot destroy the CB here, as we don't know who is using its output*/
+		return GF_OK;
 	}
 
 	/*image codecs*/
@@ -758,7 +856,7 @@
 		else if (codec->CB->Status == CB_PLAY) {
 			/*extremely late, set the level to drop
 			 NOTE: the 100 ms safety gard is to avoid discarding audio*/
-			if (!ch->skip_sl && (AU->CTS + 100 < obj_time) ) {
+			if (!ch->skip_sl && (AU->CTS + (codec->is_reordering ? 1000 : 100) < obj_time) ) {
 				mmlevel = GF_CODEC_LEVEL_DROP;
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d: frame too late (%d vs %d) - using drop level\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, AU->CTS, obj_time));
 
@@ -785,11 +883,6 @@
 			}
 		}
 
-		/*when using temporal scalability make sure we can decode*/
-		if (ch->esd->dependsOnESID && (codec->last_unit_dts > AU->DTS)){
-			goto drop;
-		}
-
 		if (ch->skip_sl) {
 			if (codec->bytes_per_sec) {
 				AU->CTS = codec->last_unit_cts + ch->ts_offset + codec->cur_audio_bytes * 1000 / codec->bytes_per_sec;
@@ -822,24 +915,28 @@
 			/*release but no dispatch*/
 			UnlockCompositionUnit(codec, CU, 0);
 
-			/*if we have pending media do wait! - this shoud be fixed by avoiding to destroy the CB ... */
-			if (codec->CB->UnitCount>1) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] ODM%d: Resize output buffer requested\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID));
+			/*if we have pending media, wait untill CB is completely flushed by the compositor - this shoud be fixed by avoiding to destroy the CB ... */
+			if (codec->CB->LastRenderedTS) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] ODM%d ES%d: Resize output buffer requested\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID));
 				codec->force_cb_resize = unit_size;
 				return GF_OK;
 			}
-			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] ODM%d: Resizing output buffer %d -> %d\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, codec->CB->UnitSize, unit_size));
-			ResizeCompositionBuffer(codec, unit_size);
+			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] ODM%d ES%d: Resizing output buffer %d -> %d\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, codec->CB->UnitSize, unit_size));
+			gf_codec_resize_composition_buffer(codec, unit_size);
 			continue;
 
 		/*this happens a lot when using non-MPEG-4 streams (ex: ffmpeg demuxer)*/
 		case GF_PACKED_FRAMES:
 			/*in seek don't dispatch any output*/
-			if (mmlevel	>= GF_CODEC_LEVEL_DROP)
-				unit_size = 0;
+			if (mmlevel >= GF_CODEC_LEVEL_DROP) {
+				if (drop_late_frames)
+					unit_size = 0;
+				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 at %d decoded packed frame TS %d in %d ms\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, 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 %d ms\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;
@@ -864,11 +961,13 @@
 		processing a scalable stream*/
 		case GF_OK:
 			if (unit_size) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d at %d decoded frame TS %d in %d ms (DTS %d) - %d in CB\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, gf_clock_real_time(ch->clock), AU->CTS, now, AU->DTS, codec->CB->UnitCount + 1));
+				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));
 			}
 			/*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) {
-				gf_cm_abort_buffering(codec->CB);
+				codec->nb_dispatch_skipped++;
+				if (codec->nb_dispatch_skipped==codec->CB->UnitCount)
+					gf_cm_abort_buffering(codec->CB);
 			}
 
 			codec_update_stats(codec, AU->dataLength, now);
@@ -885,7 +984,7 @@
 			}
 #ifndef GPAC_DISABLE_LOGS
 			if (codec->odm->flags & GF_ODM_PREFETCH) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] ODM%d At %d decoding frame TS %d in prefetch mode\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, gf_clock_real_time(ch->clock), AU->CTS));
+				GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] ODM%d ES%d At %d decoding frame TS %d in prefetch mode\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, gf_clock_real_time(ch->clock), AU->CTS));
 			}
 #endif
 			break;
@@ -893,17 +992,18 @@
 			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 At %d (frame TS %d - %d ms ): decoded error %s\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, 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 - %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) ));
 			e = GF_OK;
 			break;
 		}
 
 		codec->last_unit_dts = AU->DTS;
 		/*remember base layer timing*/
-		if (!ch->esd->dependsOnESID && !ch->skip_sl) codec->last_unit_cts = AU->CTS;
-
+		if (!ch->esd->dependsOnESID && !ch->skip_sl) {
+			codec->last_unit_cts = AU->CTS;
+			codec->first_frame_processed = 1;
+		}
 
-drop:
 		/*store current CTS*/
 		cts = AU->CTS;
 		prev_ch = ch;
@@ -917,16 +1017,20 @@
 			return e;
 		}
 
-		Decoder_GetNextAU(codec, &ch, &AU);
+		MediaDecoder_GetNextAU(codec, &ch, &AU);
 		/*same CTS: same output, likely scalable stream so don't release the CB*/
-		if (AU && (AU->CTS == cts) && (ch !=prev_ch) ) {
+		if (AU && (AU->CTS == cts) && (ch != prev_ch) ) {
 			unit_size = codec->CB->UnitSize;
 			goto scalable_retry;
 		}
 
 		/*in seek don't dispatch any output*/
-		if (mmlevel	>= GF_CODEC_LEVEL_DROP)
-			unit_size = 0;
+		if (mmlevel >= GF_CODEC_LEVEL_DROP) {
+			if (drop_late_frames || (mmlevel == GF_CODEC_LEVEL_SEEK) )
+				unit_size = 0;
+			else 
+				ch->clock->last_TS_rendered = codec->CB->LastRenderedTS;
+		} 
 
 		UnlockCompositionUnit(codec, CU, unit_size);
 		if (!ch || !AU) {
@@ -944,7 +1048,7 @@
 			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;
 		}
-		Decoder_GetNextAU(codec, &ch, &AU);
+		MediaDecoder_GetNextAU(codec, &ch, &AU);
 		if (!ch || !AU) return GF_OK;
 	}
 	return GF_OK;
@@ -1042,7 +1146,7 @@
 
 	if (codec->flags & GF_ESM_CODEC_IS_RAW_MEDIA) {
 		GF_BitStream *bs;
-		u32 pf, w, h, stride=0, out_size, sr, nb_ch, bpp, ch_cfg;
+		u32 pf, w, h, stride=0, out_size, sr, nb_ch, bpp, ch_cfg, is_flipped = 0;
 		GF_Channel *ch = gf_list_get(codec->odm->channels, 0);
 		if (!ch || !ch->esd->decoderConfig->decoderSpecificInfo || !ch->esd->decoderConfig->decoderSpecificInfo->data) return 0;
 		bs = gf_bs_new(ch->esd->decoderConfig->decoderSpecificInfo->data, ch->esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
@@ -1054,6 +1158,7 @@
 			h = gf_bs_read_u16(bs);
 			out_size = gf_bs_read_u32(bs);
 			stride = gf_bs_read_u32(bs);
+            is_flipped = gf_bs_read_u8(bs);
 		} else {
 			sr = gf_bs_read_u32(bs);
 			nb_ch = gf_bs_read_u16(bs);
@@ -1075,6 +1180,9 @@
 		case GF_CODEC_PIXEL_FORMAT:
 			cap->cap.valueInt = pf;
 			return GF_OK;
+        case GF_CODEC_FLIP:
+            cap->cap.valueInt = is_flipped;
+            return GF_OK;
 		case GF_CODEC_OUTPUT_SIZE:
 			cap->cap.valueInt = out_size;
 			return GF_OK;
@@ -1126,6 +1234,10 @@
 		codec->cur_audio_bytes = codec->cur_video_frames = 0;
 		codec->nb_droped = 0;
 		codec->nb_repeted_frames = 0;
+		codec->recomputed_cts = 0;
+		codec->first_frame_dispatched = 0;
+		codec->first_frame_processed = 0;
+		codec->nb_dispatch_skipped = 0;
 		memset(codec->last_unit_signature, 0, sizeof(codec->last_unit_signature));
 	}
 	else codec->Status = Status;

gpac-0.5.0.svn4296.tar.bz2/src/terminal/input_sensor.c -> gpac-0.5.0.svn4668.tar.bz2/src/terminal/input_sensor.c Changed

@@ -101,7 +101,7 @@
 		ISPriv *is = (ISPriv *)cod->decio->privateStack;
 		if (is->type==priv->type) {
 			GF_Channel *ch = (GF_Channel *)gf_list_get(cod->inChannels, 0);
-			gf_es_receive_sl_packet(ch->service, ch, data, data_len, &slh, GF_OK);
+			gf_es_receive_sl_packet(ch->service, ch, (char *)data, data_len, &slh, GF_OK);
 		}
 	}
 }
@@ -285,10 +285,10 @@
 		field1->eventType = field2->eventType = 0;
 		priv->enteredText[priv->text_len] = (short) '\0';
 
-		len = gf_utf8_wcslen(priv->enteredText);
+		len = (u32) gf_utf8_wcslen(priv->enteredText);
 		if (len && (priv->enteredText[len-1] == priv->termChar)) {
 			ptr = priv->enteredText;
-			len = gf_utf8_wcstombs(tmp_utf8, 5000, &ptr);
+			len = (u32) gf_utf8_wcstombs(tmp_utf8, 5000, &ptr);
 			if (outText->buffer) gf_free(outText->buffer);
 			outText->buffer = (char*)gf_malloc(sizeof(char) * (len));
 			memcpy(outText->buffer, tmp_utf8, sizeof(char) * len-1);
@@ -312,7 +312,7 @@
 			}
 			priv->text_len = len;
 			ptr = priv->enteredText;
-			len = gf_utf8_wcstombs(tmp_utf8, 5000, &ptr);
+			len = (u32) gf_utf8_wcstombs(tmp_utf8, 5000, &ptr);
 			if (inText->buffer) gf_free(inText->buffer);
 			inText->buffer = (char*)gf_malloc(sizeof(char) * (len+1));
 			memcpy(inText->buffer, tmp_utf8, sizeof(char) * len);
@@ -731,7 +731,7 @@
 			if (n->keyPress.buffer) gf_free(n->keyPress.buffer);
 			tc[0] = keyPressed; tc[1] = 0;
 			ptr = tc;
-			len = gf_utf8_wcstombs(szStr, 10, &ptr);
+			len = (u32) gf_utf8_wcstombs(szStr, 10, &ptr);
 			n->keyPress.buffer = (char*)gf_malloc(sizeof(char) * (len+1));
 			memcpy(n->keyPress.buffer, szStr, sizeof(char) * len);
 			n->keyPress.buffer[len] = 0;
@@ -741,7 +741,7 @@
 			if (n->keyRelease.buffer) gf_free(n->keyRelease.buffer);
 			tc[0] = keyReleased; tc[1] = 0;
 			ptr = tc;
-			len = gf_utf8_wcstombs(szStr, 10, &ptr);
+			len = (u32) gf_utf8_wcstombs(szStr, 10, &ptr);
 			n->keyRelease.buffer = (char*)gf_malloc(sizeof(char) * (len+1));
 			memcpy(n->keyRelease.buffer, szStr, sizeof(char) * len);
 			n->keyRelease.buffer[len] = 0;
@@ -847,7 +847,7 @@
 				st->text_len -= 1;
 				st->enteredText[st->text_len] = 0;
 				ptr = st->enteredText;
-				len = gf_utf8_wcstombs(szStr, 10, &ptr);
+				len = (u32) gf_utf8_wcstombs(szStr, 10, &ptr);
 				if (n->enteredText.buffer) gf_free(n->enteredText.buffer);
 				szStr[len] = 0;
 				n->enteredText.buffer = gf_strdup(szStr);
@@ -865,7 +865,7 @@
 			st->text_len += 1;
 			st->enteredText[st->text_len] = 0;
 			ptr = st->enteredText;
-			len = gf_utf8_wcstombs(szStr, 10, &ptr);
+			len = (u32) gf_utf8_wcstombs(szStr, 10, &ptr);
 			if (n->enteredText.buffer) gf_free(n->enteredText.buffer);
 			szStr[len] = 0;
 			n->enteredText.buffer = gf_strdup(szStr);

gpac-0.5.0.svn4296.tar.bz2/src/terminal/media_manager.c -> gpac-0.5.0.svn4668.tar.bz2/src/terminal/media_manager.c Changed

@@ -41,7 +41,7 @@
 	GF_MM_CE_REQ_THREAD = 1<<3,
 	/*only used by threaded decs to signal end of thread*/
 	GF_MM_CE_DEAD = 1<<4,
-	GF_MM_CE_DISCRADED = 1<<5,
+	GF_MM_CE_DISCARDED = 1<<5,
 };
 
 typedef struct
@@ -91,7 +91,7 @@
 		count = gf_list_count(term->codecs);
 		for (i=0; i<count; i++) {
 			CodecEntry *ce = gf_list_get(term->codecs, i);
-			if (ce->flags & GF_MM_CE_DISCRADED) {
+			if (ce->flags & GF_MM_CE_DISCARDED) {
 				gf_free(ce);
 				gf_list_rem(term->codecs, i);
 				count--;
@@ -252,7 +252,7 @@
 			gf_free(ce);
 			gf_list_rem(term->codecs, i-1);
 		} else {
-			ce->flags |= GF_MM_CE_DISCRADED;
+			ce->flags |= GF_MM_CE_DISCARDED;
 		}
 		break;
 	}
@@ -298,13 +298,13 @@
 
 	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);
 		if (!ce) break;
 
-		if (!(ce->flags & GF_MM_CE_RUNNING) || (ce->flags & GF_MM_CE_THREADED) ) {
+		if (!(ce->flags & GF_MM_CE_RUNNING) || (ce->flags & GF_MM_CE_THREADED) || ce->dec->force_cb_resize) {
 			remain--;
 			if (!remain) break;
 			term->last_codec = (term->last_codec + 1) % count;
@@ -316,7 +316,6 @@
 
 		e = gf_codec_process(ce->dec, time_slice);
 		time_taken = gf_sys_clock() - time_taken;
-
 		/*avoid signaling errors too often...*/
 #ifndef GPAC_DISABLE_LOG
 		if (e) {
@@ -325,7 +324,7 @@
 			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_DISCRADED) {
+		if (ce->flags & GF_MM_CE_DISCARDED) {
 			gf_free(ce);
 			gf_list_rem(term->codecs, term->last_codec);
 			count--;
@@ -334,15 +333,14 @@
 		} else {
 			if (ce->dec->CB && (ce->dec->CB->UnitCount >= ce->dec->CB->Min)) ce->dec->PriorityBoost = 0;
 		}
-
 		term->last_codec = (term->last_codec + 1) % count;
 
 		remain -= 1;
-		if (!remain) break;
-
 		if (time_left > time_taken) {
 			time_left -= time_taken;
+			if (!remain) break;
 		} else {
+			time_left = 0;
 			break;
 		}
 	}
@@ -351,7 +349,6 @@
 	term->compositor->decoders_time = gf_sys_clock() - term->compositor->decoders_time;
 #endif
 
-
 	return time_left;
 }
 
@@ -367,9 +364,9 @@
 //	GF_LOG(GF_LOG_DEBUG, GF_LOG_RTI, ("(RTI] Terminal Cycle Log\tServices\tDecoders\tCompositor\tSleep\n"));
 
 	while (term->flags & GF_TERM_RUNNING) {
-		u32 left;
+		u32 left = 0;
 		if (do_codec) left = MM_SimulationStep_Decoder(term);
-		else left = term->frame_duration;
+//		else left = term->frame_duration;
 		
 		if (do_scene) {
 			u32 time_taken = gf_sys_clock();
@@ -380,8 +377,12 @@
 			else
 				left = 0;
 		}
-		if (do_regulate)
-			gf_sleep(left);
+
+		if (do_regulate) {
+			if (left==term->frame_duration) {
+				gf_sleep(term->frame_duration);
+			}
+		}
 	}
 	term->flags |= GF_TERM_DEAD;
 	return 0;
@@ -397,10 +398,12 @@
 
 	while (ce->flags & GF_MM_CE_RUNNING) {
 		time_left = gf_sys_clock();
-		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);
+		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;

gpac-0.5.0.svn4296.tar.bz2/src/terminal/media_memory.c -> gpac-0.5.0.svn4668.tar.bz2/src/terminal/media_memory.c Changed

@@ -353,7 +353,7 @@
 			/*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;
+//			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);
@@ -613,6 +613,7 @@
 		}
 		if (Status == CB_STOP) {
 			gf_cm_reset(cb);
+			cb->LastRenderedTS = 0;
 		}
 		cb->Status = Status;
 	}
@@ -630,7 +631,7 @@
 	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;
+//		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->HasSeenEOS = 1;
@@ -667,7 +668,7 @@
 	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;
+//		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));
 	}
 }

gpac-0.5.0.svn4296.tar.bz2/src/terminal/media_object.c -> gpac-0.5.0.svn4668.tar.bz2/src/terminal/media_object.c Changed

@@ -48,7 +48,7 @@
 	} else if (!iri->string) {
 		return NULL;
 	} else {
-		if (iri->target) ref = iri->target;
+		if (iri->target) ref = (GF_Node *)iri->target;
 		else if (iri->string[0]=='#') ref = gf_sg_find_node_by_name(scene->graph, iri->string+1);
 		else ref = gf_sg_find_node_by_name(scene->graph, iri->string);
 
@@ -60,14 +60,14 @@
 			switch (ref->sgprivate->tag) {
 			case TAG_SVG_audio:
 				o_type = GF_MEDIA_OBJECT_AUDIO; 
-				if (gf_node_get_attribute_by_tag(ref, TAG_XLINK_ATT_href, 0, 0, &info)==GF_OK) {
-					return get_sync_reference(scene, info.far_ptr, o_type, orig_ref ? orig_ref : ref, post_pone);
+				if (gf_node_get_attribute_by_tag(ref, TAG_XLINK_ATT_href, GF_FALSE, GF_FALSE, &info)==GF_OK) {
+					return get_sync_reference(scene, (XMLRI *)info.far_ptr, o_type, orig_ref ? orig_ref : ref, post_pone);
 				}
 				return NULL;
 			case TAG_SVG_video:
 				o_type = GF_MEDIA_OBJECT_VIDEO; 
-				if (gf_node_get_attribute_by_tag(ref, TAG_XLINK_ATT_href, 0, 0, &info)==GF_OK) {
-					return get_sync_reference(scene, info.far_ptr, o_type, orig_ref ? orig_ref : ref, post_pone);
+				if (gf_node_get_attribute_by_tag(ref, TAG_XLINK_ATT_href, GF_FALSE, GF_FALSE, &info)==GF_OK) {
+					return get_sync_reference(scene, (XMLRI *)info.far_ptr, o_type, orig_ref ? orig_ref : ref, post_pone);
 				}
 				return NULL;
 			default:
@@ -75,14 +75,14 @@
 			}
 		}
 	}
-	*post_pone = 0;
+	*post_pone = GF_FALSE;
 	mfurl.count = 1;
 	mfurl.vals = &sfurl;
 	mfurl.vals[0].OD_ID = stream_id;
 	mfurl.vals[0].url = iri->string;
 
-	res = gf_scene_get_media_object(scene, &mfurl, o_type, 0);
-	if (!res) *post_pone = 1;
+	res = gf_scene_get_media_object(scene, &mfurl, o_type, GF_FALSE);
+	if (!res) *post_pone = GF_TRUE;
 	return res;
 }
 #endif
@@ -150,16 +150,16 @@
 #ifndef GPAC_DISABLE_SVG
 	case TAG_SVG_audio: 
 		obj_type = GF_MEDIA_OBJECT_AUDIO; 
-		if (gf_node_get_attribute_by_tag(node, TAG_SVG_ATT_syncReference, 0, 0, &info)==GF_OK) {
-			syncRef = get_sync_reference(scene, info.far_ptr, GF_MEDIA_OBJECT_UNDEF, node, &post_pone);
+		if (gf_node_get_attribute_by_tag(node, TAG_SVG_ATT_syncReference, GF_FALSE, GF_FALSE, &info)==GF_OK) {
+			syncRef = get_sync_reference(scene, (XMLRI *)info.far_ptr, GF_MEDIA_OBJECT_UNDEF, node, &post_pone);
 			/*syncRef is specified but doesn't exist yet, post-pone*/
 			if (post_pone) return NULL;
 		}
 		break;
 	case TAG_SVG_video: 
 		obj_type = GF_MEDIA_OBJECT_VIDEO; 
-		if (gf_node_get_attribute_by_tag(node, TAG_SVG_ATT_syncReference, 0, 0, &info)==GF_OK) {
-			syncRef = get_sync_reference(scene, info.far_ptr, GF_MEDIA_OBJECT_UNDEF, node, &post_pone);
+		if (gf_node_get_attribute_by_tag(node, TAG_SVG_ATT_syncReference, GF_FALSE, GF_FALSE, &info)==GF_OK) {
+			syncRef = get_sync_reference(scene, (XMLRI *)info.far_ptr, GF_MEDIA_OBJECT_UNDEF, node, &post_pone);
 			/*syncRef is specified but doesn't exist yet, post-pone*/
 			if (post_pone) return NULL;
 		}
@@ -191,7 +191,7 @@
 void gf_mo_unregister(GF_Node *node, GF_MediaObject *mo)
 {
 	if (mo && node) {
-		gf_list_del_item(mo->nodes, node);
+		gf_mo_event_target_remove_by_node(mo, node);
 	}
 }
 
@@ -203,16 +203,16 @@
 	mo->speed = FIX_ONE;
 	mo->URLs.count = 0;
 	mo->URLs.vals = NULL;
-	mo->nodes = gf_list_new();
+	mo->evt_targets = gf_list_new();
 	return mo;
 }
 
 
 GF_EXPORT
-Bool gf_mo_get_visual_info(GF_MediaObject *mo, u32 *width, u32 *height, u32 *stride, u32 *pixel_ar, u32 *pixelFormat)
+Bool gf_mo_get_visual_info(GF_MediaObject *mo, u32 *width, u32 *height, u32 *stride, u32 *pixel_ar, u32 *pixelFormat, Bool *is_flipped)
 {
 	GF_CodecCapability cap;
-	if ((mo->type != GF_MEDIA_OBJECT_VIDEO) && (mo->type!=GF_MEDIA_OBJECT_TEXT)) return 0;
+	if ((mo->type != GF_MEDIA_OBJECT_VIDEO) && (mo->type!=GF_MEDIA_OBJECT_TEXT)) return GF_FALSE;
 
 	if (width) {
 		cap.CapCode = GF_CODEC_WIDTH;
@@ -224,7 +224,14 @@
 		gf_codec_get_capability(mo->odm->codec, &cap);
 		*height = cap.cap.valueInt;
 	}
-	if (mo->type==GF_MEDIA_OBJECT_TEXT) return 1;
+	if (mo->type==GF_MEDIA_OBJECT_TEXT) return GF_TRUE;
+    
+    if (is_flipped) {
+        cap.CapCode = GF_CODEC_FLIP;
+        cap.cap.valueInt = 0;
+		gf_codec_get_capability(mo->odm->codec, &cap);
+		*is_flipped = cap.cap.valueInt ? GF_TRUE : GF_FALSE;
+    }
 
 	if (stride) {
 		cap.CapCode = GF_CODEC_STRIDE;
@@ -237,7 +244,7 @@
 		*pixelFormat = cap.cap.valueInt;
 
 		if (mo->odm && mo->odm->parentscene->is_dynamic_scene) {
-			const char *name = gf_node_get_name(gf_list_get(mo->nodes, 0));
+			const char *name = gf_node_get_name(gf_event_target_get_node(gf_mo_event_target_get(mo, 0)));
 			if (name && !strcmp(name, "DYN_VIDEO")) {
 				const char *opt;
 				u32 r, g, b, a;
@@ -258,10 +265,10 @@
 						back->backColor.blue = INT2FIX(b)/255;
 						break;
 					default:
-						back->backColor.red = back->backColor.green = back->backColor.blue = FIX_ONE;
+						back->backColor.red = back->backColor.green = back->backColor.blue = 0;
 						break;
 					}
-					gf_node_dirty_set((GF_Node *)back, 0, 1);
+					gf_node_dirty_set((GF_Node *)back, 0, GF_TRUE);
 				}
 			}
 		}
@@ -279,8 +286,8 @@
 			GF_Channel *ch;
 			GF_NetworkCommand com;
 			com.base.command_type = GF_NET_CHAN_GET_PIXEL_AR;
-			ch = gf_list_get(mo->odm->channels, 0);
-			if (!ch) return 0;
+			ch = (GF_Channel *)gf_list_get(mo->odm->channels, 0);
+			if (!ch) return GF_FALSE;
 
 			com.base.on_channel = ch;
 			com.par.hSpacing = com.par.vSpacing = 0;
@@ -294,14 +301,14 @@
 			}
 		}
 	}
-	return 1;
+	return GF_TRUE;
 }
 
 GF_EXPORT
 Bool gf_mo_get_audio_info(GF_MediaObject *mo, u32 *sample_rate, u32 *bits_per_sample, u32 *num_channels, u32 *channel_config)
 {
 	GF_CodecCapability cap;
-	if (!mo->odm || !mo->odm->codec || (mo->type != GF_MEDIA_OBJECT_AUDIO)) return 0;
+	if (!mo->odm || !mo->odm->codec || (mo->type != GF_MEDIA_OBJECT_AUDIO)) return GF_FALSE;
 
 	if (sample_rate) {
 		cap.CapCode = GF_CODEC_SAMPLERATE;
@@ -323,7 +330,7 @@
 		gf_codec_get_capability(mo->odm->codec, &cap);
 		*channel_config = cap.cap.valueInt;
 	}
-	return 1;
+	return GF_TRUE;
 }
 
 void gf_mo_update_caps(GF_MediaObject *mo)
@@ -348,10 +355,11 @@
 GF_EXPORT
 char *gf_mo_fetch_data(GF_MediaObject *mo, Bool resync, Bool *eos, u32 *timestamp, u32 *size)
 {
-	Bool force_decode = 0;
+	GF_Codec *codec;
+	Bool force_decode = GF_FALSE;
 	u32 obj_time;
 	GF_CMUnit *CU;
-	*eos = 0;
+	*eos = GF_FALSE;
 
 	if (!gf_odm_lock_mo(mo)) return NULL;
 
@@ -360,38 +368,61 @@
 		return NULL;
 	}
 
+
 	/*if frame locked return it*/
 	if (mo->nb_fetch) {
-		*eos = 0;
+		*eos = GF_FALSE;
 		*timestamp = mo->timestamp;
 		*size = mo->framesize;
 		mo->nb_fetch ++;
 		gf_odm_lock(mo->odm, 0);
 		return mo->frame;
 	}
+	codec = mo->odm->codec;
 
 	/*end of stream */
-	*eos = gf_cm_is_eos(mo->odm->codec->CB);
+	*eos = gf_cm_is_eos(codec->CB);
 
 	/*not running and no resync (ie audio)*/
-	if (!resync && !gf_cm_is_running(mo->odm->codec->CB)) {
+	if (!resync && !gf_cm_is_running(codec->CB)) {
 		gf_odm_lock(mo->odm, 0);
 		return NULL;
 	}
-	if (! *eos && (mo->odm->codec->ck->speed > FIX_ONE))
-		force_decode = 1;
+
+	/*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);
+		if (!CU || (CU->TS==mo->timestamp)) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] ODM%d: Resizing output buffer %d -> %d\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, codec->CB->UnitSize, codec->force_cb_resize));
+			gf_codec_resize_composition_buffer(codec, codec->force_cb_resize);
+			codec->force_cb_resize=0;
+			force_decode = GF_TRUE;
+		}
+	}
+
+	/*fast forward, force decode if no data is available*/
+	if (! *eos && (codec->ck->speed > FIX_ONE))
+		force_decode = GF_TRUE;
 
 	if (force_decode) {
+		u32 retry=100;
 		gf_odm_lock(mo->odm, 0);
-		if (gf_term_lock_codec(mo->odm->codec, 1)) {
-			gf_codec_process(mo->odm->codec, 1);
-			gf_term_lock_codec(mo->odm->codec, 0);
+		while (retry) {
+			if (gf_term_lock_codec(codec, GF_TRUE)) {
+				gf_codec_process(codec, 1);
+				gf_term_lock_codec(codec, GF_FALSE);
+				break;
+			}
+			retry--;
+		}
+		if (!retry) {
+			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;
 	}
 
 	/*new frame to fetch, lock*/
-	CU = gf_cm_get_output(mo->odm->codec->CB);
+	CU = gf_cm_get_output(codec->CB);
 	/*no output*/
 	if (!CU || (CU->RenderedLength == CU->dataLength)) {
 		gf_odm_lock(mo->odm, 0);
@@ -399,22 +430,22 @@
 	}
 
 	/*note this assert is NOT true when recomputing DTS from CTS on the fly (MPEG1/2 RTP and H264/AVC RTP)*/
-	//assert(CU->TS >= mo->odm->codec->CB->LastRenderedTS);
+	//assert(CU->TS >= codec->CB->LastRenderedTS);
 
-	if (mo->odm->codec->CB->UnitCount==1) resync = 0;
+	if (codec->CB->UnitCount==1) resync = GF_FALSE;
 
 	/*resync*/
 	if (resync) {
 		u32 nb_droped = 0;
-		obj_time = gf_clock_time(mo->odm->codec->ck);
+		obj_time = gf_clock_time(codec->ck);
 		while (CU->TS < obj_time) {
 			if (!CU->next->dataLength) {
 				if (force_decode) {
-					obj_time = gf_clock_time(mo->odm->codec->ck);
+					obj_time = gf_clock_time(codec->ck);
 					gf_odm_lock(mo->odm, 0);
-					if (gf_term_lock_codec(mo->odm->codec, 1)) {
-						gf_codec_process(mo->odm->codec, 1);
-						gf_term_lock_codec(mo->odm->codec, 0);
+					if (gf_term_lock_codec(codec, GF_TRUE)) {
+						gf_codec_process(codec, 1);
+						gf_term_lock_codec(codec, GF_FALSE);
 					}
 					gf_odm_lock(mo->odm, 1);
 					if (!CU->next->dataLength) 
@@ -425,21 +456,21 @@
 			}
 			/*figure out closest time*/
 			if (CU->next->TS > obj_time) {
-				*eos = 0;
+				*eos = GF_FALSE;
 				break;
 			}
 			nb_droped ++;
 			if (nb_droped>1) {
 				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] At OTB %u dropped frame TS %u\n", mo->odm->OD->objectDescriptorID, obj_time, CU->TS));
-				mo->odm->codec->nb_droped++;
+				codec->nb_droped++;
 			}
 			/*discard*/
 			CU->RenderedLength = CU->dataLength = 0;
-			gf_cm_drop_output(mo->odm->codec->CB);
+			gf_cm_drop_output(codec->CB);
 
 			/*get next*/
-			CU = gf_cm_get_output(mo->odm->codec->CB);
-			*eos = gf_cm_is_eos(mo->odm->codec->CB);
+			CU = gf_cm_get_output(codec->CB);
+			*eos = gf_cm_is_eos(codec->CB);
 		}
 	}	
 
@@ -447,20 +478,20 @@
 	mo->frame = CU->data + CU->RenderedLength;
 	if (mo->timestamp != CU->TS) {
 #ifndef GPAC_DISABLE_VRML
-		mediasensor_update_timing(mo->odm, mo->odm->codec->CB->HasSeenEOS);
+		mediasensor_update_timing(mo->odm, codec->CB->HasSeenEOS);
 #endif
 	
 		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;
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] At OTB %u fetch frame TS %u size %d - %d unit in CB\n", mo->odm->OD->objectDescriptorID, gf_clock_time(mo->odm->codec->ck), mo->timestamp, mo->framesize, mo->odm->codec->CB->UnitCount));
 		/*signal EOS after rendering last frame, not while rendering it*/
-		*eos = 0;
+		*eos = GF_FALSE;
 	}
 
 	/*also adjust CU time based on consummed bytes in input, since some codecs output very large audio chunks*/
-	if (mo->odm->codec->bytes_per_sec) mo->timestamp += CU->RenderedLength * 1000 / mo->odm->codec->bytes_per_sec;
+	if (codec->bytes_per_sec) mo->timestamp += CU->RenderedLength * 1000 / codec->bytes_per_sec;
 
 	mo->nb_fetch ++;
 	*timestamp = mo->timestamp;
@@ -570,16 +601,16 @@
 
 	if (!mo->num_open && mo->odm) {
 		s32 res;
-		Bool is_restart = 0;
+		Bool is_restart = GF_FALSE;
 
 		/*remove object from media queue*/
-		gf_term_lock_media_queue(mo->odm->term, 1);
+		gf_term_lock_media_queue(mo->odm->term, GF_TRUE);
 		res = gf_list_del_item(mo->odm->term->media_queue, mo->odm);
-		gf_term_lock_media_queue(mo->odm->term, 0);
+		gf_term_lock_media_queue(mo->odm->term, GF_FALSE);
 
 		if (mo->odm->action_type!=GF_ODM_ACTION_PLAY) {
 			mo->odm->action_type = GF_ODM_ACTION_PLAY;
-			is_restart = 0;
+			is_restart = GF_FALSE;
 			res = -1;
 		}
 
@@ -627,15 +658,15 @@
 GF_EXPORT
 Bool gf_mo_stop(GF_MediaObject *mo)
 {
-	Bool ret = 0;
-	if (!mo || !mo->num_open) return 0;
+	Bool ret = GF_FALSE;
+	if (!mo || !mo->num_open) return GF_FALSE;
 
 	mo->num_open--;
 	if (!mo->num_open && mo->odm) {
-		if (mo->odm->flags & GF_ODM_DESTROYED) return 1;
+		if (mo->odm->flags & GF_ODM_DESTROYED) return GF_TRUE;
 
 		/*do not stop directly, this can delete channel data currently being decoded (BIFS anim & co)*/
-		gf_term_lock_media_queue(mo->odm->term, 1);
+		gf_term_lock_media_queue(mo->odm->term, GF_TRUE);
 		/*if object not in media queue, add it*/
 		if (gf_list_find(mo->odm->term->media_queue, mo->odm)<0) {
 			gf_list_add(mo->odm->term->media_queue, mo->odm);
@@ -644,12 +675,12 @@
 		/*signal STOP request*/
 		if ((mo->OD_ID==GF_MEDIA_EXTERNAL_ID) || (mo->odm && mo->odm->OD && (mo->odm->OD->objectDescriptorID==GF_MEDIA_EXTERNAL_ID))) {
 			mo->odm->action_type = GF_ODM_ACTION_DELETE;
-			ret = 1;
+			ret = GF_TRUE;
 		}
 		else 
 			mo->odm->action_type = GF_ODM_ACTION_STOP;
 
-		gf_term_lock_media_queue(mo->odm->term, 0);
+		gf_term_lock_media_queue(mo->odm->term, GF_FALSE);
 	} else {
 		if (!mo->num_to_restart) {
 			mo->num_restart = mo->num_to_restart = mo->num_open + 1;
@@ -739,12 +770,12 @@
 
 Bool gf_mo_is_same_url(GF_MediaObject *obj, MFURL *an_url, Bool *keep_fragment, u32 obj_hint_type)
 {
-	Bool include_sub_url = 0;
+	Bool include_sub_url = GF_FALSE;
 	u32 i;
 	char szURL1[GF_MAX_PATH], szURL2[GF_MAX_PATH], *ext;
 
 	if (!obj->URLs.count) {
-		if (!obj->odm) return 0;
+		if (!obj->odm) return GF_FALSE;
 		strcpy(szURL1, obj->odm->net_service->url);
 	} else {
 		strcpy(szURL1, obj->URLs.vals[0].url);
@@ -752,8 +783,8 @@
 
 	/*don't analyse audio/video to locate segments or viewports*/
 	if ((obj->type==GF_MEDIA_OBJECT_AUDIO) || (obj->type==GF_MEDIA_OBJECT_VIDEO)) {
-		if (keep_fragment) *keep_fragment = 0;
-		include_sub_url = 1;
+		if (keep_fragment) *keep_fragment = GF_FALSE;
+		include_sub_url = GF_TRUE;
 	} else if ((obj->type==GF_MEDIA_OBJECT_SCENE) && keep_fragment && obj->odm) {
 		GF_ClientService *ns;
 		u32 j;
@@ -762,32 +793,32 @@
 			char *frag = strrchr(an_url->vals[i].url, '#');
 			j=0;
 			/*this is the same object (may need some refinement)*/
-			if (!stricmp(szURL1, an_url->vals[i].url)) return 1;
+			if (!stricmp(szURL1, an_url->vals[i].url)) return GF_TRUE;
 
 			/*fragment is a media segment, same URL*/
 			if (frag ) {
-				Bool same_res = 0;
+				Bool same_res = GF_FALSE;
 				frag[0] = 0;
-				same_res = !strncmp(an_url->vals[i].url, szURL1, strlen(an_url->vals[i].url)) ? 1 : 0;
+				same_res = !strncmp(an_url->vals[i].url, szURL1, strlen(an_url->vals[i].url)) ? GF_TRUE : GF_FALSE;
 				frag[0] = '#';
 
 				/*if we're talking about the same resource, check if the fragment can be matched*/
 				if (same_res) {
 					/*if the fragment is a node which can be found, this is the same resource*/
 					if (obj->odm->subscene && (gf_sg_find_node_by_name(obj->odm->subscene->graph, frag+1)!=NULL) )
-						return 1;
+						return GF_TRUE;
 				
 					/*if the expected type is an existing segment (undefined media type), this is the same resource*/
 					if (!obj_hint_type && gf_odm_find_segment(obj->odm, frag+1))
-						return 1;
+						return GF_TRUE;
 				}
 			}
 
 			while ( (ns = (GF_ClientService*)gf_list_enum(obj->odm->term->net_services, &j)) ) {
 				/*sub-service of an existing service - don't touch any fragment*/
 				if (gf_term_service_can_handle_url(ns, an_url->vals[i].url)) {
-					*keep_fragment = 1;
-					return 0;
+					*keep_fragment = GF_TRUE;
+					return GF_FALSE;
 				}
 			}
 		}
@@ -796,40 +827,40 @@
 	/*check on full URL without removing fragment IDs*/
 	if (include_sub_url) {
 		for (i=0; i<an_url->count; i++) {
-			if (an_url->vals[i].url && !stricmp(szURL1, an_url->vals[i].url)) return 1;
+			if (an_url->vals[i].url && !stricmp(szURL1, an_url->vals[i].url)) return GF_TRUE;
 		}
 		/*not same resource, we will have to check fragment as URL might point to a sub-service or single stream of a mux*/
-		if (keep_fragment) *keep_fragment = 1;
-		return 0;
+		if (keep_fragment) *keep_fragment = GF_TRUE;
+		return GF_FALSE;
 	}
 	ext = strrchr(szURL1, '#');
 	if (ext) ext[0] = 0;
 	for (i=0; i<an_url->count; i++) {
-		if (!an_url->vals[i].url) return 0;
+		if (!an_url->vals[i].url) return GF_FALSE;
 		strcpy(szURL2, an_url->vals[i].url);
 		ext = strrchr(szURL2, '#');
 		if (ext) ext[0] = 0;
-		if (!stricmp(szURL1, szURL2)) return 1;
+		if (!stricmp(szURL1, szURL2)) return GF_TRUE;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 GF_EXPORT
 Bool gf_mo_url_changed(GF_MediaObject *mo, MFURL *url)
 {
 	u32 od_id;
-	Bool ret = 0;
-	if (!mo) return (url ? 1 : 0);
+	Bool ret = GF_FALSE;
+	if (!mo) return (url ? GF_TRUE : GF_FALSE);
 	od_id = gf_mo_get_od_id(url);
 	if ( (mo->OD_ID == GF_MEDIA_EXTERNAL_ID) && (od_id == GF_MEDIA_EXTERNAL_ID)) {
 		ret = !gf_mo_is_same_url(mo, url, NULL, 0);
 	} else {
-		ret = (mo->OD_ID == od_id) ? 0 : 1;
+		ret = (mo->OD_ID == od_id) ? GF_FALSE : GF_TRUE;
 	}
 	/*special case for 3GPP text: if not playing and user node changed, force removing it*/
 	if (ret && mo->odm && !mo->num_open && (mo->type == GF_MEDIA_OBJECT_TEXT)) {
 		mo->flags |= GF_MO_DISPLAY_REMOVE;
-		gf_term_stop_codec(mo->odm->codec, 0);
+		gf_term_stop_codec(mo->odm->codec, GF_FALSE);
 	}
 	return ret;
 }
@@ -919,7 +950,7 @@
 	/*otherwise looping is only accepted if not sharing parent scene clock*/
 	ck = gf_odm_get_media_clock(mo->odm->parentscene->root_od);
 	if (gf_odm_shares_clock(mo->odm, ck)) {
-		in_loop = 0;
+		in_loop = GF_FALSE;
 #ifndef GPAC_DISABLE_VRML
 /*
 	if (ctrl && ctrl->stream->odm && ctrl->stream->odm->subscene)
@@ -944,30 +975,30 @@
 GF_EXPORT
 Bool gf_mo_should_deactivate(GF_MediaObject *mo)
 {
-	Bool res = 0;
+	Bool res = GF_FALSE;
 #ifndef GPAC_DISABLE_VRML
 	MediaControlStack *ctrl;
 #endif
 
-	if (!gf_odm_lock_mo(mo)) return 0;
+	if (!gf_odm_lock_mo(mo)) return GF_FALSE;
 	
 	if (!mo->odm->state) {
 		gf_odm_lock(mo->odm, 0);
-		return 0;
+		return GF_FALSE;
 	}
 
 #ifndef GPAC_DISABLE_VRML
 	/*get media control and see if object owning control is running*/
 	ctrl = gf_odm_get_mediacontrol(mo->odm);
-	if (!ctrl) res = 1;
+	if (!ctrl) res = GF_TRUE;
 	/*if ctrl and ctrl not ruling this mediaObject, deny deactivation*/
-	else if (ctrl->stream->odm != mo->odm) res = 0;
+	else if (ctrl->stream->odm != mo->odm) res = GF_FALSE;
 	/*this is currently under discussion in MPEG. for now we deny deactivation as soon as a mediaControl is here*/
-	else if (ctrl->stream->odm->state) res = 0;
+	else if (ctrl->stream->odm->state) res = GF_FALSE;
 	/*otherwise allow*/	
 	else 
 #endif
-		res = 1;
+		res = GF_TRUE;
 
 	gf_odm_lock(mo->odm, 0);
 	return res;
@@ -976,10 +1007,10 @@
 GF_EXPORT
 Bool gf_mo_is_muted(GF_MediaObject *mo)
 {
-	Bool res = 0;
+	Bool res = GF_FALSE;
 #ifndef GPAC_DISABLE_VRML
-	if (!gf_odm_lock_mo(mo)) return 0;
-	res = mo->odm->media_ctrl ? mo->odm->media_ctrl->control->mute : 0;
+	if (!gf_odm_lock_mo(mo)) return GF_FALSE;
+	res = mo->odm->media_ctrl ? mo->odm->media_ctrl->control->mute : GF_FALSE;
 	gf_odm_lock(mo->odm, 0);
 #endif
 	return res;
@@ -988,20 +1019,20 @@
 GF_EXPORT
 Bool gf_mo_is_done(GF_MediaObject *mo)
 {
-	Bool res = 0;
+	Bool res = GF_FALSE;
 	GF_Codec *codec;
 	u64 dur;
-	if (!gf_odm_lock_mo(mo)) return 0;
+	if (!gf_odm_lock_mo(mo)) return GF_FALSE;
 
 	if (mo->odm->codec && mo->odm->codec->CB) {
 		/*for natural media use composition buffer*/
-		res = (mo->odm->codec->CB->Status==CB_STOP) ? 1 : 0;
+		res = (mo->odm->codec->CB->Status==CB_STOP) ? GF_TRUE : GF_FALSE;
 	} else {
 		/*otherwise check EOS and time*/
 		codec = mo->odm->codec;
 		dur = mo->odm->duration;
 		if (!mo->odm->codec) {
-			if (!mo->odm->subscene) res = 0;
+			if (!mo->odm->subscene) res = GF_FALSE;
 			else {
 				codec = mo->odm->subscene->scene_codec;
 				dur = mo->odm->subscene->duration;
@@ -1010,7 +1041,7 @@
 		if (codec && (codec->Status==GF_ESM_CODEC_STOP)) {
 			/*codec is done, check by duration*/
 			GF_Clock *ck = gf_odm_get_media_clock(mo->odm);
-			if (gf_clock_time(ck) > dur) res = 1;
+			if (gf_clock_time(ck) > dur) res = GF_TRUE;
 		}
 	}
 	gf_odm_lock(mo->odm, 0);
@@ -1052,8 +1083,8 @@
 GF_EXPORT
 Bool gf_mo_is_private_media(GF_MediaObject *mo)
 {
-	if (mo->odm && mo->odm->codec && mo->odm->codec->decio && (mo->odm->codec->decio->InterfaceType==GF_PRIVATE_MEDIA_DECODER_INTERFACE)) return 1;
-	return 0;
+	if (mo->odm && mo->odm->codec && mo->odm->codec->decio && (mo->odm->codec->decio->InterfaceType==GF_PRIVATE_MEDIA_DECODER_INTERFACE)) return GF_TRUE;
+	return GF_FALSE;
 }
 
 GF_EXPORT
@@ -1061,12 +1092,12 @@
 {
 	GF_Err e;
 	GF_PrivateMediaDecoder *dec;
-	if (!mo->odm || !mo->odm->codec || !mo->odm->codec->decio || (mo->odm->codec->decio->InterfaceType!=GF_PRIVATE_MEDIA_DECODER_INTERFACE)) return 0;
+	if (!mo->odm || !mo->odm->codec || !mo->odm->codec->decio || (mo->odm->codec->decio->InterfaceType!=GF_PRIVATE_MEDIA_DECODER_INTERFACE)) return GF_FALSE;
 
 	dec = (GF_PrivateMediaDecoder*)mo->odm->codec->decio;
-	e = dec->Control(dec, 0, src, dst);
-	if (e==GF_BUFFER_TOO_SMALL) return 1;
-	return 0;
+	e = dec->Control(dec, GF_FALSE, src, dst);
+	if (e==GF_BUFFER_TOO_SMALL) return GF_TRUE;
+	return GF_FALSE;
 }
 
 GF_EXPORT
@@ -1085,7 +1116,7 @@
 	scene = mo->odm->parentscene;
 	sub_url = strchr(ns->url, '#');
 	for (i=0; i<gf_list_count(scene->resources); i++) {
-		GF_ObjectManager *odm = gf_list_get(scene->resources, i);
+		GF_ObjectManager *odm = (GF_ObjectManager *)gf_list_get(scene->resources, i);
 		if (odm->net_service != ns) continue;
 		if (!odm->mo) continue;
 
@@ -1112,3 +1143,112 @@
 	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)
+{
+    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);
+}
+
+GF_Err gf_mo_event_target_remove(GF_MediaObject *mo, GF_DOMEventTarget *target)
+{
+    if (!mo || !target) return GF_BAD_PARAM;
+    gf_list_del_item(mo->evt_targets, target);
+    return GF_OK;
+}
+
+GF_Err gf_mo_event_target_remove_by_index(GF_MediaObject *mo, u32 i)
+{
+    if (!mo) return GF_BAD_PARAM;
+    gf_list_rem(mo->evt_targets, i);
+    return GF_OK;
+}
+
+GF_Node *gf_mo_event_target_enum_node(GF_MediaObject *mo, u32 *i)
+{
+    GF_DOMEventTarget *target;
+    if (!mo || !i) return NULL;
+    target = (GF_DOMEventTarget *)gf_list_enum(mo->evt_targets, i);
+    if (!target) return NULL;
+    return (GF_Node *)target->ptr;
+}
+
+s32 gf_mo_event_target_find_by_node(GF_MediaObject *mo, GF_Node *node)
+{
+    u32 i, count;
+    count = gf_list_count(mo->evt_targets);
+    for (i = 0; i < count; i++) {
+        GF_DOMEventTarget *target = (GF_DOMEventTarget *)gf_list_get(mo->evt_targets, i);
+        if (target->ptr == node) {
+            return i;
+        }
+    }
+    return -1;
+}
+
+GF_EXPORT
+GF_Err gf_mo_event_target_remove_by_node(GF_MediaObject *mo, GF_Node *node)
+{
+    u32 i, count;
+    count = gf_list_count(mo->evt_targets);
+    for (i = 0; i < count; i++) {
+        GF_DOMEventTarget *target = (GF_DOMEventTarget *)gf_list_get(mo->evt_targets, i);
+        if (target->ptr == node) {
+            gf_list_del_item(mo->evt_targets, target);
+            return GF_OK;
+        }
+    }
+    return GF_BAD_PARAM;
+}
+
+GF_EXPORT
+GF_Node *gf_event_target_get_node(GF_DOMEventTarget *target)
+{
+    if (target && (target->ptr_type == GF_DOM_EVENT_NODE)) {
+        return (GF_Node *)target->ptr;
+    }
+    return NULL;
+}
+
+GF_EXPORT
+GF_DOMEventTarget *gf_mo_event_target_get(GF_MediaObject *mo, u32 i)
+{
+    GF_DOMEventTarget *target = (GF_DOMEventTarget *)gf_list_get(mo->evt_targets, i);
+    return target;
+}
+
+void gf_mo_event_target_reset(GF_MediaObject *mo)
+{
+    if (mo->evt_targets) gf_list_reset(mo->evt_targets);
+}
+
+u32 gf_mo_event_target_count(GF_MediaObject *mo)
+{
+    if (!mo) return 0;
+    return gf_list_count(mo->evt_targets);
+}
+
+void gf_mo_del(GF_MediaObject *mo)
+{
+    gf_list_del(mo->evt_targets);
+    gf_free(mo);
+}
+

gpac-0.5.0.svn4296.tar.bz2/src/terminal/media_sensor.c -> gpac-0.5.0.svn4668.tar.bz2/src/terminal/media_sensor.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/terminal/mpeg4_inline.c -> gpac-0.5.0.svn4668.tar.bz2/src/terminal/mpeg4_inline.c Changed

@@ -57,20 +57,20 @@
 	GF_Scene *parent;
 	GF_SceneGraph *graph = gf_node_get_graph((GF_Node *) root);
 	parent = (GF_Scene *)gf_sg_get_private(graph);
-	if (!parent) return 0;
+	if (!parent) return GF_FALSE;
 
-	mo = gf_scene_get_media_object_ex(parent, &root->url, GF_MEDIA_OBJECT_SCENE, 0, NULL, 0, (GF_Node*)root);
-	if (!mo || !mo->odm) return 0;
+	mo = gf_scene_get_media_object_ex(parent, &root->url, GF_MEDIA_OBJECT_SCENE, GF_FALSE, NULL, GF_FALSE, (GF_Node*)root);
+	if (!mo || !mo->odm) return GF_FALSE;
 
 	if (!mo->odm->subscene) {
 		gf_term_invalidate_compositor(parent->root_od->term);
-		return 0;
+		return GF_FALSE;
 	}
 	/*assign inline scene as private stack of inline node, and remember inline node for event propagation*/
 	gf_node_set_private((GF_Node *)root, mo->odm->subscene);
 	/*play*/
-	gf_mo_play(mo, 0, -1, 0);
-	return 1;
+	gf_mo_play(mo, 0, -1, GF_FALSE);
+	return GF_TRUE;
 }
 
 void gf_inline_on_modified(GF_Node *node)
@@ -86,18 +86,18 @@
 
 		/*disconnect current inline if we're the last one using it (same as regular OD session leave/join)*/
 		if (mo) {
-			Bool changed = 1;
+			Bool changed = GF_TRUE;
 			if (ODID != GF_MEDIA_EXTERNAL_ID) {
-				if (ODID && (ODID==scene->root_od->OD->objectDescriptorID)) changed = 0;
+				if (ODID && (ODID==scene->root_od->OD->objectDescriptorID)) changed = GF_FALSE;
 			} else {
-				if (gf_mo_is_same_url(mo, &pInline->url, NULL, 0) ) changed = 0;
+				if (gf_mo_is_same_url(mo, &pInline->url, NULL, 0) ) changed = GF_FALSE;
 			}
 			if (mo->num_open) {
 				if (!changed) return;
 
 				gf_scene_notify_event(scene, GF_EVENT_UNLOAD, node, NULL, GF_OK);
 				gf_node_dirty_parents(node);
-				gf_list_del_item(mo->nodes, node);
+				gf_mo_event_target_remove_by_node(mo, node);
 
 				/*reset the scene pointer as it may get destroyed*/
 				switch (gf_node_get_tag(node)) {
@@ -114,17 +114,16 @@
 					if (ODID == GF_MEDIA_EXTERNAL_ID) {
 						GF_Scene *parent = scene->root_od->parentscene;
 						/*!!! THIS WILL DESTROY THE INLINE SCENE OBJECT !!!*/
-						gf_odm_disconnect(scene->root_od, 1);
+						gf_odm_disconnect(scene->root_od, GF_TRUE);
 						/*and force removal of the media object*/
 						if (parent) {
 							if (gf_list_del_item(parent->scene_objects, mo)>=0) {
 								gf_sg_vrml_mf_reset(&mo->URLs, GF_SG_VRML_MFURL);
-								gf_list_del(mo->nodes);
-								gf_free(mo);
+								gf_mo_del(mo);
 							}
 						}
 					} else {
-						gf_term_lock_media_queue(scene->root_od->term, 1);
+						gf_term_lock_media_queue(scene->root_od->term, GF_TRUE);
 						
 						/*external media are completely unloaded*/
 						if (scene->root_od->OD->objectDescriptorID==GF_MEDIA_EXTERNAL_ID) {
@@ -135,7 +134,7 @@
 						if (gf_list_find(scene->root_od->term->media_queue, scene->root_od)<0)
 							gf_list_add(scene->root_od->term->media_queue, scene->root_od);
 
-						gf_term_lock_media_queue(scene->root_od->term, 0);
+						gf_term_lock_media_queue(scene->root_od->term, GF_FALSE);
 					}
 				}
 			}
@@ -220,9 +219,9 @@
 		safely restart an inline scene*/
 
 		/*1- stop main object from playing but don't disconnect channels*/
-		gf_odm_stop(scene->root_od, 1);
+		gf_odm_stop(scene->root_od, GF_TRUE);
 		/*2- close all ODs inside the scene and reset the graph*/
-		gf_scene_disconnect(scene, 0);
+		gf_scene_disconnect(scene, GF_FALSE);
 		if (scene->root_od->media_ctrl) scene->root_od->media_ctrl->current_seg = current_seg;
 		/*3- restart the scene*/
 		gf_odm_start(scene->root_od, 0);
@@ -241,13 +240,13 @@
 
 		gf_scene_notify_event(scene, GF_EVENT_UNLOAD, n, NULL, GF_OK);
 		if (!mo) return;
-		gf_list_del_item(mo->nodes, n);
+		gf_mo_event_target_remove_by_node(mo, n);
 
 		/*disconnect current inline if we're the last one using it (same as regular OD session leave/join)*/
 		if (mo->num_open) {
 			mo->num_open --;
 			if (!mo->num_open) {
-				gf_term_lock_media_queue(scene->root_od->term, 1);
+				gf_term_lock_media_queue(scene->root_od->term, GF_TRUE);
 
 				/*this is unspecified in the spec: whenever an inline not using the 
 				OD framework is destroyed, destroy the associated resource*/
@@ -257,9 +256,8 @@
 					GF_Scene *parent_scene = (GF_Scene *)gf_sg_get_private(gf_node_get_graph((GF_Node *) n) );
 					if (gf_list_del_item(parent_scene->scene_objects, mo)>=0) {
 						gf_sg_vrml_mf_reset(&mo->URLs, GF_SG_VRML_MFURL);
-						gf_list_del(mo->nodes);
 						if (mo->odm) mo->odm->mo = NULL;
-						gf_free(mo);
+						gf_mo_del(mo);
 					}
 					scene->root_od->action_type = GF_ODM_ACTION_DELETE;
 					gf_list_add(scene->root_od->term->media_queue, scene->root_od);
@@ -267,7 +265,7 @@
 					scene->root_od->action_type = GF_ODM_ACTION_SCENE_DISCONNECT;
 					gf_list_add(scene->root_od->term->media_queue, scene->root_od);
 				}
-				gf_term_lock_media_queue(scene->root_od->term, 0);
+				gf_term_lock_media_queue(scene->root_od->term, GF_FALSE);
 			}
 		}
 		return;
@@ -285,7 +283,7 @@
 				if (!inl->url.vals[0].OD_ID && (!inl->url.vals[0].url || !strlen(inl->url.vals[0].url) ) ) {
 					gf_sg_vrml_mf_reset(&inl->url, GF_SG_VRML_MFURL);
 				} else {
-					gf_node_dirty_set(n, 0, 1);
+					gf_node_dirty_set(n, 0, GF_TRUE);
 				}
 			}
 			return;
@@ -304,19 +302,19 @@
 		}
 
 		scene->needs_restart = 0;
-		gf_term_lock_media_queue(scene->root_od->term, 1);
+		gf_term_lock_media_queue(scene->root_od->term, GF_TRUE);
 		scene->root_od->action_type = GF_ODM_ACTION_SCENE_INLINE_RESTART;
 		gf_list_add(scene->root_od->term->media_queue, scene->root_od);
-		gf_term_lock_media_queue(scene->root_od->term, 0);
+		gf_term_lock_media_queue(scene->root_od->term, GF_FALSE);
 
-		gf_node_dirty_set(n, 0, 1);
+		gf_node_dirty_set(n, 0, GF_TRUE);
 		return;
 	} 
 	
 	/*if not attached return (attaching the graph cannot be done in render since render is not called while unattached :) */
 	if (!scene->graph_attached) {
 		/*just like protos, we must invalidate parent graph until attached*/
-		gf_node_dirty_set(n, 0, 1);
+		gf_node_dirty_set(n, 0, GF_TRUE);
 		return;
 	}
 	/*clear dirty flags for any sub-inlines, bitmaps or protos*/
@@ -334,12 +332,12 @@
 	u32 i;
 	for (i=0; i<url->count; i++) {
 		if (!url->vals[i].url) continue;
-		if (strstr(url->vals[i].url, "urn:inet:gpac:builtin")) return 1;
+		if (strstr(url->vals[i].url, "urn:inet:gpac:builtin")) return GF_TRUE;
 
 		if (gf_sc_uri_is_hardcoded_proto(term->compositor, url->vals[i].url)) 
-			return 1;
+			return GF_TRUE;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 GF_SceneGraph *gf_inline_get_proto_lib(void *_is, MFURL *lib_url)
@@ -380,8 +378,8 @@
 				/*check the url path is the same*/
 				url1 = gf_url_concatenate(pl->mo->odm->net_service->url, lib_url->vals[0].url);
 				url2 = gf_url_concatenate(scene->root_od->net_service->url, lib_url->vals[0].url);
-				ok = 0;
-				if (url1 && url2 && !strcmp(url1, url2)) ok=1;
+				ok = GF_FALSE;
+				if (url1 && url2 && !strcmp(url1, url2)) ok=GF_TRUE;
 				if (url1) gf_free(url1);
 				if (url2) gf_free(url2);
 				if (!ok) continue;
@@ -408,9 +406,9 @@
 	pl = (GF_ProtoLink*)gf_malloc(sizeof(GF_ProtoLink));
 	pl->url = lib_url;
 	gf_list_add(scene->extern_protos, pl);
-	pl->mo = gf_scene_get_media_object(scene, lib_url, GF_MEDIA_OBJECT_SCENE, 0);
+	pl->mo = gf_scene_get_media_object(scene, lib_url, GF_MEDIA_OBJECT_SCENE, GF_FALSE);
 	/*this may already be destroyed*/
-	if (pl->mo) gf_mo_play(pl->mo, 0, -1, 0);
+	if (pl->mo) gf_mo_play(pl->mo, 0, -1, GF_FALSE);
 
 	/*and return NULL*/
 	return NULL;
@@ -422,9 +420,9 @@
 	GF_ProtoLink *pl;
 	i=0;
 	while ((pl = (GF_ProtoLink*)gf_list_enum(scene->extern_protos, &i))) {
-		if (pl->mo->odm == odm) return 1;
+		if (pl->mo->odm == odm) return GF_TRUE;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 GF_EXPORT
@@ -433,10 +431,10 @@
 	const char *nname, *seg_name;
 	GF_SceneGraph *sg = gf_node_get_graph(node);
 	GF_Scene *scene = sg ? (GF_Scene *) gf_sg_get_private(sg) : NULL;
-	if (!scene) return 0;
+	if (!scene) return GF_FALSE;
 
 	nname = gf_node_get_name(node);
-	if (!nname) return 0;
+	if (!nname) return GF_FALSE;
 
 	/*check any viewpoint*/
 	seg_name = strrchr(scene->root_od->net_service->url, '#');
@@ -448,12 +446,12 @@
 	} else if (!seg_name && scene->root_od->mo && scene->root_od->mo->URLs.count && scene->root_od->mo->URLs.vals[0].url) {
 		seg_name = strrchr(scene->root_od->mo->URLs.vals[0].url, '#');
 	}
-	if (!seg_name) return 0;
+	if (!seg_name) return GF_FALSE;
 	seg_name += 1;
 	/*look for a media segment with this name - if none found, this is a viewpoint name*/
-	if (gf_odm_find_segment(scene->root_od, (char *) seg_name) != NULL) return 0;
+	if (gf_odm_find_segment(scene->root_od, (char *) seg_name) != NULL) return GF_FALSE;
 
-	return (!strcmp(nname, seg_name));
+	return (!strcmp(nname, seg_name) ? GF_TRUE : GF_FALSE);
 }
 
 
@@ -473,17 +471,19 @@
 {
 	GF_Scene *scene;
 	char *szPath;
-	u8 hash[20], name[50];
-	u32 i, len;
+	u8 hash[20];
+	char name[50];
+	u32 i;
+	size_t len;
 
 	scene = (GF_Scene *)gf_node_get_private((GF_Node*)storage);
 
 	len = strlen(scene->root_od->net_service->url)+strlen(storage->name.buffer)+2;
-	szPath = gf_malloc(sizeof(char)* len);
+	szPath = (char *)gf_malloc(sizeof(char)* len);
 	strcpy(szPath, scene->root_od->net_service->url);
 	strcat(szPath, "@");
 	strcat(szPath, storage->name.buffer);
-	gf_sha1_csum(szPath, strlen(szPath), hash);
+	gf_sha1_csum((u8*)szPath, (u32) strlen(szPath), hash);
 	gf_free(szPath);
 
 	strcpy(name, "@cache=");
@@ -579,7 +579,7 @@
 			void *slot;
 			gf_sg_vrml_mf_reset(info.far_ptr, info.fieldType);
 			while (1) {
-				val = strchr(opt, '\'');
+				val = (char *)strchr(opt, '\'');
 				sep = val ? strchr(val+1, '\'') : NULL;
 				if (!val || !sep) break;
 
@@ -629,7 +629,7 @@
 void gf_storage_save(M_Storage *storage)
 {
 	char szID[20];
-	u32 i;
+	u32 i, j;
 	GF_Config *cfg = storage_get_cfg(storage);
 	char *section = storage_get_section(storage);
 	if (!cfg || !section) return;
@@ -662,14 +662,14 @@
 			char *slotval;
 			void *slot;
 			val = NULL;
-			for (i=0; i<((GenMFField *)info.far_ptr)->count; i++) {
-				if (gf_sg_vrml_mf_get_item(info.far_ptr, info.fieldType, &slot, i) != GF_OK) break;
+			for (j=0; j<((GenMFField *)info.far_ptr)->count; j++) {
+				if (gf_sg_vrml_mf_get_item(info.far_ptr, info.fieldType, &slot, j) != GF_OK) break;
 				slotval = storage_serialize_sf(info.far_ptr, info.fieldType);
 				if (!slotval) break;
 				if (val) {
-					val = gf_realloc(val, strlen(val) + 3 + strlen(slot));
+					val = (char *)gf_realloc(val, strlen(val) + 3 + strlen((const char *)slot));
 				} else {
-					val = gf_malloc(3 + strlen(slot));
+					val = (char *)gf_malloc(3 + strlen((const char *)slot));
 					val[0] = 0;
 				}
 				strcat(val, "'");
@@ -690,7 +690,7 @@
 static void gf_storage_traverse(GF_Node *n, void *rs, Bool is_destroy)
 {
 	if (is_destroy) {
-		GF_Scene *scene = gf_node_get_private(n);
+		GF_Scene *scene = (GF_Scene *)gf_node_get_private(n);
 		GF_ClientService *net_service = scene->root_od->net_service;
 		while (scene->root_od->parentscene) { 
 			if (scene->root_od->parentscene->root_od->net_service != net_service)
@@ -739,13 +739,13 @@
 {
 #ifndef GPAC_DISABLE_VRML
 	u32 i, count;
-	GF_Scene *scene = gf_sg_get_private(sg);
+	GF_Scene *scene = (GF_Scene *)gf_sg_get_private(sg);
 	if (!scene) return NULL;
-	if (!sensor) return gf_list_get(scene->keynavigators, 0);
+	if (!sensor) return (GF_Node *)gf_list_get(scene->keynavigators, 0);
 
 	count = gf_list_count(scene->keynavigators);
 	for (i=0; i<count; i++) {
-		M_KeyNavigator *kn = gf_list_get(scene->keynavigators, i);
+		M_KeyNavigator *kn = (M_KeyNavigator *)gf_list_get(scene->keynavigators, i);
 		if (kn->sensor==sensor) return (GF_Node *) kn;
 	}
 #endif

gpac-0.5.0.svn4296.tar.bz2/src/terminal/network_service.c -> gpac-0.5.0.svn4668.tar.bz2/src/terminal/network_service.c Changed

@@ -488,6 +488,8 @@
 				if (ch->service != service) continue;
 				if (ch->es_state != GF_ESM_ES_RUNNING) 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) {
@@ -529,28 +531,45 @@
 		return;
 	/*time mapping (TS to media-time)*/
 	case GF_NET_CHAN_MAP_TIME:
-		ch->seed_ts = com->map_time.timestamp;
-		ch->ts_offset = (u32) (com->map_time.media_time*1000);
-		GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d: mapping TS "LLD" to media time %f - current time %d\n", ch->esd->ESID, com->map_time.timestamp, com->map_time.media_time, gf_clock_time(ch->clock)));
 
-		if (com->map_time.reset_buffers) {
-			gf_es_reset_buffers(ch);
-		}
-		/*if we were reassembling an AU, do not perform clock init check when dispatching it since we computed its timestamps 
-		according to the previous clock origin*/
-		else {
-			gf_mx_p(ch->mx);
-			ch->skip_time_check_for_pending = 1;
-			gf_mx_v(ch->mx);
-		}
-		/*if the channel is the clock, force a re-init*/
-		if (gf_es_owns_clock(ch)) {
-			ch->IsClockInit = 0;
-			gf_clock_reset(ch->clock);
-		}
-		else if (ch->odm->flags & GF_ODM_INHERIT_TIMELINE) {
-			ch->IsClockInit = 0;
-//			ch->ts_offset -= ch->seed_ts*1000/ch->ts_res;
+		if (ch->esd->dependsOnESID) {
+			//ignore everything
+		} else {
+			u32 i;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d: before mapping: seed TS %d - TS offset %d\n", ch->esd->ESID, ch->seed_ts, ch->ts_offset));
+			ch->seed_ts = com->map_time.timestamp;
+			ch->ts_offset = (u32) (com->map_time.media_time*1000);
+			GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d: mapping TS "LLD" to media time %f - current time %d\n", ch->esd->ESID, com->map_time.timestamp, com->map_time.media_time, gf_clock_time(ch->clock)));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d: after mapping: seed TS %d - TS offset %d\n", ch->esd->ESID, ch->seed_ts, ch->ts_offset));
+
+			if (com->map_time.reset_buffers) {
+				gf_es_reset_buffers(ch);
+			}
+			/*if we were reassembling an AU, do not perform clock init check when dispatching it since we computed its timestamps 
+			according to the previous clock origin*/
+			else {
+				gf_mx_p(ch->mx);
+				ch->skip_time_check_for_pending = 1;
+				gf_mx_v(ch->mx);
+			}
+			/*if the channel is the clock, force a re-init*/
+			if (gf_es_owns_clock(ch)) {
+				ch->IsClockInit = 0;
+				gf_clock_reset(ch->clock);
+			}
+			else if (ch->odm->flags & GF_ODM_INHERIT_TIMELINE) {
+				ch->IsClockInit = 0;
+//				ch->ts_offset -= ch->seed_ts*1000/ch->ts_res;
+			}
+
+			for (i=0; i<gf_list_count(ch->odm->channels); i++) {
+				GF_Channel *a_ch = gf_list_get(ch->odm->channels, i);
+				if (ch==a_ch) continue;
+				if (! a_ch->esd->dependsOnESID) continue;
+				a_ch->seed_ts = ch->seed_ts;
+				a_ch->IsClockInit = 0;
+				a_ch->ts_offset = ch->ts_offset;
+			}
 		}
 		break;
 	/*duration changed*/
@@ -577,6 +596,9 @@
 		com->cache_esd.is_iod_stream = (ch->odm->subscene /*&& (ch->odm->subscene->root_od==ch->odm)*/) ? 1 : 0;
 		gf_term_lock_net(term, 0);
 		return;
+	case GF_NET_CHAN_RESET:
+		gf_es_reset_buffers(ch);
+		break;
 	default:
 		return;
 	}
@@ -1208,7 +1230,7 @@
 	char *buf;
 	if (!ifce || !mimeType || !extList || !description) return;
 
-	len = strlen(extList) + 3 + strlen(description) + 3 + strlen(ifce->module_name) + 1;
+	len = (u32) strlen(extList) + 3 + (u32) strlen(description) + 3 + (u32) strlen(ifce->module_name) + 1;
 	buf = (char*)gf_malloc(sizeof(char)*len);
 	sprintf(buf, "\"%s\" ", extList);
 	strlwr(buf);

gpac-0.5.0.svn4296.tar.bz2/src/terminal/object_browser.c -> gpac-0.5.0.svn4668.tar.bz2/src/terminal/object_browser.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/terminal/object_manager.c -> gpac-0.5.0.svn4668.tar.bz2/src/terminal/object_manager.c Changed

@@ -64,10 +64,10 @@
 #endif
 
 	/*make sure we are not in the media queue*/
-	gf_term_lock_media_queue(odm->term, 1);
+	gf_term_lock_media_queue(odm->term, GF_TRUE);
 	gf_list_del_item(odm->term->media_queue, odm);
 	gf_term_check_connections_for_delete(odm->term, odm);
-	gf_term_lock_media_queue(odm->term, 0);
+	gf_term_lock_media_queue(odm->term, GF_FALSE);
 
 	/*detach media object as referenced by the scene - this should ensures that any attempt to lock the ODM from the 
 	compositor will fail as the media object is no longer linked to object manager*/
@@ -119,11 +119,11 @@
 
 Bool gf_odm_lock_mo(GF_MediaObject *mo)
 {
-	if (!mo || !mo->odm) return 0;
+	if (!mo || !mo->odm) return GF_FALSE;
 	gf_odm_lock(mo->odm, 1);
 	/*the ODM may have been destroyed here !!*/
-	if (!mo->odm) return 0;
-	return 1;
+	if (!mo->odm) return GF_FALSE;
+	return GF_TRUE;
 }
 
 GF_EXPORT
@@ -137,7 +137,7 @@
 		odm->flags |= GF_ODM_DESTROYED;
 		gf_mx_v(odm->term->net_mx);
 	}
-	gf_odm_stop(odm, 1);
+	gf_odm_stop(odm, GF_TRUE);
 
 	/*disconnect sub-scene*/
 	if (odm->subscene) gf_scene_disconnect(odm->subscene, do_remove);
@@ -153,9 +153,9 @@
 			u32 i, count;
 			// Remove all Registered InputSensor nodes -> shut down the InputSensor threads -> prevent illegal access on deleted pointers
 			GF_MediaObject *obj = odm->mo;
-			count = gf_list_count(obj->nodes);
+			count = gf_mo_event_target_count(obj);
 			for (i=0; i<count; i++) {
-				GF_Node *n = (GF_Node *)gf_list_get(obj->nodes, i);
+				GF_Node *n = (GF_Node *)gf_event_target_get_node(gf_mo_event_target_get(obj, i));
 				switch (gf_node_get_tag(n)) {
 #ifndef GPAC_DISABLE_VRML
 				case TAG_MPEG4_InputSensor:
@@ -221,13 +221,13 @@
 					/*if the new root is not playing or assoicated with the scene, force a destroy on it - this
 					is needed for services declaring their objects dynamically*/
 					if (!new_root->mo || (!new_root->mo->num_open)) {
-						gf_term_lock_media_queue(odm->term, 1);
+						gf_term_lock_media_queue(odm->term, GF_TRUE);
 						new_root->action_type = GF_ODM_ACTION_DELETE;
 						if (gf_list_find(odm->term->media_queue, new_root)<0) {
 							assert(! (new_root->flags & GF_ODM_DESTROYED));
 							gf_list_add(odm->term->media_queue, new_root);
 						}
-						gf_term_lock_media_queue(odm->term, 0);
+						gf_term_lock_media_queue(odm->term, GF_FALSE);
 					}
 					ns->owner = new_root;
 					break;
@@ -248,14 +248,14 @@
 	if (odm->parentscene) {
 		GF_Event evt;
 		evt.type = GF_EVENT_CONNECT;
-		evt.connect.is_connected = 0;
-		gf_term_forward_event(odm->term, &evt, 0, 1);
+		evt.connect.is_connected = GF_FALSE;
+		gf_term_forward_event(odm->term, &evt, GF_FALSE, GF_TRUE);
 
-		gf_term_lock_net(term, 1);
+		gf_term_lock_net(term, GF_TRUE);
 		gf_scene_remove_object(odm->parentscene, odm, do_remove);
 		if (odm->subscene) gf_scene_del(odm->subscene);
 		gf_odm_del(odm);
-		gf_term_lock_net(term, 0);
+		gf_term_lock_net(term, GF_FALSE);
 		return;
 	}
 	
@@ -268,15 +268,15 @@
 		odm->term->root_scene = NULL;
 
 		evt.type = GF_EVENT_CONNECT;
-		evt.connect.is_connected = 0;
+		evt.connect.is_connected = GF_FALSE;
 		gf_term_send_event(odm->term, &evt);
 	}
 
-	gf_term_lock_net(term, 1);
+	gf_term_lock_net(term, GF_TRUE);
 	/*delete the ODMan*/
 	gf_odm_del(odm);
 
-	gf_term_lock_net(term, 0);
+	gf_term_lock_net(term, GF_FALSE);
 }
 
 /*setup service for OD (extract IOD and go)*/
@@ -324,7 +324,7 @@
 		}
 		gf_odf_desc_del((GF_Descriptor *) odm->OD);
 		odm->OD=NULL;
-		odm->subscene->is_dynamic_scene = 0;
+		odm->subscene->is_dynamic_scene = GF_FALSE;
 	}
 
 	if (!desc) {
@@ -401,7 +401,7 @@
 	if (!odm->parentscene) {
 		GF_Event evt;
 		evt.type = GF_EVENT_CONNECT;
-		evt.connect.is_connected = 0;
+		evt.connect.is_connected = GF_FALSE;
 		gf_term_send_event(odm->term, &evt);
 	}
 	if (redirect_url)
@@ -602,12 +602,12 @@
 	GF_ESD *esd;
 	GF_MediaObject *syncRef;
 
-	gf_term_lock_net(odm->term, 1);
+	gf_term_lock_net(odm->term, GF_TRUE);
 
 	if (!odm->net_service) {
 		if (odm->flags & GF_ODM_DESTROYED) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ODM%d] Object has been scheduled for destruction - ignoring object setup\n", odm->OD->objectDescriptorID));
-			gf_term_lock_net(odm->term, 0);
+			gf_term_lock_net(odm->term, GF_FALSE);
 			return;
 		}
 		odm->net_service = serv;
@@ -644,7 +644,7 @@
 
 		gf_term_post_connect_object(odm->term, odm, url, parent_url);
 		gf_free(url);
-		gf_term_lock_net(odm->term, 0);
+		gf_term_lock_net(odm->term, GF_FALSE);
 		return;
 	}
 	/*restore OD ID */
@@ -662,13 +662,13 @@
 	if (e) {
 		GF_Terminal *term = odm->term;
 		gf_term_message(term, odm->net_service->url, "MPEG-4 Service Error", e);
-		gf_odm_disconnect(odm, 1);
-		gf_term_lock_net(term, 0);
+		gf_odm_disconnect(odm, GF_TRUE);
+		gf_term_lock_net(term, GF_FALSE);
 		return;
 	}
 
 	if (odm->mo && (odm->mo->type == GF_MEDIA_OBJECT_UPDATES)) {
-		hasInline = 0;
+		hasInline = GF_TRUE;
 	}
 
 	if (odm->net_service->owner &&  (odm->net_service->owner->flags & GF_ODM_INHERIT_TIMELINE)) {
@@ -691,7 +691,7 @@
 	if (!gf_list_count(odm->OD->ESDescriptors) && odm->subscene) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] No streams in object - taking over scene graph generation\n",odm->OD->objectDescriptorID));
 		assert(odm->subscene->root_od==odm);
-		odm->subscene->is_dynamic_scene = 1;
+		odm->subscene->is_dynamic_scene = GF_TRUE;
 	} else {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] Setting up object streams\n"));
 		/*avoid channels PLAY request when confirming connection (sync network service)*/
@@ -720,33 +720,33 @@
 		/*setup node decoder*/
 		if (odm->mo && odm->codec && odm->codec->decio && (odm->codec->decio->InterfaceType==GF_NODE_DECODER_INTERFACE) ) {
 			GF_NodeDecoder *ndec = (GF_NodeDecoder *) odm->codec->decio;
-			GF_Node *n = gf_list_get(odm->mo->nodes, 0);
+			GF_Node *n = gf_event_target_get_node(gf_mo_event_target_get(odm->mo, 0));
 			if (n) ndec->AttachNode(ndec, n);
 
 			/*not clear in the spec how the streams attached to AFC are started - default to "right now"*/
 			gf_odm_start(odm, 0);
 		}
 
-		gf_term_lock_net(odm->term, 0);
+		gf_term_lock_net(odm->term, GF_FALSE);
 
 		evt.type = GF_EVENT_CONNECT;
-		evt.connect.is_connected = 1;
-		gf_term_forward_event(odm->term, &evt, 0, 1);
+		evt.connect.is_connected = GF_TRUE;
+		gf_term_forward_event(odm->term, &evt, GF_FALSE, GF_TRUE);
 
-		gf_term_lock_net(odm->term, 1);
+		gf_term_lock_net(odm->term, GF_TRUE);
 	} else {
 		/*othewise send a connect ack for top level*/
 		GF_Event evt;
 
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM] Root object connected !\n", odm->net_service->url));
 		
-		gf_term_lock_net(odm->term, 0);
+		gf_term_lock_net(odm->term, GF_FALSE);
 
 		evt.type = GF_EVENT_CONNECT;
-		evt.connect.is_connected = 1;
+		evt.connect.is_connected = GF_TRUE;
 		gf_term_send_event(odm->term, &evt);
 
-		gf_term_lock_net(odm->term, 1);
+		gf_term_lock_net(odm->term, GF_TRUE);
 	}
 
 
@@ -767,14 +767,14 @@
 	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)) {
-		Bool force_play = 0;
+		Bool force_play = GF_FALSE;
 		if (odm->state==GF_ODM_STATE_STOP) {
 			odm->flags |= GF_ODM_PREFETCH;
-			force_play = 1;
+			force_play = GF_TRUE;
 		}
 		/*the object could have been queued for play when setting up the scene object. If so, remove from queue and start right away*/
 		else if ((odm->state==GF_ODM_STATE_PLAY) && (gf_list_del_item(odm->term->media_queue, odm)>=0) ) {
-			force_play = 1;
+			force_play = GF_TRUE;
 		}
 		if (force_play) {
 			odm->flags |= GF_ODM_INITIAL_BROADCAST_PLAY;
@@ -794,16 +794,16 @@
 			odm->OD_PL = 0;
 		}
 		if (odm->parentscene==odm->term->root_scene) {
-			gf_term_lock_net(odm->term, 0);
+			gf_term_lock_net(odm->term, GF_FALSE);
 
 			evt.type = GF_EVENT_STREAMLIST;
 			gf_term_send_event(odm->term,&evt);
 	
-			gf_term_lock_net(odm->term, 1);
+			gf_term_lock_net(odm->term, GF_TRUE);
 		}
 	}
 
-	gf_term_lock_net(odm->term, 0);
+	gf_term_lock_net(odm->term, GF_FALSE);
 }

gpac-0.5.0.svn4296.tar.bz2/src/terminal/scene.c -> gpac-0.5.0.svn4668.tar.bz2/src/terminal/scene.c Changed

@@ -161,8 +161,7 @@
 		if (obj->odm) obj->odm->mo = NULL;
 		gf_list_rem(scene->scene_objects, 0);
 		gf_sg_vrml_mf_reset(&obj->URLs, GF_SG_VRML_MFURL);
-		gf_list_del(obj->nodes);
-		gf_free(obj);
+		gf_mo_del(obj);
 	}
 	gf_list_del(scene->scene_objects);
 #ifndef GPAC_DISABLE_VRML
@@ -203,14 +202,14 @@
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Scene] disconnecting\n"));
 
-	gf_term_lock_compositor(scene->root_od->term, 1);
+	gf_term_lock_compositor(scene->root_od->term, GF_TRUE);
 		
 	/*force unregistering of inline nodes (for safety)*/
 	if (for_shutdown && scene->root_od->mo) {
 		/*reset private stack of all inline nodes still registered*/
-		while (gf_list_count(scene->root_od->mo->nodes)) {
-			GF_Node *n = (GF_Node *)gf_list_get(scene->root_od->mo->nodes, 0);
-			gf_list_rem(scene->root_od->mo->nodes, 0);
+		while (gf_mo_event_target_count(scene->root_od->mo)) {
+			GF_Node *n = (GF_Node *)gf_event_target_get_node(gf_mo_event_target_get(scene->root_od->mo, 0));
+			gf_mo_event_target_remove_by_index(scene->root_od->mo, 0);
 #ifndef GPAC_DISABLE_VRML
 			switch (gf_node_get_tag(n)) {
 			case TAG_MPEG4_Inline:
@@ -231,8 +230,8 @@
 		while ((odm = (GF_ObjectManager *)gf_list_enum(scene->resources, &i))) {
 			if (for_shutdown && odm->mo) {
 				obj = odm->mo;
-				while (gf_list_count(obj->nodes)) {
-					GF_Node *n = (GF_Node *)gf_list_get(obj->nodes, 0);
+				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:
 							{
@@ -242,7 +241,7 @@
 								break;
 							}
 					}
-					gf_list_rem(obj->nodes, 0);
+					gf_mo_event_target_remove_by_index(obj, 0);
 				}	
 			}
 		}
@@ -252,12 +251,12 @@
 	/*remove all associated eventTargets*/
 	i=0;
 	while ((obj = (GF_MediaObject *)gf_list_enum(scene->scene_objects, &i))) {
-		if (obj->nodes) gf_list_reset(obj->nodes);
+		gf_mo_event_target_reset(obj);
 	}
 
 #ifndef GPAC_DISABLE_VRML
 	while (gf_list_count(scene->storages)) {
-		M_Storage *storage = gf_list_get(scene->storages, 0);
+		M_Storage *storage = (M_Storage *)gf_list_get(scene->storages, 0);
 		gf_list_rem(scene->storages, 0);
 		if (storage->_auto) gf_storage_save(storage);
 	}
@@ -275,7 +274,7 @@
 	
 
 	/*reset statc ressource flag since we destroyed scene objects*/
-	scene->static_media_ressources = 0;
+	scene->static_media_ressources = GF_FALSE;
 
 
 	/*disconnect and kill all objects*/
@@ -283,13 +282,13 @@
 		i=0;
 		/*stop all objects but DON'T DESTROY THEM*/
 		while ((odm = (GF_ObjectManager *)gf_list_enum(scene->resources, &i))) {
-			if (odm->state) gf_odm_disconnect(odm, 0);
+			if (odm->state) gf_odm_disconnect(odm, GF_FALSE);
 		}
 		/*reset all stream associations*/
 		i=0;
 		while ((obj = (GF_MediaObject*)gf_list_enum(scene->scene_objects, &i))) {
 			gf_sg_vrml_mf_reset(&obj->URLs, GF_SG_VRML_MFURL);
-			gf_list_reset(obj->nodes);
+			gf_mo_event_target_reset(obj);
 		}
 	} else {
 		while (gf_list_count(scene->resources)) {
@@ -311,10 +310,9 @@
 		gf_list_rem(scene->scene_objects, 0);
 		if (obj->odm) obj->odm->mo = NULL;
 		gf_sg_vrml_mf_reset(&obj->URLs, GF_SG_VRML_MFURL);
-		gf_list_del(obj->nodes);
-		gf_free(obj);
+		gf_mo_del(obj);
 	}
-	gf_term_lock_compositor(scene->root_od->term, 0);
+	gf_term_lock_compositor(scene->root_od->term, GF_FALSE);
 }
 
 static void gf_scene_insert_object(GF_Scene *scene, GF_MediaObject *mo, Bool lock_timelines, GF_MediaObject *sync_ref, Bool keep_fragment, GF_Scene *original_parent_scene)
@@ -334,7 +332,7 @@
 	odm->parentscene = scene;
 	odm->term = scene->root_od->term;
 	root_od = scene->root_od;
-	if (scene->force_single_timeline) lock_timelines = 1;
+	if (scene->force_single_timeline) lock_timelines = GF_TRUE;
 
 	url = mo->URLs.vals[0].url;
 	if (url) {
@@ -402,7 +400,7 @@
 	mo->URLs.vals[mo->URLs.count-1].url = NULL;
 	mo->URLs.count-=1;
 	/*FIXME - we should re-ananlyse whether the fragment is important or not ...*/
-	gf_scene_insert_object(scene, mo, 0, NULL, 0, NULL);
+	gf_scene_insert_object(scene, mo, GF_FALSE, NULL, GF_FALSE, NULL);
 }
 
 
@@ -411,9 +409,9 @@
 	u32 i;
 	GF_MediaObject *obj;
 
-	gf_term_lock_net(odm->term, 1);
+	gf_term_lock_net(odm->term, GF_TRUE);
 	gf_list_del_item(scene->resources, odm);
-	gf_term_lock_net(odm->term, 0);
+	gf_term_lock_net(odm->term, GF_FALSE);
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Scene] removing ODM %d\n", odm->OD ? odm->OD->objectDescriptorID : GF_MEDIA_EXTERNAL_ID));
 
@@ -428,7 +426,7 @@
 			/*dynamic OD*/
 			(obj->URLs.count && odm->OD && odm->OD->URLString && !stricmp(obj->URLs.vals[0].url, odm->OD->URLString)) 
 		) {
-			Bool discard_obj = 0;
+			u32 discard_obj = 0;
 			gf_odm_lock(odm, 1);
 			obj->flags = 0;
 			if (obj->odm) obj->odm->mo = NULL;
@@ -468,9 +466,9 @@
 			
 			/*reset private stack of all inline nodes still registered*/
 			if (discard_obj) {
-				while (gf_list_count(obj->nodes)) {
-					GF_Node *n = (GF_Node *)gf_list_get(obj->nodes, 0);
-					gf_list_rem(obj->nodes, 0);
+				while (gf_mo_event_target_count(obj)) {
+					GF_Node *n = (GF_Node *)gf_event_target_get_node(gf_mo_event_target_get(obj, 0));
+					gf_mo_event_target_remove_by_index(obj, 0);
 #ifndef GPAC_DISABLE_VRML
 					switch (gf_node_get_tag(n)) {
 					case TAG_MPEG4_Inline:
@@ -487,8 +485,7 @@
 			if ((discard_obj==1) && !obj->num_open) {
 				gf_list_rem(scene->scene_objects, i-1);
 				gf_sg_vrml_mf_reset(&obj->URLs, GF_SG_VRML_MFURL);
-				gf_list_del(obj->nodes);
-				gf_free(obj);
+				gf_mo_del(obj);
 			}
 			return;
 		}
@@ -589,9 +586,9 @@
 	} else {
 		if (root) gf_dom_event_fire(root, event);
 	
-		count=scene->root_od->mo ? gf_list_count(scene->root_od->mo->nodes) : 0;
+		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_list_get(scene->root_od->mo->nodes, i), event);
+			gf_dom_event_fire(gf_event_target_get_node(gf_mo_event_target_get(scene->root_od->mo, i)), event);
 		}
 	}
 #endif
@@ -626,9 +623,9 @@
 	}
 	else {
 		u32 i, count;
-		count = scene->root_od->mo ? gf_list_count(scene->root_od->mo->nodes) : 0;
+		count = scene->root_od->mo ? gf_mo_event_target_count(scene->root_od->mo) : 0;
 		for (i=0;i<count; i++) {
-			gf_node_dirty_parents( gf_list_get(scene->root_od->mo->nodes, i) );
+			gf_node_dirty_parents( gf_event_target_get_node(gf_mo_event_target_get(scene->root_od->mo, i)));
 		}
 		gf_term_invalidate_compositor(scene->root_od->term);
 
@@ -656,29 +653,29 @@
 
 static GFINLINE Bool is_match_obj_type(u32 type, u32 hint_type)
 {
-	if (!hint_type) return 1;
-	if (type==hint_type) return 1;
+	if (!hint_type) return GF_TRUE;
+	if (type==hint_type) return GF_TRUE;
 	/*TEXT are used by animation stream*/
-	if ((type==GF_MEDIA_OBJECT_TEXT) && (hint_type==GF_MEDIA_OBJECT_UPDATES)) return 1;
-	return 0;
+	if ((type==GF_MEDIA_OBJECT_TEXT) && (hint_type==GF_MEDIA_OBJECT_UPDATES)) return GF_TRUE;
+	return GF_FALSE;
 }
 
 GF_MediaObject *gf_scene_get_media_object_ex(GF_Scene *scene, MFURL *url, u32 obj_type_hint, Bool lock_timelines, GF_MediaObject *sync_ref, Bool force_new_if_not_attached, GF_Node *node)
 {
 	GF_MediaObject *obj;
 	GF_Scene *original_parent_scene = NULL;
-	Bool keep_fragment = 1;
-	Bool first_pass = force_new_if_not_attached ? 0 : 1;
+	Bool keep_fragment = GF_TRUE;
+	Bool first_pass = force_new_if_not_attached ? GF_FALSE : GF_TRUE;
 	u32 i, OD_ID;
 
 	OD_ID = gf_mo_get_od_id(url);
 	if (!OD_ID) return NULL;
 
-	gf_term_lock_net(scene->root_od->term, 1);
+	gf_term_lock_net(scene->root_od->term, GF_TRUE);
 
 	/*we may have overriden the time lines in parent scene, thus all objects in this scene have the same clock*/
 	if (scene->root_od->parentscene && scene->root_od->parentscene->force_single_timeline) 
-		lock_timelines = 1;
+		lock_timelines = GF_TRUE;
 
 	/*the first pass is needed to detect objects already inserted and registered with the given nodes, regardless of 
 	the force_new_if_not_attached flag. This ty^pically occurs when a resource is first created then linked to an animation/inline*/
@@ -686,7 +683,7 @@
 	obj = NULL;
 	i=0;
 	while ((obj = (GF_MediaObject *)gf_list_enum(scene->scene_objects, &i))) {
-		Bool odm_matches = 0;
+		Bool odm_matches = GF_FALSE;
 
 		if (
 			/*regular OD scheme*/
@@ -702,54 +699,54 @@
 				&& gf_mo_is_same_url(obj, url, &keep_fragment, obj_type_hint) 
 			)
 		) {	
-			odm_matches = 1;
+			odm_matches = GF_TRUE;
 		}
 
 		if (!odm_matches) continue;
 
 		if (obj->odm) {
-			Bool can_reuse = 1;
-			Bool timeline_locked = (obj->odm->flags & GF_ODM_INHERIT_TIMELINE) ? 1 : 0;
+			Bool can_reuse = GF_TRUE;
+			Bool timeline_locked = (obj->odm->flags & GF_ODM_INHERIT_TIMELINE) ? GF_TRUE : GF_FALSE;
 			if (timeline_locked != lock_timelines) 
 				continue;
 
-			gf_term_lock_media_queue(scene->root_od->term, 1);
-			if (obj->odm->flags & GF_ODM_DESTROYED) can_reuse = 0;
+			gf_term_lock_media_queue(scene->root_od->term, GF_TRUE);
+			if (obj->odm->flags & GF_ODM_DESTROYED) can_reuse = GF_FALSE;
 			else if (obj->odm->action_type == GF_ODM_ACTION_DELETE) {
 				/*check if object is being destroyed (no longer in the queue)*/
 				if (gf_list_del_item(scene->root_od->term->media_queue, obj->odm)<0) { 
-					can_reuse = 0;
+					can_reuse = GF_FALSE;
 				} 
 				/*otherwise reuse object, discard current destroy command*/
 				else {
 					obj->odm->action_type = GF_ODM_ACTION_PLAY;
 				}
 			}
-			gf_term_lock_media_queue(scene->root_od->term, 0);
+			gf_term_lock_media_queue(scene->root_od->term, GF_FALSE);
 			if (!can_reuse) continue;
 
 		}
 
 		if (!first_pass && !force_new_if_not_attached) {
-			if (node && (gf_list_find(obj->nodes, node)<0))
-				gf_list_add(obj->nodes, node);
-			gf_term_lock_net(scene->root_od->term, 0);
+			if (node && (gf_mo_event_target_find_by_node(obj, node)<0))
+				gf_mo_event_target_add_node(obj, node);
+			gf_term_lock_net(scene->root_od->term, GF_FALSE);
 			return obj;
 		}
 		/*special case where the URL is requested twice for the same node: use the existing resource*/
-		else if (node && (gf_list_find(obj->nodes, node)>=0)) {
-			gf_term_lock_net(scene->root_od->term, 0);
+		else if (node && (gf_mo_event_target_find_by_node(obj, node)>=0)) {
+			gf_term_lock_net(scene->root_od->term, GF_FALSE);
 			return obj;
 		}
 	}
 	if (first_pass) {
-		first_pass = 0;
+		first_pass = GF_FALSE;
 		goto restart;
 	}
 
 	/*we cannot create an OD manager at this point*/
 	if (obj_type_hint==GF_MEDIA_OBJECT_UNDEF) {
-		gf_term_lock_net(scene->root_od->term, 0);
+		gf_term_lock_net(scene->root_od->term, GF_FALSE);
 		return NULL;
 	}
 
@@ -760,7 +757,7 @@
 
 	/*register node with object*/
 	if (node) {
-		gf_list_add(obj->nodes, node);
+		gf_mo_event_target_add_node(obj, node);
 
 		original_parent_scene = (GF_Scene*) gf_sg_get_private(gf_node_get_graph(node));
 	}
@@ -777,26 +774,25 @@
 		gf_scene_insert_object(scene, obj, lock_timelines, sync_ref, keep_fragment, original_parent_scene);
 		/*safety check!!!*/
 		if (gf_list_find(scene->scene_objects, obj)<0) {
-			gf_term_lock_net(scene->root_od->term, 0);
+			gf_term_lock_net(scene->root_od->term, GF_FALSE);
 			return NULL;
 		}
 
 		if (obj->odm==NULL) {
 			gf_list_del_item(scene->scene_objects, obj); 
-			if (obj->nodes) gf_list_del(obj->nodes);
-			gf_free(obj);
-			gf_term_lock_net(scene->root_od->term, 0);
+			gf_mo_del(obj);
+			gf_term_lock_net(scene->root_od->term, GF_FALSE);
 			return NULL;
 		}
 	}
 
-	gf_term_lock_net(scene->root_od->term, 0);
+	gf_term_lock_net(scene->root_od->term, GF_FALSE);
 	return obj;
 }
 
 GF_MediaObject *gf_scene_get_media_object(GF_Scene *scene, MFURL *url, u32 obj_type_hint, Bool lock_timelines)
 {
-	return gf_scene_get_media_object_ex(scene, url, obj_type_hint, lock_timelines, NULL, 0, NULL);
+	return gf_scene_get_media_object_ex(scene, url, obj_type_hint, lock_timelines, NULL, GF_FALSE, NULL);
 }
 
 GF_EXPORT
@@ -904,8 +900,8 @@
 		GF_Event evt;
 		evt.type = GF_EVENT_DURATION;
 		evt.duration.duration = dur;
-		evt.duration.can_seek = !(scene->root_od->flags & GF_ODM_NO_TIME_CTRL);
-		if (dur<2.0) evt.duration.can_seek = 0;
+		evt.duration.can_seek = (scene->root_od->flags & GF_ODM_NO_TIME_CTRL) ? GF_FALSE : GF_TRUE;
+		if (dur<1.0) evt.duration.can_seek = 0;
 		gf_term_send_event(scene->root_od->term,&evt);
 	}
 
@@ -950,7 +946,7 @@
 static void gf_scene_get_video_size(GF_MediaObject *mo, u32 *w, u32 *h)
 {
 	u32 pixel_ar;
-	if (!gf_mo_get_visual_info(mo, w, h, NULL, &pixel_ar, NULL)) return;
+	if (!gf_mo_get_visual_info(mo, w, h, NULL, &pixel_ar, NULL, NULL)) return;
 	if (pixel_ar) {
 		u32 n, d;
 		n = (pixel_ar>>16) & 0x0000FFFF;
@@ -1368,20 +1364,29 @@
 {
 	/*for now only allowed when no scene info*/
 	if (!scene->is_dynamic_scene) return;
-	gf_sg_set_scene_size_info(scene->graph, width, height, gf_sg_use_pixel_metrics(scene->graph));
+	
+	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) {
 		GF_NetworkCommand com;
 
-		gf_sc_set_scene_size(scene->root_od->term->compositor, width, height, 1);
-
 		memset(&com, 0, sizeof(GF_NetworkCommand));
 		com.base.command_type = GF_NET_SERVICE_HAS_FORCED_VIDEO_SIZE;
 		gf_term_service_command(scene->root_od->net_service, &com);
+
 		if (com.par.width && com.par.height) {
-			gf_sc_set_size(scene->root_od->term->compositor, com.par.width, com.par.height);
+			gf_sc_set_scene_size(scene->root_od->term->compositor, width, height, 1);
+			if (!scene->force_size_set) {
+				gf_sc_set_size(scene->root_od->term->compositor, com.par.width, com.par.height);
+				scene->force_size_set = 1;
+			} else {
+				gf_sc_set_size(scene->root_od->term->compositor, 0, 0);
+			}
 		} else {
 			/*need output resize*/
+			gf_sg_set_scene_size_info(scene->graph, width, height, gf_sg_use_pixel_metrics(scene->graph));
 			gf_sc_set_scene(scene->root_od->term->compositor, scene->graph);
 			gf_sc_set_size(scene->root_od->term->compositor, width, height);
 		}
@@ -1395,12 +1400,15 @@
 			}
 		}
 	}
-
-	gf_scene_notify_event(scene, GF_EVENT_SCENE_ATTACHED, NULL, NULL, GF_OK);
+	gf_sg_set_scene_size_info(scene->graph, width, height, gf_sg_use_pixel_metrics(scene->graph));
 
 #ifndef GPAC_DISABLE_VRML
 	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);
 }
 
 
@@ -1430,7 +1438,7 @@
 	/*FIXME this is too restrictive, we assume the navigate URL is really a presentation one...*/
 #ifndef GPAC_DISABLE_VRML
 	i=0;
-	while ((inl = (M_Inline*)gf_list_enum(scene->root_od->mo->nodes, &i))) {
+	while ((inl = (M_Inline*)gf_mo_event_target_enum_node(scene->root_od->mo, &i))) {
 		switch (gf_node_get_tag((GF_Node *)inl)) {
 		case TAG_MPEG4_Inline:
 #ifndef GPAC_DISABLE_X3D

gpac-0.5.0.svn4296.tar.bz2/src/terminal/term_node_init.c -> gpac-0.5.0.svn4668.tar.bz2/src/terminal/term_node_init.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/terminal/terminal.c -> gpac-0.5.0.svn4668.tar.bz2/src/terminal/terminal.c Changed

@@ -307,11 +307,11 @@
 	
 	/*reload term part*/
 
-	sOpt = gf_cfg_get_key(term->user->config, "Systems", "AlwaysDrawBIFS");
+	sOpt = gf_cfg_get_key(term->user->config, "Systems", "DrawLateFrames");
 	if (sOpt && !stricmp(sOpt, "yes"))
-		term->flags &= ~GF_TERM_SYSDEC_RESYNC;
+		term->flags &= ~GF_TERM_DROP_LATE_FRAMES;
 	else
-		term->flags |= GF_TERM_SYSDEC_RESYNC;
+		term->flags |= GF_TERM_DROP_LATE_FRAMES;
 
 	sOpt = gf_cfg_get_key(term->user->config, "Systems", "ForceSingleClock");
 	if (sOpt && !stricmp(sOpt, "yes")) 
@@ -517,6 +517,21 @@
 	}
 }
 
+Bool gf_term_is_type_supported(GF_Terminal *term, const char* mime)
+{
+	if (mime) {
+		/* TODO: handle codecs and params */
+		const char *sPlug;
+		sPlug = gf_cfg_get_key(term->user->config, "MimeTypes", mime);
+		if (sPlug) {
+			return 1;
+		} else {
+			return 0;
+		}
+	} else {
+		return 0;
+	}
+}
 
 GF_EXPORT
 GF_Terminal *gf_term_new(GF_User *user)
@@ -537,7 +552,7 @@
 	memset(tmp, 0, sizeof(GF_Terminal));
 
 	/*just for safety*/
-	gf_sys_init(0);
+	gf_sys_init(GF_FALSE);
 
 	tmp->user = user;
 
@@ -907,6 +922,10 @@
 	case GF_OPT_MEDIA_CACHE:
 		gf_term_set_cache_state(term, value);
 		return GF_OK;
+	case GF_OPT_HTTP_MAX_RATE:
+		gf_dm_set_data_rate(term->downloader, value);
+		return GF_OK;
+
 	default:
 		return gf_sc_set_option(term->compositor, type, value);
 	}
@@ -964,7 +983,7 @@
 				if (!ck) return GF_STATE_PAUSED;
 			}
 			if (ck->Buffering)
-				return GF_STATE_STEP_PAUSE;
+				return GF_STATE_PLAYING;
 		}
 		if (term->play_state != GF_STATE_PLAYING) return GF_STATE_PAUSED;
 		return GF_STATE_PLAYING;
@@ -973,6 +992,7 @@
 		else if (term->root_scene && term->root_scene->root_od->net_service->cache) return GF_MEDIA_CACHE_RUNNING;
 		else return GF_MEDIA_CACHE_ENABLED;
 	case GF_OPT_CAN_SELECT_STREAMS: return (term->root_scene && term->root_scene->is_dynamic_scene) ? 1 : 0;
+	case GF_OPT_HTTP_MAX_RATE: return gf_dm_get_data_rate(term->downloader);
 	default: return gf_sc_get_option(term->compositor, type);
 	}
 }
@@ -1246,7 +1266,7 @@
 }
 
 #ifndef GPAC_DISABLE_SVG
-static void media_event_collect_info(GF_ClientService *net, GF_ObjectManager *odm, GF_DOMMediaEvent *media_event, u32 *min_time, u32 *min_buffer)
+void media_event_collect_info(GF_ClientService *net, GF_ObjectManager *odm, GF_DOMMediaEvent *media_event, u32 *min_time, u32 *min_buffer)
 {
 	u32 i=0;
 	GF_Channel *ch;
@@ -1255,7 +1275,7 @@
 		u32 val;
 		if (ch->service != net) continue;
 
-		media_event->bufferValid = 1;
+		media_event->bufferValid = GF_TRUE;
 		if (ch->BufferTime>0) {
 			if (ch->MaxBuffer) {
 				val = (ch->BufferTime * 100) / ch->MaxBuffer;
@@ -1285,9 +1305,9 @@
 
 	if (!odm || !odm->net_service) return;
 	if (odm->mo) {
-		count = gf_list_count(odm->mo->nodes);
+		count = gf_mo_event_target_count(odm->mo);
 		if (!count) return;
-		if (!(gf_node_get_dom_event_filter(gf_list_get(odm->mo->nodes, 0)) & GF_DOM_EVENT_MEDIA))
+		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))
 			return;
 	} else {
 		count = 0;
@@ -1295,7 +1315,7 @@
 
 
 	memset(&media_event, 0, sizeof(GF_DOMMediaEvent));
-	media_event.bufferValid = 0;
+	media_event.bufferValid = GF_FALSE;
 	media_event.session_name = odm->net_service->url;
 
 	min_time = min_buffer = (u32) -1;
@@ -1325,14 +1345,16 @@
 	if (!locked) return;
 
 	for (i=0; i<count; i++) {
-		GF_Node *node = gf_list_get(odm->mo->nodes, i);
-		gf_dom_event_fire(node, &evt);
+		//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 (!count) {
 		GF_Node *root = gf_sg_get_root_node(scene->graph);
 		if (root) gf_dom_event_fire(root, &evt);
 	}
-	gf_sc_lock(odm->term->compositor, 0);
+	gf_sc_lock(odm->term->compositor, GF_FALSE);
 #endif
 }
 
@@ -1496,6 +1518,18 @@
 	gf_term_cleanup_pending_session(term, ns);
 }
 
+GF_ClientService *gf_term_get_service_from_url(GF_Terminal *term, const char *url)
+{
+	u32 i = 0;
+	GF_ClientService *ns;
+	while ( (ns = (GF_ClientService*)gf_list_enum(term->net_services, &i)) ) {
+		if (!strcmp(ns->url, url)) {
+			return ns;
+		}
+	}
+	return NULL;
+}
+
 /*connects given channel to its URL if needed*/
 GF_Err gf_term_connect_remote_channel(GF_Terminal *term, GF_Channel *ch, char *URL)
 {
@@ -1579,7 +1613,7 @@
 Bool gf_term_user_event(GF_Terminal * term, GF_Event *evt)
 {
 	if (term) return gf_sc_user_event(term->compositor, evt);
-	return 0;
+	return GF_FALSE;
 }
 
 
@@ -1594,10 +1628,15 @@
 GF_EXPORT
 u32 gf_term_get_time_in_ms(GF_Terminal *term)
 {
+	GF_Clock *ck;
 	if (!term || !term->root_scene) return 0;
-	if (term->root_scene->scene_codec && term->root_scene->scene_codec->ck) return gf_clock_ellapse_time(term->root_scene->scene_codec->ck);
-	else if (term->root_scene->dyn_ck) return gf_clock_ellapse_time(term->root_scene->dyn_ck);
-	return 0;
+	ck = NULL;
+	if (term->root_scene->scene_codec && term->root_scene->scene_codec->ck) ck = term->root_scene->scene_codec->ck;
+	else if (term->root_scene->dyn_ck) ck = term->root_scene->dyn_ck;
+
+	if (!ck) return 0;
+	if (!ck->has_seen_eos && ck->last_TS_rendered) return ck->last_TS_rendered;
+	return gf_clock_elapse_time(ck);
 }
 
 GF_Node *gf_term_pick_node(GF_Terminal *term, s32 X, s32 Y)

gpac-0.5.0.svn4296.tar.bz2/src/utils/alloc.c -> gpac-0.5.0.svn4668.tar.bz2/src/utils/alloc.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/utils/bitstream.c -> gpac-0.5.0.svn4668.tar.bz2/src/utils/bitstream.c Changed

@@ -26,7 +26,7 @@
 #include <gpac/bitstream.h>
 
 /*the default size for new streams allocation...*/
-#define BS_MEM_BLOCK_ALLOC_SIZE		250
+#define BS_MEM_BLOCK_ALLOC_SIZE		4096
 
 /*private types*/
 enum
@@ -145,7 +145,7 @@
 static void bs_flush_cache(GF_BitStream *bs)
 {
 	if (bs->buffer_written) {
-		u32 nb_write = fwrite(bs->buffer_io, 1, bs->buffer_written, bs->stream);
+		u32 nb_write = (u32) fwrite(bs->buffer_io, 1, bs->buffer_written, bs->stream);
 		bs->size += nb_write;
 		bs->position += nb_write;
 		bs->buffer_written = 0;
@@ -278,6 +278,29 @@
 }
 
 GF_EXPORT
+u32 gf_bs_read_u8_until_delimiter(GF_BitStream *bs, u8 delimiter, u8* out, u32 max_length){
+	u32 i = 0;
+	char token;
+	u64 cur_pos = gf_bs_get_position(bs);
+
+	if (!max_length) out = NULL;
+
+	while(gf_bs_available(bs) && (!max_length || i < max_length)){
+		gf_bs_read_data(bs, &token, 1);
+		if (token == delimiter) goto found;
+		if (out) out[i] = token;
+		i++;
+	}
+
+	/* Delimiter not found */
+	gf_bs_seek(bs, cur_pos);
+	return 0;
+
+found:
+	return i;
+}
+
+GF_EXPORT
 u32 gf_bs_read_u16(GF_BitStream *bs)
 {
 	u32 ret;
@@ -374,6 +397,8 @@
 	if (BS_IsAlign(bs)) {
 		switch (bs->bsmode) {
 		case GF_BITSTREAM_READ:
+		case GF_BITSTREAM_WRITE:
+		case GF_BITSTREAM_WRITE_DYN:
 			memcpy(data, bs->original + bs->position, nbBytes);
 			bs->position += nbBytes;
 			return nbBytes;
@@ -381,7 +406,7 @@
 		case GF_BITSTREAM_FILE_WRITE:
 			if (bs->buffer_io) 
 				bs_flush_cache(bs);
-			nbBytes = fread(data, 1, nbBytes, bs->stream);
+			nbBytes = (u32) fread(data, 1, nbBytes, bs->stream);
 			bs->position += nbBytes;
 			return nbBytes;
 		default:
@@ -411,9 +436,9 @@
 			if (bs->bsmode != GF_BITSTREAM_WRITE_DYN) return;
 			/*gf_realloc if enough space...*/
 			if (bs->size > 0xFFFFFFFF) return;
-			bs->original = (char*)gf_realloc(bs->original, (u32) (bs->size + BS_MEM_BLOCK_ALLOC_SIZE));
+			bs->original = (char*)gf_realloc(bs->original, (u32) (bs->size * 2));
 			if (!bs->original) return;
-			bs->size += BS_MEM_BLOCK_ALLOC_SIZE;
+			bs->size *= 2;
 		}
 		bs->original[bs->position] = val;
 		bs->position++;
@@ -534,12 +559,17 @@
 	case GF_BITSTREAM_WRITE_DYN:
 		/*need to gf_realloc ...*/
 		if (bs->position+repeat_count> bs->size) {
+			u32 new_size = (u32) (bs->size*2);
+			if (!new_size) new_size = BS_MEM_BLOCK_ALLOC_SIZE;
+
 			if (bs->size + repeat_count > 0xFFFFFFFF) 
 				return 0;
-			bs->original = (char*)gf_realloc(bs->original, sizeof(u32)*((u32) bs->size + repeat_count));
+			while (new_size < (u32) ( bs->size + repeat_count))
+				new_size *= 2;
+			bs->original = (char*)gf_realloc(bs->original, sizeof(u32)*new_size);
 			if (!bs->original) 
 				return 0;
-			bs->size += repeat_count;
+			bs->size = new_size;
 		}
 		memset(bs->original + bs->position, byte, repeat_count);
 		bs->position += repeat_count;
@@ -606,12 +636,18 @@
 		case GF_BITSTREAM_WRITE_DYN:
 			/*need to gf_realloc ...*/
 			if (bs->position+nbBytes > bs->size) {
+				u32 new_size = (u32) (bs->size*2);
+				if (!new_size) new_size = BS_MEM_BLOCK_ALLOC_SIZE;
+				
 				if (bs->size + nbBytes > 0xFFFFFFFF) 
 					return 0;
-				bs->original = (char*)gf_realloc(bs->original, sizeof(u32)*((u32) bs->size + nbBytes));
+
+				while (new_size < (u32) ( bs->size + nbBytes))
+					new_size *= 2;
+				bs->original = (char*)gf_realloc(bs->original, sizeof(u32)*new_size);
 				if (!bs->original) 
 					return 0;
-				bs->size += nbBytes;
+				bs->size = new_size;
 			}
 			memcpy(bs->original + bs->position, data, nbBytes);
 			bs->position += nbBytes;
@@ -711,8 +747,10 @@
 
 	nbBytes = (u32) (bs->size - bs->position);
 	if (!nbBytes || (nbBytes == 0xFFFFFFFF) || (bs->position >= 0xFFFFFFFF)) return 0;
+/*
 	bs->original = (char*)gf_realloc(bs->original, (u32) bs->position);
 	if (! bs->original) return (u32) -1;
+*/
 	/*just in case, re-adjust..*/
 	bs->size = bs->position;
 	return nbBytes;
@@ -981,3 +1019,26 @@
 	bs->size = bs->position;
 	if (bs->stream) return;
 }
+
+GF_EXPORT
+GF_Err gf_bs_transfer(GF_BitStream *dst, GF_BitStream *src)
+{
+	char *data;
+	u32 data_len, written;
+
+	data = NULL;
+	data_len = 0;
+	gf_bs_get_content(src, &data, &data_len);
+	if (!data || !data_len)
+	{
+		if (data) {
+			gf_free(data);
+			return GF_IO_ERR;
+		}
+		return GF_OK;
+	}
+	written = gf_bs_write_data(dst, data, data_len);
+	gf_free(data);
+	if (written<data_len) return GF_IO_ERR;
+	return GF_OK;
+}
\ No newline at end of file

gpac-0.5.0.svn4296.tar.bz2/src/utils/cache.c -> gpac-0.5.0.svn4668.tar.bz2/src/utils/cache.c Changed

@@ -176,12 +176,12 @@
 	assert( item_name );
 	assert( item_path);
 	startPattern = (const char *) cbck;
-	sz = strlen( startPattern );
+	sz = (u32) strlen( startPattern );
 	if (!strncmp(startPattern, item_name, sz)) {
 		if (GF_OK != gf_delete_file(item_path))
 			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] : failed to cleanup file %s\n", item_path));
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 static const char * cache_file_prefix = "gpac_cache_";
@@ -385,7 +385,7 @@
 			("[CACHE] gf_cache_create_entry :%d, dm=%p, url=%s cache_directory=%s, aborting.\n", __LINE__, dm, url, cache_directory));
 		return entry;
 	}
-	sz = strlen ( url );
+	sz = (u32) strlen ( url );
 	if ( sz > _CACHE_TMP_SIZE )
 	{
 		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK,
@@ -399,7 +399,7 @@
 	} else {
 		strcpy ( tmp, url );
 	}
-	gf_sha1_csum ( tmp, strlen ( tmp ), hash );
+	gf_sha1_csum ((u8*) tmp, (u32) strlen ( tmp ), hash );
 	tmp[0] = 0;
 	{
 		int i;
@@ -604,7 +604,7 @@
 		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->contentLength) entry->mem_allocated = entry->contentLength;
-			else if (!entry->mem_allocated) entry->mem_allocated = 1024;
+			else if (!entry->mem_allocated) entry->mem_allocated = 81920;
 			entry->mem_storage = gf_realloc(entry->mem_storage, sizeof(char)* (entry->mem_allocated + 2) );
 		}
 		if (!entry->mem_allocated) {
@@ -633,34 +633,39 @@
 }
 
 GF_Err gf_cache_write_to_cache( const DownloadedCacheEntry entry, const GF_DownloadSession * sess, const char * data, const u32 size) {
-	u32 readen;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[CACHE] gf_cache_write_to_cache:%d\n", __LINE__));
+	u32 read;
 	CHECK_ENTRY;
 
 	if (!data || (!entry->writeFilePtr && !entry->mem_storage) || sess != entry->write_session) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("Incorrect parameter : data=%p, writeFilePtr=%p mem_storage=%p at "__FILE__, data, entry->writeFilePtr, entry->mem_storage));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("Incorrect parameter : data=%p, writeFilePtr=%p mem_storage=%p at "__FILE__"\n", data, entry->writeFilePtr, entry->mem_storage));
 		return GF_BAD_PARAM;
 	}
 		
 	if (entry->memory_stored) {
 		if (entry->written_in_cache + size > entry->mem_allocated) {
-			entry->mem_storage = gf_realloc(entry->mem_storage, (entry->mem_allocated+size+2));
-			entry->mem_allocated += size;
+			u32 new_size = entry->mem_allocated*2;
+			if (new_size < size) new_size = size;
+			entry->mem_storage = gf_realloc(entry->mem_storage, (new_size+2));
+			entry->mem_allocated = new_size + 2;
 			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));
 		}
 		memcpy(entry->mem_storage + entry->written_in_cache, data, size);
 		entry->written_in_cache += size;
 		memset(entry->mem_storage + entry->written_in_cache, 0, 2);
+		sprintf(entry->cache_filename, "gmem://%d@%p", entry->written_in_cache, entry->mem_storage);
+
+		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[CACHE] Writing %d bytes to cache\n", size));
 		return GF_OK;
 	}
 
-	readen = gf_fwrite(data, sizeof(char), size, entry->writeFilePtr);
-	if (readen > 0)
-		entry->written_in_cache+= readen;
-	if (readen != size) {
+	read = (u32) gf_fwrite(data, sizeof(char), size, entry->writeFilePtr);
+	if (read > 0)
+		entry->written_in_cache+= read;
+	if (read != size) {
 		/* Something bad happened */
 		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK,
-			("[CACHE] Error while writting %d bytes of data to cache : has written only %d bytes.", size, readen));
+			("[CACHE] Error while writting %d bytes of data to cache : has written only %d bytes.", size, read));
 		gf_cache_close_write_cache(entry, sess, 0);
 		gf_delete_file(entry->cache_filename);
 		return GF_IO_ERR;
@@ -672,6 +677,7 @@
 		gf_delete_file(entry->cache_filename);
 		return GF_IO_ERR;
 	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[CACHE] Writing %d bytes to cache\n", size));
 	return GF_OK;
 }
 
@@ -719,13 +725,13 @@
 s64 gf_cache_reader_full_size( GF_CacheReader reader );
 
 s32 gf_cache_reader_read( GF_CacheReader reader, char * buff, s32 length) {
-	s32 readen;
+	s32 read;
 	if (!reader || !buff || length < 0 || !reader->readPtr)
 		return -1;
-	readen = fread(buff, sizeof(char), length, reader->readPtr);
-	if (readen > 0)
-		reader->readPosition+= readen;
-	return readen;
+	read = (u32) fread(buff, sizeof(char), length, reader->readPtr);
+	if (read > 0)
+		reader->readPosition+= read;
+	return read;
 }
 
 GF_Err gf_cache_delete_entry ( const DownloadedCacheEntry entry )

gpac-0.5.0.svn4296.tar.bz2/src/utils/color.c -> gpac-0.5.0.svn4668.tar.bz2/src/utils/color.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/utils/configfile.c -> gpac-0.5.0.svn4668.tar.bz2/src/utils/configfile.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/utils/dlmalloc.c -> gpac-0.5.0.svn4668.tar.bz2/src/utils/dlmalloc.c Changed

@@ -2738,7 +2738,7 @@
     I = NTREEBINS-1;\
   else {\
     unsigned int K;\
-    _BitScanReverse((DWORD *) &K, X);\
+    _BitScanReverse((DWORD *) &K, (DWORD)X);\
     I =  (bindex_t)((K << 1) + ((S >> (K + (TREEBIN_SHIFT-1)) & 1)));\
   }\
 }
@@ -3423,7 +3423,7 @@
 
 /* Link a free chunk into a smallbin  */
 #define insert_small_chunk(M, P, S) {\
-  bindex_t I  = small_index(S);\
+  bindex_t I  = (bindex_t)small_index(S);\
   mchunkptr B = smallbin_at(M, I);\
   mchunkptr F = B;\
   assert(S >= MIN_CHUNK_SIZE);\
@@ -3639,6 +3639,7 @@
 #define insert_chunk(M, P, S)\
   if (is_small(S)) insert_small_chunk(M, P, S)\
   else { tchunkptr TP = (tchunkptr)(P); insert_large_chunk(M, TP, S); }
+  
 
 #define unlink_chunk(M, P, S)\
   if (is_small(S)) unlink_small_chunk(M, P, S)\
@@ -3784,9 +3785,9 @@
                            size_t nb) {
   mchunkptr p = align_as_chunk(newbase);
   mchunkptr oldfirst = align_as_chunk(oldbase);
-  size_t psize = (char*)oldfirst - (char*)p;
+  bindex_t psize = (bindex_t)((char*)oldfirst - (char*)p);
   mchunkptr q = chunk_plus_offset(p, nb);
-  size_t qsize = psize - nb;
+  bindex_t qsize = psize - (bindex_t)nb;
   set_size_and_pinuse_of_inuse_chunk(m, p, nb);
 
   assert((char*)oldfirst > (char*)q);
@@ -3807,7 +3808,7 @@
   }
   else {
     if (!is_inuse(oldfirst)) {
-      size_t nsize = chunksize(oldfirst);
+      bindex_t nsize = chunksize(oldfirst);
       unlink_chunk(m, oldfirst, nsize);
       oldfirst = chunk_plus_offset(oldfirst, nsize);
       qsize += nsize;
@@ -3865,7 +3866,7 @@
   /* Insert the rest of old top into a bin as an ordinary free chunk */
   if (csp != old_top) {
     mchunkptr q = (mchunkptr)old_top;
-    size_t psize = csp - old_top;
+    bindex_t psize = (bindex_t)(csp - old_top);
     mchunkptr tn = chunk_plus_offset(q, psize);
     set_free_with_pinuse(q, psize, tn);
     insert_chunk(m, q, psize);
@@ -4268,15 +4269,15 @@
 /* allocate a small request from the best fitting chunk in a treebin */
 static void* tmalloc_small(mstate m, size_t nb) {
   tchunkptr t, v;
-  size_t rsize;
+  bindex_t rsize;
   bindex_t i;
   binmap_t leastbit = least_bit(m->treemap);
   compute_bit2idx(leastbit, i);
   v = t = *treebin_at(m, i);
-  rsize = chunksize(t) - nb;
+  rsize = (bindex_t)(chunksize(t) - nb);
 
   while ((t = leftmost_child(t)) != 0) {
-    size_t trem = chunksize(t) - nb;
+    bindex_t trem = chunksize(t) - (bindex_t)nb;
     if (trem < rsize) {
       rsize = trem;
       v = t;
@@ -4629,7 +4630,7 @@
 
   if (!PREACTION(gm)) {
     void* mem;
-    size_t nb;
+    bindex_t nb;
     if (bytes <= MAX_SMALL_REQUEST) {
       bindex_t idx;
       binmap_t smallbits;
@@ -4653,7 +4654,7 @@
       else if (nb > gm->dvsize) {
         if (smallbits != 0) { /* Use chunk in next nonempty smallbin */
           mchunkptr b, p, r;
-          size_t rsize;
+          bindex_t rsize;
           bindex_t i;
           binmap_t leftbits = (smallbits << idx) & left_bits(idx2bit(idx));
           binmap_t leastbit = least_bit(leftbits);
@@ -4756,10 +4757,10 @@
     if (!PREACTION(fm)) {
       check_inuse_chunk(fm, p);
       if (RTCHECK(ok_address(fm, p) && ok_inuse(p))) {
-        size_t psize = chunksize(p);
+        bindex_t psize = chunksize(p);
         mchunkptr next = chunk_plus_offset(p, psize);
         if (!pinuse(p)) {
-          size_t prevsize = p->prev_foot;
+          bindex_t prevsize = (bindex_t)p->prev_foot;
           if (is_mmapped(p)) {
             psize += prevsize + MMAP_FOOT_PAD;
             if (CALL_MUNMAP((char*)p - prevsize, psize) == 0)
@@ -4806,7 +4807,7 @@
               goto postaction;
             }
             else {
-              size_t nsize = chunksize(next);
+              bindex_t nsize = chunksize(next);
               psize += nsize;
               unlink_chunk(fm, next, nsize);
               set_size_and_pinuse_of_free_chunk(p, psize);

gpac-0.5.0.svn4296.tar.bz2/src/utils/downloader.c -> gpac-0.5.0.svn4668.tar.bz2/src/utils/downloader.c Changed

@@ -38,6 +38,12 @@
 #include <openssl/x509.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>
+
+#if (defined(WIN32) || defined(_WIN32_WCE)) && !defined(__GNUC__)
+#pragma comment(lib, "ssleay32")
+#pragma comment(lib, "libeay32")
+#endif
+
 #endif
 
 #ifdef __USE_POSIX
@@ -50,7 +56,8 @@
 #define SESSION_RETRY_COUNT	20
 
 #define GF_DOWNLOAD_AGENT_NAME		"GPAC/" GPAC_FULL_VERSION
-#define GF_DOWNLOAD_BUFFER_SIZE		8193
+//let's be agressive with socket buffer size
+#define GF_DOWNLOAD_BUFFER_SIZE		131072
 #define GF_WAIT_REPLY_SLEEP	20
 
 
@@ -151,6 +158,9 @@
     void *usr_cbk;
 	Bool reassigned;
 
+	Bool chunked;
+	u32 nb_left_in_chunk;
+
     /*private extension*/
     void *ext;
 };
@@ -283,7 +293,7 @@
     if (!dm || !creds || !password)
         return GF_BAD_PARAM;
     sprintf(pass_buf, "%s:%s", creds->username, password);
-    size = gf_base64_encode(pass_buf, strlen(pass_buf), range_buf, 1024);
+    size = gf_base64_encode(pass_buf, (u32) strlen(pass_buf), range_buf, 1024);
     range_buf[size] = 0;
     strcpy(creds->digest, range_buf);
     creds->valid = 1;
@@ -1060,9 +1070,8 @@
 
 static GF_Err gf_dm_read_data(GF_DownloadSession *sess, char *data, u32 data_size, u32 *out_read)
 {
-#ifdef GPAC_HAS_SSL
     GF_Err e;
-#endif
+
 	if (!sess)
         return GF_BAD_PARAM;
 #ifdef GPAC_HAS_SSL
@@ -1082,7 +1091,13 @@
 #endif
     if (!sess->sock)
         return GF_NETIO_DISCONNECTED;
-    return gf_sk_receive(sess->sock, data, data_size, 0, out_read);
+    e = gf_sk_receive(sess->sock, data, data_size, 0, out_read);
+
+ 	if (e==GF_IP_NETWORK_EMPTY) {
+		gf_sleep(1);
+	}
+
+    return e;
 }
 
 
@@ -1212,6 +1227,7 @@
 
 	    sess->status = GF_NETIO_CONNECTED;
 		gf_dm_sess_notify_state(sess, GF_NETIO_CONNECTED, GF_OK);
+		gf_sk_set_buffer_size(sess->sock, 1, GF_DOWNLOAD_BUFFER_SIZE);
 		gf_sk_set_buffer_size(sess->sock, 0, GF_DOWNLOAD_BUFFER_SIZE);
 	}
 
@@ -1515,7 +1531,7 @@
        
 	opt = cfg ? gf_cfg_get_key(cfg, "Downloader", "MaxRate") : NULL;
 	/*use it in in BYTES per second*/
-	if (opt) dm->limit_data_rate = 1024 * atoi(opt) / 8;
+	if (opt) dm->limit_data_rate = 1000 * atoi(opt) / 8;
 
 	if (cfg) {
 		opt = gf_cfg_get_key(cfg, "Downloader", "DisableCache");
@@ -1693,35 +1709,109 @@
 }
 
 
-static GFINLINE void gf_dm_data_received(GF_DownloadSession *sess, const char *data, u32 nbBytes)
+static u8 *gf_dm_get_chunk_data(GF_DownloadSession *sess, u8 *body_start, u32 *payload_size, u32 *header_size)
+{
+	u32 size;
+	char *te_header, *sep;
+
+	if (!sess->chunked) return body_start;
+
+	if (sess->nb_left_in_chunk) {
+		if (sess->nb_left_in_chunk > *payload_size) {
+			sess->nb_left_in_chunk -= *payload_size;
+		} else {
+			*payload_size = sess->nb_left_in_chunk;
+			sess->nb_left_in_chunk = 0;
+		}
+		*header_size = 0;
+		return body_start;
+	}
+	
+
+	te_header = strstr(body_start, "\r\n");
+	if (!te_header) return NULL;
+
+	te_header[0] = 0;
+	*header_size = (u32) (strlen(body_start)) + 2;
+
+	sep = strchr(body_start, ';');
+	if (sep) sep[0] = 0;
+	sscanf(body_start, "%x", &size);
+	if (sep) sep[0] = ';';
+	*payload_size = size;
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Chunk Start: Header \"%s\" - header size %d - payload size %d\n", body_start, 2+strlen(body_start), size));
+	
+	te_header[0] = '\r';
+	return te_header+2;
+}
+
+static GFINLINE void gf_dm_data_received(GF_DownloadSession *sess, u8 *payload, u32 payload_size, Bool store_in_init, u32 *rewrite_size)
 {
+	u32 nbBytes, hdr_size, remaining;
+	u8 *data;
+	Bool flush_chunk = 0;
     GF_NETIO_Parameter par;
     u32 runtime, rcv;
-    rcv = nbBytes;
-    sess->bytes_done += nbBytes;
-    if (sess->icy_metaint > 0)
-        gf_icy_skip_data(sess, sess->icy_metaint, data, nbBytes);
-    else {
-        if (sess->use_cache_file)
-            gf_cache_write_to_cache( sess->cache_entry, sess, data, nbBytes);
-        {
-            par.msg_type = GF_NETIO_DATA_EXCHANGE;
-            par.error = GF_OK;
-            par.data = data;
-            par.size = nbBytes;
-            gf_dm_sess_user_io(sess, &par);
-        }
-    }
 
-    /*update state if not done*/
-    if (rcv) {
-        runtime = gf_sys_clock() - sess->start_time;
-        if (!runtime) {
-            sess->bytes_per_sec = 0;
-        } else {
-            sess->bytes_per_sec = (1000 * sess->bytes_done) / runtime;
-        }
-    }
+	nbBytes = payload_size;
+	hdr_size = 0;
+	remaining = 0;
+	if (sess->chunked) {
+		data = gf_dm_get_chunk_data(sess, payload, &nbBytes, &hdr_size);
+		if (hdr_size + nbBytes + 2 > payload_size) {
+			remaining = nbBytes + 2 - payload_size + hdr_size;
+			nbBytes = payload_size - hdr_size; 
+			payload_size = 0;
+			payload = NULL;
+		} else {
+			payload_size -= hdr_size + nbBytes + 2;
+			payload += hdr_size + nbBytes + 2;
+			flush_chunk = 1;
+		}
+		/*chunk transfer is done*/
+		if (!nbBytes) {
+			sess->total_size = sess->bytes_done;
+		}
+	} else {
+		data = payload;
+		remaining = payload_size = 0;
+	}
+
+	if (data && store_in_init) {
+		sess->init_data = (char *) gf_realloc(sess->init_data , sizeof(char) * (sess->init_data_size + nbBytes) );
+		memcpy(sess->init_data+sess->init_data_size, data, nbBytes);
+		sess->init_data_size += nbBytes;
+	}
+
+
+	if (nbBytes) {
+		rcv = nbBytes;
+		sess->bytes_done += nbBytes;
+		if (sess->icy_metaint > 0)
+			gf_icy_skip_data(sess, sess->icy_metaint, data, nbBytes);
+		else {
+			if (sess->use_cache_file)
+				gf_cache_write_to_cache( sess->cache_entry, sess, data, nbBytes);
+
+			par.msg_type = GF_NETIO_DATA_EXCHANGE;
+			par.error = GF_OK;
+			par.data = data;
+			par.size = nbBytes;
+			par.reply = flush_chunk;
+			gf_dm_sess_user_io(sess, &par);
+		}
+
+		/*update state if not done*/
+		if (rcv) {
+			runtime = gf_sys_clock() - sess->start_time;
+			if (!runtime) {
+				sess->bytes_per_sec = 0;
+			} else {
+				sess->bytes_per_sec = (1000 * sess->bytes_done) / runtime;
+			}
+		}
+	}
 
 	if (sess->total_size && (sess->bytes_done == sess->total_size)) {
         gf_dm_disconnect(sess, 0);
@@ -1737,12 +1827,26 @@
         }
 		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] url %s downloaded in %d ms (%d kbps)\n", gf_cache_get_url(sess->cache_entry), gf_sys_clock() - sess->start_time, 8*sess->bytes_per_sec/1024 ));
     }
+
+	if (rewrite_size && sess->chunked) {
+		//use memmove since regions overlap
+		memmove(data + *rewrite_size, data, nbBytes);
+		*rewrite_size += nbBytes;
+	}
+
+	if (!sess->nb_left_in_chunk && remaining) {
+		assert(remaining>=2);
+		sess->nb_left_in_chunk = remaining-2;
+	} else if (payload_size) {
+		gf_dm_data_received(sess, payload, payload_size, store_in_init, rewrite_size);
+	}
 }
 
 
 GF_EXPORT
 GF_Err gf_dm_sess_fetch_data(GF_DownloadSession *sess, char *buffer, u32 buffer_size, u32 *read_size)
 {
+    u32 size;
     GF_Err e;
     if (/*sess->cache || */ !buffer || !buffer_size) return GF_BAD_PARAM;
     if (sess->th) return GF_BAD_PARAM;
@@ -1779,7 +1883,9 @@
 
     e = gf_dm_read_data(sess, buffer, buffer_size, read_size);
     if (e) return e;
-    gf_dm_data_received(sess, buffer, *read_size);
+    size = *read_size;
+    *read_size = 0;
+    gf_dm_data_received(sess, buffer, size, 0, read_size);
     return GF_OK;
 }
 
@@ -1805,7 +1911,7 @@
 const char *gf_dm_sess_get_cache_name(GF_DownloadSession * sess)
 {
     if (!sess) return NULL;
-    if (! sess->cache_entry )  return NULL;
+    if (! sess->cache_entry || sess->needs_cache_reconfig) return NULL;
     return gf_cache_get_cache_filename(sess->cache_entry);
 }
 
@@ -1923,7 +2029,7 @@
                     par.name ? par.name : "GET", url, param_string, sess->server_name);
         }
     } else {
-        sprintf(sHTTP, "%s %s HTTP/1.0\r\nHost: %s\r\n" ,
+        sprintf(sHTTP, "%s %s HTTP/1.1\r\nHost: %s\r\n" ,
                 par.name ? par.name : "GET", url, sess->server_name);
     }
 
@@ -2039,7 +2145,7 @@
     strcat(sHTTP, "\r\n");
 
     if (send_profile || par.data) {
-        u32 len = strlen(sHTTP);
+        u32 len = (u32) strlen(sHTTP);
         char *tmp_buf = gf_malloc(sizeof(char)*(len+par.size+1));
         strcpy(tmp_buf, sHTTP);
         if (par.data) {
@@ -2053,7 +2159,7 @@
             assert (user_profile);
             profile = gf_f64_open(user_profile, "rt");
             if (profile) {
-                u32 readen = fread(tmp_buf+len, sizeof(char), par.size, profile);
+                u32 readen = (u32) fread(tmp_buf+len, sizeof(char), par.size, profile);
                 if (readen<par.size) {
                     GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK,
                            ("Error while loading Downloader/UserProfile, size=%d, should be %d.", readen, par.size));
@@ -2089,7 +2195,7 @@
 				e = GF_IP_NETWORK_FAILURE;
          } else
 #endif
-            e = gf_sk_send(sess->sock, sHTTP, strlen(sHTTP));
+            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));
     }
@@ -2130,9 +2236,9 @@
             }
         }
 #endif
-        e = gf_dm_read_data(sess, sHTTP, GF_DOWNLOAD_BUFFER_SIZE-1, &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 && (gf_sys_clock() - sess->start_time > 5000))) {
+			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);
@@ -2146,7 +2252,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);
+					gf_dm_data_received(sess, sHTTP, size, 0, NULL);
 				if ( ( (len == 0) && sess->use_cache_file) 
 					/*ivica patch*/
 					|| (size==0)
@@ -2167,13 +2273,18 @@
 			gf_dm_sess_notify_state(sess, sess->status, e);
 			return e;
 		}
-		gf_dm_data_received(sess, sHTTP, size);
+		gf_dm_data_received(sess, sHTTP, size, 0, NULL);
 
         /*socket empty*/
-        if (size < GF_DOWNLOAD_BUFFER_SIZE) return GF_OK;
+        if (size < GF_DOWNLOAD_BUFFER_SIZE) {
+			gf_sleep(1);
+			return GF_OK;
+		}
     }
 }
 
+
+
 /*!
  * Waits for the response HEADERS, parse the information... and so on
  * \param sess The session
@@ -2195,7 +2306,7 @@
     new_location = NULL;
     sess->use_cache_file = 1;
     while (1) {
-        e = gf_dm_read_data(sess, sHTTP + bytesRead, GF_DOWNLOAD_BUFFER_SIZE - 1 - bytesRead, &res);
+        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;
@@ -2287,20 +2398,14 @@
             if (hdr_sep) hdr_sep[0] = 0;
         }
 
-		/*header signaling is moved after response processing*/
-#if 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);
-#endif
-
  //       GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTP] Processing header %s: %s\n", hdr, hdr_val));
 
         if (!stricmp(hdr, "Content-Length") ) {
             ContentLength = (u32) atoi(hdr_val);
-            gf_cache_set_content_length(sess->cache_entry, ContentLength);
+            
+			if (rsp_code<300)
+				gf_cache_set_content_length(sess->cache_entry, ContentLength);
+			
 			/*Ivica patch*/
 			if (ContentLength==0)
 				sess->use_cache_file = 0;
@@ -2308,7 +2413,7 @@
         else if (!stricmp(hdr, "Content-Type")) {
             char * mime_type = gf_strdup(hdr_val);
             while (1) {
-                u32 len = strlen(mime_type);
+                u32 len = (u32) strlen(mime_type);
                 char c = len ? mime_type[len-1] : 0;
                 if ((c=='\r') || (c=='\n')) {
                     mime_type[len-1] = 0;
@@ -2318,8 +2423,10 @@
             }
             hdr = strchr(mime_type, ';');
             if (hdr) hdr[0] = 0;
-	    strlwr(mime_type);
-            gf_cache_set_mime_type(sess->cache_entry, mime_type);
+
+			strlwr(mime_type);
+			if (rsp_code<300)
+	            gf_cache_set_mime_type(sess->cache_entry, mime_type);
             gf_free(mime_type);
         }
         else if (!stricmp(hdr, "Content-Range")) {
@@ -2352,11 +2459,17 @@
         else if (!stricmp(hdr, "Cache-Control")) {
         }
         else if (!stricmp(hdr, "ETag")) {
-            gf_cache_set_etag_on_server(sess->cache_entry, hdr_val);
+			if (rsp_code<300)
+	            gf_cache_set_etag_on_server(sess->cache_entry, hdr_val);
         }
         else if (!stricmp(hdr, "Last-Modified")) {
-            gf_cache_set_last_modified_on_server(sess->cache_entry, hdr_val);
+			if (rsp_code<300)
+	            gf_cache_set_last_modified_on_server(sess->cache_entry, hdr_val);
         }
+        else if (!stricmp(hdr, "Transfer-Encoding")) {
+			if (!stricmp(hdr_val, "chunked"))
+				sess->chunked = GF_TRUE;
+		}		
         else if (!stricmp(hdr, "X-UserProfileID") ) {
             if (sess->dm && sess->dm->cfg)
                 gf_cfg_set_key(sess->dm->cfg, "Downloader", "UserProfileID", hdr_val);
@@ -2367,7 +2480,6 @@
         if (sep) sep[0]=':';
         if (hdr_sep) hdr_sep[0] = '\r';
 
-
         if (sess->status==GF_NETIO_DISCONNECTED) return GF_OK;
     }
     if (no_range) first_byte = 0;
@@ -2397,6 +2509,7 @@
         /*redirection: extract the new location*/
     case 301:
     case 302:
+    case 307:
         if (!new_location || !strlen(new_location) ) {
             gf_dm_sess_user_io(sess, &par);
             e = GF_URL_ERROR;
@@ -2457,7 +2570,7 @@
                 int read = 0;
                 u32 total_size = gf_cache_get_cache_filesize(sess->cache_entry);
                 do {
-                    read = fread(file_cache_buff, sizeof(char), 16384, f);
+                    read = (u32) fread(file_cache_buff, sizeof(char), 16384, f);
                     if (read > 0) {
                         sess->bytes_done += read;
                         sess->total_size = total_size;
@@ -2622,7 +2735,7 @@
             sess->icy_bytes = 0;
             sess->total_size = SIZE_IN_STREAM;
             sess->status = GF_NETIO_DATA_EXCHANGE;
-        } else if (!ContentLength) {
+		} else if (!ContentLength && !sess->chunked) {
             if (sess->http_read_type == GET) {
                 sess->total_size = SIZE_IN_STREAM;
                 sess->use_cache_file = 0;
@@ -2653,11 +2766,11 @@
 
     /* we may have existing data in this buffer ... */
     if (!e && (BodyStart < (s32) bytesRead)) {
-        gf_dm_data_received(sess, sHTTP + BodyStart, bytesRead - BodyStart);
-        if (sess->init_data) gf_free(sess->init_data);
-        sess->init_data_size = bytesRead - BodyStart;
-        sess->init_data = (char *) gf_malloc(sizeof(char) * sess->init_data_size);
-        memcpy(sess->init_data, sHTTP+BodyStart, sess->init_data_size);
+	    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);
     }
 exit:
     if (e) {
@@ -2679,7 +2792,7 @@
  */
 void http_do_requests(GF_DownloadSession *sess)
 {
-    char sHTTP[GF_DOWNLOAD_BUFFER_SIZE];
+    char sHTTP[GF_DOWNLOAD_BUFFER_SIZE+1];
 
 	if (sess->reused_cache_entry) {
 		if (!gf_cache_is_in_progress(sess->cache_entry)) {
@@ -2727,7 +2840,7 @@
 
 	/*handle service message*/
 	if (param->msg_type == GF_NETIO_DATA_EXCHANGE) {
-		s32 written = gf_fwrite( param->data, sizeof(char), param->size, f);
+		s32 written = (u32) gf_fwrite( param->data, sizeof(char), param->size, f);
 		if (written != param->size) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("Failed to write data on disk\n"));
 		}
@@ -2821,7 +2934,7 @@
 		*out_size = size;
 		*out_data = gf_malloc(sizeof(char)* ( 1 + size));
 		fseek(f, 0, SEEK_SET);
-		read = fread(*out_data, 1, size, f);
+		read = (u32) fread(*out_data, 1, size, f);
 		if (read != size) {
 			gf_free(*out_data);
 			e = GF_IO_ERR;
@@ -2895,7 +3008,7 @@
         if (orig == NULL)
             return NULL;
         /* 22 if 1G + 1G + 2 dashes */
-        maxLen = strlen(orig) + 22;
+        maxLen = (u32) strlen(orig) + 22;
         newFilename = (char*)gf_malloc( maxLen );
         if (newFilename == NULL)
             return NULL;
@@ -2914,7 +3027,7 @@
         }
         /* Now, we copy ! */
         {
-            char copyBuff[GF_DOWNLOAD_BUFFER_SIZE];
+            char copyBuff[GF_DOWNLOAD_BUFFER_SIZE+1];
             s64 read, write, total;
             total = endOffset - startOffset;
             read = gf_f64_seek(fr, startOffset, SEEK_SET);
@@ -2963,6 +3076,7 @@
     }
 }
 
+GF_EXPORT
 GF_Err gf_dm_sess_reassign(GF_DownloadSession *sess, u32 flags, gf_dm_user_io user_io, void *cbk)
 {
 	/*shall only be called for non-threaded sessions!! */
@@ -3013,6 +3127,12 @@
 	}
 #endif
 
+	if (flags == 0xFFFFFFFF) {
+		sess->user_proc = user_io;
+		sess->usr_cbk = cbk;
+		return GF_OK;
+	}
+
 	if (sess->flags & GF_DOWNLOAD_SESSION_USE_SSL) flags |= GF_DOWNLOAD_SESSION_USE_SSL;
 	sess->flags = flags;
 	sess->user_proc = user_io;
@@ -3028,18 +3148,13 @@
 }
 
 GF_EXPORT
-void gf_dm_set_data_rate(GF_DownloadManager *dm, u32 rate_in_byte_per_sec)
+void gf_dm_set_data_rate(GF_DownloadManager *dm, u32 rate_in_bits_per_sec)
 {
-	dm->limit_data_rate = rate_in_byte_per_sec;
-	if (dm->cfg) {
-		char szBuf[100];
-		sprintf(szBuf, "%d", rate_in_byte_per_sec*128/*8/1024*/);
-		gf_cfg_set_key(dm->cfg, "Downloader", "MaxRate", szBuf);
-	}
+	dm->limit_data_rate = rate_in_bits_per_sec/8;
 }
 
 GF_EXPORT
 u32 gf_dm_get_data_rate(GF_DownloadManager *dm)
 {
-	return dm->limit_data_rate;
+	return dm->limit_data_rate*8;
 }

gpac-0.5.0.svn4296.tar.bz2/src/utils/error.c -> gpac-0.5.0.svn4668.tar.bz2/src/utils/error.c Changed

@@ -89,7 +89,7 @@
 		prev_pc = 0;
 	}
 	if (done==total) {
-		u32 len = strlen(szT) + 40;
+		u32 len = (u32) strlen(szT) + 40;
 		while (len) { fprintf(stderr, " "); len--; };
 		fprintf(stderr, "\r");
 	}
@@ -152,9 +152,11 @@
 	{ GF_LOG_AUDIO, "audio", GF_LOG_WARNING },
 	{ GF_LOG_MODULE, "module", GF_LOG_WARNING },
 	{ GF_LOG_MUTEX, "mutex", GF_LOG_WARNING },
+	{ GF_LOG_CONDITION, "condition", GF_LOG_WARNING },
 	{ GF_LOG_DASH, "dash", GF_LOG_WARNING },
 	{ GF_LOG_CONSOLE, "console", GF_LOG_INFO },
-	{ GF_LOG_APP, "app", GF_LOG_INFO }
+	{ GF_LOG_APP, "app", GF_LOG_INFO },
+	{ GF_LOG_SCHEDULER, "scheduler", GF_LOG_INFO },
 };
 
 GF_EXPORT
@@ -302,7 +304,7 @@
 		}
 		level++;
 	}
-	len = strlen(szLogTools);
+	len = (u32) strlen(szLogTools);
 	if (len) {
 		/*remove last ':' from level*/
 		if (szLogTools[ len-1 ] == ':') szLogTools[ len-1 ] = 0;
@@ -320,8 +322,8 @@
 Bool gf_log_tool_level_on(u32 log_tool, u32 log_level)
 {
 	assert(log_tool<GF_LOG_TOOL_MAX); 
-	if (global_log_tools[log_tool].level >= log_level) return 1;
-	return 0;
+	if (global_log_tools[log_tool].level >= log_level) return GF_TRUE;
+	return GF_FALSE;
 }
 
 void default_log_callback(void *cbck, u32 level, u32 tool, const char* fmt, va_list vlist)
@@ -333,7 +335,7 @@
 
 static void *user_log_cbk = NULL;
 static gf_log_cbk log_cbk = default_log_callback;
-static Bool log_exit_on_error = 0;
+static Bool log_exit_on_error = GF_FALSE;
 
 GF_EXPORT
 void gf_log(const char *fmt, ...)
@@ -494,7 +496,14 @@
 		return "Authentication failure";
 	case GF_SCRIPT_NOT_READY:
 		return "Script not ready for playback";
-
+	case GF_INVALID_CONFIGURATION:
+		return "Bad configuration for the current context";
+	case GF_NOT_FOUND:
+		return "At least one required element has not been found";
+	case GF_MISSING_REQUIREMENTS:
+		return "The filter is missing at least one requirement";
+	case GF_WRONG_DATAFORMAT:
+		return "Unexpected data format";
 	default:
 		return "Unknown Error";
 	}
@@ -565,6 +574,10 @@
 const char *gpac_features()
 {
 	const char *features = ""
+#ifdef GPAC_X64
+		"GPAC_X64 "
+#endif
+
 #ifdef GPAC_FIXED_POINT
 		"GPAC_FIXED_POINT "
 #endif
@@ -682,6 +695,6 @@
 		"GPAC_DISABLE_STREAMING "
 #endif
 
-	;
+;
 	return features;
 }

gpac-0.5.0.svn4296.tar.bz2/src/utils/list.c -> gpac-0.5.0.svn4668.tar.bz2/src/utils/list.c Changed

@@ -725,7 +725,18 @@
 GF_EXPORT
 void *gf_list_enum(GF_List *ptr, u32 *pos)
 {
-	void *res = gf_list_get(ptr, *pos);
+	void *res;
+	if (!ptr || !pos) return NULL;
+	res = gf_list_get(ptr, *pos);
+	(*pos)++;
+	return res;
+}
+
+GF_EXPORT
+void *gf_list_rev_enum(GF_List *ptr, u32 *pos){
+	void *res;
+	if (!ptr || !pos) return NULL;
+	res = gf_list_get(ptr, gf_list_count (ptr) - *pos - 1 );
 	(*pos)++;
 	return res;
 }
@@ -755,3 +766,54 @@
 	}
 	return GF_OK;
 }
+
+GF_EXPORT
+GF_List* gf_list_clone(GF_List *ptr){
+	GF_List* new_list;
+	u32 i = 0;
+	void* item;
+	if (!ptr) return NULL;
+	new_list = gf_list_new();
+	while ((item = gf_list_enum(ptr, &i)))
+		gf_list_add(new_list, item);
+
+	return new_list;
+}
+
+GF_EXPORT
+void gf_list_reverse(GF_List *ptr){
+	GF_List* saved_order;
+	void* item;
+	u32 i = 0;
+	if (!ptr) return;
+	saved_order = gf_list_clone(ptr);
+	gf_list_reset(ptr);
+
+	while ((item = gf_list_enum(saved_order, &i))){
+		gf_list_insert(ptr, item, 0);
+	}
+
+	gf_list_del(saved_order);
+}
+
+GF_EXPORT
+void* gf_list_pop_front(GF_List *ptr){
+	void * item;
+	if (!ptr) return NULL;
+	
+	item = gf_list_get(ptr, 0);
+	gf_list_rem(ptr, 0);
+
+	return item;
+}
+
+GF_EXPORT
+void* gf_list_pop_back(GF_List *ptr){
+	void * item;
+	if (!ptr) return NULL;
+	
+	item = gf_list_last(ptr);
+	gf_list_rem_last(ptr);
+
+	return item;
+}

gpac-0.5.0.svn4668.tar.bz2/src/utils/map.c Added

@@ -0,0 +1,370 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jerome Gorin
+ *			Copyright (c) Telecom ParisTech 2000-2013
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / dashcast-Debug@dashcast_build
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+#include <gpac/map.h>
+#include <gpac/list.h>
+
+struct _tag_map
+{
+	u32 hash_capacity;
+	GF_List** pairs;
+};
+
+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;
+
+	/* 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;
+
+	/* Associate iterator to the beginning of the map */
+	new_it->map = map;
+	new_it->ilist = 0;
+	new_it->hash = 0;
+	*it = new_it;
+
+	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;
+
+	/* No iterator or iterator out of map */
+	if (!it || !(it->hash < it->map->hash_capacity)) return NULL;
+
+	next_pair = (GF_Pair*)gf_list_get(it->map->pairs[it->hash], it->ilist);
+	
+	if (next_pair){
+		/* Next element founds in the same hash */
+		it->ilist++;
+		return next_pair->value;
+	}
+
+	/* Take the next hash */
+	it->hash++;
+	it->ilist = 0;
+	return gf_map_iter_has_next(it);
+}
+
+GF_EXPORT
+GF_Err gf_map_iter_reset(GF_It_Map* it){
+	if (!it) return GF_BAD_PARAM;
+
+	it->hash = 0;
+	it->ilist = 0;
+
+	return GF_OK;
+}
+
+
+GF_Pair* gf_pair_new(const char* key, u32 key_len, void* item){
+	GF_Pair* new_pair;
+
+	/* Allocate space for a new pair */
+	GF_SAFEALLOC(new_pair, GF_Pair);
+	if (!new_pair)	return NULL;
+
+	/* Allocate space for a new key */
+	GF_SAFE_ALLOC_N(new_pair->key, key_len + 1, char);
+	if (!new_pair->key) {
+		gf_free(new_pair);
+		return NULL;
+	}
+
+	/* Set pair value*/
+	strcpy(new_pair->key, key);
+	new_pair->value = item;
+
+	return new_pair;
+}
+
+void gf_pair_del(GF_Pair* pair){
+	gf_free(pair->key);
+	gf_free(pair);
+}
+
+/* Match a key to a pair */
+static GF_Pair* gf_pair_get(GF_List* pairs, const char *key)
+{
+	GF_Pair *pair;
+	u32 index = 0;
+
+	while ((pair = (GF_Pair*)gf_list_get(pairs, index))) {
+		if (pair->key && !strcmp(pair->key, key)) return pair;
+		index++;
+	}
+
+	/* Key not found */
+	return NULL;
+}
+
+/* Remove a key from pairs */
+static Bool gf_pair_rem(GF_List* pairs, const char *key)
+{
+	GF_Pair* pair;
+	u32 index = 0;
+
+	while ((pair = (GF_Pair*)gf_list_get(pairs, index))) {
+		if (pair->key && !strcmp(pair->key, key)){
+			gf_list_rem(pairs, index);
+			gf_pair_del(pair);
+			return GF_TRUE;
+		}
+		index++;
+	}
+
+	/* Key not found */
+	return GF_FALSE;
+}
+
+
+/* Generate a hash code for the provided string */
+static unsigned long hash(const char *str)
+{
+	u32 hash = 5381;
+	int c;
+
+	while ((c = *str++)) {
+		hash = ((hash << 5) + hash) + c;
+	}
+	return hash;
+}
+
+
+
+GF_EXPORT
+GF_Map * gf_map_new(u32 hash_capacity)
+{
+	GF_Map *p_map;
+	GF_SAFEALLOC(p_map, GF_Map);
+	if (! p_map) return NULL;
+
+	p_map->hash_capacity = hash_capacity;
+	GF_SAFE_ALLOC_N(p_map->pairs, p_map->hash_capacity, GF_List*);
+	if (!p_map->pairs) {
+		gf_free(p_map);
+		return NULL;
+	}
+
+	return p_map;
+}
+
+GF_EXPORT
+void gf_map_del(GF_Map *ptr)
+{
+	u32 i, j;
+	GF_Pair *pair;
+	GF_List *bucket;
+
+	if (!ptr) return;
+
+	/* Iterate through the map and delete content */
+	for (i = 0; i < ptr->hash_capacity; i++){
+		bucket = ptr->pairs[i];
+
+		/* Bucket has not be allocated */
+		if (bucket == NULL) continue;
+
+		/* Iterate through the bucket and delete pairs */
+		j = 0;
+		while ((pair = (GF_Pair*)gf_list_get(bucket, j))) {
+			gf_pair_del(pair);
+			j++;
+		}
+
+		gf_list_del(bucket);
+	}
+
+	/* Free map */
+	gf_free(ptr->pairs);
+	gf_free(ptr);
+}
+
+GF_EXPORT
+void gf_map_reset(GF_Map *ptr){
+	u32 i, j;
+	GF_Pair *pair;
+	GF_List *bucket;
+
+	/* Iterate through the map and delete content */
+	for (i = 0; i < ptr->hash_capacity; i++){
+		bucket = ptr->pairs[i];
+
+		/* Bucket has not be allocated */
+		if (bucket == NULL)
+			continue;
+
+		/* Iterate through the bucket and delete pairs */
+		j = 0;
+		while ((pair = (GF_Pair*)gf_list_get(bucket, j))) {
+			gf_pair_del(pair);
+			j++;
+		}
+
+		/* reset bucket count */
+		gf_list_del(bucket);
+		ptr->pairs[i] = NULL;
+	}
+}
+
+GF_EXPORT
+void* gf_map_find(GF_Map *ptr, const char* key){
+	u32 index;
+	GF_List *bucket;
+	GF_Pair *pair;
+
+	/* Find requires a map and a key to work properly */
+	if (!ptr || !key) return NULL;
+
+	index = hash(key) % ptr->hash_capacity;
+	bucket = ptr->pairs[index];
+	pair = gf_pair_get(bucket, key);
+
+	/* bucket is empty */
+	if (!pair) return NULL;
+
+	return pair->value;
+}
+
+
+GF_EXPORT
+GF_Err gf_map_insert(GF_Map *ptr, const char* key, void* item){
+	u32 key_len, index;
+	GF_List *bucket;
+	GF_Pair *pair;
+	GF_Err err;
+
+	/* Insert requiered a map, a key and a value */
+	if (!ptr || !key || !item) return GF_BAD_PARAM;
+
+	key_len = (u32) strlen(key);
+
+	/* Get a pointer to the bucket the key string hashes to */
+	index = hash(key) % ptr->hash_capacity;
+	bucket = ptr->pairs[index];
+
+	if (bucket && (pair = gf_pair_get(bucket, key))) {
+		/* The bucket already contains the provided key */
+		return GF_NOT_SUPPORTED;
+	}
+
+	if (!bucket){
+		/* No bucket has been assigned yet */
+		bucket = gf_list_new();
+		if (!bucket) return GF_OUT_OF_MEM;
+
+		ptr->pairs[index] = bucket;
+	}
+
+	pair = gf_pair_new(key, key_len, item);
+
+	if (!pair){
+		return GF_OUT_OF_MEM;
+	}
+
+	/* Store the new pair in the bucket */
+	err = gf_list_add(bucket, pair);
+	if(err != GF_OK){
+		gf_free(pair);
+		return GF_OUT_OF_MEM;
+	}
+
+	return GF_OK;
+}
+
+GF_EXPORT
+Bool gf_map_rem(GF_Map *ptr, const char* key)
+{
+	u32 index;
+	GF_List *bucket;
+
+	/* Find requires a map and a key to work properly */
+	if (!ptr || !key) return GF_FALSE;
+
+	index = hash(key) % ptr->hash_capacity;
+	bucket = ptr->pairs[index];
+
+	return gf_pair_rem(bucket, key);
+}
+
+GF_EXPORT
+u32 gf_map_count(const GF_Map *ptr){
+	u32 i = 0;
+	u32 count = 0;
+
+	/* No map provided */
+	if (!ptr) return GF_BAD_PARAM;
+
+	/* Iterate through all bucket of the map and count pair */
+	for (; i < ptr->hash_capacity; i++ ){
+		count += gf_list_count(ptr->pairs[i]);
+	}
+
+	return count;
+}
+
+GF_EXPORT
+Bool gf_map_has_key(GF_Map *ptr, const char* key){
+	unsigned int index;
+	GF_List *bucket;
+
+	/* Need a map  and key */
+	if (!ptr || !key) return GF_FALSE;
+
+	index = hash(key) % ptr->hash_capacity;
+	bucket = ptr->pairs[index];
+
+	/* Check if pair exists */
+	if (gf_pair_get(bucket, key)) return GF_TRUE;
+
+	return GF_FALSE;
+}

gpac-0.5.0.svn4296.tar.bz2/src/utils/math.c -> gpac-0.5.0.svn4668.tar.bz2/src/utils/math.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/utils/module.c -> gpac-0.5.0.svn4668.tar.bz2/src/utils/module.c Changed

@@ -26,61 +26,182 @@
 #include "module_wrap.h"
 #include <gpac/config_file.h>
 #include <gpac/tools.h>
+#include <gpac/network.h>
 
 
-#if defined(TARGET_OS_IPHONE) || defined(TARGET_IPHONE_SIMULATOR)
-#include <gpac/modules/video_out.h>
-#include <gpac/modules/audio_out.h>
-#include "sdl_out.h"
+static void load_all_modules(GF_ModuleManager *mgr)
+{
+#define LOAD_PLUGIN(	__name	)	{ \
+	GF_InterfaceRegister *gf_register_module_##__name();	\
+	pr = gf_register_module_##__name();\
+	if (!pr) {\
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Failed to statically load module ##__name\n"));\
+	} else {\
+		gf_list_add(mgr->plugin_registry, pr);	\
+	}	\
+	}	
+
+#ifdef GPAC_STATIC_MODULES
+	GF_InterfaceRegister *pr;
+
+	LOAD_PLUGIN(aac_in);
+    LOAD_PLUGIN(ac3);
+#ifdef GPAC_HAS_ALSA
+    LOAD_PLUGIN(alsa);
+#endif
+    LOAD_PLUGIN(audio_filter);
+	LOAD_PLUGIN(bifs);
+#ifndef GPAC_DISABLE_SMGR	
+	LOAD_PLUGIN(ctx_load);
+#endif
+#ifdef GPAC_HAS_DIRECTFB
+	LOAD_PLUGIN(directfb_out);
+#endif
+	LOAD_PLUGIN(dummy_in);
+#ifdef GPAC_HAS_DIRECTX
+	LOAD_PLUGIN(dx_out);
+#endif
+#ifdef GPAC_HAS_FFMPEG
+	LOAD_PLUGIN(ffmpeg);
+#endif
+#ifdef GPAC_HAS_FREENECT
+	LOAD_PLUGIN(freenect);
+#endif
+#ifdef GPAC_HAS_FREETYPE
+	LOAD_PLUGIN(ftfont);
+#endif
+#ifdef GPAC_HAS_SPIDERMONKEY
+	LOAD_PLUGIN(gpac_js);
+#endif
+	LOAD_PLUGIN(img_in);
+    LOAD_PLUGIN(isma_ea);
+	LOAD_PLUGIN(isom);
+#ifdef GPAC_HAS_JACK
+	LOAD_PLUGIN(jack);
+#endif
+#ifndef GPAC_DISABLE_SVG
+	LOAD_PLUGIN(laser);
+#endif	
+	LOAD_PLUGIN(mp3_in);
+    LOAD_PLUGIN(mpd_in);
+#ifndef GPAC_DISABLE_MEDIA_IMPORT
+	LOAD_PLUGIN(mpegts_in);
+#endif
+#ifdef GPAC_HAS_SPIDERMONKEY
+    LOAD_PLUGIN(mse_in);
+#endif	
+	LOAD_PLUGIN(odf_dec);
+#ifdef GPAC_HAS_OGG
+    LOAD_PLUGIN(ogg_in);
+#endif
+#ifdef GPAC_HAS_OPENHEVC
+	LOAD_PLUGIN(openhevc);
+#endif
+#ifdef GPAC_HAS_OPENSVC
+	LOAD_PLUGIN(opensvc);
+#endif
+#ifndef GPAC_DISABLE_LOADER_BT
+	LOAD_PLUGIN(osd);
+#endif
+#ifdef GPAC_HAS_OSS
+	LOAD_PLUGIN(oss);
+#endif
+#ifdef GPAC_HAS_PULSEAUDIO
+	LOAD_PLUGIN(pulseaudio);
+#endif
+	LOAD_PLUGIN(raw_out);	
+#ifdef GPAC_HAS_FFMPEG
+	//    LOAD_PLUGIN(redirect_av);    
+#endif
+	LOAD_PLUGIN(rtp_in);
+    LOAD_PLUGIN(saf_in);
+#ifdef GPAC_HAS_SDL
+    LOAD_PLUGIN(sdl_out);
+#endif
+	LOAD_PLUGIN(soft_raster);
+#if !defined(GPAC_DISABLE_SMGR) && !defined(GPAC_DISABLE_SVG)	
+	LOAD_PLUGIN(svg_in);
+#endif		
+	LOAD_PLUGIN(timedtext);			
+    LOAD_PLUGIN(validator);
+#ifdef GPAC_HAS_WAVEOUT
+	LOAD_PLUGIN(wave_out);
+#endif
+#ifndef GPAC_DISABLE_SVG
+	LOAD_PLUGIN(widgetman);
+#endif
+#ifdef GPAC_HAS_X11
+	LOAD_PLUGIN(x11_out);
+#endif
+#ifdef GPAC_HAS_XVID
+    LOAD_PLUGIN(xvid);
+#endif
+	
 
-/*hack I'm not proud of. If you're young and innocent never do that*/
-void* (*SDL_Module_Load_Video) (void);
-void* (*SDL_Module_Load_Audio) (void);
-GF_EXPORT void gf_iphone_set_sdl_video_module(void* (*SDL_Module) (void)) {
-	SDL_Module_Load_Video = SDL_Module;
-}
-GF_EXPORT void gf_iphone_set_sdl_audio_module(void* (*SDL_Module) (void)) {
-	SDL_Module_Load_Audio = SDL_Module;
-}
+
+				
+	//todo fix project for iOS
+#ifdef GPAC_IPHONE
+//    LOAD_PLUGIN(ios_cam);
+//    LOAD_PLUGIN(ios_mpegv);
 #endif
 
 
+#endif //GPAC_STATIC_MODULES
+
+#undef LOAD_PLUGIN
+	
+}
+
+
 GF_EXPORT
 GF_ModuleManager *gf_modules_new(const char *directory, GF_Config *config)
 {
 	GF_ModuleManager *tmp;
 	u32 loadedModules;
 	const char *opt;
-	if (!directory || !strlen(directory) || (strlen(directory) > GF_MAX_PATH)){
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot load modules from directory %s, sanity check fails.\n", directory));
-		return NULL;
-	}
+	u32 num_dirs = 0;
+
+	if (!config) return NULL;
+
+	/* Try to resolve directory from config file */
 	GF_SAFEALLOC(tmp, GF_ModuleManager);
 	if (!tmp) return NULL;
-	strcpy(tmp->dir, directory);
-
-	/*remove the final delimiter*/
-	if (tmp->dir[strlen(tmp->dir)-1] == GF_PATH_SEPARATOR) tmp->dir[strlen(tmp->dir)-1] = 0;
+	tmp->cfg = config;
+	gf_modules_get_module_directories(tmp, &num_dirs);
+	if (!num_dirs) return NULL;
 
+	/* Initialize module list */
 	tmp->plug_list = gf_list_new();
 	if (!tmp->plug_list) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("OUT OF MEMORY, cannot create list of modules !!!\n", directory));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("OUT OF MEMORY, cannot create list of modules !!!\n"));
 		gf_free(tmp);
 		return NULL;
 	}
-	tmp->cfg = config;
+	tmp->plugin_registry = gf_list_new();
+	if (!tmp->plugin_registry) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("OUT OF MEMORY, cannot create list of static module registers !!!\n"));
+		gf_list_del(tmp->plug_list);
+		gf_free(tmp);
+		return NULL;
+	}
+
 	opt = gf_cfg_get_key(config, "Systems", "ModuleUnload");
 	if (opt && !strcmp(opt, "no")) {
-		tmp->no_unload = 1;
+		tmp->no_unload = GF_TRUE;
 	}
+	load_all_modules(tmp);
+
 	loadedModules = gf_modules_refresh(tmp);
 	GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("Loaded %d modules from directory %s.\n", loadedModules, directory));
+
 	return tmp;
 }
 
 GF_EXPORT
 void gf_modules_del(GF_ModuleManager *pm)
 {
+	u32 i;
 	ModuleInstance *inst;
 	if (!pm) return;
 	/*unload all modules*/
@@ -89,6 +210,12 @@
 		gf_modules_free_module(inst);
 		gf_list_rem(pm->plug_list, 0);
 	}
+
+	/* Delete module directories*/
+	for (i = 0; i < pm->num_dirs; i++){
+		gf_free((void*)pm->dirs[i]);
+	}
+
 	gf_list_del(pm->plug_list);
 	gf_free(pm);
 }
@@ -100,7 +227,7 @@
 	while ( (inst = (ModuleInstance *) gf_list_enum(pm->plug_list, &i) ) ) {
 		if (!strcmp(inst->name, filename)) return 1;
 	}
-	return 0;
+	return GF_FALSE;
 }
 
 GF_EXPORT
@@ -110,6 +237,43 @@
 	return gf_list_count(pm->plug_list);
 }
 
+GF_EXPORT
+const char **gf_modules_get_module_directories(GF_ModuleManager *pm, u32* num_dirs){
+	char* directories;
+	char* tmp_dirs;
+	char * pch;
+	if (!pm) return NULL;
+	if (pm->num_dirs > 0 ){
+		*num_dirs = pm->num_dirs;
+		return pm->dirs;
+	}
+	if (!pm->cfg) return NULL;
+	
+	/* Get directory from config file */
+	directories = (char*)gf_cfg_get_key(pm->cfg, "General", "ModulesDirectory");
+	if (! directories) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Module directory not found - check the configuration file exit and the \"ModulesDirectory\" key is set\n"));
+		return NULL;
+	}
+
+	tmp_dirs = gf_strdup(directories);
+	pch = strtok (tmp_dirs,";");
+
+	while (pch != NULL)
+	{
+		if (pm->num_dirs == MAX_MODULE_DIRS){
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Reach maximum number of module directories  - check the configuration file and the \"ModulesDirectory\" key.\n"));
+			break;
+		}
+
+		pm->dirs[pm->num_dirs] = gf_strdup(pch);
+		pm->num_dirs++;
+		pch = strtok (NULL, ";");
+	}
+	gf_free(tmp_dirs);
+	*num_dirs = pm->num_dirs;
+	return pm->dirs;
+}
 
 GF_EXPORT
 GF_BaseInterface *gf_modules_load_interface(GF_ModuleManager *pm, u32 whichplug, u32 InterfaceFamily)
@@ -156,7 +320,7 @@
 	/*build cache*/
 	if (!opt) {
 		u32 i;
-		Bool found = 0;
+		Bool found = GF_FALSE;
 		char *key;
 		const u32 *si = inst->query_func();
 		if (!si) {
@@ -167,13 +331,13 @@
 		i=0;
 		while (si[i]) i++;
 
-		key = gf_malloc(sizeof(char) * 10 * i);
+		key = (char*)gf_malloc(sizeof(char) * 10 * i);
 		key[0] = 0;
 		i=0;
 		while (si[i]) {
 			snprintf(szKey, 32, "%s:yes ", gf_4cc_to_str(si[i]));
 			strcat(key, szKey);
-			if (InterfaceFamily==si[i]) found = 1;
+			if (InterfaceFamily==si[i]) found = GF_TRUE;
 			i++;
 		}
 		gf_cfg_set_key(pm->cfg, "PluginsCache", inst->name, key);
@@ -185,17 +349,6 @@
 	ifce = (GF_BaseInterface *) inst->load_func(InterfaceFamily);
 	/*sanity check*/
 	if (!ifce) goto err_exit;
-#if defined(TARGET_OS_IPHONE) || defined(TARGET_IPHONE_SIMULATOR)
-	if (!strcmp(inst->name, "gm_sdl_out.dylib")) {
-		if (InterfaceFamily == GF_VIDEO_OUTPUT_INTERFACE) {
-			ifce = SDL_Module_Load_Video();
-			fprintf(stderr, "***         Loading SDL Video: %p ***\n", ifce);
-		} else if (InterfaceFamily == GF_AUDIO_OUTPUT_INTERFACE) {
-			ifce = SDL_Module_Load_Audio();
-			fprintf(stderr, "***         Loading SDL Audio: %p ***\n", ifce);
-		}
-	}
-#endif
 	if (!ifce->module_name || (ifce->InterfaceType != InterfaceFamily)) {
 		inst->destroy_func(ifce);
 		goto err_exit;
@@ -319,3 +472,5 @@
 	return inst->name;
 }
 
+
+

gpac-0.5.0.svn4296.tar.bz2/src/utils/module_wrap.h -> gpac-0.5.0.svn4668.tar.bz2/src/utils/module_wrap.h Changed

gpac-0.5.0.svn4296.tar.bz2/src/utils/os_config_init.c -> gpac-0.5.0.svn4668.tar.bz2/src/utils/os_config_init.c Changed

@@ -45,7 +45,11 @@
 #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
@@ -57,10 +61,31 @@
 #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;
@@ -230,10 +255,20 @@
 	/*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;
-		strcpy(file_path, user_home);
+#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;
+        return 1;
 	}
 
 	if (path_type==GF_PATH_APP) {
@@ -355,6 +390,7 @@
 	}
 	/*Create the config file*/
 	sprintf(szPath, "%s%c%s", file_path, GF_PATH_SEPARATOR, CFG_FILE_NAME);
+    fprintf(stderr, "Trying to create config file: %s", szPath);
 	f = gf_f64_open(szPath, "wt");
 	if (!f) return NULL;
 	fclose(f);
@@ -424,6 +460,9 @@
 	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");

gpac-0.5.0.svn4296.tar.bz2/src/utils/os_divers.c -> gpac-0.5.0.svn4668.tar.bz2/src/utils/os_divers.c Changed

@@ -24,6 +24,7 @@
  */
 
 #include <gpac/tools.h>
+#include <gpac/network.h>
 
 #if defined(_WIN32_WCE)
 
@@ -87,6 +88,7 @@
 #endif
 
 
+
 GF_EXPORT
 void gf_sleep(u32 ms)
 {
@@ -156,6 +158,7 @@
 	return GF_OK;
 }   
 
+GF_EXPORT
 GF_Err gf_mkdir(char* DirPathName)
 {
 #if defined (_WIN32_WCE)
@@ -409,7 +412,7 @@
 	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)-1, "mv '%s' '%s' > /dev/null 2>&1", fileName, newFileName);
 	return ( system(cmd) == 0) ? GF_OK : GF_IO_ERR;
 #endif
 }
@@ -490,7 +493,7 @@
 	if (res) return res;
 	{
 		u32 err = GetLastError();
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Win32] system failure for tmpfile(): %08x\n", err));
+		GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Win32] system failure for tmpfile(): 0x%08x\n", err));
 	}
 	/*tmpfile() may fail under vista ...*/
 	if (!GetEnvironmentVariable("TEMP",tmp,MAX_PATH)) 
@@ -579,12 +582,12 @@
 		drives = gf_malloc(sizeof(char)*(len+1));
 		drives[0]=0;
 		GetLogicalDriveStrings(len, drives);
-		len = strlen(drives);
+		len = (u32) strlen(drives);
 		volume = drives;
 		while (len) {
 			enum_dir_fct(cbck, volume, "");
 			volume += len+1;
-			len = strlen(volume);
+			len = (u32) strlen(volume);
 		}
 		gf_free(drives);
 		return GF_OK;
@@ -817,7 +820,7 @@
 	if (res) return res;
 	if (strchr(mode, 'w') || strchr(mode, 'a')) {
 		u32 err = GetLastError();
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Win32] system failure for file opening of %s in mode %s: %08x\n", file_name, mode, err));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Win32] system failure for file opening of %s in mode %s: 0x%08x\n", file_name, mode, err));
 	}
 	return NULL;
 #elif defined(GPAC_CONFIG_LINUX) && !defined(GPAC_ANDROID)
@@ -2061,3 +2064,65 @@
 
 #endif //GPAC_ANDROID
 
+GF_EXPORT
+u64 gf_net_get_utc()
+{
+	u64 current_time;
+	Double msec;
+	u32 sec, frac;
+
+#ifndef _WIN32_WCE
+	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);
+
+#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;
+	current_time = mktime(&_t) - t_timezone;
+	}
+#else
+	{
+		s32 val = timezone;
+		current_time = mktime(&_t) - val;
+	}
+#endif
+
+#else
+	{
+	SYSTEMTIME syst;
+	FILETIME filet;
+	GetSystemTime(&syst);
+	SystemTimeToFileTime(&syst, &filet);
+
+#define TIMESPEC_TO_FILETIME_OFFSET (((LONGLONG)27111902 << 32) + (LONGLONG)3577643008)
+
+	current_time = (u64) ((*(LONGLONG *) &filet - TIMESPEC_TO_FILETIME_OFFSET) / 10000000);
+
+#undef TIMESPEC_TO_FILETIME_OFFSET 
+	}
+
+#endif
+
+	current_time *= 1000;
+	msec = frac*1000.0;
+	msec /= 0xFFFFFFFF;
+	current_time += (u64) msec;
+	return current_time;
+}
+
+

gpac-0.5.0.svn4296.tar.bz2/src/utils/os_module.c -> gpac-0.5.0.svn4668.tar.bz2/src/utils/os_module.c Changed

@@ -24,6 +24,7 @@
  */
 
 #include "module_wrap.h"
+#include <gpac/network.h>
 
 #if defined(WIN32) || defined(_WIN32_WCE)
 #include <windows.h>
@@ -49,12 +50,19 @@
 #else
 	if (inst->lib_handle) dlclose(inst->lib_handle);
 #endif
-        if (inst->interfaces)
-          gf_list_del(inst->interfaces);
-        inst->interfaces = NULL;
-        if (inst->name)
-          gf_free(inst->name);
-        inst->name = NULL;
+	if (inst->interfaces)
+		gf_list_del(inst->interfaces);
+	inst->interfaces = NULL;
+	
+	if (inst->name && !inst->ifce_reg) {
+		gf_free(inst->name);
+		inst->name = NULL;
+	}
+
+	if (inst->dir) {
+		gf_free(inst->dir);
+		inst->dir = NULL;
+	}
 	gf_free(inst);
 }
 
@@ -77,18 +85,26 @@
 	const char * error;
 #endif
 
-	if (inst->lib_handle) return 1;
+	if (inst->lib_handle) return GF_TRUE;
+
+	if (inst->ifce_reg) {
+		inst->query_func = (QueryInterfaces) inst->ifce_reg->QueryInterfaces;
+		inst->load_func = (LoadInterface) inst->ifce_reg->LoadInterface;
+		inst->destroy_func = (ShutdownInterface) inst->ifce_reg->ShutdownInterface;
+		return GF_TRUE;
+	}
+
 	GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Core] Load module file %s\n", inst->name));
 
 #if _WIN32_WINNT >= 0x0502
-	SetDllDirectory(inst->plugman->dir);
+	SetDllDirectory(inst->dir);
 #endif
 
 #ifdef _WIN32_WCE
-	sprintf(s_path, "%s%c%s", inst->plugman->dir, GF_PATH_SEPARATOR, inst->name);
+	sprintf(s_path, "%s%c%s", inst->dir, GF_PATH_SEPARATOR, inst->name);
 	CE_CharToWide(s_path, path);
 #else
-	sprintf(path, "%s%c%s", inst->plugman->dir, GF_PATH_SEPARATOR, inst->name);
+	sprintf(path, "%s%c%s", inst->dir, GF_PATH_SEPARATOR, inst->name);
 #endif
 
 #ifdef WIN32
@@ -100,16 +116,16 @@
 #else
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Cannot load module file %s: error %d\n", path, res));
 #endif
-		return 0;
+		return GF_FALSE;
 	}
 #if defined(_WIN32_WCE)
 	inst->query_func = (QueryInterfaces) GetProcAddress(inst->lib_handle, _T("QueryInterfaces"));
 	inst->load_func = (LoadInterface) GetProcAddress(inst->lib_handle, _T("LoadInterface"));
 	inst->destroy_func = (ShutdownInterface) GetProcAddress(inst->lib_handle, _T("ShutdownInterface"));
 #else
-	inst->query_func = (QueryInterfaces) GetProcAddress(inst->lib_handle, "QueryInterfaces");
-	inst->load_func = (LoadInterface) GetProcAddress(inst->lib_handle, "LoadInterface");
-	inst->destroy_func = (ShutdownInterface) GetProcAddress(inst->lib_handle, "ShutdownInterface");
+	inst->query_func = (QueryInterfaces) GetProcAddress((HMODULE)inst->lib_handle, "QueryInterfaces");
+	inst->load_func = (LoadInterface) GetProcAddress((HMODULE)inst->lib_handle, "LoadInterface");
+	inst->destroy_func = (ShutdownInterface) GetProcAddress((HMODULE)inst->lib_handle, "ShutdownInterface");
 #endif
 
 #else
@@ -139,7 +155,7 @@
 	  GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Cannot resolve symbol ShutdownInterface in module file %s, error is %s\n", path, error));
 #endif
         GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Core] Load module file %s : DONE\n", inst->name));
-	return 1;
+	return GF_TRUE;
 }
 
 void gf_modules_unload_library(ModuleInstance *inst)
@@ -150,7 +166,7 @@
 		return;
 
 #ifdef WIN32
-	FreeLibrary(inst->lib_handle);
+	FreeLibrary((HMODULE)inst->lib_handle);
 #else
 	dlclose(inst->lib_handle);
 #endif
@@ -177,7 +193,7 @@
 
 #endif
 
-	GF_ModuleManager *pm = cbck;
+	GF_ModuleManager *pm = (GF_ModuleManager*)cbck;
 
 	if (strstr(item_name, "nposmozilla")) return 0;
 	if (strncmp(item_name, "gm_", 3) && strncmp(item_name, "libgm_", 6)) return 0;
@@ -236,178 +252,55 @@
 	inst->interfaces = gf_list_new();
 	inst->plugman = pm;
 	inst->name = gf_strdup(item_name);
-        GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Core] Added module %s.\n", inst->name));
+	inst->dir = gf_strdup(item_path);
+	gf_url_get_resource_path(item_path, inst->dir); 
+	GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Core] Added module %s.\n", inst->name));
 	gf_list_add(pm->plug_list, inst);
-	return 0;
+	return GF_FALSE;
+}
+
+static void load_static_modules(GF_ModuleManager *pm)
+{
+	ModuleInstance *inst;
+	u32 i, count;
+	count = gf_list_count(pm->plugin_registry);
+	for (i=0; i<count; i++) {
+		GF_InterfaceRegister *ifce_reg = (GF_InterfaceRegister*)gf_list_get(pm->plugin_registry, i);
+		if (gf_module_is_loaded(pm, (char *) ifce_reg->name) ) continue;
+
+		GF_SAFEALLOC(inst, ModuleInstance);
+		inst->interfaces = gf_list_new();
+		inst->plugman = pm;
+		inst->name = (char *) ifce_reg->name;
+		inst->ifce_reg = ifce_reg;
+		GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Core] Added static module %s.\n", inst->name));
+		gf_list_add(pm->plug_list, inst);
+	}
 }
 
 /*refresh modules - note we don't check for deleted modules but since we've open them the OS should forbid delete*/
 u32 gf_modules_refresh(GF_ModuleManager *pm)
 {
+	u32 i;
 	if (!pm) return 0;
+
+	/*load all static modules*/
+	load_static_modules(pm);
+
+	for (i =0; i < pm->num_dirs; i++){
 #ifdef WIN32
-	gf_enum_directory(pm->dir, 0, enum_modules, pm, ".dll");
+	gf_enum_directory(pm->dirs[i], GF_FALSE, enum_modules, pm, ".dll");
 #elif defined(__APPLE__)
 #if defined(TARGET_OS_IPHONE) || defined(TARGET_IPHONE_SIMULATOR)
-	{
-		ModuleInstance *inst;
-		GF_SAFEALLOC(inst, ModuleInstance);
-		inst->interfaces = gf_list_new();
-		inst->plugman = pm;
-		inst->name = gf_strdup("gm_sdl_out.dylib");
-		gf_list_add(pm->plug_list, inst);
-	}
-	{
-		ModuleInstance *inst;
-		GF_SAFEALLOC(inst, ModuleInstance);
-		inst->interfaces = gf_list_new();
-		inst->plugman = pm;
-		inst->name = gf_strdup("gm_soft_raster.dylib");
-		gf_list_add(pm->plug_list, inst);
-	}
-	{
-		ModuleInstance *inst;
-		GF_SAFEALLOC(inst, ModuleInstance);
-		inst->interfaces = gf_list_new();
-		inst->plugman = pm;
-		inst->name = gf_strdup("gm_dummy_in.dylib");
-		gf_list_add(pm->plug_list, inst);
-	}
-	{
-		ModuleInstance *inst;
-		GF_SAFEALLOC(inst, ModuleInstance);
-		inst->interfaces = gf_list_new();
-		inst->plugman = pm;
-		inst->name = gf_strdup("gm_ctx_load.dylib");
-		gf_list_add(pm->plug_list, inst);
-	}
-	{
-		ModuleInstance *inst;
-		GF_SAFEALLOC(inst, ModuleInstance);
-		inst->interfaces = gf_list_new();
-		inst->plugman = pm;
-		inst->name = gf_strdup("gm_svg_in.dylib");
-		gf_list_add(pm->plug_list, inst);
-	}
-	{
-		ModuleInstance *inst;
-		GF_SAFEALLOC(inst, ModuleInstance);
-		inst->interfaces = gf_list_new();
-		inst->plugman = pm;
-		inst->name = gf_strdup("gm_mp3_in.dylib");
-		gf_list_add(pm->plug_list, inst);
-	}
-	{
-		ModuleInstance *inst;
-		GF_SAFEALLOC(inst, ModuleInstance);
-		inst->interfaces = gf_list_new();
-		inst->plugman = pm;
-		inst->name = gf_strdup("gm_aac_in.dylib");
-		gf_list_add(pm->plug_list, inst);
-	}
-	{
-		ModuleInstance *inst;
-		GF_SAFEALLOC(inst, ModuleInstance);
-		inst->interfaces = gf_list_new();
-		inst->plugman = pm;
-		inst->name = gf_strdup("gm_img_in.dylib");
-		gf_list_add(pm->plug_list, inst);
-	}
-	{
-		ModuleInstance *inst;
-		GF_SAFEALLOC(inst, ModuleInstance);
-		inst->interfaces = gf_list_new();
-		inst->plugman = pm;
-		inst->name = gf_strdup("gm_bifs_dec.dylib");
-		gf_list_add(pm->plug_list, inst);
-	}
-	{
-		ModuleInstance *inst;
-		GF_SAFEALLOC(inst, ModuleInstance);
-		inst->interfaces = gf_list_new();
-		inst->plugman = pm;
-		inst->name = gf_strdup("gm_hyb_in.dylib");
-		gf_list_add(pm->plug_list, inst);
-	}
-	{
-		ModuleInstance *inst;
-		GF_SAFEALLOC(inst, ModuleInstance);
-		inst->interfaces = gf_list_new();
-		inst->plugman = pm;
-		inst->name = gf_strdup("gm_gpac_js.dylib");
-		gf_list_add(pm->plug_list, inst);
-	}
-	{
-		ModuleInstance *inst;
-		GF_SAFEALLOC(inst, ModuleInstance);
-		inst->interfaces = gf_list_new();
-		inst->plugman = pm;
-		inst->name = gf_strdup("gm_isom_in.dylib");
-		gf_list_add(pm->plug_list, inst);
-	}
-	{
-		ModuleInstance *inst;
-		GF_SAFEALLOC(inst, ModuleInstance);
-		inst->interfaces = gf_list_new();
-		inst->plugman = pm;
-		inst->name = gf_strdup("gm_laser_dec.dylib");
-		gf_list_add(pm->plug_list, inst);
-	}
-	{
-		ModuleInstance *inst;
-		GF_SAFEALLOC(inst, ModuleInstance);
-		inst->interfaces = gf_list_new();
-		inst->plugman = pm;
-		inst->name = gf_strdup("gm_odf_dec.dylib");
-		gf_list_add(pm->plug_list, inst);
-	}
-	{
-		ModuleInstance *inst;
-		GF_SAFEALLOC(inst, ModuleInstance);
-		inst->interfaces = gf_list_new();
-		inst->plugman = pm;
-		inst->name = gf_strdup("gm_rtp_in.dylib");
-		gf_list_add(pm->plug_list, inst);
-	}
-	{
-		ModuleInstance *inst;
-		GF_SAFEALLOC(inst, ModuleInstance);
-		inst->interfaces = gf_list_new();
-		inst->plugman = pm;
-		inst->name = gf_strdup("gm_mpegts_in.dylib");
-		gf_list_add(pm->plug_list, inst);
-	}
-	{
-		ModuleInstance *inst;
-		GF_SAFEALLOC(inst, ModuleInstance);
-		inst->interfaces = gf_list_new();
-		inst->plugman = pm;
-		inst->name = gf_strdup("gm_ft_font.dylib");
-		gf_list_add(pm->plug_list, inst);
-	}
-	{
-		ModuleInstance *inst;
-		GF_SAFEALLOC(inst, ModuleInstance);
-		inst->interfaces = gf_list_new();
-		inst->plugman = pm;
-		inst->name = gf_strdup("gm_widgetman.dylib");
-		gf_list_add(pm->plug_list, inst);
-	}
-	{
-		ModuleInstance *inst;
-		GF_SAFEALLOC(inst, ModuleInstance);
-		inst->interfaces = gf_list_new();
-		inst->plugman = pm;
-		inst->name = gf_strdup("gm_mpd_in.dylib");
-		gf_list_add(pm->plug_list, inst);
-	}
+	/*we are in static build for modules by default*/
 #else
-	gf_enum_directory(pm->dir, 0, enum_modules, pm, ".dylib");
+	gf_enum_directory(pm->dirs[i], 0, enum_modules, pm, ".dylib");
 #endif
 #else
-	GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("Refreshing list of modules in directory %s...\n", pm->dir));
-	gf_enum_directory(pm->dir, 0, enum_modules, pm, ".so");
+	GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("Refreshing list of modules in directory %s...\n", pm->dirs[i]));
+	gf_enum_directory(pm->dirs[i], 0, enum_modules, pm, ".so");
 #endif
+	}
 
 	return gf_list_count(pm->plug_list);
 }

gpac-0.5.0.svn4296.tar.bz2/src/utils/os_net.c -> gpac-0.5.0.svn4668.tar.bz2/src/utils/os_net.c Changed

@@ -208,6 +208,7 @@
 /*
 		NTP tools
 */
+GF_EXPORT
 void gf_net_get_ntp(u32 *sec, u32 *frac)
 {
 	struct timeval now;
@@ -304,7 +305,7 @@
 	struct addrinfo *res = gf_sk_get_ipv6_addr(address, PortNumber, AF_UNSPEC, 0, (sock->flags & GF_SOCK_IS_TCP) ? SOCK_STREAM : SOCK_DGRAM);
 	if (!res) return 0;
     memcpy(&sock->dest_addr, res->ai_addr, res->ai_addrlen);
-	sock->dest_addr_len = res->ai_addrlen;
+	sock->dest_addr_len = (u32) res->ai_addrlen;
 	freeaddrinfo(res);
 	return 1;
 }
@@ -383,12 +384,18 @@
 GF_EXPORT
 GF_Err gf_sk_set_buffer_size(GF_Socket *sock, Bool SendBuffer, u32 NewSize)
 {
+	s32 res;
 	if (!sock || !sock->socket) return GF_BAD_PARAM;
 
 	if (SendBuffer) {
-		setsockopt(sock->socket, SOL_SOCKET, SO_SNDBUF, (char *) &NewSize, sizeof(u32) );
+		res = setsockopt(sock->socket, SOL_SOCKET, SO_SNDBUF, (char *) &NewSize, sizeof(u32) );
+	} else {
+		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));
 	} else {
-		setsockopt(sock->socket, SOL_SOCKET, SO_RCVBUF, (char *) &NewSize, sizeof(u32) );
+		GF_LOG(GF_LOG_NETWORK, GF_LOG_DEBUG, ("[Core] Set socket %s buffer size\n", SendBuffer ? "send" : "receive"));
 	}
 	return GF_OK;
 }
@@ -475,7 +482,7 @@
 
 s32 gf_sk_get_handle(GF_Socket *sock)
 {
-	return sock->socket;
+	return (s32) sock->socket;
 }
 
 
@@ -524,7 +531,7 @@
 		else sock->flags &= ~GF_SOCK_IS_IPV6;
 
 		if (lip) {
-			ret = bind(sock->socket, lip->ai_addr, lip->ai_addrlen);
+			ret = bind(sock->socket, lip->ai_addr, (int) lip->ai_addrlen);
 			if (ret == SOCKET_ERROR) {
 				closesocket(sock->socket);
 				sock->socket = NULL_SOCKET;
@@ -532,7 +539,7 @@
 			}
 		}
 
-		ret = connect(sock->socket, aip->ai_addr, aip->ai_addrlen);
+		ret = connect(sock->socket, aip->ai_addr, (int) aip->ai_addrlen);
 		if (ret == SOCKET_ERROR) {
 			closesocket(sock->socket);
 			sock->socket = NULL_SOCKET;
@@ -540,7 +547,7 @@
 		}
 
 		memcpy(&sock->dest_addr, aip->ai_addr, aip->ai_addrlen);
-		sock->dest_addr_len = aip->ai_addrlen;
+		sock->dest_addr_len = (u32) aip->ai_addrlen;
 		freeaddrinfo(res);
 		if (lip) freeaddrinfo(lip);
 		return GF_OK;
@@ -658,7 +665,7 @@
 		af = res->ai_family;
 #endif
 		memcpy(&sock->dest_addr, res->ai_addr, res->ai_addrlen);
-		sock->dest_addr_len = res->ai_addrlen;
+		sock->dest_addr_len = (u32) res->ai_addrlen;
 		freeaddrinfo(res);
 	}
 
@@ -709,7 +716,7 @@
 			sock->flags |= GF_SOCK_HAS_PEER;
 
 
-		ret = bind(sock->socket, aip->ai_addr, aip->ai_addrlen);
+		ret = bind(sock->socket, aip->ai_addr, (int) aip->ai_addrlen);
 		if (ret == SOCKET_ERROR) {
 			closesocket(sock->socket);
 			sock->socket = NULL_SOCKET;
@@ -820,7 +827,7 @@
 	u32 count;
 	s32 res;
 #ifndef __SYMBIAN32__
-	s32 ready;
+	int ready;
 	struct timeval timeout;
 	fd_set Group;
 #endif
@@ -835,7 +842,8 @@
 	timeout.tv_sec = 0;
 	timeout.tv_usec = SOCK_MICROSEC_WAIT;
 
-	ready = select(sock->socket+1, NULL, &Group, NULL, &timeout);
+	//TODO CHECK IF THIS IS CORRECT
+	ready = select((int) sock->socket+1, NULL, &Group, NULL, &timeout);
 	if (ready == SOCKET_ERROR) {
 		switch (LASTSOCKERROR) {
 		case EAGAIN:
@@ -972,10 +980,10 @@
 		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 = aip->ai_addrlen;
+		sock->dest_addr_len = (u32) aip->ai_addrlen;
 
 		if (!NoBind) {
-			ret = bind(sock->socket, aip->ai_addr, aip->ai_addrlen);
+			ret = bind(sock->socket, aip->ai_addr, (int) aip->ai_addrlen);
 			if (ret == SOCKET_ERROR) {
 				closesocket(sock->socket);
 				sock->socket = NULL_SOCKET;
@@ -1114,7 +1122,8 @@
 	timeout.tv_usec = SOCK_MICROSEC_WAIT;
 
 	res = 0;
-	ready = select(sock->socket+1, &Group, NULL, NULL, &timeout);
+	//TODO - check if this is correct
+	ready = select((int) sock->socket+1, &Group, NULL, NULL, &timeout);
 	if (ready == SOCKET_ERROR) {
 		switch (LASTSOCKERROR) {
 		case EBADF:
@@ -1124,6 +1133,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"));
 			return GF_IP_NETWORK_EMPTY;
 		default:
 			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] cannot select (error %d)\n", LASTSOCKERROR));
@@ -1131,7 +1141,7 @@
 		}
 	}
 	if (!ready || !FD_ISSET(sock->socket, &Group)) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[socket] nothing to be read\n"));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[socket] nothing to be read - ready %d\n", ready));
 		return GF_IP_NETWORK_EMPTY;
 	}
 #endif
@@ -1200,7 +1210,8 @@
 	timeout.tv_sec = 0;
 	timeout.tv_usec = SOCK_MICROSEC_WAIT;
 
-	ready = select(sock->socket+1, &Group, NULL, NULL, &timeout);
+	//TODO - check if this is correct
+	ready = select((int) sock->socket+1, &Group, NULL, NULL, &timeout);
 	if (ready == SOCKET_ERROR) {
 		switch (LASTSOCKERROR) {
 		case EAGAIN:
@@ -1346,7 +1357,8 @@
 	timeout.tv_sec = 0;
 	timeout.tv_usec = SOCK_MICROSEC_WAIT;
 
-	ready = select(sock->socket+1, NULL, &Group, NULL, &timeout);
+	//TODO - check if this is correct
+	ready = select((int) sock->socket+1, NULL, &Group, NULL, &timeout);
 	if (ready == SOCKET_ERROR) {
 		switch (LASTSOCKERROR) {
 		case EAGAIN:
@@ -1368,7 +1380,7 @@
 		struct addrinfo *res = gf_sk_get_ipv6_addr(remoteHost, remotePort, AF_UNSPEC, 0, (sock->flags & GF_SOCK_IS_TCP) ? SOCK_STREAM : SOCK_DGRAM);
 		if (!res) return GF_IP_ADDRESS_NOT_FOUND;
 		memcpy(&remote_add, res->ai_addr, res->ai_addrlen);
-		remote_add_len = res->ai_addrlen;
+		remote_add_len = (u32) res->ai_addrlen;
 		freeaddrinfo(res);
 	} else {
 		struct sockaddr_in6 *remotePtr = (struct sockaddr_in6 *)&remote_add;
@@ -1432,7 +1444,8 @@
 	timeout.tv_usec = SOCK_MICROSEC_WAIT;
 
 	res = 0;
-	ready = select(sock->socket+1, &Group, NULL, NULL, &timeout);
+	//TODO - check if this is correct
+	ready = select((int) sock->socket+1, &Group, NULL, NULL, &timeout);
 	if (ready == SOCKET_ERROR) {
 		switch (LASTSOCKERROR) {
 		case EAGAIN:
@@ -1482,7 +1495,8 @@
 	timeout.tv_sec = Second;
 	timeout.tv_usec = SOCK_MICROSEC_WAIT;
 
-	ready = select(sock->socket+1, NULL, &Group, NULL, &timeout);
+	//TODO - check if this is correct
+	ready = select((int) sock->socket+1, NULL, &Group, NULL, &timeout);
 	if (ready == SOCKET_ERROR) {
 		switch (LASTSOCKERROR) {
 		case EAGAIN:
@@ -1518,3 +1532,4 @@
 	return GF_OK;
 }
 
+

gpac-0.5.0.svn4296.tar.bz2/src/utils/os_thread.c -> gpac-0.5.0.svn4668.tar.bz2/src/utils/os_thread.c Changed

@@ -23,6 +23,7 @@
  *
  */
 
+
 #ifdef GPAC_ANDROID
 #include <jni.h>
 #endif
@@ -230,7 +231,26 @@
 
 #ifdef WIN32
 	t->threadH = CreateThread(NULL,  t->stackSize, &(RunThread), (void *)t, 0, &id);
-	if (t->threadH == NULL) {
+	if (t->threadH != NULL) {
+		/*add thread name for the msvc debugger*/
+#pragma pack(push,8)
+		typedef struct {
+			DWORD dwType;
+			LPCSTR szName;
+			DWORD dwThreadID;
+			DWORD dwFlags;
+		} THREADNAME_INFO;
+#pragma pack(pop)
+		THREADNAME_INFO info;
+		info.dwType = 0x1000;
+		info.szName = t->log_name;
+		info.dwThreadID = id;
+		info.dwFlags = 0;
+		__try {
+			RaiseException(0x406D1388, 0, sizeof(info)/sizeof(ULONG_PTR), (ULONG_PTR*)&info);
+		} __except (EXCEPTION_CONTINUE_EXECUTION) {
+		}
+	} else {
 #else
 	if ( pthread_attr_init(&att) != 0 ) return GF_IO_ERR;
 	pthread_attr_setdetachstate(&att, PTHREAD_CREATE_JOINABLE);
@@ -664,8 +684,12 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("[Mutex] CloseHandle when deleting semaphore failed with error code %d\n", err));
 	}
 #elif defined(__DARWIN__) || defined(__APPLE__)
+#ifdef GPAC_IPHONE
+    sem_close(sm->hSemaphore);
+#else
 	sem_destroy(sm->hSemaphore);
-	gf_free(sm->SemName);
+#endif
+    gf_free(sm->SemName);
 #else
 	sem_destroy(sm->hSemaphore);
 #endif
@@ -742,3 +766,203 @@
 #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.svn4296.tar.bz2/src/utils/ringbuffer.c -> gpac-0.5.0.svn4668.tar.bz2/src/utils/ringbuffer.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/utils/sha1.c -> gpac-0.5.0.svn4668.tar.bz2/src/utils/sha1.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/utils/token.c -> gpac-0.5.0.svn4668.tar.bz2/src/utils/token.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/utils/url.c -> gpac-0.5.0.svn4668.tar.bz2/src/utils/url.c Changed

@@ -36,7 +36,9 @@
 	/*relative URL*/
 	GF_URL_TYPE_RELATIVE ,
 	/*any other URL*/
-	GF_URL_TYPE_ANY
+	GF_URL_TYPE_ANY,
+	/*BLOB URL*/
+	GF_URL_TYPE_BLOB
 };
 
 /*resolve the protocol type, for a std URL: http:// or ftp:// ...*/
@@ -50,6 +52,8 @@
 		|| ((pathName[0] == ':') && (pathName[1] == ':'))
 		) return GF_URL_TYPE_FILE;
 
+    if (!strncmp(pathName, "blob:", 5)) return GF_URL_TYPE_BLOB;
+
 	begin = strstr(pathName, "://");
 	if (!begin) begin = strstr(pathName, "|//"); 
 	if (!begin) return GF_URL_TYPE_RELATIVE;
@@ -110,7 +114,7 @@
 		if (sep) {
 			u32 len;
 			sep[0] = 0;
-			len = strlen(parentName);
+			len = (u32) strlen(parentName);
 			outPath = (char*)gf_malloc(sizeof(char)*(len+1+strlen(pathName)));
 			strcpy(outPath, parentName);
 			strcat(outPath, pathName);
@@ -214,7 +218,7 @@
 	}
 
 	/*remove the last /*/
-	for (i = strlen(parentName); i > 0; i--) {
+	for (i = (u32) strlen(parentName); i > 0; i--) {
 		//break our path at each separator
 		if ((parentName[i-1] == GF_PATH_SEPARATOR) || (parentName[i-1] == '/'))  {
 			tmp[i-1] = 0;
@@ -233,7 +237,7 @@
 		strcat(tmp, "/");
 	}
 
-	i = strlen(tmp);
+	i = (u32) strlen(tmp);
 	outPath = (char *) gf_malloc(i + strlen(name) + 1);
 	sprintf(outPath, "%s%s", tmp, name);
 
@@ -335,3 +339,22 @@
 	return 0;
 }
 
+
+GF_EXPORT
+Bool gf_url_remove_last_delimiter(const char *sURL, char *res_path)
+{
+	strcpy(res_path, sURL);
+	if (sURL[strlen(sURL)-1] == GF_PATH_SEPARATOR){
+		res_path[strlen(sURL)-1] = 0;
+		return GF_TRUE;
+	}
+
+	return GF_FALSE;
+}
+
+GF_EXPORT
+const char* gf_url_get_ressource_extension(const char *sURL){
+	const char *dot = strrchr(sURL, '.');
+    if(!dot || dot == sURL) return "";
+    return dot + 1;
+}
\ No newline at end of file

gpac-0.5.0.svn4296.tar.bz2/src/utils/utf.c -> gpac-0.5.0.svn4668.tar.bz2/src/utils/utf.c Changed

gpac-0.5.0.svn4296.tar.bz2/src/utils/xml_parser.c -> gpac-0.5.0.svn4668.tar.bz2/src/utils/xml_parser.c Changed

@@ -64,7 +64,7 @@
 				end = strchr(szChar, ';');
 				if (!end) break;
 				end[1] = 0;
-				i+=strlen(szChar);
+				i += (u32) strlen(szChar);
 				wchar[1] = 0;
 				if (szChar[2]=='x')
 					sscanf(szChar, "&#x%x;", &val);
@@ -72,7 +72,7 @@
 					sscanf(szChar, "&#%u;", &val);
 				wchar[0] = val;
 				srcp = wchar;
-				j += gf_utf8_wcstombs(&value[j], 20, &srcp);
+				j += (u32) gf_utf8_wcstombs(&value[j], 20, &srcp);
 			}
 			else if (!strnicmp(&str[i], "&amp;", sizeof(char)*5)) {
 				value[j] = '&';
@@ -217,7 +217,7 @@
 	
 	sprintf(szM, " - Line %d: ", parser->line + 1);
 	strcat(parser->err_msg, szM);
-	len = strlen(parser->err_msg);
+	len = (u32) strlen(parser->err_msg);
 	strncpy(parser->err_msg + len, parser->buffer+ (linepos ? linepos : parser->current_pos), 10);
 	parser->err_msg[len + 10] = 0;
 	parser->sax_state = SAX_STATE_SYNTAX_ERROR;
@@ -407,7 +407,7 @@
 			sep = strchr(parser->buffer + parser->att_name_start - 1, parser->in_quote ?  parser->in_quote : ' ');
 			/*not enough data*/
 			if (!sep) return 1;
-			parser->current_pos = sep - parser->buffer;
+			parser->current_pos = (u32) (sep - parser->buffer);
 			parser->att_name_start = 0;
 			if (parser->in_quote) {
 				parser->current_pos++;
@@ -423,7 +423,7 @@
 			/*not enough data*/
 			if (!sep) return 1;
 
-			parser->current_pos = sep - parser->buffer;
+			parser->current_pos = (u32) (sep - parser->buffer);
 			att = xml_get_sax_attribute(parser);
 			att->name_start = parser->att_name_start;
 			att->name_end = parser->current_pos + 1;
@@ -491,16 +491,16 @@
 		if (!sep || !sep[1]) return 1;
 
 		if (sep[1]==parser->att_sep) {
-			format_sax_error(parser, sep - parser->buffer, "Invalid character %c after attribute value separator %c ", sep[1], parser->att_sep);
+			format_sax_error(parser, (u32) (sep - parser->buffer), "Invalid character %c after attribute value separator %c ", sep[1], parser->att_sep);
 			return 1;
 		}
 
 		if (!parser->init_state && (strchr(" />\n\t\r", sep[1])==NULL)) {
-			parser->current_pos = sep - parser->buffer + 1;
+			parser->current_pos = (u32) (sep - parser->buffer + 1);
 			goto att_retry;
 		}
 
-		parser->current_pos = sep - parser->buffer;
+		parser->current_pos = (u32) (sep - parser->buffer);
 		att->val_end = parser->current_pos + 1;
 		parser->current_pos++;
 
@@ -645,7 +645,7 @@
 			szName[i] = 0;
 			GF_SAFEALLOC(ent, XML_Entity);
 			ent->name = gf_strdup(szName);
-			ent->namelen = strlen(ent->name);
+			ent->namelen = (u32) strlen(ent->name);
 			ent->sep = c;
 			parser->current_pos += 1+i;
 			assert(parser->current_pos < parser->line_size);
@@ -680,7 +680,7 @@
 	if (!cd_end) {
 		xml_sax_store_text(parser, parser->line_size - parser->current_pos);
 	} else {
-		u32 size = cd_end - (parser->buffer + parser->current_pos);
+		u32 size = (u32) (cd_end - (parser->buffer + parser->current_pos));
 		xml_sax_store_text(parser, size);
 		xml_sax_flush_text(parser);
 		parser->current_pos += 3;
@@ -911,7 +911,7 @@
 static GF_Err xml_sax_append_string(GF_SAXParser *parser, char *string)
 {
 	u32 size = parser->line_size;
-	u32 nl_size = strlen(string);
+	u32 nl_size = (u32) strlen(string);
 	
 	if (!nl_size) return GF_OK;
 
@@ -933,7 +933,7 @@
 static XML_Entity *gf_xml_locate_entity(GF_SAXParser *parser, char *ent_start, Bool *needs_text)
 {
 	u32 i, count;
-	u32 len = strlen(ent_start);
+	u32 len = (u32) strlen(ent_start);
 
 	*needs_text = 0;
 	count = gf_list_count(parser->entities);
@@ -973,7 +973,7 @@
 			entityStart = strrchr(parser->buffer, '&');
 
 			entityEnd[0] = 0;
-			len = strlen(entityStart) + strlen(current) + 1;
+			len = (u32) strlen(entityStart) + (u32) strlen(current) + 1;
 			name = gf_malloc(sizeof(char)*len);
 			sprintf(name, "%s%s;", entityStart+1, current);
 
@@ -989,7 +989,7 @@
 			}
 			assert(ent);
 			/*truncate input buffer*/
-			parser->line_size -= strlen(entityStart);
+			parser->line_size -= (u32) strlen(entityStart);
 			entityStart[0] = 0;
 
 			parser->in_entity = 0;
@@ -1042,9 +1042,9 @@
 
 	if (parser->unicode_type>1) {
 		const u16 *sptr = (const u16 *)string;
-		u32 len = 2*gf_utf8_wcslen(sptr);
+		u32 len = 2 * (u32) gf_utf8_wcslen(sptr);
 		utf_conv = (char *)gf_malloc(sizeof(char)*(len+1));
-		len = gf_utf8_wcstombs(utf_conv, len, &sptr);
+		len = (u32) gf_utf8_wcstombs(utf_conv, len, &sptr);
 		if (len==(u32) -1) {
 			parser->sax_state = SAX_STATE_SYNTAX_ERROR;
 			gf_free(utf_conv);
@@ -1343,8 +1343,8 @@
 
 
 #define CPYCAT_ALLOC(__str, __is_copy) if ( strlen(__str) + (__is_copy ? 0 : strlen(szLine))>=alloc_size) {\
-								alloc_size = 1+strlen(__str);	\
-								if (!__is_copy) alloc_size += strlen(szLine); \
+								alloc_size = 1 + (u32) strlen(__str);	\
+								if (!__is_copy) alloc_size += (u32) strlen(szLine); \
 								szLine = gf_realloc(szLine, alloc_size);	\
 							}\
 							if (__is_copy) strcpy(szLine, __str);	\
@@ -1368,13 +1368,14 @@
 		pos = gztell(parser->gz_in);
 #endif
 	}
-	att_len = strlen(parser->buffer + parser->att_name_start);
+	att_len = (u32) strlen(parser->buffer + parser->att_name_start);
 	if (att_len<2*XML_INPUT_SIZE) att_len = 2*XML_INPUT_SIZE;
 	alloc_size = att_len;
 	szLine = (char *) gf_malloc(sizeof(char)*alloc_size);
 	strcpy(szLine, parser->buffer + parser->att_name_start);
+	parser->buffer[parser->elt_name_end - 1] = '"';
 	cur_line = szLine;
-	att_len = strlen(att_value);
+	att_len = (u32) strlen(att_value);
 	state = 0;
 	goto retry;
 
@@ -1383,9 +1384,9 @@
 		u8 sep_char;
 		if (!from_buffer) {
 #ifdef NO_GZIP
-			if (!feof(parser->f_in)) break;
+			if (feof(parser->f_in)) break;
 #else
-			if (!gzeof(parser->gz_in)) break;
+			if (gzeof(parser->gz_in)) break;
 #endif
 		}
 
@@ -1568,6 +1569,7 @@
 GF_EXPORT
 void gf_xml_dom_node_del(GF_XMLNode *node)
 {
+	if (!node) return;
 	if (node->attributes) {
 		while (gf_list_count(node->attributes)) {
 			GF_XMLAttribute *att = (GF_XMLAttribute *)gf_list_last(node->attributes);
@@ -1617,6 +1619,7 @@
 	gf_list_add(par->stack, node);
 	if (!par->root) par->root = node;
 }
+
 static void on_dom_node_end(void *cbk, const char *name, const char *ns)
 {
 	GF_DOMParser *par = (GF_DOMParser *)cbk;
@@ -1726,15 +1729,27 @@
 	gf_xml_dom_reset(dom, 1);
 	dom->stack = gf_list_new();
 	dom->parser = gf_xml_sax_new(on_dom_node_start, on_dom_node_end, on_dom_text_content, dom);
-	e = gf_xml_sax_init(dom->parser, string);
+	e = gf_xml_sax_init(dom->parser, (unsigned char *) string);
 	gf_xml_dom_reset(dom, 0);
 	return e<0 ? e : GF_OK;
 }
 
 GF_EXPORT
+GF_XMLNode *gf_xml_dom_create_root(GF_DOMParser *parser, const char* name){
+	GF_XMLNode * root;
+	if (!parser) return NULL;
+
+	GF_SAFEALLOC(root, GF_XMLNode);
+	if (!root) return NULL;
+	root->name = gf_strdup(name);
+
+	return root;
+}
+
+GF_EXPORT
 GF_XMLNode *gf_xml_dom_get_root(GF_DOMParser *parser)
 {
-	return parser->root;
+	return parser? parser->root : NULL;
 }
 GF_EXPORT
 const char *gf_xml_dom_get_error(GF_DOMParser *parser)
@@ -1747,14 +1762,13 @@
 	return gf_xml_sax_get_line(parser->parser);
 }
 
-
 static void gf_xml_dom_node_serialize(GF_XMLNode *node, Bool content_only, char **str, u32 *alloc_size, u32 *size)
 {
 	u32 i, count, vlen;
 	char *name;
 	
 #define SET_STRING(v)	\
-	vlen = strlen(v);	\
+	vlen = (u32) strlen(v);	\
 	if (vlen+ (*size) >= (*alloc_size)) {	\
 		(*alloc_size) += 1024;	\
 		(*str) = gf_realloc((*str), (*alloc_size));	\
@@ -1826,3 +1840,70 @@
 	gf_xml_dom_node_serialize(node, content_only, &str, &alloc_size, &size);
 	return str;
 }
+
+GF_EXPORT
+GF_XMLAttribute *gf_xml_dom_set_attribute(GF_XMLNode *node, const char* name, const char* value){
+	GF_XMLAttribute *att;
+	if (!name || !value) return NULL;
+	if (!node->attributes) {
+		node->attributes = gf_list_new();
+		if (!node->attributes) return NULL;
+	}
+	
+	GF_SAFEALLOC(att, GF_XMLAttribute);
+	if (!att) return NULL;
+
+	att->name = gf_strdup(name);
+	att->value = gf_strdup(value);
+	gf_list_add(node->attributes, att);
+	return att;
+}
+
+GF_EXPORT
+GF_XMLAttribute *gf_xml_dom_get_attribute(GF_XMLNode *node, const char* name){
+	u32 i = 0;
+	GF_XMLAttribute *att;
+	if (!node | !name) return NULL;
+
+	while ( (att = (GF_XMLAttribute*)gf_list_enum(node->attributes, &i))) {
+		if (!strcmp(att->name, name)){
+			return att;
+		}
+	}
+
+	return NULL;
+}
+
+GF_EXPORT
+GF_Err gf_xml_dom_append_child(GF_XMLNode *node, GF_XMLNode *child){
+	if (!node | !child) return GF_BAD_PARAM;
+	if (!node->content){
+		node->content = gf_list_new();
+		if (!node->content) return GF_OUT_OF_MEM;
+	}
+	return gf_list_add(node->content, child);
+}
+
+GF_EXPORT
+GF_XMLNode* gf_xml_dom_node_new(const char* ns, const char* name){
+	GF_XMLNode* node;
+	GF_SAFEALLOC(node, GF_XMLNode);
+	if (!node) return NULL;
+	if (ns){
+		node->ns = gf_strdup(ns);
+		if (!node->ns){
+			gf_free(node);
+			return NULL;
+		}
+	}
+
+	if (name){
+		node->name = gf_strdup(name);
+		if (!node->name){
+			gf_free(node->ns);
+			gf_free(node);
+			return NULL;
+		}
+	}
+	return node;
+}

Overview

Request 13 (accepted)

Request History