From: gn64_jp <gn64_jp@4e526526-5e11-4fc0-8910-f8fd03428081>
Date: Sat, 26 Dec 2009 13:51:02 +0000 (+0000)
Subject: add tstools.
X-Git-Url: http://git.osdn.net/view?p=rec10%2Frec10-git.git;a=commitdiff_plain;h=4a46c2f9fb724230e1534abe701d621d2037200d

add tstools.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@367 4e526526-5e11-4fc0-8910-f8fd03428081
---

diff --git a/tstools/BonTsDemux/BonTsDemux.exe b/tstools/BonTsDemux/BonTsDemux.exe
new file mode 100755
index 0000000..8ea97f4
Binary files /dev/null and b/tstools/BonTsDemux/BonTsDemux.exe differ
diff --git a/tstools/BonTsDemux/BonTsDemux.txt b/tstools/BonTsDemux/BonTsDemux.txt
new file mode 100755
index 0000000..0f47538
--- /dev/null
+++ b/tstools/BonTsDemux/BonTsDemux.txt
@@ -0,0 +1,270 @@
+BonTsDemux mod 10k5 (modified by kt)
+
+LxbEvo.FpEŽ‚É‚æ‚é BonTsDemux mod 10 ‚ð‰ü‘¢‚µ‚½‚à‚́B
+
+AAC ‚Ì Demux ‚ðƒoƒbƒ`ˆ—‚Å‚«‚éƒ\ƒtƒg‚ªŒ©“–‚½‚ç‚È‚©‚Á‚½‚½‚߂ɍ쐬B
+
+›•ÏX“_
+EAAC ‚Ì Demux ‹@”\‚𕜊ˆB
+  AAC Demux Žž‚ɂ́Aƒtƒ@ƒCƒ‹–¼‚É’x‰„ŽžŠÔ‚ð“ü‚ê‚é‚悤‚ɕύXB
+  iDGIndex ‚È‚Ç‚Æ“¯‚¶Œ`Ž®Bj
+
+E‰¹º‚Ì’x‰„ŽžŠÔ‚ð•â³‚Å‚«‚é‚悤‚ɕύXB
+  ƒRƒ}ƒ“ƒhƒ‰ƒCƒ“‚Å‚Í -delay nnn ‚ÅŽw’è‰Â”\Binnn ‚́Ams’PˆÊ‚̐®”j
+
+ERF64ƒTƒ|[ƒgAVideo Frame•âŠ®‚̐ݒè‚ðƒtƒ@ƒCƒ‹‚²‚Æ‚É‹L‰¯‚·‚é‚悤‚ɕύXB
+  D&D ‚Ńtƒ@ƒCƒ‹‚ð“o˜^‚·‚éê‡‚́A‘¼‚̃IƒvƒVƒ‡ƒ“‚Æ“¯—l‚ɁAæ‚ÉŠó–]‚̐ݒè‚ð
+  ‘I‚ñ‚Å‚¨‚¢‚½ó‘Ô‚Å D&D ‚·‚邱‚ƁB
+
+EƒXƒNƒ‰ƒ“ƒuƒ‹‰ðœ‚ðs‚í‚È‚¢ƒIƒvƒVƒ‡ƒ“‚ð’ljÁB
+  ƒRƒ}ƒ“ƒhƒ‰ƒCƒ“‚Å‚Í -nd ‚ÅŽw’è‰Â”\B
+  iƒXƒNƒ‰ƒ“ƒuƒ‹‰ðœÏ‚݃tƒ@ƒCƒ‹‚̏ˆ—‚‘¬‰»—pj
+
+E‘€ì«Œüã‚Ì‚½‚߁Aˆê•”‚̃{ƒ^ƒ““™‚ɃAƒNƒZƒXƒL[‚ð’ljÁB
+
+E‚»‚Ì‘¼‚ׂ̍©‚¢•ÏX‚͉º‹L‚Ì—š—ð‚ðŽQÆ‚Ì‚±‚ƁB
+
+
+›ƒrƒ‹ƒh‚É•K—v‚Ȋ‹«/ƒ‰ƒCƒuƒ‰ƒŠ
+EMicrosoft Visual Studio 2003 ˆÈã
+EFAAD 2.6.1
+  http://www.audiocoding.com/downloads.html
+  iƒRƒ“ƒpƒCƒ‹‚µ‚Ä‚Å‚«‚½ƒŠƒŠ[ƒX”Å libfaad.lib ‚ð BonTsDemux.vcproj ‚È‚Ç‚Æ
+    “¯‚¶ŠK‘w‚É’u‚­‚±‚ƁB‚Ü‚½AƒfƒoƒbƒO”ł̃‰ƒCƒuƒ‰ƒŠ‚Í libfaadd.lib ‚ɃŠƒl[ƒ€
+    ‚µ‚Ä“¯‚¶ŠK‘w‚É’u‚­‚±‚ƁBj
+
+›—š—ð
+2009/01/10  mod 10k5
+E‘€ì«Œüã‚Ì‚½‚߁Aˆê•”‚̃{ƒ^ƒ““™‚ɃAƒNƒZƒXƒL[‚ð’ljÁB
+EMFC ‚ðƒXƒ^ƒeƒBƒbƒNƒŠƒ“ƒN‚·‚é‚悤‚ɕύXBiƒ‰ƒ“ƒ^ƒCƒ€ƒ‰ƒCƒuƒ‰ƒŠ‚Í•s—v‚ɁBj
+
+2008/09/13  mod 10k4
+EƒXƒNƒ‰ƒ“ƒuƒ‹‰ðœ‚ðs‚í‚È‚¢ƒIƒvƒVƒ‡ƒ“‚ð’ljÁB
+EÝ’è‚ð•ÏX‚µ‚Ä‚¢‚È‚¢‚É‚àŠÖ‚í‚炸A•ÏŠ·ŠJŽnŽž‚Ƀoƒbƒ`ƒŠƒXƒg‚ɒljÁ“o˜^‚³‚ê‚é
+  ê‡‚ª‚ ‚Á‚½‚Ì‚ðC³B
+
+2008/09/10  mod 10k3
+Eƒ‰ƒ“ƒ^ƒCƒ€ƒ‰ƒCƒuƒ‰ƒŠ‚ª•s‘«‚µ‚Ä‚¢‚½‚̂ŒljÁBi’†g‚̕ύX‚Í–³‚µBj
+
+2008/09/07  mod 10k3
+Emod 10k2 ‚ŁA‰¹º‚Ì’x‰„ŽžŠÔ‚̕␳‚ªŒø‚¢‚Ä‚¢‚È‚©‚Á‚½‚Ì‚ðC³B
+  ‚È‚¨A•â³’l‚É‚ ‚Ü‚è‘å‚«‚È’li”•bˆÈãHj‚ð“ü‚ê‚é‚Æ“®ì‚ª‚¨‚©‚µ‚­‚È‚é‚©‚à
+  ’m‚ê‚È‚¢‚Ì‚Å’ˆÓB
+
+2008/09/07  mod 10k2
+Eˆ—‚ªI—¹‚µ‚½‚çƒEƒBƒ“ƒhƒE‚ð“_–Å‚³‚¹‚é‚悤‚ɕύXB
+ERF64ƒTƒ|[ƒgAVideo Frame•âŠ®‚̐ݒè‚ðƒtƒ@ƒCƒ‹‚²‚Æ‚É•Û‘¶‚·‚é‚悤‚ɕύXB
+E‰¹º‚Ì’x‰„ŽžŠÔ‚ð•â³‚Å‚«‚é‚悤‚ɕύXB
+Eƒ^ƒuƒI[ƒ_[‚ª‚ß‚¿‚á‚­‚¿‚Ⴞ‚Á‚½‚Ì‚ðC³B
+Eƒ‰ƒ“ƒ^ƒCƒ€ƒ‰ƒCƒuƒ‰ƒŠ‚𓯍«B
+
+2008/08/25  mod 10k1
+Emod 10 ‚ð‰ü‘¢B
+EAAC ‚Ì Demux ‹@”\‚𕜊ˆB
+  AAC Demux Žž‚ɂ́Aƒtƒ@ƒCƒ‹–¼‚É’x‰„ŽžŠÔ‚ð“ü‚ê‚é‚悤‚ɕύXB
+  iDGIndex ‚È‚Ç‚Æ“¯‚¶Œ`Ž®Bj
+EWin2kiWinXP ‚ŃrƒWƒ…ƒAƒ‹ƒXƒ^ƒCƒ‹ off ‚̏ꍇ‚àHj‚ŁAƒhƒƒbƒvƒ_ƒEƒ“
+  ƒRƒ“ƒ{ƒ{ƒbƒNƒX‚ª 1s‚µ‚©•\Ž¦‚³‚ê‚È‚¢‚Ì‚ðC³B
+Eƒoƒbƒ`ƒŠƒXƒg‚Ì•\Ž¦•‚ðŠg‘åB
+Eƒtƒ@ƒCƒ‹ƒI[ƒvƒ“ƒ_ƒCƒAƒƒO‚̃TƒCƒY‚ð‰Â•Ï‚ɐݒèB
+E‚»‚Ì‘¼AVS2003 ‚ŃRƒ“ƒpƒCƒ‹‚Å‚«‚é‚悤‚É‚·‚邽‚߂̃\[ƒXã‚̏C³‚ȂǁB
+
+
+
+----------------------------------------------------------------------------
+BonTsDemux mod 10 readme
+----------------------------------------------------------------------------
+
+BonTsDemux mod 10 (modified by LxbEvo.FpE)
+
+TSƒtƒ@ƒCƒ‹‚ðA’¼Ú•Êƒtƒ@ƒCƒ‹‚É•ÏŠ·‚·‚éB
+
+BonTsDemux‚ŁAWAV•ÏŠ·Žž‚ÉVideo Frame‚ÆAudio PTS‚ðŽg‚Á‚ĉ¹º‚𠂸‚ê‚È‚¢‚悤‚ɕ⊮
+ffmpeg‚É’¼Ú‚Í‚¢‚Ä‚Ý‚é
+
+
+Ý’荀–Ú‚Ìà–¾
+
+	ERF64ƒTƒ|[ƒg
+	
+		true Žž 4GB ƒI[ƒo[Žž RIFF‹­§ 
+		false Žž 4GB ƒI[ƒo[Žž RF64i¡‚Ü‚Å’Ê‚è‚Ì“®ìj 
+
+	EVideo Frame•âŠ®
+
+		ETSƒ\[ƒX‚ʼn¹º‚Ì‚Ý‚Ì‹óŠÔ‚ª‚ ‚é
+		Ebiterr“™‚ŁAƒrƒfƒI or ‰¹ºƒtƒŒ[ƒ€‚ÌŒ‡—Ž‚ª‚ ‚é
+		ã‹L‚ª‚ ‚Ä‚Í‚Ü‚éTSƒ\[ƒX‚ʼn¹‚¸‚ꂪ”­¶‚·‚éê‡A‚±‚ê‚Ƀ`ƒFƒbƒN‚ð“ü‚ê‚é‚Ɖü‘P‚·‚é‚©‚àB
+		¦‚½‚¾‚µAŒ»ó‚Å‚Í29.97fpsŒˆ‚ß‚¤‚¿‚Ȃ̂ŁA‚»‚êˆÈŠO‚̃\[ƒX‚¾‚Æ‹t‚É‚¸‚ê‚Ä‚µ‚Ü‚¢‚Ü‚·B
+
+
+FFMPEGŽg—pŽž‚Ì’ˆÓŽ–€
+	E‹­§5.1cho—Í‚¾‚Æ‚Ù‚Æ‚ñ‚ǂ̃P[ƒX‚ŃGƒ‰[‚É‚È‚è‚Ü‚·B
+	Elocalhost:1234‚ðBonTsDemux‘¤‚ÅŽg—p‚µ‚Ü‚·B
+	E“ü—Í(-i)Ao—̓tƒ@ƒCƒ‹‚ÌŽw’è‚Í‚µ‚È‚¢‚Å‚­‚¾‚³‚¢B
+
+
+ƒRƒ}ƒ“ƒhƒ‰ƒCƒ“‚©‚ç‚̌Ăяo‚µŽd—l
+	—á: bontsdemux -i "test.ts" -o "test" -encode "Demux(m2v)" -start -quit
+
+	ƒRƒ}ƒ“ƒhŽí—Þ
+	-i [ƒtƒ@ƒCƒ‹–¼]		“ü—̓tƒ@ƒCƒ‹(ts)‚̐ݒè
+	-o [ƒtƒ@ƒCƒ‹–¼]		o—̓tƒ@ƒCƒ‹‚̐ݒèBŠg’£Žq‚ÍŽ©“®‚Å•t‚­Žd—l‚Ȃ̂ŁA‚‚¯‚È‚¢‚±‚Ƃ𐄏§
+	-srv [ƒT[ƒrƒX”ԍ†]	ƒT[ƒrƒX”ԍ†‚Ì‘I‘ð(10i”’l)
+	-es [0-2]			‰¹ºES‚Ì‘I‘ð(0:ƒT[ƒrƒX‚Ɉˑ¶ 1-2:2-3”Ô–Ú‚É‘¶Ý‚·‚鉹º(‚È‚¢ê‡‚Í0‚Æ“¯‚¶U‚é•‘‚¢‚ð‚·‚é)
+	-encode [Ží—Þ]		[Ží—Þ]—áF	Žw’è‚È‚µ	cDemux(m2v+wav)
+									Demux(wav)	c‰¹º‚Ì‚Ý
+									Demux(m2v)	c‰f‘œ‚Ì‚Ý
+									MPG2PS		cMPG2PSŒ`Ž®‚ŏo—Í(cap_sts_sea.ini‚ł̐ݒ荀–Ú)
+									WMV8		cWMV8(cap_sts_sea.ini‚ł̐ݒ荀–Ú)
+									 F
+	-sound [•ûŽ®(0-4)]	0:Stereo(Žå+•›)
+						1:Žå‰¹º
+						2:•›‰¹º
+						3:‹­§5.1ch
+						4:‹­§5.1ch(Split)
+	-rf64				wav RF64ƒTƒ|[ƒg
+	-vf					Video Frame•âŠ®—LŒø
+	-start				Ž©“®‚ÅŠJŽn
+	-quit				Ž©“®‚ŏI—¹
+
+----------------------------------------------------------------------------------------
+mod 10
+	qE.77T.inkŽ‚ÌWavWriter ‚Ì RIFF ‹­§‘Ήž”Å
+	Video Frame•âŠ® ‚ðAƒIƒvƒVƒ‡ƒ“ˆµ‚¢‚ɕύX
+
+mod 9.1
+	•›‰¹º‚ª‘I‘ð‚Å‚«‚Ä‚¢‚È‚©‚Á‚½•s‹ï‡‚ðC³
+
+mod 9
+	ƒRƒ}ƒ“ƒhƒ‰ƒCƒ“ƒIƒvƒVƒ‡ƒ“‚ɑΉž
+	‰¹ºo—Í•ûŽ®‚ŁAŽå‰¹º,•›‰¹º‚Ì‘I‘ð‚ªo—ˆ‚È‚©‚Á‚½•s‹ï‡‚ðC³(mod 8‚ł̃Gƒ“ƒoƒO)
+	ƒtƒ@ƒCƒ‹–¼‚ª’·‚·‚¬‚é‚ƁAD&DŽž‚É—Ž‚¿‚Ä‚¢‚½•s‹ï‡‚ðC³
+	RF64o—Í‚ð‘I‘ð‰Â”\‚É‚µ‚½
+	cap_sts_sea.iniƒtƒ@ƒCƒ‹‚ŁAŠg’£Žq‚ÌŽw’è‚ð‰Â”\‚Æ‚µ‚½
+	
+mod 8
+	5.1cho—ÍŽž‚̃`ƒƒƒ“ƒlƒ‹ƒAƒTƒCƒ“ƒoƒOC³
+	qE.77T.inkŽ‚ÌRF64ƒtƒH[ƒ}ƒbƒg‘Ήž
+		¨4GB ‚ð’´‚¦‚é‚ÆŽ©“®“I‚É RF64 ƒtƒH[ƒ}ƒbƒg‚É‚È‚éB
+		¨5.1ch Splitƒ‚[ƒh
+			Eƒ`ƒƒƒ“ƒlƒ‹–ˆ‚É 1ch Wav ‘‚«o‚µƒNƒ‰ƒXB
+			E“n‚³‚ꂽƒtƒ@ƒCƒ‹–¼‚ɑ΂µ‚āAƒ`ƒƒƒ“ƒlƒ‹‚̃TƒtƒBƒbƒNƒX‚ð•t‚¯‚ďo—Í‚·‚éB
+			E4GB ‚ð’´‚¦‚é‚ÆŽ©“®“I‚É RF64 ƒtƒH[ƒ}ƒbƒg‚É‚È‚éB
+
+mod 7
+	Fileo—ÍŽž‚ɁAGOP‚̃TƒCƒY‚ª‘å‚«‚¢‚Ə‘‚«‚±‚݃Gƒ‰[‚ð‚¨‚±‚µ‚Ä‚¢‚½•s‹ï‡‚ðC³
+	ffmpeg‚ªˆÙíI—¹‚µ‚½‚Æ‚«‚Ƀnƒ“ƒOƒAƒbƒv‚µ‚Ä‚¢‚½‚Ì‚ðC³
+	demuxŽž‚ɉ¹º•â³‚ðs‚Á‚½ÛAˆÙíI—¹‚·‚é•s‹ï‡‚ðC³
+	‚»‚Ì‘¼A×‚©‚¢‚Æ‚±‚ë‚ðC³
+	
+mod 6b2
+	MeruŽ‚̃T[ƒrƒX‘I‘ð‚ð‘g‚ݍž‚Ý(“®ì‚ ‚܂茩‚ê‚Ä‚¢‚È‚¢B)
+	PTS‚Ì‚È‚¢ƒpƒPƒbƒg‚ª‚«‚½‚Æ‚«‚ɁA‹­§I—¹‚·‚é•s‹ï‡‚ðC³
+	ƒrƒfƒIo—̓tƒ@ƒCƒ‹‚̃GƒfƒBƒbƒgƒ{ƒbƒNƒX‚ɁAŠg’£Žq‚ð•\Ž¦‚µ‚È‚¢‚悤‚ɏC³
+	Šg’£Žq‚ðm2v,wav,mpg,mp4,avi‚©‚玩“®‚Å‘I‘ð‚·‚é‹@”\
+
+mod 6b
+	5.1 DownMix‚ÌŒW”ŠÔˆá‚¢‚ðC³
+	qE.77T.inkŽ‚Ì‹­§5.1cho—Í‚ð‘g‚ݍž‚Ý(TSƒ\[ƒX‚ª‚È‚¢‚½‚߁A“®ì–¢ŒŸØ)
+	Audio ES ‘I‘ð‹@”\’ljÁ
+	ƒoƒbƒ`ˆ—‹@”\’ljÁ
+	D&D‹@”\’ljÁ
+	‰¹º‘I‘ð(ŽåA•›‰¹)’ljÁ
+	WAVo—͂̂݁AM2Vo—Í‚Ì‚Ý‘I‘ð‹@”\’ljÁ
+	‰¹‚¸‚ê•â³C³(ƒXƒgƒŠ[ƒ€“r’†‚Å‚àA200msˆÈã‹ó”’‚ª‚ ‚éê‡‚ÍNULL‚ňê‹C‚É–„‚ß‚Ä‚Ý‚é)
+
+mod 5
+	ffmpeg‚É’¼Ú‚Í‚¢‚Ä‚Ý‚éƒeƒXƒg
+	ffmpeg‚ւ̃pƒ‰ƒ[ƒ^‚́Acap_sts_sea.ini‚Å’€ŽŸ•ÏX‚µ‚Ä‚­‚¾‚³‚¢B
+		¨“ü—Í(-i)Ao—̓tƒ@ƒCƒ‹‚ÌŽw’è‚Í‚µ‚È‚¢‚Å‚­‚¾‚³‚¢B
+		¨2-pass‚͏o—ˆ‚Ü‚¹‚ñ(Žd—l)B
+		¨•t‘®‚Ìffmpeg.exe‚́A rev.12910 Pentium4Å“K‰»”Å‚Å‚·B(“üŽèŒ³Fhttp://blog.k-tai-douga.com/)
+	‚Ü‚½A¡‰ñ‚̃o[ƒWƒ‡ƒ“‚æ‚èAwav“f‚«o‚µê—p‚É‚È‚Á‚Ä‚¢‚Ü‚·B(‰¹º‚Í‹­§2chê—p)
+
+mod 4
+	mod 3‚ŃRƒ~ƒbƒgƒ~ƒX‚ª‚ ‚Á‚½‚̂ŏC³
+	{‘½­‰ü—Ç
+
+mod 3
+	“r’†‚Ń`ƒƒƒ“ƒlƒ‹‚ð•Ï‚¦‚Ä‚àA‚ ‚é’ö“x“¯Šú‚Å‚«‚é‚悤‚É‚µ‚½(Ž„‚ÌŽÀ—͂ł́A‚±‚ꂪŒÀŠE)
+	ƒGƒ‰[‚Å”jŠü‚·‚邵‚©‚È‚¢‰¹ºƒtƒŒ[ƒ€‚ª‚ ‚Á‚½ê‡AˆÈ‘O‚̃I[ƒfƒBƒIƒTƒCƒY•ª0o—Í‚·‚é‚悤‚É‚µ‚Ä‚Ý‚½B
+	(Œø‰Ê‚Í‚ ‚Á‚½‚ç‚¢‚¢‚È’ö“x)
+
+
+
+----------------------------------------------------------------------------
+original readme
+----------------------------------------------------------------------------
+
+
+| BonTsDemux Ver.1.10 |
+
+
+‚PDŠT—v
+@@EBonƒVƒŠ[ƒY‚ÌMPEG2-TSˆ—ƒGƒ“ƒWƒ“uBonTsEnginev‚ðŽg—p‚µ‚½ƒTƒ“ƒvƒ‹ƒvƒƒOƒ‰ƒ€‚Å‚·B
+@@ETSƒtƒ@ƒCƒ‹‚©‚ç‰f‘œ(m2v)‚Ɖ¹º(aac/wav)‚𕪗£‚µ‚ătƒ@ƒCƒ‹‚ɏo—Í‚µ‚Ü‚·B
+@@EB-CASƒJ[ƒh‚ªÚ‘±‚³‚ê‚Ä‚¢‚éê‡‚̓XƒNƒ‰ƒ“ƒuƒ‹‚³‚ꂽTSƒtƒ@ƒCƒ‹‚̓ǂݍž‚Ý‚ª‰Â”\‚Å‚·B
+@@Eƒ}ƒ‹ƒ`ƒ`ƒƒƒ“ƒlƒ‹‚̏ꍇ‚ÍPAT‚ōŏ‰‚̃T[ƒrƒX‚É‘®‚·‚éƒXƒgƒŠ[ƒ€‚ª•ª—£‚³‚ê‚Ü‚·B
+@@EAACƒfƒR[ƒh‚ðŽg—p‚·‚éê‡‚͏í‚É2ch‚Ƀ_ƒEƒ“ƒRƒ“ƒo[ƒg/ƒAƒbƒvƒRƒ“ƒo[ƒg‚³‚ê‚Ü‚·B
+
+@@¦–{ƒ\ƒtƒgƒEƒFƒA‚Ì“®ì‚ɂ́uMicrosoft Visual C++ 2005 SP1 Ä”Еz‰Â”\ƒpƒbƒP[ƒWv‚ª•K—v‚Å‚·B
+@@@@http://www.microsoft.com/downloads/details.aspx?displaylang=ja&FamilyID=200b2fd9-ae1a-4a14-984d-389c36f85647
+
+
+‚QD’ˆÓŽ–€
+@@EB-CASƒJ[ƒh‚ð‹–‰Â‚³‚ꂽ‹@ŠíˆÈŠO‚ÅŽg—p‚·‚邱‚Æ‚ÍB-CASƒJ[ƒh‚ÌŒ_–ñ–ñŠ¼‚É’ïG‚·‚é‰Â”\«‚ª‚ ‚é
+@@@‚½‚߁A–{ƒ\ƒtƒgƒEƒFƒA‚ÍŽ©ŒÈ‚̐ӔC‚É‚¨‚¢‚ÄŽg—p‚µ‚ĉº‚³‚¢B
+@@E–{ƒ\ƒtƒgƒEƒFƒA‚͉º‹LuŒöŠJ‹KŠiv‚Ì‹Zpî•ñ‚ÉŠî‚«u³‹K‚ÌŽè–@v‚ð—p‚¢‚é‚悤ŽÀ‘•‚³‚ê‚Ä‚¢‚Ü‚·B
+@@@ƒˆ‚É‹Zp“I‚ÈŒŸØ‚ð–Ú“I‚Æ‚µ‚½ƒTƒ“ƒvƒ‹ƒvƒƒOƒ‰ƒ€‚Å‚ ‚èA‘æŽOŽÒ‚Ì’m“IàŽYŒ ‚ðNŠQ‚·‚é‰Â”\«‚Ì
+@@@‚ ‚é–Ú“I‚ÉŽg—p‚³‚ê‚邱‚Æ‚ðìŽÒ‚͈êØˆÓ}‚µ‚Ä‚¨‚炸A‚Ü‚½‚±‚ê‚ç‚̍sˆ×‚ð‹ÖŽ~‚µ‚Ü‚·B
+@@E–{ƒ\ƒtƒgƒEƒFƒA‚͐³‹K‚Ƀ‰ƒCƒZƒ“ƒX‚³‚ꂽB-CASƒJ[ƒh‚ð—p‚¢‚邱‚Æ‚É‚æ‚è•œ†‚ðs‚¢‚Ü‚·B
+@@E–{ƒ\ƒtƒgƒEƒFƒA’P‘Ì‚Å‚Í‚¢‚©‚È‚é’˜ì•¨‚Ì‹Zp“I•ÛŒìŽè’i‚à‰ñ”ð‚·‚é‚±‚Æ‚Í‚Å‚«‚Ü‚¹‚ñB
+@@E–{ƒ\ƒtƒgƒEƒFƒA‚́uƒtƒŠ[ƒ\ƒtƒgv‚Å‚·B
+@@E–{ƒ\ƒtƒgƒEƒFƒA‚ÍARIB‹KŠi‚É“K‡‚·‚邱‚Æ‚ð•Ûá‚µ‚Ä‚¨‚炸A‚¢‚©‚È‚éŽí•Ê‚̐»•i‚É‚àŠY“–‚µ‚Ü‚¹‚ñB
+@@E–{ƒ\ƒtƒgƒEƒFƒA‚ðŽg—p‚µ‚½Œ‹‰Ê”­¶‚µ‚½‚¢‚©‚Ȃ鑹ŠQ‚àìŽÒ‚͐ӔC‚𕉂¤‚±‚Æ‚Í‚Å‚«‚Ü‚¹‚ñB
+@@E–{ƒTƒ“ƒvƒ‹ƒvƒƒOƒ‰ƒ€‚̃\[ƒXƒR[ƒh‚ÌŽæ‚舵‚¢‚ÍGPL‚ɏ]‚¤‚±‚Æ‚Æ‚µ‚Ü‚·B
+
+@@‚±‚ê‚ç‚É“¯ˆÓ’¸‚¯‚éê‡‚ɂ̂݁A–{ƒ\ƒtƒgƒEƒFƒA‚ÌŽg—p‚ð‹–‰Â’v‚µ‚Ü‚·B
+
+
+‚RDƒ‰ƒCƒZƒ“ƒX‚ɂ‚¢‚Ä
+@@E–{ƒpƒbƒP[ƒW‚ÉŠÜ‚Ü‚ê‚é‘S‚Ẵ\[ƒXƒR[ƒhAƒoƒCƒiƒŠ‚ɂ‚¢‚Ä’˜ìŒ ‚͈êØŽå’£‚µ‚Ü‚¹‚ñB
+@@EƒIƒŠƒWƒiƒ‹‚Ì‚Ü‚Ü–”‚͉ü•Ï‚µAŠeŽ©‚̃\ƒtƒgƒEƒFƒA‚ÉŽ©—R‚É“Y•tA‘g‚ݍž‚Þ‚±‚Æ‚ª‚Å‚«‚Ü‚·B
+@@E’A‚µGPL‚ɏ]‚¤‚±‚Æ‚ð—v‹‚µ‚Ü‚·‚Ì‚Å‚±‚ê‚ç‚ðs‚¤ê‡‚̓\[ƒXƒR[ƒh‚ÌŠJŽ¦‚ª•K{‚Æ‚È‚è‚Ü‚·B
+@@E‚±‚Ì‚Æ‚«–{ƒ\ƒtƒgƒEƒFƒA‚Ì’˜ìŒ •\Ž¦‚ðs‚¤‚©‚Ç‚¤‚©‚Í”CˆÓ‚Å‚·B
+@@E–{ƒ\ƒtƒgƒEƒFƒA‚ÍFAAD2‚̃‰ƒCƒuƒ‰ƒŠ”ŃoƒCƒiƒŠ‚ðŽg—p‚µ‚Ä‚¢‚Ü‚·B
+
+@@@"Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
+
+@@Eƒrƒ‹ƒh‚É•K—v‚Ȋ‹«
+@@@- Microsoft Visual Studio 2005 ˆÈã@¦MFC‚ª•K—v
+@@@- Microsoft Windows SDK v6.0 ˆÈã
+
+
+‚SDŽQl•¶Œ£
+@@EARIB STD-B10
+@@EARIB STD-B24
+@@EARIB STD-B25
+@@EARIB STD-B32
+@@EISO/IEC 11172-3
+@@EISO/IEC 13818-1
+@@EISO/IEC 13818-2
+@@EISO/IEC 13818-7
+
+@@E‚Ü‚é‚à»ìŠuARIB STD-B25 Žd—lŠm”FƒeƒXƒgƒvƒƒOƒ‰ƒ€v
+@@EMeruŽuBonTsEngine‰ü‘¢”Łv
+@@EMeruŽuCapUSB M-Editionv
+@@EìŽÒ•s–¾uMpeg2-TS‚̃XƒgƒŠ[ƒ€‚©‚çƒf[ƒ^•ú‘—î•ñ‚𒊏o‚·‚éƒeƒXƒgv
+@@EMicrosoft DirectX 9.0uPSI ƒp[ƒT[ ƒtƒBƒ‹ƒ^ ƒTƒ“ƒvƒ‹v
+
+
+‚TDƒTƒ|[ƒgA˜A—æ
+@@@˜A—æ@@F@Šg’£ƒc[ƒ‹’†‚̐l@@nakanohito@2sen.dip.jp
+@@@ŒöŽ®ƒTƒCƒgF@http://2sen.dip.jp/friio/
+
+‚UDXV—š—ð
+@Ver.1.10 E‰f‘œ‚Ɖ¹º‚ÌŠJŽnˆÊ’u‚𓯊ú‚³‚¹‚é‹@”\‚ð’ljÁB
+@@@@@ E‰¹ºo—̓tƒ@ƒCƒ‹–¼‚ª”½‰f‚³‚ê‚È‚©‚Á‚½•s‹ï‡C³B
+
+@Ver.1.00 E‰‰ñƒŠƒŠ[ƒX
diff --git a/tstools/BonTsDemux/cap_sts_sea.ini b/tstools/BonTsDemux/cap_sts_sea.ini
new file mode 100755
index 0000000..a73ec86
--- /dev/null
+++ b/tstools/BonTsDemux/cap_sts_sea.ini
@@ -0,0 +1,18 @@
+[FFMPEG_SETTING]
+
+
+MPEG2PS		=-f dvd -vcodec copy -aspect 16:9 -acodec libmp3lame -ar 48000 -ab 192k -vol 256 -y
+MPEG2PS_EXT	=mpg
+
+MPEG2PS_AC3 =-f dvd -vcodec copy -aspect 16:9 -acodec ac3 -ar 48000 -ab 448k -vol 256 -y
+MPEG2PS_AC3_EXT = mpg
+MPEG2PS_MP2 =-f dvd -vcodec copy -aspect 16:9 -acodec mp2 -ar 48000 -ab 384k -vol 256 -y
+MPEG2PS_MP2_EXT = mpg
+DVD_1h =-target ntsc-dvd -b 8000k -aspect 16:9 -acodec ac3 -ar 48000 -ab 192k -vol 256 -y
+DVD_1h_EXT = mpg
+DVD_2h =-target ntsc-dvd -b 4600k -aspect 16:9 -acodec ac3 -ar 48000 -ab 192k -vol 256 -y
+DVD_2h_EXT = mpg
+DVD_3h =-target ntsc-dvd -b 3050k -aspect 16:9 -acodec ac3 -ar 48000 -ab 192k -vol 256 -y
+DVD_3h_EXT = mpg
+DVD_4h =-target ntsc-dvd -b 2200k -aspect 16:9 -acodec ac3 -ar 48000 -ab 192k -vol 256 -y
+DVD_4h_EXT = mpg
diff --git a/tstools/BonTsDemux/ffmpeg.exe b/tstools/BonTsDemux/ffmpeg.exe
new file mode 100755
index 0000000..a8b45c1
Binary files /dev/null and b/tstools/BonTsDemux/ffmpeg.exe differ
diff --git a/tstools/DtsEdit/DtsEdit.exe b/tstools/DtsEdit/DtsEdit.exe
new file mode 100644
index 0000000..9b0dff8
Binary files /dev/null and b/tstools/DtsEdit/DtsEdit.exe differ
diff --git a/tstools/DtsEdit/License.txt b/tstools/DtsEdit/License.txt
new file mode 100644
index 0000000..17bdbc0
--- /dev/null
+++ b/tstools/DtsEdit/License.txt
@@ -0,0 +1,18 @@
+–{ƒA[ƒJƒCƒu‚ÉŠÜ‚Ü‚ê‚éƒ\ƒtƒgƒEƒFƒA‚ÍGPL‚ÌŒ³ŒöŠJ‚³‚ê‚Ä‚¢‚Ü‚·B
+”z•zŠÈˆÕ‰»‚Ì‚½‚߃\[ƒX‚Í“Y•t‚µ‚Ä‚¢‚Ü‚¹‚ñ‚ªA‚Ç‚È‚½‚Å‚àƒ\[ƒX‚Ì
+“üŽè‚͉”\‚Å‚·B
+‚²—v–]‚̍ۂɂ́A”z•zƒTƒCƒg‚ÌŒfŽ¦”E‚à‚µ‚­‚̓[ƒ‹‚É‚Ä‚²˜A—
+‚­‚¾‚³‚¢B
+
+®A‚²Šó–]‚Ì”z•z”}‘Ì‚É‚æ‚Á‚Ă͎萔—¿‚𒸂­ê‡‚à‚²‚´‚¢‚Ü‚·‚ªA
+HttpŒo—R‚Å‚ ‚ê‚Ζ³—¿‚Å‚·B
+‘Ήž‚Ü‚Å‚É1TŠÔ’ö“x‚ÌŽžŠÔ‚𒸂­ê‡‚ª‚ ‚è‚Ü‚·B
+ƒ[ƒ‹‚𑗐M‚µ‚½‚Ì‚É”½‰ž‚ª‚È‚¢ê‡‚́AƒXƒpƒ€ƒtƒBƒ‹ƒ^‚É‚æ‚Á‚Ä
+íœ‚³‚ê‚Ä‚µ‚Ü‚Á‚½‰Â”\«‚à‚ ‚è‚Ü‚·‚̂ŁAŒfŽ¦”‚܂ł²˜A—‚­‚¾‚³‚¢B
+
+”z•zƒTƒCƒg
+http://seraphy.fam.cx/~seraphy
+http://seraphy.luna.ddns.vc/~seraphy
+
+˜A—æ
+seraphy@seraphy.fam.cx
diff --git a/tstools/DtsEdit/gpl.txt b/tstools/DtsEdit/gpl.txt
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/tstools/DtsEdit/gpl.txt
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/tstools/DtsEdit/readme.txt b/tstools/DtsEdit/readme.txt
new file mode 100644
index 0000000..1e9f0a5
--- /dev/null
+++ b/tstools/DtsEdit/readme.txt
@@ -0,0 +1,130 @@
+
+*****************************************************************************
+*
+* DtsEdit.exe
+*
+*****************************************************************************
+yŠT—vz
+EMP4(AVC)ƒRƒ“ƒeƒi‚ɑ΂µ‚āAƒ^ƒCƒ€ƒR[ƒh‚Ì“üo—Í‚ðs‚¢‚Ü‚·B
+E‘Ήž‚µ‚Ä‚¢‚é timecode format ‚́Av1Av2‚É‚È‚è‚Ü‚·B
+
+
+yŽg‚¢•ûz
+Usage: DtsEdit <option> <mp4 file>
+
+option list
+        -tc <file name>       : “ü—Í‚·‚éTimeCodeƒtƒ@ƒCƒ‹‚ðŽw’肵‚Ü‚·B
+                                -tc‚ªŽw’肳‚ꂽê‡‚́ATimeCode‚ðŽw’è‚ÌMP4ƒtƒ@ƒCƒ‹‚É–„‚ߍž‚Ý‚Ü‚·B
+                                Žw’肳‚ê‚È‚©‚Á‚½ê‡‚́AMP4ƒtƒ@ƒCƒ‹‚©‚çTimeCode‚𒊏o‚µ‚Ü‚·B
+        -tv <1|2>             : “üo—Í‚·‚éTimeCodeƒtƒ@ƒCƒ‹‚̃o[ƒWƒ‡ƒ“‚ðŽw’肵‚Ü‚·BƒfƒtƒHƒ‹ƒg‚Í2‚Å‚·B
+        -s <time scale>       : timeScale‚ðŽw’肵‚Ü‚·B
+                                –¢Žw’è‚̏ꍇ‚́A“ü—Í‚³‚ꂽtimecode format‚É‚æ‚Á‚ÄŽ©“®ŒvŽZ‚³‚ê‚Ü‚·B
+        -mlt <multiple>       : timeScale‚ÌŽ©“®ŒvŽZ‚ÉŽg—p‚µ‚Ü‚·B
+                                ƒfƒtƒHƒ‹ƒg’l‚Í4.0”{‚Å‚·BtimeScale‚𒼐ڎw’肵‚½ê‡‚́A“à•”‚ÌŒvŽZŒ‹‰Ê‚ŏ㏑‚«‚³‚ê‚Ü‚·B
+        -r <time rate>        : Å¬timeRate‚ðŽw’肵‚Ü‚·B
+                                –¢Žw’è‚̏ꍇ‚́A“ü—Í‚³‚ꂽMP4ƒtƒ@ƒCƒ‹‚ɏ]‚¢‚Ü‚·B
+        -no-dc                : ‰ŠúƒfƒBƒŒƒCƒJƒbƒg‚𖳌ø‚É‚µ‚Ü‚·B
+        -df <count>           : ‰ŠúƒfƒBƒŒƒC‚ð•t—^‚·‚éê‡‚́AƒfƒBƒŒƒCƒtƒŒ[ƒ€”‚ðŽw’肵‚Ü‚·B
+                                –¢Žw’è‚̏ꍇ‚́A“ü—Í‚³‚ꂽMP4ƒtƒ@ƒCƒ‹‚©‚玩“®ŒvŽZ‚µ‚Ü‚·B
+                                Ä¶ŽžŠÔ‚Ì’Z‚¢“®‰æ‚ł͐³Šm‚Ɏ擾‚Å‚«‚È‚¢ê‡‚ª‚ ‚è‚Ü‚·B
+        -o <output file>      : o—̓tƒ@ƒCƒ‹‚ðŽw’肵‚Ü‚·B
+
+
+   TimeCode‚ðo—Í‚·‚éB
+    Šî–{“I‚ɃIƒvƒVƒ‡ƒ“‚ÌŽw’è‚Í•s—v‚Å‚·B
+    timecode format v1 ‚ðo—Í‚µ‚½‚¢ê‡‚́AƒIƒvƒVƒ‡ƒ“‚Ɂu-tv 1v‚ðŽw’肵‚Ü‚·B
+
+   TimeCode‚ð“ü—Í‚·‚éB
+    TimeScaleATimeRate‚ðŽ©“®”»’è‚·‚邽‚߁AƒIƒvƒVƒ‡ƒ“‚ðŽw’肵‚È‚­‚Ä‚à“ü—Í‚µ‚½TimeCode‚É‚ ‚킹‚Ä“KØ‚È’l‚ªÝ’肳‚ê‚Ü‚·B
+    TimeCode“ü—Í‚ÍVFR‰»‚ð‘O’ñ‚É‚µ‚Ä‚¢‚Ü‚·‚̂ŁATimeScale‚Í4”{¸“x‚ÅŒvŽZ‚³‚ê‚Ü‚·B
+    ¸“x‚ð•ÏX‚µ‚½‚¢ê‡‚́A-mltƒIƒvƒVƒ‡ƒ“‚ð—˜—p‚µ‚Ü‚·Bi­”Žw’肪‰Â”\‚Å‚·j
+    –Ú“I‚ÌTimeScale‚ª–¾Šm‚ȏꍇ‚́A-sƒIƒvƒVƒ‡ƒ“‚ð—˜—p‚µ‚Ü‚·B‚»‚Ì‚Æ‚«ATimeRate‚Í“ü—ÍŒ³‚̃tƒ@ƒCƒ‹‚ɏ]‚¢‚Ü‚·‚Ì‚Å’ˆÓ‚ª
+    •K—v‚Å‚·B
+
+    ¦TimeRate‚ɂ‚¢‚āB
+      fps‚𕪐”‚Å•\Œ»‚µ‚½ê‡‚Ì•ª•ê‚É‚ ‚½‚è‚Ü‚·B•W€NTSC‚Å‚ ‚ê‚Î29.97fps‚Å‚·‚ªA³Šm‚É‚Í‚±‚Ì‚Æ‚«‚Ìfps‚͏zŠÂ¬”‚Å‚ ‚èA
+      30000/1001‚Æ•\‹L‚µ‚Ü‚·B
+      ‚±‚̏ꍇATimeScale‚Í30000ATimeRate‚Í1001‚Æ‚È‚è‚Ü‚·B
+
+      ‚à‚µ”ñNTSCƒ\[ƒX‚ðˆµ‚¤ê‡‚͏ˆ—Œ‹‰Ê‚Ì•\Ž¦‚ðŠm”F‚µ‚Ä‚­‚¾‚³‚¢B
+      —Ⴆ‚Î30fps‚Ì“®‰æ‚̏ꍇ‚́ATimeRate‚Í1‚Å‚à\‚¢‚Ü‚¹‚ñBi‚»‚Ì‚Æ‚«‚ÌTimeScale‚Í120‚ÆŽ©“®ŒvŽZ‚³‚ê‚Ü‚·Bj
+      ƒfƒBƒŒƒCƒtƒŒ[ƒ€‚ª3ƒtƒŒ[ƒ€ˆÈã‚ ‚éê‡‚́ATimeRate‚ª1‚ł͏‰ŠúƒfƒBƒŒƒCƒJƒbƒg‚ÉŽ¸”s‚µ‚Ü‚·B
+      ‚»‚̏ꍇ‚ÍTimeRate‚ð10‚ɕύX‚·‚é‚È‚Ç‚µ‚Ä‚­‚¾‚³‚¢B
+
+    ¦”{¸“x‚ɂ‚¢‚Ä
+      VFR‚ðŽÀŒ»‚·‚é‚É‚ ‚½‚èANTSC‚Ì•\Ž¦ƒ^ƒCƒ~ƒ“ƒO‚ð•ö‚³‚È‚¢‚悤‚É‚·‚邽‚ß‚ÉTimeScale‚ðn”{‚µ‚Ü‚·B
+      —Ⴆ‚Î23.976fps‚Æ29.97fps‚̍¬‡ƒtƒŒ[ƒ€ƒŒ[ƒg‚Å‚ ‚Á‚½ê‡A‚±‚ê‚𕪐”•\Œ»‚·‚é‚Æ24000/1001A30000/1001‚Æ‚È‚è‚Ü‚·B
+      ‘å‚«‚¢‚Ù‚¤‚ÌTimeScale 30000‚É‚ ‚킹‚é‚ƁA24000/1001 => 30000/1251.25 ‚Æ‚È‚Á‚Ä‚µ‚Ü‚¢A•ªŽq‚É’[”‚ª”­¶‚µ‚Ä‚µ‚Ü‚¢‚Ü‚·B
+      ‚»‚±‚ŁA‘å‚«‚¢‚Ù‚¤‚ÌTimeScale‚ð4”{‚É‚µ120000/5005A120000/4004‚Ɛ®”‚Å•\‚·‚±‚ƂŁA•\Ž¦ƒ^ƒCƒ~ƒ“ƒO‚ð•ö‚³‚¸‚ɃtƒŒ[ƒ€
+      ƒŒ[ƒg‚̍¬‡‚ðŽÀŒ»‚µ‚Ä‚¢‚Ü‚·B
+      ‚³‚ç‚É59.94fps(60000/1001)‚ð¬‡‚·‚éê‡‚àA120000/2002‚Æ•\Œ»‚Å‚«‚é‚Ì‚Å‚»‚̂܂܍¬‡‚ª‰Â”\‚Å‚·B
+      i‚½‚¾‚µA”{¸“x‚̃fƒtƒHƒ‹ƒg’l‚Í4”{‚É‚È‚Á‚Ä‚¢‚Ü‚·‚̂ŁAã‚Ì—l‚ÈTimeCode‚ð“ü—Í‚µ‚½ê‡‚́A240000/10010A240000/8008A
+      240000/4004‚Æ‚¢‚¤ŒvŽZŒ‹‰Ê‚É‚È‚è‚Ü‚·Bj
+      TimeCode‚ªCFR‚É‚È‚Á‚Ä‚¢‚éê‡‚́Au-mlt 1v‚Æ‚µ‚ďˆ—‚µ‚Ä‚à–â‘è‚ ‚è‚Ü‚¹‚ñ‚ªA‰ŠúƒfƒBƒŒƒCƒJƒbƒg‚ðs‚¤‚É‚ ‚½‚èˆê’èã‚Ì
+      TimeScale•ª‰ð”\iTimeRate‚Ì‘å‚«‚³j‚ª•K—v‚Å‚·B
+
+    ¦ƒfƒBƒŒƒCƒtƒŒ[ƒ€”‚ɂ‚¢‚Ä
+      Œ¾‚¢Š·‚¦‚é‚Ɓu‘O•ûŽQÆƒtƒŒ[ƒ€‚̘A‘±”v‚É‚È‚è‚Ü‚·B
+      DtsEdit‚ł́A‚±‚̃tƒŒ[ƒ€”‚ðCTSiComposition Time Stampj‚̏‡˜«‚ðƒ`ƒFƒbƒN‚·‚邱‚Æ‚ÅŽ©“®ŽZo‚µ‚Ä‚¢‚Ü‚·B
+      \•ª‚È’·‚³‚Ì“®‰æ‚Å‚Í‚È‚¢ê‡AŽ©“®ŽZo‚ª‚¤‚Ü‚­“®ì‚µ‚È‚¢ê‡‚ª‚ ‚è‚Ü‚·B
+      ®A‚±‚̐”’l‚͏‰ŠúƒfƒBƒŒƒCƒJƒbƒg‚𖳌ø‰»‚µ‚½ê‡‚ÉŽg—p‚µ‚Ü‚·B
+      ˆ—Œ‹‰Ê‚É•\Ž¦‚³‚ê‚éuDelay Framev‚Ì–‡”‚ªA“ü—ÍŒ³ƒtƒ@ƒCƒ‹‚Ì–{—ˆ‚Ì–‡”‚ƈႤê‡‚́A-dfƒIƒvƒVƒ‡ƒ“‚É‚Ä’ù³‚µ‚Ä‚­‚¾‚³‚¢B
+
+
+y’ˆÓŽ–€z
+Eƒpƒ‰ƒ[ƒ^‚͈̔̓`ƒFƒbƒN‚Ȃǂ͍s‚Á‚Ä‚¢‚È‚¢‚̂ŁA‚©‚È‚è–³’ƒ‚ÈŽw’è‚à‚Å‚«‚Ä‚µ‚Ü‚¢‚Ü‚·B
+E‚²—˜—p‚ÍŒv‰æ“I‚ɁB
+
+
+yC³—š—ðz
+     20081009
+      E1fps`120fps‚ª¬Ý‚·‚é‚悤‚È•Ï‘ÔVFR‚Å‚È‚¢‚©‚¬‚èA‰ŠúƒfƒBƒŒƒC‚Í•½‹Ïfps‚©‚çŽZo‚µ‚Ä‚à‘åä•v‚»‚¤
+        ‚Ȃ̂ŏC³Bƒ_ƒ‚¾‚Á‚½ê‡‚̓Gƒ‰[‚ð•\Ž¦‚·‚é‚悤‚É‚µ‚½B
+        timecode format v2 ‚ðŽæ‚荞‚Þ‚Æ‚«ATimeStamp‚ª®”‚ÉŠÛ‚ß‚ç‚ê‚Ä‚¢‚Ä‚àATimeRate‚©‚ç–{—ˆ‚ÌTimeStamp
+        ‚𕜌³‚Å‚«‚é‚悤‚É‚µ‚½B
+
+     20081008
+      E -no-dc ‚ðŽg—p‚µA¸“x‚ð4”{–¢–ž‚Åtimecode‚ðŽæ‚荞‚ñ‚¾ê‡A•t—^‚·‚éƒfƒBƒŒƒC‚ª¬‚³‚·‚¬‚Ä
+        DTS‚Ì‰Â•Ï”ÍˆÍ‚ð‹·‚ß‚Ä‚µ‚Ü‚¢ADTS‚ª‚¸‚ê‚邱‚Æ‚É‚æ‚èŽÀÛ‚̃tƒŒ[ƒ€‚Ì•\Ž¦ƒ^ƒCƒ~ƒ“ƒO‚Ü‚Å‚¸‚ê‚Ä
+        ‚µ‚Ü‚¤–â‘肪‚ ‚Á‚½‚½‚ߏC³B
+
+        ‚±‚̏C³‚É‚æ‚èA•t—^‚·‚éƒfƒBƒŒƒC‚́uƒfƒBƒŒƒCƒtƒŒ[ƒ€” * TimeRate * ¸“xv‚©‚çA
+        uƒfƒBƒŒƒCƒtƒŒ[ƒ€” * Å¬fpsv‚É•Ï‚í‚è‚Ü‚µ‚½B‹É’[‚Éfps‚Ì’á‚¢•”•ª‚ª‚ ‚éTimeCode‚ðŽæ‚荞‚ނƁA
+        ƒfƒBƒŒƒC‚ª‘å‚«‚­‚È‚é‚Ì‚Å’ˆÓ‚µ‚Ä‚­‚¾‚³‚¢B
+        i¦‰ŠúƒfƒBƒŒƒCƒJƒbƒg‚ðŽg—p‚µ‚½ê‡‚́A–â‘è‚ ‚è‚Ü‚¹‚ñBj
+
+     20080614
+      EGPAC‚̍ŐV‰»B
+
+     20080511
+      Eƒgƒ‰ƒbƒN•¡»Žž‚ɁA“ü—ÍŒ³ƒtƒ@ƒCƒ‹‚Ìedit box‚ªƒRƒs[‚³‚ê‚é‚̂ō폜‚·‚é‚悤‚ɏC³B
+
+     20080328
+      E‰ŠúƒfƒBƒŒƒCƒJƒbƒg‚ðs‚í‚È‚¢‚Æ‚«‚́Aedts‚ð‘}“ü‚µ‚úƒfƒBƒŒƒC‚ð‘Å‚¿Á‚·‚悤‚É‚µ‚Ä‚Ý‚½B
+        ‚Å‚àAedts‚ɑΉž‚µ‚½splitterAplayer‚ð’m‚ç‚È‚¢c  QuickTime‚͑Ήž‚µ‚Ä‚¢‚é‚Ì‚©‚ȁH
+        ŽèŒ³‚ÅŠm”F‚µ‚½ŒÀ‚肾‚ÆVLC‚͑Ήž‚µ‚Ä‚Ü‚µ‚½BGabest‚̓_ƒBHaali‚ÍŒ³XƒfƒBƒŒƒCƒJƒbƒg‚·‚é‚Ì‚Å
+        ‚»‚à‚»‚àˆÓ–¡‚È‚µB
+
+        ˆê‰žmp4‚Æ‚µ‚ẮA‰ŠúƒfƒBƒŒƒCƒJƒbƒg‚ªhack‚Û‚¢‘Ήž‚ŁAedts–„‚ߍž‚Ý‚ª‹KŠi’Ê‚è‚̉¤“¹B
+        ‚µ‚©‚µŒ»ó‚́Ahack‚Ì•û‚ªŒÝŠ·«‚ª‚‚¢‚Æ‚¢‚¤”ß‚µ‚¢ó‹µB
+        ‚È‚ñ‚őΉž‚µ‚Ä‚¢‚È‚¢ƒ\ƒtƒg‚ª‚ ‚é‚Ì‚©‚Í‚¨Ž@‚µc
+
+        ‚È‚ñ‚ƁAHaali splitter‚Íedts‚𖳎‹‚·‚é‚Ì‚Å‚Í‚È‚­AŒë”F‚µ‚Č듮ì‚µ‚Ü‚·B
+        ‚È‚ñ‚¾‚©2”N‘O‚Æ‚Ü‚é‚ŏ󋵂ª•Ï‚í‚Á‚Ä‚È‚¢‚킯‚Å‚·‚ˁB‚Æ‚¢‚¤‚킯‚Åedts‘Ήž‚Í2”NŒã‚É‚à‚¤ˆê‰ñ
+        ƒ`ƒƒƒŒƒ“ƒW‚µ‚Ü‚·B
+        ‚±‚̃o[ƒWƒ‡ƒ“‚Í‚¨‘ “ü‚èB
+
+     20080327
+      ETimeScaleATimeRate‚ÌŽ©“®ŒvŽZˆ—‚ðŽÀ‘•B
+        ‚±‚ê‚É”º‚¢AƒIƒvƒVƒ‡ƒ“‚ðˆê•”•ÏXB
+
+     20080314
+      E‚¢‚ë‚¢‚ël‚¦‚āAtimecode format v1 ‚ÌAssume‚É‚Í•½‹Ï‚Å‚Í‚È‚­Å‘åfps‚ðo—Í‚·‚é
+        ‚悤‚É‚µ‚Ä‚Ý‚½B
+        v1“ü—ÍŽž‚ÌtimeScale‚́A‚±‚ÌAssume‚©‚çŒvŽZ‚µ‚Ü‚·B
+
+     20080313
+      E—\‘zˆÈã‚ɁADTSRepair‚ð timecode ‚Ì“üo—Í‚ÉŽg‚¤l‚ª‚¢‚½‚悤‚Ȃ̂ŁA‹}篍쐬B
+        DTSRepair‚Í–¼‘O‚Ì’Ê‚èDTS‚ðNTSCƒ^ƒCƒ~ƒ“ƒO‚É‹¸³‚·‚邽‚߂̃\ƒtƒg‚Å‚·‚̂ŁA
+        ‘¼‚̃^ƒCƒ~ƒ“ƒO‚ÌMP4ƒtƒ@ƒCƒ‹‚ÉŽg—p‚·‚é‚ƁA‚©‚È‚è‚ÌŠm—¦‚Ń_ƒ‚É‚µ‚Ä‚µ‚Ü‚¢‚Ü‚·B
+
diff --git a/tstools/DtsEdit/src/DtsEdit.cpp b/tstools/DtsEdit/src/DtsEdit.cpp
new file mode 100644
index 0000000..e7682c3
--- /dev/null
+++ b/tstools/DtsEdit/src/DtsEdit.cpp
@@ -0,0 +1,142 @@
+// DTSRepair.cpp : ƒRƒ“ƒ\[ƒ‹ ƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚̃Gƒ“ƒgƒŠ ƒ|ƒCƒ“ƒg‚ð’è‹`‚µ‚Ü‚·B
+//
+
+#include "stdafx.h"
+#include "Help.h"
+#include "EditMain.h"
+#include "windows.h"
+
+#define EXIST(s) (GetFileAttributes(s) != 0xFFFFFFFF)
+
+int main(int argc, char* argv[])
+{
+	int ret = -1;
+	T_EDIT_PARAM prm;
+
+	ZeroMemory(&prm, sizeof(T_EDIT_PARAM));
+
+	// ƒRƒ}ƒ“ƒhƒ‰ƒCƒ“ƒ`ƒFƒbƒN
+	if (argc < 2){
+		Help();
+		return ret;
+	}
+
+	// ‰Šú’l
+	prm.i_mode = MODE_OUT;
+	prm.i_tcv = 2;
+	prm.i_timescale = 0;
+	prm.i_timerate = 0;
+	prm.f_scaleFct = 0;
+	prm.f_mlt = 4.0;
+	prm.i_delayFrame = -1;
+	prm.b_dc = TRUE;
+
+	for(int i=1; i<argc; i++){
+		char *name = argv[i];
+		char *value = NULL;
+		char *value2 = NULL;
+		if((i+1)<argc)
+			value = argv[i+1];
+
+		if(0){}
+
+#define OPT(x) else if (!_stricmp(x, name))
+
+		// ƒ^ƒCƒ€ƒR[ƒh
+		OPT("-tc"){
+			if(!value || prm.p_tcfile) goto _ERROR_ARG;
+			prm.p_tcfile = new char[strlen(value) + 1];
+			strcpy(prm.p_tcfile, value);
+			prm.i_mode = MODE_IN;
+			i++;		
+		}
+
+		// ƒ^ƒCƒ€ƒR[ƒh
+		OPT("-tv"){
+			if(!value) goto _ERROR_ARG;
+			prm.i_tcv = atoi(value);
+			i++;
+		}
+
+		// ƒ^ƒCƒ€ƒXƒP[ƒ‹
+		OPT("-s"){
+			if(!value) goto _ERROR_ARG;
+			prm.i_timescale = atol(value);
+			i++;
+		}
+
+		// ”{”
+		OPT("-mlt"){
+			if(!value) goto _ERROR_ARG;
+			prm.f_mlt = atof(value);
+			i++;
+		}
+
+		// Å¬ƒ^ƒCƒ€ƒŒ[ƒg
+		OPT("-r"){
+			if(!value) goto _ERROR_ARG;
+			prm.i_timerate = atol(value);
+			i++;
+		}
+
+		// ‰ŠúƒfƒBƒŒƒCƒJƒbƒg
+		OPT("-no-dc"){
+			prm.b_dc = FALSE;
+		}
+
+		// ƒfƒBƒŒƒCƒtƒŒ[ƒ€”
+		OPT("-df"){
+			if(!value) goto _ERROR_ARG;
+			prm.i_delayFrame = atol(value);
+			i++;
+		}
+
+		// o—̓tƒ@ƒCƒ‹–¼
+		OPT("-o"){
+			if(!value || prm.p_outfile) goto _ERROR_ARG;
+			prm.p_outfile = new char[strlen(value) + 1];
+			strcpy(prm.p_outfile, value);
+			i++;
+		}
+
+		// “ü—̓tƒ@ƒCƒ‹
+		else if(EXIST(name)){
+			if(prm.p_infile) goto _ERROR_ARG;
+			prm.p_infile = new char[strlen(name) + 1];
+			strcpy(prm.p_infile, name);
+		}
+
+		else {
+_ERROR_ARG:
+			Help();
+			goto _ERROR_RET;
+		}
+	}
+
+	// ƒ`ƒFƒbƒNˆ—
+	if(prm.i_mode == MODE_IN && !EXIST(prm.p_tcfile)){
+		Help();
+		goto _ERROR_RET;
+	}
+
+	if(!prm.p_outfile){
+		prm.p_outfile = new char[strlen(prm.p_infile) + 20];
+		strcpy(prm.p_outfile, prm.p_infile);
+
+		if(prm.i_mode == MODE_IN)
+			strcat(prm.p_outfile, "_tc_input.mp4");
+		if(prm.i_mode == MODE_OUT)
+			strcat(prm.p_outfile, "_timecode.txt");
+	}
+
+	// ƒƒCƒ“ˆ—
+	EditMain(&prm);
+	ret = 0;
+
+_ERROR_RET:
+	if(prm.p_tcfile)	delete [] prm.p_tcfile;
+	if(prm.p_outfile)	delete [] prm.p_outfile;
+	if(prm.p_infile)	delete [] prm.p_infile;
+	return ret;
+}
+
diff --git a/tstools/DtsEdit/src/DtsEdit.sln b/tstools/DtsEdit/src/DtsEdit.sln
new file mode 100644
index 0000000..3f5dd16
--- /dev/null
+++ b/tstools/DtsEdit/src/DtsEdit.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DtsEdit", "DtsEdit.vcproj", "{29DD06A3-83FD-4C25-8783-D93D9C3C671F}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{29DD06A3-83FD-4C25-8783-D93D9C3C671F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{29DD06A3-83FD-4C25-8783-D93D9C3C671F}.Debug|Win32.Build.0 = Debug|Win32
+		{29DD06A3-83FD-4C25-8783-D93D9C3C671F}.Release|Win32.ActiveCfg = Release|Win32
+		{29DD06A3-83FD-4C25-8783-D93D9C3C671F}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/tstools/DtsEdit/src/DtsEdit.vcproj b/tstools/DtsEdit/src/DtsEdit.vcproj
new file mode 100644
index 0000000..864281a
--- /dev/null
+++ b/tstools/DtsEdit/src/DtsEdit.vcproj
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="shift_jis"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="DtsEdit"
+	ProjectGUID="{29DD06A3-83FD-4C25-8783-D93D9C3C671F}"
+	RootNamespace="DtsEdit"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;"
+				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="WinMM.lib uuid.lib"
+				OutputFile="bin\$(ProjectName).exe"
+				LinkIncremental="2"
+				IgnoreDefaultLibraryNames="libcmt.lib"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				FavorSizeOrSpeed="1"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;"
+				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="WinMM.lib uuid.lib"
+				OutputFile="bin\$(ProjectName).exe"
+				LinkIncremental="1"
+				IgnoreDefaultLibraryNames=""
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="ƒ\[ƒX ƒtƒ@ƒCƒ‹"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\common.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\DtsEdit.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Help.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\EditMain.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\stdafx.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="ƒwƒbƒ_[ ƒtƒ@ƒCƒ‹"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\common.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Help.h"
+				>
+			</File>
+			<File
+				RelativePath=".\EditMain.h"
+				>
+			</File>
+			<File
+				RelativePath=".\stdafx.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="ƒŠƒ\[ƒX ƒtƒ@ƒCƒ‹"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+		<File
+			RelativePath=".\gpac\libgpac_static.lib"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/tstools/DtsEdit/src/EditMain.cpp b/tstools/DtsEdit/src/EditMain.cpp
new file mode 100644
index 0000000..3790de8
--- /dev/null
+++ b/tstools/DtsEdit/src/EditMain.cpp
@@ -0,0 +1,281 @@
+#include <stdio.h>
+#include "stdafx.h"
+#include "Help.h"
+#include "EditMain.h"
+#include "debug.h"
+
+
+void EditMain(T_EDIT_PARAM *prm){
+
+	GF_Err		e;
+	T_MP4_INFO	mi;
+	T_TS_LIST	*ts		= NULL;
+	T_TS_LIST	*tsSort	= NULL;
+
+	// ‰Šú‰»
+	gf_sys_init();
+
+	ZeroMemory(&mi, sizeof(T_MP4_INFO));
+
+	// ƒ^[ƒQƒbƒgƒtƒ@ƒCƒ‹‚̃I[ƒvƒ“
+	mi.fp_in = gf_isom_open(prm->p_infile, GF_ISOM_OPEN_READ, NULL);
+	printf("“ü—̓tƒ@ƒCƒ‹... [%s]\n\n", prm->p_infile);
+
+	mi.i_trackCount = gf_isom_get_track_count(mi.fp_in);
+	
+	// Šeƒgƒ‰ƒbƒN‚̃tƒH[ƒ}ƒbƒg‚ðŽæ“¾
+	u32 lst4CC[] = {GF_ISOM_BRAND_AVC1, GF_ISOM_BRAND_MP4V, GF_ISOM_BRAND_XVID};
+	SearchTrackOf4CC(&mi, lst4CC, 3);
+
+	// –Ú“I‚̃gƒ‰ƒbƒN‚ªŒ©‚‚©‚ç‚È‚©‚Á‚½ê‡B
+	if (mi.i_trackNo == NULL){
+		ErrorMessage(MSG_NO_4CC);
+		goto _ERROR_RET;
+	}
+
+	// ƒTƒ“ƒvƒ‹”‚̎擾
+	mi.ui_sampleCount = gf_isom_get_sample_count(mi.fp_in, mi.i_trackNo);
+	if(mi.ui_sampleCount < 3){
+		ErrorMessage(MSG_NO_SAMPLE);
+		goto _ERROR_RET;
+	}
+
+	ts = new T_TS_LIST[mi.ui_sampleCount + 1];
+	ZeroMemory(ts, sizeof(T_TS_LIST) * mi.ui_sampleCount);
+
+	// ƒTƒ“ƒvƒ‹î•ñ‚ðŽæ“¾‚µAƒfƒBƒŒƒCƒtƒŒ[ƒ€”»’èECTS‡‚É•À‚Ñ‘Ö‚¦
+	printf("ƒTƒ“ƒvƒ‹î•ñŽæ“¾’†...\n");
+	if(readTsFromFile(&mi, ts))
+		goto _ERROR_RET;
+
+	// ƒsƒNƒ`ƒƒ•\Ž¦‡‚Ń\[ƒg
+	tsSort = new T_TS_LIST[mi.ui_sampleCount + 1];
+	memcpy(tsSort, ts, sizeof(T_TS_LIST) * mi.ui_sampleCount);
+	qsort(tsSort, mi.ui_sampleCount, sizeof(T_TS_LIST), (int(*)(const void*, const void*))CompareTS_PTS);
+
+	// ÅIƒtƒŒ[ƒ€‚ÌFPS•âŠ®
+	u32 i = mi.ui_sampleCount;
+	tsSort[i].DTS			= ts[i-1].DTS + (ts[i-1].DTS - ts[i-2].DTS);
+	tsSort[i].CTS_Offset	= 0;
+	tsSort[i].CTS			= tsSort[i-1].CTS + (tsSort[i-1].CTS - tsSort[i-2].CTS);
+	tsSort[i].PTS			= tsSort[i-1].PTS + (tsSort[i-1].PTS - tsSort[i-2].PTS);
+	tsSort[i].samples		= i+1;
+
+	// ƒ^ƒCƒ€ƒXƒP[ƒ‹‚̎擾
+	mi.i_org_timescale = (int)gf_isom_get_media_timescale(mi.fp_in, mi.i_trackNo);
+
+	// ‚±‚̕ӂŃ‚[ƒh•ªŠò
+	if(prm->i_mode == MODE_IN){
+		// ƒ^ƒCƒ€ƒR[ƒh“ü—Í
+
+		// Å¬ƒtƒŒ[ƒ€ƒŒ[ƒgŽæ“¾
+		mi.i_org_timerate = getMinimumPTSDiff(&mi, tsSort);
+		if(prm->i_timerate <= 0) {
+			int rate = gcd(mi.i_org_timescale, mi.i_org_timerate);
+			prm->i_timerate = mi.i_org_timerate / rate;
+		}
+
+		// TimeCode V2 ‚ÌŽæ‚荞‚Ý
+		if (prm->i_tcv == 1){
+			if(readTimeCodeFromFileV1(&mi, tsSort, prm))
+				goto _ERROR_RET;
+		} else if(prm->i_tcv == 2){
+			if(readTimeCodeFromFile(&mi, tsSort, prm))
+				goto _ERROR_RET;
+		} else {
+			goto _ERROR_RET;
+		}
+
+		// ’x‰„ƒtƒŒ[ƒ€”Žæ“¾
+		if(prm->i_delayFrame < 0) {
+			prm->i_delayFrame = getDelayFlame(&mi, ts);
+		}
+		mi.i_delayFrame = prm->i_delayFrame;
+		mi.i_initDelay = mi.i_delayFrame * (int)(getAveragePTSDiff(&mi, tsSort) / (double)prm->i_timerate + 0.5) * prm->i_timerate;
+
+		// Œ‹‰Ê‚ðƒRƒs[‚µ‚ăsƒNƒ`ƒƒ‡‚Ƀ\[ƒg
+		memcpy(ts, tsSort, sizeof(T_TS_LIST) * mi.ui_sampleCount);
+		qsort(ts, mi.ui_sampleCount, sizeof(T_TS_LIST), (int(*)(const void*, const void*))CompareTS_Sample);
+
+
+		// î•ñ‚Ì•\Ž¦
+		printf("\n");
+		printf("--- input ---\n");
+		printf("TimeScale       F%d\n", mi.i_org_timescale);
+		printf("TimeRate        F%d\n", mi.i_org_timerate);
+		printf("Sample Count    F%d\n", mi.ui_sampleCount);
+		printf("Delay Frame     F%d\n", mi.i_delayFrame);
+		printf("Delay Time      F%d\n", mi.i_initDelay);
+		printf("\n");
+		printf("--- output ---\n");
+		printf("TimeScale       F%d\n", prm->i_timescale);
+		printf("TimeRate        F%d\n", prm->i_timerate);
+		printf("Multiple        F%lf\n", prm->f_scaleFct);
+		printf("\n");
+		printf("ƒtƒ@ƒCƒ‹o—Í’†... [%s]\n", prm->p_outfile);
+
+		u32 readDscIdx = 0;
+		u32 destTrack = 0;
+		mi.fp_out = gf_isom_open(prm->p_outfile, GF_ISOM_OPEN_WRITE, NULL);
+
+
+		// o—ÍŠJŽn
+		for (int trackIdx=1; trackIdx<=mi.i_trackCount; trackIdx++){
+			// ƒgƒ‰ƒbƒN‚̃Rƒs[
+			gf_isom_clone_track(mi.fp_in, trackIdx, mi.fp_out, true, &destTrack);
+			// edts‚̍폜
+			gf_isom_remove_edit_segments(mi.fp_out, destTrack);
+
+			if (trackIdx != mi.i_trackNo){
+				u32 sampleCount = gf_isom_get_sample_count(mi.fp_in, trackIdx);
+				for(u32 i=1; i<=sampleCount; i++){
+					printf("... %5.1f%%\r", (double)i/(double)sampleCount * 100.0);
+					GF_ISOSample *sample = gf_isom_get_sample(mi.fp_in, trackIdx, i, &readDscIdx);
+					e = gf_isom_add_sample(mi.fp_out, destTrack, readDscIdx, sample);
+					gf_isom_sample_del(&sample);
+				}
+
+			} else {
+				// ƒ^ƒCƒ€ƒXƒP[ƒ‹Ý’è
+				e = gf_isom_set_media_timescale(mi.fp_out, destTrack, (u32)prm->i_timescale);
+				if(e)
+					printf("!!! ƒ^ƒCƒ€ƒXƒP[ƒ‹Ý’莸”s : %d !!!\n", e);
+
+				// DTS‚ðÝ’肵o—Í
+				s64 before_dts = -1;
+				int delta_time = int((prm->i_timerate * prm->f_scaleFct) / (mi.i_delayFrame*2));
+
+				if(delta_time < 1 && prm->b_dc){
+					ErrorMessage(MSG_MORE_SMALL_TIMERATE);
+					break;
+				}
+
+				for(u32 i=0; i<mi.ui_sampleCount; i++){
+					printf("... %5.1f%%\r", (double)i/(double)mi.ui_sampleCount * 100.0);
+
+					s64 cts = 0;
+					s64 dts = 0;
+					int offset = 0;
+					int dts_delay = 0;
+					int cts_delay = 0;
+					int ts_diff = 0;
+
+					cts = ts[i].PTS;
+					if(!prm->b_dc){
+						dts_delay = 0;
+						cts_delay = mi.i_initDelay;
+					} else {
+						for(u32 k=MAX(0, i - mi.i_delayFrame); k<i; k++)
+							ts_diff += (int)(tsSort[k + 1].PTS - tsSort[k].PTS);
+
+						dts_delay = MAX(mi.i_initDelay, ts_diff);
+						cts_delay = 0;
+					}
+
+					if(dts_delay < tsSort[i].PTS)
+						dts = tsSort[i].PTS - dts_delay;
+
+					// ‘O‰ñ‚ÌDTS‚æ‚è‚à’l‚Í‘å‚«‚­‚È‚¯‚ê‚΂Ȃç‚È‚¢B
+					if(dts <= before_dts)
+						dts = before_dts + delta_time;
+
+					// CTS_Offset‚ÌŽZo
+					offset = (int)(cts - dts + cts_delay);
+
+					// ƒIƒtƒZƒbƒg‚ÌŒvŽZ‚Å•‰‚É‚È‚Á‚Ä‚µ‚Ü‚Á‚½ê‡
+					if (offset < 0){
+						dts += offset;
+						offset = 0;
+					}
+
+					ts[i].DTS = before_dts = dts;
+					ts[i].CTS_Offset = offset;
+
+					// ƒ`ƒFƒbƒN
+					if( (dts + (s64)offset - (s64)ts[0].CTS_Offset) != cts )
+						printf("!!! •\Ž¦ƒ^ƒCƒ~ƒ“ƒOƒGƒ‰[ / Track:%d Frame:%d Target PTS:%I64d (DTS:%I64d, CTS_Offset:%d, Delay:%d) !!!\n", destTrack, i+1, cts, dts, offset, ts[0].CTS_Offset);
+
+					GF_ISOSample *sample = gf_isom_get_sample(mi.fp_in, mi.i_trackNo, i+1, &readDscIdx);
+					sample->DTS = ts[i].DTS;
+					sample->CTS_Offset = ts[i].CTS_Offset;
+					e = gf_isom_add_sample(mi.fp_out, destTrack, readDscIdx, sample);
+
+					if(e)
+						printf("!!! ƒTƒ“ƒvƒ‹‘‚«ž‚݃Gƒ‰[ / Track:%d Frame:%d DTS:%I64d, CTS_Offset:%d Err:%d !!!\n", destTrack, i+1, sample->DTS, sample->CTS_Offset, e);
+					gf_isom_sample_del(&sample);
+				}
+
+				// edts‚Ì‘}“ü
+				//GF_ISOSample *sample = gf_isom_get_sample_info(mi.fp_out, destTrack, 1, NULL, NULL);
+				//if(sample->CTS_Offset > 0){
+				//	u64 trackDur = gf_isom_get_track_duration(mi.fp_out, destTrack);
+				//	gf_isom_remove_edit_segments(mi.fp_out, destTrack);
+				//	gf_isom_append_edit_segment(mi.fp_out, destTrack, trackDur, sample->CTS_Offset, GF_ISOM_EDIT_NORMAL);
+				//}
+				//gf_isom_sample_del(&sample);
+			}
+
+			printf("... %dƒgƒ‰ƒbƒNo—͏I—¹\n", trackIdx);
+		}
+
+		// o—̓tƒ@ƒCƒ‹‚ð•Â‚¶‚é
+		gf_isom_clone_pl_indications(mi.fp_in, mi.fp_out);
+		gf_isom_clone_root_od(mi.fp_in, mi.fp_out);
+
+		u64 duration = gf_isom_get_duration(mi.fp_out);
+		gf_isom_make_interleave(mi.fp_out, 0.5);
+		gf_isom_close(mi.fp_out);
+
+	}
+	else if (prm->i_mode == MODE_OUT){
+		// TIMECODE‚̏o—Í
+		if(prm->i_tcv == 2){
+			FILE *fpout;
+			if((fpout = fopen(prm->p_outfile, "wb")) != NULL){
+				fprintf(fpout, "# timecode format v2\r\n");
+				for(u32 i=0; i<mi.ui_sampleCount; i++){
+					fprintf(fpout, "%.6lf\r\n", (double)tsSort[i].PTS / (double)mi.i_org_timescale * 1000.0);
+				}
+			}
+			fclose(fpout);
+			printf("... timecode format v2 o—͏I—¹\n");
+		}
+		else if(prm->i_tcv == 1){
+			FILE *fpout;
+			if((fpout = fopen(prm->p_outfile, "wb")) != NULL){
+				fprintf(fpout, "# timecode format v1\r\n");
+				fprintf(fpout, "Assume %.6lf\r\n", getMaximumFps(&mi, tsSort));
+				u32 stpos = 0;
+				double fps = 0.0;
+				double beforFps = (double)mi.i_org_timescale/(double)(tsSort[1].PTS - tsSort[0].PTS);
+				for(u32 i=0; i<mi.ui_sampleCount; i++){
+					fps = (double)mi.i_org_timescale/(double)(tsSort[i+1].PTS - tsSort[i].PTS);
+					if (fps != beforFps){
+						fprintf(fpout, "%d,%d,%.6lf\r\n",stpos, i-1, beforFps);
+						beforFps = fps;
+						stpos = i;
+					}
+				}
+				if(stpos <= mi.ui_sampleCount - 1){
+					fprintf(fpout, "%d,%d,%.6lf\r\n",stpos, mi.ui_sampleCount - 1, fps);
+				}
+			}
+			fclose(fpout);
+			printf("... timecode format v1 o—͏I—¹\n");
+		} else {
+			goto _ERROR_RET;
+		}
+	}
+
+
+_ERROR_RET:
+
+	// ƒtƒ@ƒCƒ‹‚ð•Â‚¶‚ďI—¹
+	gf_isom_close(mi.fp_in);
+
+	if(ts)		delete [] ts;
+	if(tsSort)	delete [] tsSort;
+	// ÅI
+	gf_sys_close();
+}
+
diff --git a/tstools/DtsEdit/src/EditMain.h b/tstools/DtsEdit/src/EditMain.h
new file mode 100644
index 0000000..439a10f
--- /dev/null
+++ b/tstools/DtsEdit/src/EditMain.h
@@ -0,0 +1,9 @@
+
+#include "stdafx.h"
+
+#pragma once
+
+#define MODE_IN			0x00000001ui32
+#define MODE_OUT		0x00000002ui32
+
+void EditMain(T_EDIT_PARAM *prm);
diff --git a/tstools/DtsEdit/src/Help.cpp b/tstools/DtsEdit/src/Help.cpp
new file mode 100644
index 0000000..d250d9f
--- /dev/null
+++ b/tstools/DtsEdit/src/Help.cpp
@@ -0,0 +1,68 @@
+#include <stdio.h>
+#include <string.h>
+
+#include <Help.h>
+
+// ƒwƒ‹ƒv‚Ì•\Ž¦
+void Help(){
+	printf("ƒpƒ‰ƒ[ƒ^‚ª•s³‚Å‚·B\n");
+	printf("Usage: DtsEdit <option> <mp4 file>\n");
+	printf("\n");
+	printf("option list\n");
+	printf("	-tc <file name>       : “ü—Í‚·‚éTimeCodeƒtƒ@ƒCƒ‹‚ðŽw’肵‚Ü‚·B\n");
+	printf("	                        -tc‚ªŽw’肳‚ꂽê‡‚́ATimeCode‚ðŽw’è‚ÌMP4ƒtƒ@ƒCƒ‹‚É–„‚ߍž‚Ý‚Ü‚·B\n");
+	printf("	                        Žw’肳‚ê‚È‚©‚Á‚½ê‡‚́AMP4ƒtƒ@ƒCƒ‹‚©‚çTimeCode‚𒊏o‚µ‚Ü‚·B\n");
+	printf("	-tv <1|2>             : “üo—Í‚·‚éTimeCodeƒtƒ@ƒCƒ‹‚̃o[ƒWƒ‡ƒ“‚ðŽw’肵‚Ü‚·BƒfƒtƒHƒ‹ƒg‚Í2‚Å‚·B\n");
+	printf("	-s <time scale>       : timeScale‚ðŽw’肵‚Ü‚·B\n");
+	printf("	                        –¢Žw’è‚̏ꍇ‚́A“ü—Í‚³‚ꂽtimecode format‚É‚æ‚Á‚ÄŽ©“®ŒvŽZ‚³‚ê‚Ü‚·B\n");
+	printf("	-mlt <multiple>       : timeScale‚ÌŽ©“®ŒvŽZ‚ÉŽg—p‚µ‚Ü‚·B\n");
+	printf("	                        ƒfƒtƒHƒ‹ƒg’l‚Í4.0”{‚Å‚·BtimeScale‚𒼐ڎw’肵‚½ê‡‚́A“à•”‚ÌŒvŽZŒ‹‰Ê‚ŏ㏑‚«‚³‚ê‚Ü‚·B\n");
+	printf("	-r <time rate>        : Å¬timeRate‚ðŽw’肵‚Ü‚·B\n");
+	printf("	                        –¢Žw’è‚̏ꍇ‚́A“ü—Í‚³‚ꂽMP4ƒtƒ@ƒCƒ‹‚ɏ]‚¢‚Ü‚·B\n");
+	printf("	-no-dc                : ‰ŠúƒfƒBƒŒƒCƒJƒbƒg‚𖳌ø‚É‚µ‚Ü‚·B\n");
+	printf("	-df <count>           : ‰ŠúƒfƒBƒŒƒC‚ð•t—^‚·‚éê‡‚́AƒfƒBƒŒƒCƒtƒŒ[ƒ€”‚ðŽw’肵‚Ü‚·B\n");
+	printf("	                        –¢Žw’è‚̏ꍇ‚́A“ü—Í‚³‚ꂽMP4ƒtƒ@ƒCƒ‹‚©‚玩“®ŒvŽZ‚µ‚Ü‚·B\n");
+	printf("	                        Ä¶ŽžŠÔ‚Ì’Z‚¢“®‰æ‚ł͐³Šm‚Ɏ擾‚Å‚«‚È‚¢ê‡‚ª‚ ‚è‚Ü‚·B\n");
+	printf("	-o <output file>      : o—̓tƒ@ƒCƒ‹‚ðŽw’肵‚Ü‚·B\n");
+	printf("\n");
+}
+
+int ErrorMessage(int msgId){
+	char msg[1024];
+
+	switch(msgId)
+	{
+		case MSG_NO_4CC:
+			strcpy(msg, "–¢‘Ήž‚̃rƒfƒIŒ`Ž®‚Å‚·B\n");
+			strcat(msg, "‘Ήž‚·‚éFOURCCFavc1, mp4v, xvid");
+			break;
+		case MSG_NO_V2:
+			strcpy(msg, "Žw’肳‚ꂽƒtƒ@ƒCƒ‹‚Í timecode format v2 ‚Å‚Í‚ ‚è‚Ü‚¹‚ñB");
+			break;
+		case MSG_NO_V1:
+			strcpy(msg, "Žw’肳‚ꂽƒtƒ@ƒCƒ‹‚Í timecode format v1 ‚Å‚Í‚ ‚è‚Ü‚¹‚ñB");
+			break;
+		case MSG_MORE_SMALL_DIV_PTS:
+			strcpy(msg, "ƒsƒNƒ`ƒƒ‚Ì•\Ž¦ŠÔŠu‚ª¬‚³‚·‚¬‚Ü‚·B\n");
+			strcat(msg, "timecode‚ð“ü—Í‚µ‚Ä‚¢‚éê‡‚́A“à—e‚ðŠm”F‚µ‚Ä‚­‚¾‚³‚¢B");
+			break;
+		case MSG_LOST_FRAME:
+			strcpy(msg, "ƒtƒŒ[ƒ€‚ª˜A‘±‚µ‚Ä‚¢‚È‚¢‚½‚߁ATimeCode“ü—Í‚ð’âŽ~‚µ‚Ü‚µ‚½B");
+			break;
+		case MSG_NO_ENOUGH_FRAME:
+			strcpy(msg, "ƒtƒŒ[ƒ€‚ª‘«‚è‚È‚¢‚½‚߁ATimeCode“ü—Í‚ð’âŽ~‚µ‚Ü‚µ‚½B");
+			break;
+		case MSG_NO_SAMPLE:
+			strcpy(msg, "ƒTƒ“ƒvƒ‹‚ªŽæ“¾‚Å‚«‚Ü‚¹‚ñBÅ’á‚Å‚à2ƒtƒŒ[ƒ€‚Ì“®‰æ‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B");
+			break;
+		case MSG_MORE_SMALL_TIMERATE:
+			strcpy(msg, "TimeScale‚Ì•ª‰ð”\‚ɑ΂µ‚ăfƒBƒŒƒCƒtƒŒ[ƒ€‚ª‘½‚·‚¬‚邽‚߁A‰ŠúƒfƒBƒŒƒCƒJƒbƒg‚ªo—ˆ‚Ü‚¹‚ñB");
+			break;
+		default:
+			sprintf(msg, "–¢’è‹`ƒƒbƒZ[ƒWF0x%08X", msgId);
+			break;
+	}
+	
+	printf("\n%s\n\n", msg);
+	return 1;
+}
diff --git a/tstools/DtsEdit/src/Help.h b/tstools/DtsEdit/src/Help.h
new file mode 100644
index 0000000..5ff36a9
--- /dev/null
+++ b/tstools/DtsEdit/src/Help.h
@@ -0,0 +1,17 @@
+
+#pragma once
+
+#define MSG_NO_AVC1					0x00000001
+#define MSG_NO_V2					0x00000002
+#define MSG_NO_4CC					0x00000003
+#define MSG_NO_V1					0x00000004
+#define MSG_MORE_SMALL_DIV_PTS		0x00000005
+#define MSG_LOST_FRAME				0x00000006
+#define MSG_NO_ENOUGH_FRAME			0x00000007
+#define MSG_NO_SAMPLE				0x00000008
+#define MSG_MORE_SMALL_TIMERATE		0x00000009
+
+void Help();
+
+int ErrorMessage(int msgId);
+
diff --git a/tstools/DtsEdit/src/common.cpp b/tstools/DtsEdit/src/common.cpp
new file mode 100644
index 0000000..7ed8b49
--- /dev/null
+++ b/tstools/DtsEdit/src/common.cpp
@@ -0,0 +1,311 @@
+#include "stdafx.h"
+#include "help.h"
+#include "debug.h"
+
+// Å‘åŒö–ñ”‚̎擾
+int gcd( int a, int b) {
+    while (1) {
+        int c = a % b;
+        if( !c )
+            return b;
+        a = b;
+        b = c;
+    }
+}
+
+int CompareU64(const u64 *a, const u64 *b)
+{
+	s64 diff = (s64)(*a - *b);
+	return (diff > 0 ? 1: diff == 0 ? 0: -1);
+}
+
+int CompareTS_PTS(const T_TS_LIST *a, const T_TS_LIST *b)
+{
+	s64 diff = (s64)(a->PTS - b->PTS);
+	return (diff > 0 ? 1: diff == 0 ? 0: -1);
+}
+
+int CompareTS_Sample(const T_TS_LIST *a, const T_TS_LIST *b)
+{
+	int diff = (int)(a->samples - b->samples);
+	return (diff > 0 ? 1: diff == 0 ? 0: -1);
+}
+
+
+int SearchTrackOf4CC(T_MP4_INFO *mi, u32 *List4CC, int ListCount){
+	u32	tgTrack = NULL;
+	u32 tg4CC = NULL;
+	for (int i = 1; i <= mi->i_trackCount; i++){
+		tg4CC = gf_isom_get_media_subtype(mi->fp_in, i, 1);
+		if (tg4CC == GF_ISOM_SUBTYPE_MPEG4)
+			tg4CC = gf_isom_get_mpeg4_subtype(mi->fp_in, i, 1);
+
+		DPRINTF("FOUR CC %s \r\n", gf_4cc_to_str(tg4CC));
+
+		for (s32 k=0; k<ListCount; k++){
+			if (tg4CC == List4CC[k]){
+				tgTrack = i;
+				break;
+			}
+		}
+
+		if (tgTrack){
+			mi->i_trackNo = tgTrack;
+			mi->ui_4cc = tg4CC;
+			break;
+		}
+	}
+
+	return 0;
+}
+
+
+int readTsFromFile(T_MP4_INFO *mi, T_TS_LIST *ts){
+	int ret = 0;
+
+	for(u32 i=0; i<mi->ui_sampleCount; i++){
+		GF_ISOSample *sample = gf_isom_get_sample_info(mi->fp_in, mi->i_trackNo, i+1, NULL, NULL);
+
+		if(!sample){
+			ret = ErrorMessage(MSG_NO_SAMPLE);
+			break;
+		}
+
+		ts[i].DTS			= sample->DTS;
+		ts[i].CTS_Offset	= sample->CTS_Offset;
+		ts[i].CTS			= sample->DTS + sample->CTS_Offset;
+		ts[i].PTS			= ts[i].CTS - ts[0].CTS_Offset;
+		ts[i].samples		= i+1;
+		gf_isom_sample_del(&sample);
+	}
+
+	return ret;
+}
+
+
+int getDelayFlame(T_MP4_INFO *mi, T_TS_LIST *ts){
+	int delay = 0;
+	int maxDelay = 0;
+	for(u32 i=1; i<mi->ui_sampleCount; i++){
+		if(ts[i-1].CTS > ts[i].CTS){
+			delay++;
+			maxDelay = MAX(maxDelay, delay);
+		} else {
+			delay = 0;
+		}
+	}
+
+	return maxDelay;
+}
+
+
+int getMinimumPTSDiff(T_MP4_INFO *mi, T_TS_LIST *ts){
+	int min_diff = INT_MAX;
+	for(u32 i=1; i<mi->ui_sampleCount; i++){
+		int diff = (int)(ts[i].PTS - ts[i-1].PTS);
+		min_diff = MIN(min_diff, diff);
+	}
+	return min_diff;
+}
+
+int getMaximumPTSDiff(T_MP4_INFO *mi, T_TS_LIST *ts){
+	int max_diff = 0;
+	for(u32 i=1; i<mi->ui_sampleCount; i++){
+		int diff = (int)(ts[i].PTS - ts[i-1].PTS);
+		max_diff = MAX(max_diff, diff);
+	}
+	return max_diff;
+}
+
+double getAveragePTSDiff(T_MP4_INFO *mi, T_TS_LIST *ts){
+	double avr_diff = 0.0;
+	for(u32 i=1; i<mi->ui_sampleCount; i++){
+		double diff = (double)(ts[i].PTS - ts[i-1].PTS);
+		avr_diff += diff / (double)(mi->ui_sampleCount-1);
+	}
+	return avr_diff;
+}
+
+double getAverageFps(T_MP4_INFO *mi, T_TS_LIST *ts){
+	double base_fps = (double)mi->i_org_timescale / (double)(ts[1].PTS - ts[0].PTS);
+	double sum_fps = 0;
+	for(u32 i=1; i<mi->ui_sampleCount; i++){
+		sum_fps += ((double)mi->i_org_timescale / (double)(ts[i].PTS - ts[i-1].PTS)) - base_fps;
+	}
+	return ((sum_fps / (double)mi->ui_sampleCount) + base_fps);
+}
+
+double getMaximumFps(T_MP4_INFO *mi, T_TS_LIST *ts){
+	double max_fps = 0;
+	for(u32 i=1; i<mi->ui_sampleCount; i++){
+		double fps = (double)mi->i_org_timescale / (double)(ts[i].PTS - ts[i-1].PTS);
+		max_fps = MAX(max_fps, fps);
+	}
+	return max_fps;
+}
+
+
+
+int readTimeCodeFromFile(T_MP4_INFO *mi, T_TS_LIST *ts, T_EDIT_PARAM *prm){
+	FILE *fpin;
+	int err = 0;
+
+	if((fpin = fopen(prm->p_tcfile, "rb")) != NULL){
+		printf("timecodeŽæž’†...\n");
+
+		char buf1[256], buf2[256], buf3[256], buf4[256];
+
+		/* read header */
+		fscanf(fpin, "%s %s %s %s", buf1, buf2, buf3, buf4);
+		if(	_stricmp(buf2, "timecode") != 0 ||
+			_stricmp(buf3, "format") != 0 ||
+			_stricmp(buf4, "v2") != 0
+		){
+			err = ErrorMessage(MSG_NO_V2);
+		} else {
+			u32		i			= 0;
+			double	timeStamp	= 0;
+			bool	enough		= false;
+			double	*timeList	= new double[mi->ui_sampleCount];
+
+			// ƒtƒ@ƒCƒ‹‚ð“ǂݍž‚Ý
+			while( fscanf(fpin, "%lf", &timeStamp) != EOF ){
+				timeList[i] = timeStamp;
+				i++;
+				if (mi->ui_sampleCount <= i){
+					enough = true;
+					break;
+				}
+			}
+
+			if (!enough) {
+				err = ErrorMessage(MSG_NO_ENOUGH_FRAME);
+			} else {
+
+				double min_timeStamp = INT_MAX;
+				// Å¬ƒ^ƒCƒ~ƒ“ƒO‚ðŽæ“¾
+				for(i=0; i<mi->ui_sampleCount - 1; i++){
+					double tmp = timeList[i+1] - timeList[i];
+					if(tmp > 0.0){
+						int true_fps = (int)((double)prm->i_timerate / tmp + 0.5);
+						if( true_fps > 0)
+							tmp = (double)prm->i_timerate / (double)(true_fps);
+					}
+					min_timeStamp = MIN(min_timeStamp, tmp);
+				}
+				// ƒGƒ‰[‰ñ”ð
+				double max_fps = 1000.0 / MAX(min_timeStamp, 1.0);
+				int timescale = int(max_fps * (double)prm->i_timerate * prm->f_mlt + 0.5);
+
+				// timescale–¢Žw’è‚̏ꍇ
+				if(prm->i_timescale <= 0){
+					prm->i_timescale = timescale;
+					prm->f_scaleFct = prm->f_mlt;
+				} else {
+					prm->f_scaleFct = ((double)prm->i_timescale / (double)timescale) * prm->f_mlt;
+				}
+
+				double timerate = prm->i_timerate;
+				if (prm->f_scaleFct < 1.0)
+					timerate = timerate * prm->f_scaleFct;
+
+				for(i=0; i<mi->ui_sampleCount; i++){
+					ts[i].PTS = u64( u64((double)prm->i_timescale * (timeList[i] / 1000.0) / timerate + 0.5) * timerate + 0.5);
+					ts[i].CTS = ts[i].PTS;
+				}
+			}
+
+			delete [] timeList;
+		}
+	}
+	fclose(fpin);
+	return err;
+}
+
+int readTimeCodeFromFileV1(T_MP4_INFO *mi, T_TS_LIST *ts, T_EDIT_PARAM *prm){
+	FILE *fpin;
+	int err = 0;
+
+	if((fpin = fopen(prm->p_tcfile, "rb")) != NULL){
+		printf("timecodeŽæž’†...\n");
+
+		char buf1[256], buf2[256], buf3[256], buf4[256];
+
+		/* read header */
+		fscanf(fpin, "%s %s %s %s", buf1, buf2, buf3, buf4);
+		if(	_stricmp(buf2, "timecode") != 0 ||
+			_stricmp(buf3, "format") != 0 ||
+			_stricmp(buf4, "v1") != 0
+		){
+			err = ErrorMessage(MSG_NO_V1);
+		} else {
+			double AssumeFps;
+			fscanf(fpin, "%s %lf",buf1, &AssumeFps);
+			if(	_stricmp(buf1, "Assume") != 0)
+				err = ErrorMessage(MSG_NO_V1);
+			else {
+				double	fps;
+				u32		st;
+				u32		ed;
+				s64		beforeCount = 0;
+				bool	enough		= false;
+				double	*fpsList	= new double[mi->ui_sampleCount];
+
+
+				while( fscanf(fpin, "%d,%d,%lf", &st, &ed, &fps) != EOF ){
+					
+					for(u32 i=st+1; i<=ed+1; i++){
+						if ((beforeCount + 1) != i){
+							err = ErrorMessage(MSG_LOST_FRAME);
+							break;
+						}
+						beforeCount = i;
+						fpsList[i] = fps;
+
+						if (mi->ui_sampleCount <= i+1)
+							break;
+					}
+					if (mi->ui_sampleCount <= ed+1){
+						enough = true;
+						break;
+					}
+				}
+				if (!enough) {
+					err = ErrorMessage(MSG_NO_ENOUGH_FRAME);
+				} else {
+
+					double max_fps = 0.1;
+					// Å‘åfps‚ðŽæ“¾
+					for(u32 i=0; i<mi->ui_sampleCount; i++){
+						max_fps = MAX(max_fps, fpsList[i]);
+					}
+					int timescale = int(max_fps * (double)prm->i_timerate * prm->f_mlt + 0.5);
+
+					// timescale–¢Žw’è‚̏ꍇ
+					if(prm->i_timescale <= 0){
+						prm->i_timescale = timescale;
+						prm->f_scaleFct = prm->f_mlt;
+					} else {
+						prm->f_scaleFct = ((double)prm->i_timescale / (double)timescale) * prm->f_mlt;
+					}
+
+					double timerate = prm->i_timerate;
+					if (prm->f_scaleFct < 1.0)
+						timerate = timerate * prm->f_scaleFct;
+
+					// æ“ª‚Í0ŒÅ’è
+					ts[0].PTS = 0;
+					ts[0].CTS = 0;
+					for(u32 i=1; i<mi->ui_sampleCount; i++){
+						ts[i].PTS = ts[i-1].PTS + u64( u64(((double)prm->i_timescale / (fpsList[i] * timerate)) + 0.5) * timerate + 0.5);
+						ts[i].CTS = ts[i].PTS;
+					}
+				}
+			}
+		}
+	}
+	fclose(fpin);
+	return err;
+}
+
+
diff --git a/tstools/DtsEdit/src/common.h b/tstools/DtsEdit/src/common.h
new file mode 100644
index 0000000..659afc7
--- /dev/null
+++ b/tstools/DtsEdit/src/common.h
@@ -0,0 +1,67 @@
+
+#ifndef _COMMON_H_
+
+// common.h
+
+#define _COMMON_H_
+
+#define GF_ISOM_BRAND_MP4V GF_4CC('m','p','4','v')
+#define GF_ISOM_BRAND_XVID GF_4CC('x','v','i','d')
+
+typedef struct {
+	char		*p_infile;
+	char		*p_outfile;
+	char		*p_tcfile;
+	int			i_mode;
+	int			i_tcv;
+	BOOL		b_dc;
+	int			i_timescale;
+	int			i_timerate;
+	int			i_delayFrame;
+	double		f_scaleFct;
+	double		f_mlt;
+} T_EDIT_PARAM;
+
+typedef struct {
+	GF_ISOFile	*fp_in;
+	GF_ISOFile	*fp_out;
+	int			i_trackCount;
+	int			i_trackNo;
+	u32			ui_4cc;
+	u32			ui_sampleCount;
+	int			i_delayFrame;
+	int			i_initDelay;
+	int			i_org_timescale;
+	int			i_org_timerate;
+} T_MP4_INFO;
+
+typedef struct {
+	u64			DTS;
+	u32			CTS_Offset;
+	u64			CTS;
+	u64			PTS;	// delay‚ðŠÜ‚Ü‚È‚¢ƒsƒNƒ`ƒƒ•\Ž¦ƒ^ƒCƒ~ƒ“ƒO
+	u32			samples;
+} T_TS_LIST;
+
+int gcd( int a, int b);
+int CompareU64(const u64 *a, const u64 *b);
+int CompareTS_PTS(const T_TS_LIST *a, const T_TS_LIST *b);
+int CompareTS_Sample(const T_TS_LIST *a, const T_TS_LIST *b);
+
+int SearchTrackOf4CC(T_MP4_INFO *mi, u32 *List4CC, int ListCount);
+int readTsFromFile(T_MP4_INFO *mi, T_TS_LIST *ts);
+int getDelayFlame(T_MP4_INFO *mi, T_TS_LIST *ts);
+int getMinimumPTSDiff(T_MP4_INFO *mi, T_TS_LIST *ts);
+int getMaximumPTSDiff(T_MP4_INFO *mi, T_TS_LIST *ts);
+double getAveragePTSDiff(T_MP4_INFO *mi, T_TS_LIST *ts);
+double getAverageFps(T_MP4_INFO *mi, T_TS_LIST *ts);
+double getMaximumFps(T_MP4_INFO *mi, T_TS_LIST *ts);
+
+int readTimeCodeFromFile(T_MP4_INFO *mi, T_TS_LIST *tc, T_EDIT_PARAM *prm);
+int readTimeCodeFromFileV1(T_MP4_INFO *mi, T_TS_LIST *tc, T_EDIT_PARAM *prm);
+
+
+
+#endif //_COMMON_H_
+
+
diff --git a/tstools/DtsEdit/src/debug.h b/tstools/DtsEdit/src/debug.h
new file mode 100644
index 0000000..4c76b5c
--- /dev/null
+++ b/tstools/DtsEdit/src/debug.h
@@ -0,0 +1,98 @@
+
+#ifndef _MY_DEBUG_H
+#define _MY_DEBUG_H 1
+
+#include <stdio.h>	 /* vsprintf */
+#include <windows.h>
+
+#ifdef _DEBUG
+
+#ifdef _cplusplus
+extern "C" {
+#endif
+
+#define DPRINTF_BUF_SZ  10240
+static void SENDSTR(char *cMsg){
+	HWND hTgWnd1 = FindWindow("Notepad", "–³‘è - ƒƒ‚’ ");
+	hTgWnd1 = GetWindow(hTgWnd1, GW_CHILD);
+  
+	if(hTgWnd1 > 0){
+		SendMessage(hTgWnd1, EM_REPLACESEL, NULL, (LPARAM)cMsg);
+	}
+}
+static void DUMP(char *tablename, unsigned char *data, DWORD size){
+	char buf1[60]	= {'\0'};
+	char *buf2		= (char*)calloc(1, size * 60);
+	DWORD i;
+
+	//sprintf(buf2, "------ DUMP %s ------\r\n", tablename);
+	//for (int y=0; y<(size/16); y++){
+	//	sprintf(buf1, "%08X: %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\r\n"
+	//		, data[y*16 + 0], data[y*16 + 1], data[y*16 + 2], data[y*16 + 3], data[y*16 + 4], data[y*16 + 5], data[y*16 + 6], data[y*16 + 7]
+	//		, data[y*16 + 8], data[y*16 + 9], data[y*16 +10], data[y*16 +11], data[y*16 +12], data[y*16 +13], data[y*16 +14], data[y*16 +15]
+	//		);
+	//	strcat(buf2, buf1);
+	//}
+
+	_snprintf(buf2, size * 60, "------ DUMP %s ------", tablename);
+	for (i=0; i<size; i++){
+		if ((i % 16) == 0){
+			sprintf(buf1, "\r\n%02X", data[i]);
+		}else{
+			sprintf(buf1, " %02X", data[i]);
+		}
+		strcat(buf2, buf1);
+	}
+	strcat(buf2, "\r\n\r\n");
+	SENDSTR(buf2);
+	free(buf2);
+}
+static void DPRINTLN(char *fmt, ...)
+{
+	va_list args;
+	char *buf1 = (char*)calloc(DPRINTF_BUF_SZ, sizeof(char));
+	char *buf2 = (char*)calloc(DPRINTF_BUF_SZ, sizeof(char));
+
+	va_start(args, fmt);
+	_vsnprintf(buf1, DPRINTF_BUF_SZ, fmt, args);
+	va_end(args);
+	_snprintf(buf2, DPRINTF_BUF_SZ, "[0x%08X]\t%s\r\n" ,GetCurrentThreadId(), buf1);
+	//strcat(buf, "\r\n");
+	//OutputDebugString(buf);
+	//FILE *fp = fopen("_debug.txt", "ab");
+	//fwrite(buf, strlen(buf), 1, fp);
+	//fclose(fp);
+	SENDSTR(buf2);
+
+	free(buf1);
+	free(buf2);
+}
+static void DPRINTF(char *fmt, ...)
+{
+	va_list args;
+	char *buf1 = (char*)calloc(DPRINTF_BUF_SZ, sizeof(char));
+
+	va_start(args, fmt);
+	_vsnprintf(buf1, DPRINTF_BUF_SZ, fmt, args);
+	va_end(args);
+
+	//OutputDebugString(buf);
+	//FILE *fp = fopen("_debug.txt", "ab");
+	//fwrite(buf, strlen(buf), 1, fp);
+	//fclose(fp);
+	SENDSTR(buf1);
+
+	free(buf1);
+}
+#else
+static __inline void DPRINTLN(char *fmt, ...) { }
+static __inline void DPRINTF(char *fmt, ...) { }
+static __inline void DUMP(char *tablename, unsigned char* data, unsigned long size){ }
+
+#ifdef _cplusplus
+} //extern "C"
+#endif
+
+#endif //_DEBUG
+
+#endif //_MY_DEBUG_H
\ No newline at end of file
diff --git a/tstools/DtsEdit/src/gpac/avparse.h b/tstools/DtsEdit/src/gpac/avparse.h
new file mode 100644
index 0000000..6cc9aaf
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/avparse.h
@@ -0,0 +1,208 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Authoring Tools sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _GF_PARSERS_AV_H_
+#define _GF_PARSERS_AV_H_
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/bitstream.h>
+
+/*basic MPEG (1,2,4) visual object parser (DSI extraction and timing/framing)*/
+typedef struct
+{
+	/*video PL*/
+	u8 VideoPL;
+	u8 RAP_stream, objectType, has_shape, enh_layer;
+	/*video resolution*/
+	u16 width, height;
+	/*pixel aspect ratio*/
+	u8 par_num, par_den;
+
+	u16 clock_rate;
+	u8 NumBitsTimeIncrement;
+	u32 time_increment;
+	/*for MPEG 1/2*/
+	Double fps;
+} GF_M4VDecSpecInfo;
+
+
+typedef struct __tag_m4v_parser GF_M4VParser;
+
+GF_M4VParser *gf_m4v_parser_new(char *data, u32 data_size, Bool mpeg12video);
+GF_M4VParser *gf_m4v_parser_bs_new(GF_BitStream *bs, Bool mpeg12video);
+void gf_m4v_parser_del(GF_M4VParser *m4v);
+GF_Err gf_m4v_parse_config(GF_M4VParser *m4v, GF_M4VDecSpecInfo *dsi);
+
+/*get a frame (can contain GOP). The parser ALWAYS resync on the next object in the bitstream
+thus you can seek the bitstream to copy the payload without re-seeking it */
+GF_Err gf_m4v_parse_frame(GF_M4VParser *m4v, GF_M4VDecSpecInfo dsi, u8 *frame_type, u32 *time_inc, u32 *size, u32 *start, Bool *is_coded);
+/*returns current object start in bitstream*/
+u32 gf_m4v_get_object_start(GF_M4VParser *m4v);
+/*returns 1 if current object is a valid MPEG-4 Visual object*/
+Bool gf_m4v_is_valid_object_type(GF_M4VParser *m4v);
+/*returns readable description of profile*/
+const char *gf_m4v_get_profile_name(u8 video_pl);
+/*decodes DSI*/
+GF_Err gf_m4v_get_config(char *rawdsi, u32 rawdsi_size, GF_M4VDecSpecInfo *dsi);
+/*rewrites PL code in DSI*/
+void gf_m4v_rewrite_pl(char **io_dsi, u32 *io_dsi_len, u8 PL);
+/*rewrites PAR code in DSI. Negative values will remove the par*/
+GF_Err gf_m4v_rewrite_par(char **o_data, u32 *o_dataLen, s32 par_n, s32 par_d);
+
+/*MP3 tools*/
+u8 gf_mp3_num_channels(u32 hdr);
+u16 gf_mp3_sampling_rate(u32 hdr);
+u16 gf_mp3_window_size(u32 hdr);
+u16 gf_mp3_bit_rate(u32 hdr);
+u8 gf_mp3_object_type_indication(u32 hdr);
+u8 gf_mp3_layer(u32 hdr);
+u8 gf_mp3_version(u32 hdr);
+const char *gf_mp3_version_name(u32 hdr);
+u16 gf_mp3_frame_size(u32 hdr);
+u32 gf_mp3_get_next_header(FILE* in);
+u32 gf_mp3_get_next_header_mem(char *buffer, u32 size, u32 *pos);
+
+/*vorbis tools*/
+typedef struct
+{
+	u32 sample_rate, channels, version;
+	s32 max_r, avg_r, low_r;
+	u32 min_block, max_block;
+
+	/*do not touch, parser private*/
+	Bool is_init;
+	u32 modebits;
+	Bool mode_flag[64];
+} GF_VorbisParser;
+
+/*call with vorbis header packets - you MUST initialize the structure to 0 before!!
+returns 1 if success, 0 if error.*/
+Bool gf_vorbis_parse_header(GF_VorbisParser *vp, char *data, u32 data_len);
+/*returns 0 if init error or not a vorbis frame, otherwise returns the number of audio samples
+in this frame*/
+u32 gf_vorbis_check_frame(GF_VorbisParser *vp, char *data, u32 data_length);
+
+
+enum
+{
+    GF_M4A_AAC_MAIN = 1,
+    GF_M4A_AAC_LC = 2,
+    GF_M4A_AAC_SSR = 3,
+    GF_M4A_AAC_LTP = 4,
+    GF_M4A_AAC_SBR = 5,
+    GF_M4A_AAC_SCALABLE = 6,
+    GF_M4A_TWINVQ = 7,
+    GF_M4A_CELP = 8, 
+    GF_M4A_HVXC = 9,
+    GF_M4A_TTSI = 12,
+    GF_M4A_MAIN_SYNTHETIC = 13,
+    GF_M4A_WAVETABLE_SYNTHESIS = 14,
+    GF_M4A_GENERAL_MIDI = 15,
+    GF_M4A_ALGO_SYNTH_AUDIO_FX = 16,
+    GF_M4A_ER_AAC_LC = 17,
+    GF_M4A_ER_AAC_LTP = 19,
+    GF_M4A_ER_AAC_SCALABLE = 20,
+    GF_M4A_ER_TWINVQ = 21,
+    GF_M4A_ER_BSAC = 22,
+    GF_M4A_ER_AAC_LD = 23,
+    GF_M4A_ER_CELP = 24,
+    GF_M4A_ER_HVXC = 25,
+    GF_M4A_ER_HILN = 26,
+    GF_M4A_ER_PARAMETRIC = 27,
+    GF_M4A_SSC = 28,
+    //GF_M4A_PS = 29,
+    GF_M4A_LAYER1 = 32,
+    GF_M4A_LAYER2 = 33,
+    GF_M4A_LAYER3 = 34,
+    GF_M4A_DST = 35,
+    GF_M4A_ALS = 36,
+};
+
+static const u32 GF_M4ASampleRates[] =
+{
+    96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 
+	16000, 12000, 11025, 8000, 7350, 0, 0, 0
+};
+
+/*get Audio type from dsi. return audio codec type:*/
+typedef struct
+{
+	u32 nb_chan;
+	u32 base_object_type, base_sr, base_sr_index;
+	/*SBR*/
+	Bool has_sbr;
+	u32 sbr_object_type, sbr_sr, sbr_sr_index;
+	/*PL indication*/
+	u8 audioPL;
+} GF_M4ADecSpecInfo;
+/*parses dsi and updates audioPL*/
+GF_Err gf_m4a_get_config(char *dsi, u32 dsi_size, GF_M4ADecSpecInfo *cfg);
+/*gets audioPL for given cfg*/
+u32 gf_m4a_get_profile(GF_M4ADecSpecInfo *cfg);
+const char *gf_m4a_object_type_name(u32 objectType);
+const char *gf_m4a_get_profile_name(u8 audio_pl);
+
+GF_Err gf_m4a_write_config(GF_M4ADecSpecInfo *cfg, char **dsi, u32 *dsi_size);
+GF_Err gf_m4a_parse_config(GF_BitStream *bs, GF_M4ADecSpecInfo *cfg, Bool size_known);
+
+typedef struct
+{
+	u32 bitrate;
+	u32 sample_rate;
+	u32 framesize;
+	u32 channels;
+	/*only set if full parse*/
+	u8 fscod, bsid, bsmod, acmod, lfon, brcode;
+} GF_AC3Header;
+
+Bool gf_ac3_parser(u8 *buffer, u32 buffer_size, u32 *pos, GF_AC3Header *out_hdr, Bool full_parse);
+Bool gf_ac3_parser_bs(GF_BitStream *bs, GF_AC3Header *hdr, Bool full_parse);
+
+
+GF_Err gf_avc_get_sps_info(char *sps, u32 sps_size, u32 *width, u32 *height, s32 *par_n, s32 *par_d);
+
+const char *gf_avc_get_profile_name(u8 video_prof);
+
+
+/*gets image size (bs must contain the whole image) 
+@OTI: image type (JPEG=0x6C, PNG=0x6D)
+@width, height: image resolution - for jpeg max size if thumbnail included*/
+void gf_img_parse(GF_BitStream *bs, u8 *OTI, u32 *mtype, u32 *width, u32 *height, char **dsi, u32 *dsi_len);
+
+GF_Err gf_img_jpeg_dec(char *jpg, u32 jpg_size, u32 *width, u32 *height, u32 *pixel_format, char *dst, u32 *dst_size, u32 dst_nb_comp);
+
+GF_Err gf_img_png_dec(char *png, u32 png_size, u32 *width, u32 *height, u32 *pixel_format, char *dst, u32 *dst_size);
+GF_Err gf_img_png_enc(char *data, u32 width, u32 height, u32 pixel_format, char *dst, u32 *dst_size);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif	/*_GF_PARSERS_AV_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/base_coding.h b/tstools/DtsEdit/src/gpac/base_coding.h
new file mode 100644
index 0000000..4b5c90a
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/base_coding.h
@@ -0,0 +1,105 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / common tools sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _GF_BASE_CODING_H_
+#define _GF_BASE_CODING_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!
+ *	\file <gpac/base_coding.h>
+ *	\brief Base coding functions.
+ */
+
+/*!
+ *	\addtogroup bascod_grp base coding
+ *	\ingroup utils_grp
+ *	\brief Base Coding functions
+ *
+ *	This section documents the base encoding and decoding functions of the GPAC framework.
+ *	@{
+ */
+
+#include <gpac/tools.h>
+
+/*!
+ *\brief base64 encoder
+ *
+ *Encodes a data buffer to Base64
+ *\param in_buffer input data buffer
+ *\param in_buffer_size input data buffer size
+ *\param out_buffer output Base64 buffer location
+ *\param out_buffer_size output Base64 buffer allocated size
+ *\return size of the encoded Base64 buffer
+ *\note the encoded data buffer is not NULL-terminated.
+ */
+u32 gf_base64_encode(char *in_buffer, u32 in_buffer_size, char *out_buffer, u32 out_buffer_size);
+/*!
+ *\brief base64 decoder
+ *
+ *Decodes a Base64 buffer to data
+ *\param in_buffer input Base64 buffer
+ *\param in_buffer_size input Base64 buffer size
+ *\param out_buffer output data buffer location
+ *\param out_buffer_size output data buffer allocated size
+ *\return size of the decoded buffer
+ */
+u32 gf_base64_decode(char *in_buffer, u32 in_buffer_size, char *out_buffer, u32 out_buffer_size);
+
+/*!
+ *\brief base16 encoder
+ *
+ *Encodes a data buffer to Base16
+ *\param in_buffer input data buffer
+ *\param in_buffer_size input data buffer size
+ *\param out_buffer output Base16 buffer location
+ *\param out_buffer_size output Base16 buffer allocated size
+ *\return size of the encoded Base16 buffer
+ *\note the encoded data buffer is not NULL-terminated.
+ */
+u32 gf_base16_encode(char *in_buffer, u32 in_buffer_size, char *out_buffer, u32 out_buffer_size);
+
+/*!
+ *\brief base16 decoder
+ *
+ *Decodes a Base16 buffer to data
+ *\param in_buffer input Base16 buffer
+ *\param in_buffer_size input Base16 buffer size
+ *\param out_buffer output data buffer location
+ *\param out_buffer_size output data buffer allocated size
+ *\return size of the decoded buffer
+ */
+u32 gf_base16_decode(char *in_buffer, u32 in_buffer_size, char *out_buffer, u32 out_buffer_size);
+
+/*! @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif		/*_GF_BASE_CODING_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/bifs.h b/tstools/DtsEdit/src/gpac/bifs.h
new file mode 100644
index 0000000..25097ca
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/bifs.h
@@ -0,0 +1,95 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / BIFS codec sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _GF_BIFS_H_
+#define _GF_BIFS_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#include <gpac/nodes_mpeg4.h>
+/*for BIFSConfig*/
+#include <gpac/mpeg4_odf.h>
+
+typedef struct __tag_bifs_dec GF_BifsDecoder;
+
+/*BIFS decoder constructor - 
+ @command_dec: if set, the decoder will only work in memory mode (creating commands for the graph)
+ otherwise the decoder will always apply commands while decoding them*/
+GF_BifsDecoder *gf_bifs_decoder_new(GF_SceneGraph *scenegraph, Bool command_dec);
+void gf_bifs_decoder_del(GF_BifsDecoder *codec);
+
+/*sets the scene time. Scene time is the real clock of the bifs stream in secs*/
+void gf_bifs_decoder_set_time_offset(GF_BifsDecoder *codec, Double ts);
+
+/*signals the sizeInfo of the config should be ignored - used for BIFS in AnimationStream nodes*/
+void gf_bifs_decoder_ignore_size_info(GF_BifsDecoder *codec);
+
+/*setup a stream*/
+GF_Err gf_bifs_decoder_configure_stream(GF_BifsDecoder *codec, u16 ESID, char *DecoderSpecificInfo, u32 DecoderSpecificInfoLength, u32 objectTypeIndication);
+/*removes a stream*/
+GF_Err gf_bifs_decoder_remove_stream(GF_BifsDecoder *codec, u16 ESID);
+
+/*decode a BIFS AU and applies it to the graph (non-memory mode only)*/
+GF_Err gf_bifs_decode_au(GF_BifsDecoder *codec, u16 ESID, char *data, u32 data_length, Double ts_offset);
+
+/*Memory BIFS decoding - fills the command list with the content of the AU - cf scenegraph_vrml.h for commands usage
+	@ESID: ID of input stream
+	@data, @data_length: BIFS AU
+	@com_list: target list for decoded commands
+*/
+GF_Err gf_bifs_decode_command_list(GF_BifsDecoder *codec, u16 ESID, char *data, u32 data_length, GF_List *com_list);
+
+
+/*BIFS encoding*/
+typedef struct __tag_bifs_enc GF_BifsEncoder;
+
+/*constructor - @graph: scene graph being encoded*/
+GF_BifsEncoder *gf_bifs_encoder_new(GF_SceneGraph *graph);
+/*destructor*/
+void gf_bifs_encoder_del(GF_BifsEncoder *codec);
+/*setup a destination stream*/
+GF_Err gf_bifs_encoder_new_stream(GF_BifsEncoder *codec, u16 ESID, GF_BIFSConfig *cfg, Bool encodeNames, Bool has_predictive);
+/*encodes a list of commands for the given stream in the output buffer - data is dynamically allocated for output
+the scenegraph used is the one described in SceneReplace command, hence scalable streams shall be encoded in time order
+*/
+GF_Err gf_bifs_encode_au(GF_BifsEncoder *codec, u16 ESID, GF_List *command_list, char **out_data, u32 *out_data_length);
+/*returns encoded config desc*/
+GF_Err gf_bifs_encoder_get_config(GF_BifsEncoder *codec, u16 ESID, char **out_data, u32 *out_data_length);
+/*returns BIFS version used by codec for given stream*/
+u8 gf_bifs_encoder_get_version(GF_BifsEncoder *codec, u16 ESID);
+
+/*Encodes current graph as a scene replace*/
+GF_Err gf_bifs_encoder_get_rap(GF_BifsEncoder *codec, char **out_data, u32 *out_data_length);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+
+#endif	/*_GF_BIFS_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/bifsengine.h b/tstools/DtsEdit/src/gpac/bifsengine.h
new file mode 100644
index 0000000..d178e32
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/bifsengine.h
@@ -0,0 +1,138 @@
+/*
+ *					GPAC Multimedia Framework
+ *
+ *			Authors: Cyril Concolato - Jean le Feuvre
+ *				Copyright (c) 2005-200X ENST
+ *					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. 
+ *
+ */
+
+
+#ifndef _GF_BIFSENGINE_H_
+#define _GF_BIFSENGINE_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/scene_manager.h>
+
+#ifndef GPAC_READ_ONLY
+	
+typedef struct __tag_bifs_engine GF_BifsEngine;
+
+/**
+ * @calling_object is the calling object on which call back will be called
+ * @inputContext is the name of a scene file (bt, xmt or mp4) to initialize the coding context
+ *
+ * must be called only one time (by process calling the DLL) before other calls
+ */
+GF_BifsEngine *gf_beng_init(void *calling_object, char *inputContext);
+
+/**
+ * @calling_object is the calling object on which call back will be called
+ * @inputContext is an UTF-8 scene description (with or without IOD) in BT or XMT-A format
+ * @width, @height: width and height of scene if no IOD is given in the context.
+ * @usePixelMetrics: metrics system used in the scene, if no IOD is given in the context.
+ *
+ * must be called only one time (by process calling the DLL) before other calls
+ */
+GF_BifsEngine *gf_beng_init_from_string(void *calling_object, char *inputContext, u32 width, u32 height, Bool usePixelMetrics);
+
+
+/**
+ * @calling_object is the calling object on which call back will be called
+ * @ctx is an already loaded scene manager
+ *
+ * must be called only one time (by process calling the DLL) before other calls
+ */
+GF_BifsEngine *gf_beng_init_from_context(void *calling_object, GF_SceneManager *ctx);
+
+/**
+ * @beng, pointer to the GF_BifsEngine returned by BENC_Init
+ * @config: pointer to the encoded BIFS config (memory is not allocated)
+ * @config_len: length of the buffer
+ *
+ * must be called after BENC_Init
+ */
+void gf_beng_get_stream_config(GF_BifsEngine *beng, char **config, u32 *config_len);
+
+/**
+ * Encodes the AU context which is not encoded when calling BENC_EncodeAUFromString/File
+ * Should be called after Aggregate.
+ *
+ * @beng, pointer to the GF_BifsEngine returned by BENC_Init
+ * @AUCallback, pointer on a callback function to get the result of the coding the AU using the current context
+ *
+ */
+GF_Err gf_beng_encode_context(GF_BifsEngine *beng, GF_Err (*AUCallback)(void *, char *data, u32 size, u64 ts));
+
+/**
+ * @beng, pointer to the GF_BifsEngine returned by BENC_Init
+ * @auFile, name of a file containing a description for an access unit (BT or XMT)
+ * @AUCallback, pointer on a callback function to get the result of the coding the AU using the current context
+ *
+ */
+GF_Err gf_beng_encode_from_file(GF_BifsEngine *beng, char *auFile, GF_Err (*AUCallback)(void *, char *data, u32 size, u64 ts));
+
+/**
+ * @beng, pointer to the GF_BifsEngine returned by BENC_Init
+ * @auString, a char string to encode (must one or several complete nodes in BT
+ * @AUCallback, pointer on a callback function to get the result of the coding the AU using the current context
+ *
+ */
+GF_Err gf_beng_encode_from_string(GF_BifsEngine *beng, char *auString, GF_Err (*AUCallback)(void *, char *data, u32 size, u64 ts));
+
+/**
+ * @beng, pointer to the GF_BifsEngine returned by BENC_Init
+ * @ctxFileName, name of the file to save the current state of the BIFS scene to
+ *
+ * save the current context of the beng.
+ * if you want to save an aggregate context, use BENC_AggregateCurrentContext before
+ *
+ */
+GF_Err gf_beng_save_context(GF_BifsEngine *beng, char *ctxFileName);
+
+/**
+ * @beng, pointer to the GF_BifsEngine returned by BENC_Init
+ *
+ * aggregates the current context of the beng, creates a scene replace
+ *
+ */
+GF_Err gf_beng_aggregate_context(GF_BifsEngine *beng);
+
+/**
+ * @beng, pointer to the GF_BifsEngine returned by BENC_Init
+ *
+ * release the memory used by this beng, no more call on the beng should happen after this
+ *
+ */
+void gf_beng_terminate(GF_BifsEngine *beng);
+
+
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif // __cplusplus
+
+
+#endif	/*_GF_BIFSENGINE_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/bitstream.h b/tstools/DtsEdit/src/gpac/bitstream.h
new file mode 100644
index 0000000..887d0d1
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/bitstream.h
@@ -0,0 +1,450 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / common tools sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _GF_BITSTREAM_H_
+#define _GF_BITSTREAM_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!
+ *	\file <gpac/bitstream.h>
+ *	\brief bitstream functions.
+ */
+
+/*!
+ *	\addtogroup bs_grp bitstream
+ *	\ingroup utils_grp
+ *	\brief BitStream object
+ *
+ *	This section documents the bitstream object of the GPAC framework.
+ *	\note Unless specified, all functions assume Big-Endian ordering of data in the bitstream.
+ *	@{
+ */
+
+#include <gpac/tools.h>
+
+
+enum
+{
+	GF_BITSTREAM_READ = 0,
+	GF_BITSTREAM_WRITE,
+};
+
+typedef struct __tag_bitstream GF_BitStream;
+
+/*!
+ *	\brief bitstream constructor
+ *
+ *	Constructs a bitstream from a buffer (read or write mode)
+ *	\param buffer buffer to read or write. In WRITE mode, this can be NULL to let the bitstream object dynamically allocate memory, in which case the size param is ignored.
+ *	\param size size of the buffer given. 
+ *	\param mode operation mode for this bitstream: GF_BITSTREAM_READ for read, GF_BITSTREAM_WRITE for write.
+ *	\return new bitstream object
+ *	\note In write mode on an existing data buffer, data overflow is never signaled but simply ignored, it is the caller responsability to ensure it 
+ *	does not write more than possible.
+ */
+GF_BitStream *gf_bs_new(char *buffer, u64 size, u32 mode);
+/*!
+ *	\brief bitstream constructor from file handle
+ *
+ * Creates a bitstream from a file handle. 
+ * \param f handle of the file to use. This handle must be created with binary mode.
+ *	\param mode operation mode for this bitstream: GF_BITSTREAM_READ for read, GF_BITSTREAM_WRITE for write.
+ *	\return new bitstream object
+ *	\note - You have to open your file in the appropriated mode:\n
+ *	- GF_BITSTREAM_READ: bitstream is constructed for reading\n
+ *	- GF_BITSTREAM_WRITE: bitstream is constructed for writing\n
+ *	\note - you may use any of these modes for a file with read/write access.
+ *	\warning RESULTS ARE UNEXPECTED IF YOU TOUCH THE FILE WHILE USING THE BITSTREAM.
+ */
+GF_BitStream *gf_bs_from_file(FILE *f, u32 mode);
+/*!
+ *	\brief bitstream constructor from file handle
+ *
+ * Deletes the bitstream object. If the buffer was created by the bitstream, it is deleted if still present.
+ */
+void gf_bs_del(GF_BitStream *bs);
+
+/*!
+ *	\brief integer reading
+ *
+ *	Reads an integer coded on a number of bit.
+ *	\param bs the target bitstream 
+ *	\param nBits the number of bits to read
+ *	\return the integer value read.
+ */
+u32 gf_bs_read_int(GF_BitStream *bs, u32 nBits);
+/*!
+ *	\brief large integer reading
+ *
+ *	Reads a large integer coded on a number of bit bigger than 32.
+ *	\param bs the target bitstream 
+ *	\param nBits the number of bits to read
+ *	\return the large integer value read.
+ */
+u64 gf_bs_read_long_int(GF_BitStream *bs, u32 nBits);
+/*!
+ *	\brief float reading
+ *
+ *	Reads a float coded as IEEE 32 bit format.
+ *	\param bs the target bitstream 
+ *	\return the float value read.
+ */
+Float gf_bs_read_float(GF_BitStream *bs);
+/*!
+ *	\brief double reading
+ *
+ *	Reads a double coded as IEEE 64 bit format.
+ *	\param bs the target bitstream 
+ *	\return the double value read.
+ */
+Double gf_bs_read_double(GF_BitStream *bs);
+/*!
+ *	\brief data reading
+ *
+ *	Reads a data buffer
+ *	\param bs the target bitstream 
+ *	\param data the data buffer to be filled
+ *	\param nbBytes the amount of bytes to read
+ *	\return the number of bytes actually read.
+ *	\warning the data buffer passed must be large enough to hold the desired amount of bytes.
+ */
+u32 gf_bs_read_data(GF_BitStream *bs, char *data, u32 nbBytes);
+
+/*!
+ *	\brief align char reading
+ *
+ *	Reads an integer coded on 8 bits starting at a byte boundary in the bitstream.
+ *	\warning you must not use this function if the bitstream is not aligned
+ *	\param bs the target bitstream 
+ *	\return the char value read.
+ */
+u32 gf_bs_read_u8(GF_BitStream *bs);
+/*!
+ *	\brief align short reading
+ *
+ *	Reads an integer coded on 16 bits starting at a byte boundary in the bitstream.
+ *	\warning you must not use this function if the bitstream is not aligned
+ *	\param bs the target bitstream 
+ *	\return the short value read.
+ */
+u32 gf_bs_read_u16(GF_BitStream *bs);
+/*!
+ *	\brief align 24-bit integer reading
+ *
+ *	Reads an integer coded on 24 bits starting at a byte boundary in the bitstream.
+ *	\warning you must not use this function if the bitstream is not aligned
+ *	\param bs the target bitstream 
+ *	\return the integer value read.
+ */
+u32 gf_bs_read_u24(GF_BitStream *bs);
+/*!
+ *	\brief align integer reading
+ *
+ *	Reads an integer coded on 32 bits starting at a byte boundary in the bitstream.
+ *	\warning you must not use this function if the bitstream is not aligned
+ *	\param bs the target bitstream 
+ *	\return the integer value read.
+ */
+u32 gf_bs_read_u32(GF_BitStream *bs);
+/*!
+ *	\brief align large integer reading
+ *
+ *	Reads an integer coded on 64 bits starting at a byte boundary in the bitstream.
+ *	\warning you must not use this function if the bitstream is not aligned
+ *	\param bs the target bitstream 
+ *	\return the large integer value read.
+ */
+u64 gf_bs_read_u64(GF_BitStream *bs);
+/*!
+ *	\brief little endian integer reading
+ *
+ *	Reads an integer coded on 32 bits in little-endian order.
+ *	\param bs the target bitstream 
+ *	\return the integer value read.
+ */
+u32 gf_bs_read_u32_le(GF_BitStream *bs);
+/*!
+ *	\brief little endian integer reading
+ *
+ *	Reads an integer coded on 16 bits in little-endian order.
+ *	\param bs the target bitstream 
+ *	\return the integer value read.
+ */
+u16 gf_bs_read_u16_le(GF_BitStream *bs);
+
+
+/*!
+ *	\brief variable length integer reading
+ *
+ *	Reads an integer coded on a variable number of 4-bits chunks. The number of chunks is given by the number of non-0 bits at the begining.
+ *	\param bs the target bitstream 
+ *	\return the integer value read.
+ */
+u32 gf_bs_read_vluimsbf5(GF_BitStream *bs);
+
+/*!
+ *	\brief bit position
+ *
+ *	Returns current bit position in the bitstream - only works in memory mode.
+ *	\param bs the target bitstream 
+ *	\return the integer value read.
+ */
+u32 gf_bs_get_bit_offset(GF_BitStream *bs);
+
+/*!
+ *	\brief current bit position
+ *
+ *	Returns bit position in the current byte of the bitstream - only works in memory mode.
+ *	\param bs the target bitstream 
+ *	\return the integer value read.
+ */
+u32 gf_bs_get_bit_position(GF_BitStream *bs);
+
+
+/*!
+ *	\brief integer writing
+ *
+ *	Writes an integer on a given number of bits.
+ *	\param bs the target bitstream 
+ *	\param value the integer to write
+ *	\param nBits number of bits used to code the integer
+ */
+void gf_bs_write_int(GF_BitStream *bs, s32 value, s32 nBits);
+/*!
+ *	\brief large integer writing
+ *
+ *	Writes an integer on a given number of bits greater than 32.
+ *	\param bs the target bitstream 
+ *	\param value the large integer to write
+ *	\param nBits number of bits used to code the integer
+ */
+void gf_bs_write_long_int(GF_BitStream *bs, s64 value, s32 nBits);
+/*!
+ *	\brief float writing
+ *
+ *	Writes a float in IEEE 32 bits format.
+ *	\param bs the target bitstream 
+ *	\param value the float to write
+ */
+void gf_bs_write_float(GF_BitStream *bs, Float value);
+/*!
+ *	\brief double writing
+ *
+ *	Writes a double in IEEE 64 bits format.
+ *	\param bs the target bitstream 
+ *	\param value the double to write
+ */
+void gf_bs_write_double(GF_BitStream *bs, Double value);
+/*!
+ *	\brief data writing
+ *
+ *	Writes a data buffer.
+ *	\param bs the target bitstream 
+ *	\param data the data to write
+ *	\param nbBytes number of data bytes to write
+ */
+u32 gf_bs_write_data(GF_BitStream *bs, char *data, u32 nbBytes);
+
+/*!
+ *	\brief align char writing
+ *
+ *	Writes an integer on 8 bits starting at a byte boundary in the bitstream.
+ *	\warning you must not use this function if the bitstream is not aligned
+ *	\param bs the target bitstream 
+ *	\param value the char value to write
+ */
+void gf_bs_write_u8(GF_BitStream *bs, u32 value);
+/*!
+ *	\brief align short writing
+ *
+ *	Writes an integer on 16 bits starting at a byte boundary in the bitstream.
+ *	\warning you must not use this function if the bitstream is not aligned
+ *	\param bs the target bitstream 
+ *	\param value the short value to write
+ */
+void gf_bs_write_u16(GF_BitStream *bs, u32 value);
+/*!
+ *	\brief align 24-bits integer writing
+ *
+ *	Writes an integer on 24 bits starting at a byte boundary in the bitstream.
+ *	\warning you must not use this function if the bitstream is not aligned
+ *	\param bs the target bitstream 
+ *	\param value the integer value to write
+ */
+void gf_bs_write_u24(GF_BitStream *bs, u32 value);
+/*!
+ *	\brief align integer writing
+ *
+ *	Writes an integer on 32 bits starting at a byte boundary in the bitstream.
+ *	\warning you must not use this function if the bitstream is not aligned
+ *	\param bs the target bitstream 
+ *	\param value the integer value to write
+ */
+void gf_bs_write_u32(GF_BitStream *bs, u32 value);
+/*!
+ *	\brief align large integer writing
+ *
+ *	Writes an integer on 64 bits starting at a byte boundary in the bitstream.
+ *	\warning you must not use this function if the bitstream is not aligned
+ *	\param bs the target bitstream 
+ *	\param value the large integer value to write
+ */
+void gf_bs_write_u64(GF_BitStream *bs, u64 value);
+/*!
+ *	\brief little endian integer writing
+ *
+ *	Writes an integer on 32 bits in little-endian order.
+ *	\param bs the target bitstream
+ *	\param value the integer value to write
+ */
+void gf_bs_write_u32_le(GF_BitStream *bs, u32 value);
+/*!
+ *	\brief little endian short writing
+ *
+ *	Writes an integer on 16 bits in little-endian order.
+ *	\param bs the target bitstream
+ *	\param value the short value to write
+ */
+void gf_bs_write_u16_le(GF_BitStream *bs, u32 value);
+
+/*!
+ *	\brief end of bitstream management
+ *
+ *	Assigns a notification callback function for end of stream signaling in read mode
+ *	\param bs the target bitstream
+ *	\param EndOfStream the notification function to use
+ *	\param par opaque user data passed to the bitstream
+ */
+void gf_bs_set_eos_callback(GF_BitStream *bs, void (*EndOfStream)(void *par), void *par);
+
+/*!
+ *	\brief bitstream alignment
+ *
+ *	Aligns bitstream to next byte boundary. In write mode, this will write 0 bit values until alignment.
+ *	\param bs the target bitstream
+ *	\return the number of bits read/written until alignment
+ */
+u8 gf_bs_align(GF_BitStream *bs);
+/*!
+ *	\brief capacity query
+ *
+ *	Returns the number of bytes still available in the bitstream in read mode.
+ *	\param bs the target bitstream
+ *	\return the number of bytes still available in read mode, -1 in write modes.
+ */
+u64 gf_bs_available(GF_BitStream *bs);
+/*!
+ *	\brief buffer fetching
+ *
+ *	Fetches the internal bitstream buffer in write mode. If a buffer was given at the bitstream construction, or if the bitstream is in read mode, this does nothing.
+ *	\param bs the target bitstream
+ *	\param output address of a memory block to be allocated for bitstream data.
+ *	\param outSize set to the size of the allocated memory block.
+ *	\note 
+	* It is the user responsability to destroy the allocated buffer
+	* Once this function has been called, the internal bitstream buffer is reseted.
+ */
+void gf_bs_get_content(GF_BitStream *bs, char **output, u32 *outSize);
+/*!
+ *	\brief byte skipping
+ *
+ *	Skips bytes in the bitstream. In Write mode, this will write the 0 integer value for memory-based bitstreams or seek the stream
+ for file-based bitstream.
+ *	\param bs the target bitstream
+ *	\param nbBytes the number of bytes to skip
+ */
+void gf_bs_skip_bytes(GF_BitStream *bs, u64 nbBytes);
+
+/*!
+ *\brief bitstream seeking
+ *
+ *Seeks the bitstream to a given offset after the begining of the stream. This will perform alignment of the bitstream in all modes.
+ *\warning Results are unpredictable if seeking beyond the bitstream end is performed.
+ *\param bs the target bitstream
+ *\param offset buffer/file offset to seek to
+ */
+GF_Err gf_bs_seek(GF_BitStream *bs, u64 offset);
+
+/*!
+ *\brief bit peeking 
+ *
+ *Peeks a given number of bits (read without moving the position indicator) for read modes only.
+ *\param bs the target bitstream
+ *\param numBits the number of bits to peek
+ *\param byte_offset
+	* if set, bitstream is aligned and moved from byte_offset before peeking (byte-aligned picking)
+	* otherwise, bitstream is not aligned and bits are peeked from current state
+ *\return the integer value read
+*/
+u32 gf_bs_peek_bits(GF_BitStream *bs, u32 numBits, u32 byte_offset);
+
+/*!
+ *\brief bit reservoir query
+ *
+ * Queries the number of bits available in read mode.
+ *\param bs the target bitstream
+ *\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
+ *
+ *Returns the reading/writting position in the buffer/file.
+ *\param bs the target bitstream
+ *\return the read/write position of the bitstream
+ */
+u64 gf_bs_get_position(GF_BitStream *bs);
+/*!
+ *\brief size query
+ *
+ *Returns the size of the associated buffer/file.
+ *\param bs the target bitstream
+ *\return the size of the bitstream
+ */
+u64 gf_bs_get_size(GF_BitStream *bs);
+/*!
+ *\brief file-based size query
+ *
+ *Returns the size of a file-based bitstream and force a seek to end of file. This is used in case the file handle
+ *describes a file being constructed on disk while being read?
+ *
+ *\param bs the target bitstream
+ *\return the disk size of the associated file
+ */
+u64 gf_bs_get_refreshed_size(GF_BitStream *bs);
+
+
+
+/*! @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif		/*_GF_BITSTREAM_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/color.h b/tstools/DtsEdit/src/gpac/color.h
new file mode 100644
index 0000000..ee53b54
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/color.h
@@ -0,0 +1,239 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / common tools interfaces
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+#ifndef _GF_RASTER_2D_H_
+#define _GF_RASTER_2D_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/constants.h>
+
+
+/*!
+ *\addtogroup color_grp color
+ *\ingroup utils_grp
+ *\brief Color tools
+ *
+ *This section documents color tools for image processing and color conversion
+ *	@{
+ */
+
+
+/*!\brief Video framebuffer object
+ *
+ *The video framebuffer object represents uncompressed color data like images in a variety of formats. Data in
+ *the video framebuffer MUST be continuous.
+*/
+typedef struct
+{
+	/*!Width of the video framebuffer */
+	u32 width;
+	/*!Height of the video framebuffer */
+	u32 height;
+	/*!Vertical pitch of the video framebuffer (number of bytes to skip to go down one line in the buffer). May be 
+	negative for some framebuffers (embedded devices)*/
+	s32 pitch;
+	/*!Pixel format of the video framebuffer*/
+	u32 pixel_format;
+	/*!pointer to the begining of the video memory (top-left corner)*/
+	char *video_buffer;
+	/*!indicates that the video data reside on systems memory or video card one*/
+	Bool is_hardware_memory;
+} GF_VideoSurface;
+
+/*!\brief Video Window object
+ *
+ *The video window object represents a rectangle in framebuffer coordinate system
+*/
+typedef struct
+{
+	/*!left-most coordinate of the rectangle*/
+	u32 x;
+	/*!top-most coordinate of the rectangle*/
+	u32 y;
+	/*!width of the rectangle*/
+	u32 w;
+	/*!height of the rectangle*/
+	u32 h;
+} GF_Window;
+
+
+/*!\brief color matrix object
+ *
+ *The Color transformation matrix object allows complete color space transformation (shift, rotate, skew, add).\n
+ *The matrix coefs are in rgba order, hence the color RGBA is transformed to:
+ \code
+	R'		m0	m1	m2	m3	m4			R
+	G'		m5	m6	m7	m8	m9			G
+	B'	=	m10	m11	m12	m13	m14		x	B
+	A'		m15	m16	m17	m18	m19			A
+	0		0	0	0	0	1			0
+ \endcode
+ *Coeficients are in intensity scale, ranging from 0 to \ref FIX_ONE.
+*/
+typedef struct
+{
+	/*!color matrix coefficient*/
+	Fixed m[20];
+	/*!internal flag to speed up things when matrix is identity. This is a read only flag, do not modify it*/
+	u32 identity;
+} GF_ColorMatrix;
+
+/*!\brief ARGB color object
+ *
+ *The color type used in the GPAC framework represents colors in the form 0xAARRGGBB, with each component ranging from 0 to 255
+*/
+typedef u32 GF_Color;
+/*!\hideinitializer color formating macro from alpha, red, green and blue components expressed as integers ranging from 0 to 255*/
+#define GF_COL_ARGB(a, r, g, b) ((a)<<24 | (r)<<16 | (g)<<8 | (b))
+/*!\hideinitializer color formating macro from alpha, red, green and blue components expressed as fixed numbers ranging from 0 to \ref FIX_ONE*/
+#define GF_COL_ARGB_FIXED(_a, _r, _g, _b) GF_COL_ARGB(FIX2INT(255*(_a)), FIX2INT(255*(_r)), FIX2INT(255*(_g)), FIX2INT(255*(_b)))
+/*!\hideinitializer gets alpha component of a color*/
+#define GF_COL_A(c) (u8) ((c)>>24)
+/*!\hideinitializer gets red component of a color*/
+#define GF_COL_R(c) (u8) ( ((c)>>16) & 0xFF)
+/*!\hideinitializer gets green component of a color*/
+#define GF_COL_G(c) (u8) ( ((c)>>8) & 0xFF)
+/*!\hideinitializer gets blue component of a color*/
+#define GF_COL_B(c) (u8) ( (c) & 0xFF)
+/*!\hideinitializer 16-bits color formating macro from red, green and blue components*/
+#define GF_COL_565(r, g, b) (u16) (((r & 248)<<8) + ((g & 252)<<3)  + (b>>3))
+/*!\hideinitializer 15-bits color formating macro from red, green and blue components*/
+#define GF_COL_555(r, g, b) (u16) (((r & 248)<<7) + ((g & 248)<<2)  + (b>>3))
+/*!\hideinitializer 15-bits color formating macro from red, green and blue components*/
+#define GF_COL_444(r, g, b) (u16) (((r & 240)<<4) + ((g & 240))  + ((b & 240)>>4))
+/*!\hideinitializer 16-bits alphagrey color formating macro alpha and grey components*/
+#define GF_COL_AG(a, g) (u16) ( (a << 8) | g)
+/*!\hideinitializer transfoms a 32-bits color into a 16-bits one.\note alpha component is lost*/
+#define GF_COL_TO_565(c) (((GF_COL_R(c) & 248)<<8) + ((GF_COL_G(c) & 252)<<3)  + (GF_COL_B(c)>>3))
+/*!\hideinitializer transfoms a 32-bits color into a 15-bits one.\note alpha component is lost*/
+#define GF_COL_TO_555(c) (((GF_COL_R(c) & 248)<<7) + ((GF_COL_G(c) & 248)<<2)  + (GF_COL_B(c)>>3))
+/*!\hideinitializer transfoms a 32-bits color into a 16-bits alphagrey one.\note red component is used for grey, green and blue components are lost.*/
+#define GF_COL_TO_AG(c) ( (GF_COL_A(c) << 8) | GF_COL_R(c))
+/*!\hideinitializer transfoms a 32-bits color into a 15-bits one.\note alpha component is lost*/
+#define GF_COL_TO_444(c) (((GF_COL_R(c) & 240)<<4) + ((GF_COL_G(c) & 240))  + ((GF_COL_B(c)>>4) & 240) )
+
+/*!Inits a color matrix to identity*/
+void gf_cmx_init(GF_ColorMatrix *_this);
+/*!Inits all coefficients of a color matrix 
+ *\param _this color matrix to initialize
+ *\param coefs list of the 20 fixed numbers to copy
+*/
+void gf_cmx_set_all(GF_ColorMatrix *_this, Fixed *coefs);
+/*!Inits all coefficients of a color matrix 
+ *\param _this color matrix to initialize
+ *\param mrr red-to-red multiplication factor
+ *\param mrg red-to-green multiplication factor
+ *\param mrb red-to-blue multiplication factor
+ *\param mra red-to-alpha multiplication factor
+ *\param tr red translation factor
+ *\param mgr green-to-red multiplication factor
+ *\param mgg green-to-green multiplication factor
+ *\param mgb green-to-blue multiplication factor
+ *\param mga green-to-alpha multiplication factor
+ *\param tg green translation factor
+ *\param mbr blue-to-red multiplication factor
+ *\param mbg blue-to-green multiplication factor
+ *\param mbb blue-to-blue multiplication factor
+ *\param mba blue-to-alpha multiplication factor
+ *\param tb blue translation factor
+ *\param mar alpha-to-red multiplication factor
+ *\param mag alpha-to-green multiplication factor
+ *\param mab alpha-to-blue multiplication factor
+ *\param maa alpha-to-alpha multiplication factor
+ *\param ta alpha translation factor
+*/
+void gf_cmx_set(GF_ColorMatrix *_this, 
+				 Fixed mrr, Fixed mrg, Fixed mrb, Fixed mra, Fixed tr,
+				 Fixed mgr, Fixed mgg, Fixed mgb, Fixed mga, Fixed tg,
+				 Fixed mbr, Fixed mbg, Fixed mbb, Fixed mba, Fixed tb,
+				 Fixed mar, Fixed mag, Fixed mab, Fixed maa, Fixed ta);
+/*!Inits a matrix from another matrix
+ *\param _this color matrix to initialize
+ *\param from color matrix to copy from
+*/
+void gf_cmx_copy(GF_ColorMatrix *_this, GF_ColorMatrix *from);
+/*!\brief color matrix multiplication
+ *
+ *Multiplies a color matrix by another one. Result is _this*with
+ *\param _this color matrix to transform. Once the function called, _this will contain the resulting color matrix
+ *\param with color matrix to add
+*/
+void gf_cmx_multiply(GF_ColorMatrix *_this, GF_ColorMatrix *with);
+/*!\brief color matrix transform
+ *
+ *Transforms a color with a given color matrix
+ *\param _this color matrix to use.
+ *\param col color to transform
+ *\return transformed color
+*/
+GF_Color gf_cmx_apply(GF_ColorMatrix *_this, GF_Color col);
+/*!\brief color components matrix transform
+ *
+ *Transforms color components with a given color matrix
+ *\param _this color matrix to use.
+ *\param a pointer to alpha component. Once the function is called, a contains the transformed alpha component
+ *\param r pointer to red component. Once the function is called, r contains the transformed red component
+ *\param g pointer to green component. Once the function is called, g contains the transformed green component
+ *\param b pointer to blue component. Once the function is called, b contains the transformed blue component
+*/
+void gf_cmx_apply_fixed(GF_ColorMatrix *_this, Fixed *a, Fixed *r, Fixed *g, Fixed *b);
+
+
+/*!\brief Color Key descriptor
+ *
+ *The ColorKey object represents a ColorKey with low and high threshold keying
+*/
+typedef struct
+{
+	/*!color key R, G, and B components*/
+	u8 r, g, b;
+	/*!Alpha value for opaque (non-keyed) pixels*/
+	u8 alpha;
+	/*!low variance threshold*/
+	u8 low;
+	/*!high variance threshold*/
+	u8 high;
+} GF_ColorKey;
+
+/*!\brief not done yet
+ *
+ */
+GF_Err gf_stretch_bits(GF_VideoSurface *dst, GF_VideoSurface *src, GF_Window *dst_wnd, GF_Window *src_wnd, s32 dst_x_pitch, u8 alpha, Bool flip, GF_ColorKey *colorKey, GF_ColorMatrix * cmat);
+
+
+
+/*! @} */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif	/*_GF_RASTER_2D_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/compositor.h b/tstools/DtsEdit/src/gpac/compositor.h
new file mode 100644
index 0000000..9eb001b
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/compositor.h
@@ -0,0 +1,164 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Scene Compositor sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _GF_COMPOSITOR_H_
+#define _GF_COMPOSITOR_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*include scene graph API*/
+#include <gpac/scenegraph.h>
+/*GF_User and GF_Terminal */
+#include <gpac/user.h>
+/*frame buffer definition*/
+#include <gpac/color.h>
+
+typedef struct __tag_compositor GF_Compositor;
+
+/*creates default compositor 
+if self_threaded, video compositor uses a dedicated thread, otherwise visual rendering is done by the user
+audio compositor always runs in its own thread if enabled
+term may be NULL, in which case InputSensors won't be enabled
+*/
+GF_Compositor *gf_sc_new(GF_User *user_interface, Bool self_threaded, GF_Terminal *term);
+void gf_sc_del(GF_Compositor *sr);
+
+/*sets simulation frame rate*/
+void gf_sc_set_fps(GF_Compositor *sr, Double fps);
+
+/*set the root scene graph of the compositor - if NULL remove current and reset simulation time*/
+GF_Err gf_sc_set_scene(GF_Compositor *sr, GF_SceneGraph *scene_graph);
+
+/*if the compositor doesn't use its own thread for visual, this will perform a render pass*/
+Bool gf_sc_draw_frame(GF_Compositor *sr);
+
+/*inits rendering info for the node - shall be called for all nodes the parent system doesn't handle*/
+void gf_sc_on_node_init(GF_Compositor *sr, GF_Node *node);
+
+/*notify the given node has been modified. The compositor filters object to decide whether the scene graph has to be 
+traversed or not- if object is NULL, this means complete traversing of the graph is requested (use carefully since it
+can be a time consuming operation)*/
+void gf_sc_invalidate(GF_Compositor *sr, GF_Node *byObj);
+
+/*return the compositor time - this is the time every time line syncs on*/
+u32 gf_sc_get_clock(GF_Compositor *sr);
+
+
+/*locks/unlocks the visual scene rendering - modification of the scene tree shall only happen when scene compositor is locked*/
+void gf_sc_lock(GF_Compositor *sr, Bool doLock);
+/*locks/unlocks the audio scene rendering - this is needed whenever an audio object changes config on the fly*/
+void gf_sc_lock_audio(GF_Compositor *sr, Bool doLock);
+
+/*notify user input - returns 0 if event hasn't been handled by the compositor*/
+Bool gf_sc_user_event(GF_Compositor *sr, GF_Event *event);
+
+/*maps screen coordinates to bifs 2D coordinates for the current zoom/pan settings
+X and Y are point coordinates in the display expressed in BIFS-like fashion (0,0) at center of 
+display and Y increasing from bottom to top*/
+void gf_sc_map_point(GF_Compositor *sr, s32 X, s32 Y, Fixed *bifsX, Fixed *bifsY);
+
+/*signal the size of the display area has been changed*/
+GF_Err gf_sc_size_changed(GF_Compositor *sr, u32 NewWidth, u32 NewHeight);
+
+/*set/get user options - options are as defined in user.h*/
+GF_Err gf_sc_set_option(GF_Compositor *sr, u32 type, u32 value);
+u32 gf_sc_get_option(GF_Compositor *sr, u32 type);
+
+/*returns current FPS
+if @absoluteFPS is set, the return value is the absolute framerate, eg NbFrameCount/NbTimeSpent regardless of
+whether a frame has been drawn or not, which means the FPS returned can be much greater than the compositor FPS
+if @absoluteFPS is not set, the return value is the FPS taking into account not drawn frames (eg, less than or equal to
+compositor FPS)
+*/
+Double gf_sc_get_fps(GF_Compositor *sr, Bool absoluteFPS);
+
+Bool gf_sc_has_text_selection(GF_Compositor *compositor);
+const char *gf_sc_get_selected_text(GF_Compositor *compositor);
+
+GF_Err gf_sc_paste_text(GF_Compositor *compositor, const char *text);
+
+/*user-define management: this is used for instant visual rendering of the scene graph, 
+for exporting or authoring tools preview. User is responsible for calling render when desired and shall also maintain
+scene timing*/
+
+/*force render tick*/
+void gf_sc_render(GF_Compositor *sr);
+/*gets screen buffer - this locks the scene graph too until released is called*/
+GF_Err gf_sc_get_screen_buffer(GF_Compositor *sr, GF_VideoSurface *framebuffer, Bool depth_buffer);
+/*releases screen buffer and unlocks graph*/
+GF_Err gf_sc_release_screen_buffer(GF_Compositor *sr, GF_VideoSurface *framebuffer);
+
+/*renders one frame*/
+void gf_sc_simulation_tick(GF_Compositor *sr);
+
+/*forces graphics cache recompute*/
+void gf_sc_reset_graphics(GF_Compositor *sr);
+
+/*picks a node (may return NULL) - coords are given in OS client system coordinate, as in UserInput*/
+GF_Node *gf_sc_pick_node(GF_Compositor *sr, s32 X, s32 Y);
+
+/*get viewpoints/viewports for main scene - idx is 1-based, and if greater than number of viewpoints return GF_EOS*/
+GF_Err gf_sc_get_viewpoint(GF_Compositor *sr, u32 viewpoint_idx, const char **outName, Bool *is_bound);
+/*set viewpoints/viewports for main scene given its name - idx is 1-based, or 0 to retrieve by viewpoint name
+if only one viewpoint is present in the scene, this will bind/unbind it*/
+GF_Err gf_sc_set_viewpoint(GF_Compositor *sr, u32 viewpoint_idx, const char *viewpoint_name);
+
+/*render subscene root node. rs is the current traverse stack
+this is needed to handle graph metrics changes between scenes...*/
+void gf_sc_traverse_subscene(GF_Compositor *sr, GF_Node *inline_parent, GF_SceneGraph *subscene, void *rs);
+
+/*set outupt size*/
+GF_Err gf_sc_set_size(GF_Compositor *sr, u32 NewWidth, u32 NewHeight);
+/*get outupt size*/
+Bool gf_sc_get_size(GF_Compositor *sr, u32 *Width, u32 *Height);
+
+/*returns total length of audio hardware buffer in ms, 0 if no audio*/
+u32 gf_sc_get_audio_buffer_length(GF_Compositor *sr);
+
+/*add/remove extra scene from compositor (extra scenes are OSDs or any other scene graphs not directly
+usable by main scene, like 3GP text streams*/
+void gf_sc_register_extra_graph(GF_Compositor *sr, GF_SceneGraph *extra_scene, Bool do_remove);
+
+/*gets audio hardware delay*/
+u32 gf_sc_get_audio_delay(GF_Compositor *sr);
+
+/*returns total length of audio hardware buffer in ms, 0 if no audio*/
+u32 gf_sc_get_audio_buffer_length(GF_Compositor *sr);
+
+void *gf_sc_get_visual_compositor(GF_Compositor *sr);
+
+GF_Compositor *gf_sc_get_compositor(GF_Node *node);
+
+Bool gf_sc_script_action(GF_Compositor *sr, u32 type, GF_Node *n, GF_JSAPIParam *param);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/*_GF_COMPOSITOR_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/config_file.h b/tstools/DtsEdit/src/gpac/config_file.h
new file mode 100644
index 0000000..b855a48
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/config_file.h
@@ -0,0 +1,165 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / common tools sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _GF_CONFIG_FILE_H_
+#define _GF_CONFIG_FILE_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!
+ *	\file <gpac/config_file.h>
+ *	\brief configuration file functions.
+ */
+
+ /*!
+ *	\addtogroup cfg_grp configuration
+ *	\ingroup utils_grp
+ *	\brief Configuration File object
+ *
+ *	This section documents the configuration file object of the GPAC framework.
+ *	This file is formatted as the INI file mode of WIN32 in sections and keys.\n
+ *\note For more information on the GPAC configuration file itself, please refer to the GPAC configuration help provided with GPAC.
+ *	@{
+ */
+
+#include <gpac/tools.h>
+
+
+typedef struct __tag_config GF_Config;
+
+/*!
+ *	\brief configuration file constructor
+ *
+ *Constructs a configuration file
+ *\param filePath directory the file is located in
+ *\param fileName name of the configuration file
+ *\return the configuration file object
+ */
+GF_Config *gf_cfg_new(const char *filePath, const char *fileName);
+/*!
+ *	\brief configuration file destructor
+ *
+ *Destroys the configuration file and saves it if needed.
+ *\param cfgFile the target configuration file
+ */
+void gf_cfg_del(GF_Config *cfgFile);
+/*!
+ *	\brief configuration saving
+ *
+ *Saves the configuration file if modified.
+ *\param cfgFile the target configuration file
+ */
+GF_Err gf_cfg_save(GF_Config *iniFile);
+/*!
+ *	\brief key value query
+ *
+ *Gets a key value from its section and name.
+ *\param cfgFile the target configuration file
+ *\param secName the desired key parent section name
+ *\param keyName the desired key name
+ *\return the desired key value if found, NULL otherwise.
+ */
+const char *gf_cfg_get_key(GF_Config *cfgFile, const char *secName, const char *keyName);
+/*!
+ *	\brief key value update
+ *
+ *Sets a key value from its section and name.
+ *\param cfgFile the target configuration file
+ *\param secName the desired key parent section name
+ *\param keyName the desired key name
+ *\param keyValue the desired key value
+ *\note this will also create both section and key if they are not found in the configuration file
+ */
+GF_Err gf_cfg_set_key(GF_Config *cfgFile, const char *secName, const char *keyName, const char *keyValue);
+/*!
+ *	\brief section count query
+ *
+ *Gets the number of sections in the configuration file
+ *\param cfgFile the target configuration file
+ *\return the number of sections
+ */
+u32 gf_cfg_get_section_count(GF_Config *cfgFile);
+/*!
+ *	\brief section name query
+ *
+ *Gets a section name based on its index
+ *\param cfgFile the target configuration file
+ *\param secIndex 0-based index of the section to query
+ *\return the section name if found, NULL otherwise
+ */
+const char *gf_cfg_get_section_name(GF_Config *cfgFile, u32 secIndex);
+/*!
+ *	\brief key count query
+ *
+ *Gets the number of keys in a section of the configuration file
+ *\param cfgFile the target configuration file
+ *\param secName the target section
+ *\return the number of keys in the section
+ */
+u32 gf_cfg_get_key_count(GF_Config *cfgFile, const char *secName);
+/*!
+ *	\brief key count query
+ *
+ *Gets the number of keys in a section of the configuration file
+ *\param cfgFile the target configuration file
+ *\param secName the target section
+ *\param keyIndex 0-based index of the key in the section
+ *\return the key name if found, NULL otherwise
+ */
+const char *gf_cfg_get_key_name(GF_Config *cfgFile, const char *secName, u32 keyIndex);
+
+/*!
+ *	\brief key insertion
+ *
+ *Inserts a new key in a given section. Returns an error if a key with the given name 
+ *already exists in the section
+ *\param cfgFile the target configuration file
+ *\param secName the target section
+ *\param keyName the name of the target key
+ *\param keyValue the value for the new key
+ *\param index the 0-based index position of the new key
+ */
+GF_Err gf_cfg_insert_key(GF_Config *cfgFile, const char *secName, const char *keyName, const char *keyValue, u32 index);
+
+/*!
+ *	\brief section destrouction
+ *
+ *Removes all entries in the given section
+ *\param cfgFile the target configuration file
+ *\param secName the target section
+ */
+void gf_cfg_del_section(GF_Config *cfgFile, const char *secName);
+
+/*! @} */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif		/*_GF_CONFIG_FILE_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/constants.h b/tstools/DtsEdit/src/gpac/constants.h
new file mode 100644
index 0000000..ad36acb
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/constants.h
@@ -0,0 +1,407 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / exported constants
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  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_CONSTANTS_H_
+#define _GF_CONSTANTS_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/tools.h>
+
+/*! \addtogroup cst_grp constants
+ *	\brief Constants used within GPAC
+ *
+ *	This section documents some constants used in the GPAC framework which are not related to
+ *	any specific sub-project.
+ *	\ingroup utils_grp
+ *	@{
+ */
+
+
+/*!
+ *	\brief Supported media stream types
+ *	\hideinitializer
+ *
+ * Supported media stream types for media objects.
+*/
+enum
+{
+	/*!MPEG-4 Object Descriptor Stream*/
+	GF_STREAM_OD		= 0x01,
+	/*!MPEG-4 Object Clock Reference Stream*/
+	GF_STREAM_OCR		= 0x02,
+	/*!MPEG-4 Scene Description Stream*/
+	GF_STREAM_SCENE		= 0x03,
+	/*!Visual Stream (Video, Image or MPEG-4 SNHC Tools)*/
+	GF_STREAM_VISUAL	= 0x04,
+	/*!Audio Stream (Audio, MPEG-4 Structured-Audio Tools)*/
+	GF_STREAM_AUDIO		= 0x05,
+	/*!MPEG-7 Description Stream*/
+	GF_STREAM_MPEG7		= 0x06,
+	/*!MPEG-4 Intellectual Property Management and Protection Stream*/
+	GF_STREAM_IPMP		= 0x07,
+	/*!MPEG-4 Object Content Information Stream*/
+	GF_STREAM_OCI		= 0x08,
+	/*!MPEG-4 MPEGlet Stream*/
+	GF_STREAM_MPEGJ		= 0x09,
+	/*!MPEG-4 User Interaction Stream*/
+	GF_STREAM_INTERACT	= 0x0A,
+	/*!MPEG-4 IPMP Tool Stream*/
+	GF_STREAM_IPMP_TOOL	= 0x0B,
+	/*!MPEG-4 Font Data Stream*/
+	GF_STREAM_FONT		= 0x0C,
+	/*!MPEG-4 Streaming Text Stream*/
+	GF_STREAM_TEXT		= 0x0D,
+	/*!Nero Digital Subpicture Stream*/
+	GF_STREAM_ND_SUBPIC = 0x38,
+
+	/*GPAC internal stream types*/
+
+
+	/*!GPAC Private Scene streams\n
+	*\n\note
+	*this stream type (MPEG-4 user-private) is reserved for streams only used to create a scene decoder 
+	*handling the scene without input streams, as is the case for file readers (BT/VRML/XML..).\n
+	*The decoderSpecificInfo carried is as follows:
+	 \code 
+		u32 file_size:	total file size 
+		char file_name[dsi_size - sizeof(u32)]: local file name. 
+		\n\note: File may be a cache file, it is the decoder responsability to check if the file is completely
+		downloaded before parsing if needed.
+	 \endcode 
+	*The inBufferLength param for decoders using these streams is the stream clock in ms (no input data is given).\n
+	*The "dummy_in" module is available to generate these streams for common files, and also takes care of proper 
+	clock init in case of seeking.\n
+	*This is a reentrant stream type: if any media object with this streamtype also exist in the scene, they will be 
+	*attached to the scene decoder (except when a new inline scene is detected, in which case a new decoder will 
+	*be created). This allows for animation/sprite usage along with the systems timing/stream management.\n
+	*\n
+	*the objectTypeIndication currently in use for these streams are documented below\n
+	*/
+	GF_STREAM_PRIVATE_SCENE	= 0x20,
+};
+
+
+/*!
+ *	Media Object types
+ * 
+ *	This type provides a hint to network modules which may have to generate an service descriptor on the fly.
+ *	They occur only if objects/services used in the scene are not referenced through ObjectDescriptors (MPEG-4) 
+ *	but direct through URL
+*/
+enum
+{
+	/*!service descriptor expected is of undefined type. This should be treated like GF_MEDIA_OBJECT_SCENE*/
+	GF_MEDIA_OBJECT_UNDEF = 0,
+	/*!service descriptor expected is of SCENE type and shall contain a scene stream and OD one if needed*/
+	GF_MEDIA_OBJECT_SCENE,
+	/*!service descriptor expected is of SCENE UPDATES type (animation streams)*/
+	GF_MEDIA_OBJECT_UPDATES,
+	/*!service descriptor expected is of VISUAL type*/
+	GF_MEDIA_OBJECT_VIDEO,
+	/*!service descriptor expected is of AUDIO type*/
+	GF_MEDIA_OBJECT_AUDIO,
+	/*!service descriptor expected is of TEXT type (3GPP/MPEG4)*/
+	GF_MEDIA_OBJECT_TEXT,
+	/*!service descriptor expected is of UserInteraction type (MPEG-4 InputSensor)*/
+	GF_MEDIA_OBJECT_INTERACT,
+};
+
+/*! All Media Objects inserted through URLs and not MPEG-4 OD Framework use this ODID*/
+#define GF_MEDIA_EXTERNAL_ID		1050
+
+
+/*!
+ * \brief Pixel Formats
+ * 
+ *	Supported pixel formats for everything using video
+ *\note	For textures using 32 bit ARGB/RGB_32/BGR_32:
+ *\li on little endian machines, shall be ordered in memory as BGRA, 
+ *\li on big endians, shall be ordered in memory as ARGB
+ *so that *(u32*)pixel_mem is always ARGB (0xAARRGGBB).
+*/
+typedef enum
+{
+	/*!8 bit GREY */
+	GF_PIXEL_GREYSCALE	=	GF_4CC('G','R','E','Y'),
+	/*!16 bit greyscale*/
+	GF_PIXEL_ALPHAGREY	=	GF_4CC('G','R','A','L'),
+	/*!12 bit RGB on 16 bits (4096 colors)*/
+	GF_PIXEL_RGB_444	=	GF_4CC('R','4','4','4'),
+	/*!15 bit RGB*/
+	GF_PIXEL_RGB_555	=	GF_4CC('R','5','5','5'),
+	/*!16 bit RGB*/
+	GF_PIXEL_RGB_565	=	GF_4CC('R','5','6','5'),
+	/*!24 bit RGB*/
+	GF_PIXEL_RGB_24		=	GF_4CC('R','G','B','3'),
+	/*!24 bit BGR - used for graphics cards video format signaling*/
+	GF_PIXEL_BGR_24		=	GF_4CC('B','G','R','3'),
+	/*!32 bit RGB*/
+	GF_PIXEL_RGB_32		=	GF_4CC('R','G','B','4'),
+	/*!32 bit BGR - used for graphics cards video format signaling*/
+	GF_PIXEL_BGR_32		=	GF_4CC('B','G','R','4'),
+
+	/*!32 bit ARGB.*/
+	GF_PIXEL_ARGB		=	GF_4CC('A','R','G','B'),
+	/*!32 bit RGBA (openGL like)*/
+	GF_PIXEL_RGBA		=	GF_4CC('R','G','B', 'A'),
+
+	/*!RGB24 + depth plane*/
+    GF_PIXEL_RGBD		=	GF_4CC('R', 'G', 'B', 'D'),
+
+	/*!RGB24 + depth plane (7 power bits) + shape mask*/
+    GF_PIXEL_RGBDS		=	GF_4CC('3', 'C', 'D', 'S'),
+    
+	/*!YUV packed format*/
+	GF_PIXEL_YUY2		=	GF_4CC('Y','U','Y','2'),
+	/*!YUV packed format*/
+	GF_PIXEL_YVYU		=	GF_4CC('Y','V','Y','U'),
+	/*!YUV packed format*/
+	GF_PIXEL_UYVY		=	GF_4CC('U','Y','V','Y'),
+	/*!YUV packed format*/
+	GF_PIXEL_VYUY		=	GF_4CC('V','Y','U','Y'),
+	/*!YUV packed format*/
+	GF_PIXEL_Y422		=	GF_4CC('Y','4','2','2'),
+	/*!YUV packed format*/
+	GF_PIXEL_UYNV		=	GF_4CC('U','Y','N','V'),
+	/*!YUV packed format*/
+	GF_PIXEL_YUNV		=	GF_4CC('Y','U','N','V'),
+	/*!YUV packed format*/
+	GF_PIXEL_V422		=	GF_4CC('V','4','2','2'),
+	
+	/*!YUV planar format*/
+	GF_PIXEL_YV12		=	GF_4CC('Y','V','1','2'),
+	/*!YUV planar format*/
+	GF_PIXEL_IYUV		=	GF_4CC('I','Y','U','V'),
+	/*!YUV planar format*/
+	GF_PIXEL_I420		=	GF_4CC('I','4','2','0'),
+		
+	/*!YV12 + Alpha plane*/
+	GF_PIXEL_YUVA		=	GF_4CC('Y', 'U', 'V', 'A'),
+
+	/*!YV12 + Depth plane*/
+	GF_PIXEL_YUVD		=	GF_4CC('Y', 'U', 'V', 'D'),
+
+} GF_PixelFormat;
+
+
+/*!
+ * \brief Scene ObjectTypeIndication Formats
+ * 
+ *	Supported ObjectTypeIndication for scene description streams. *_FILE_* are only used with private scene streams
+ * and only carry the file name for the scene. Other internal stream types can be used in a real streaming environment
+*/
+enum
+{
+	/*!OTI for BIFS v1*/
+	GPAC_OTI_SCENE_BIFS = 0x01,
+	/*!OTI for BIFS v2*/
+	GPAC_OTI_SCENE_BIFS_V2 = 0x02,
+	/*!OTI for BIFS InputSensor streams*/
+	GPAC_OTI_SCENE_INTERACT = 0x03,
+	/*!OTI forLASeR streams*/
+	GPAC_OTI_SCENE_LASER = 0x09,
+
+	/*!OTI for dummy streams (dsi = file name) using the generci context loader (BIFS/VRML/SWF/...) - GPAC internal*/
+	GPAC_OTI_PRIVATE_SCENE_GENERIC = 0xC0,
+	/*!OTI for SVG dummy stream (dsi = file name) - GPAC internal*/
+	GPAC_OTI_PRIVATE_SCENE_SVG = 0xC1,
+	/*!OTI for LASeR/SAF+XML dummy stream (dsi = file name) - GPAC internal*/
+	GPAC_OTI_PRIVATE_SCENE_LASER = 0xC2,
+	/*!OTI for XBL dummy streams (dsi = file name) - GPAC internal*/
+	GPAC_OTI_PRIVATE_SCENE_XBL = 0xC3,
+	/*!OTI for EPG dummy streams (dsi = null) - GPAC internal*/
+	GPAC_OTI_PRIVATE_SCENE_EPG = 0xC4,
+
+	/*!OTI for streaming SVG - GPAC internal*/
+	GPAC_OTI_SCENE_SVG = 0xD0,
+	/*!OTI for streaming SVG + gz - GPAC internal*/
+	GPAC_OTI_SCENE_SVG_GZ = 0xD1,
+	/*!OTI for DIMS (dsi = 3GPP DIMS configuration) - GPAC internal*/
+	GPAC_OTI_SCENE_DIMS = 0xD2,
+};
+
+
+/*!
+ * \brief Extra ObjectTypeIndication
+ *
+ *	ObjectTypeIndication for media (audio/video) codecs not defined in MPEG-4. Since GPAC signals streams through MPEG-4 Descriptions,
+ *	it needs extensions for non-MPEG-4 streams such as AMR, H263 , etc.\n
+ *\note The decoder specific info for such streams is always carried encoded, with the following syntax:\n
+ *	DSI Syntax for audio streams
+ \code 
+ *	u32 codec_four_cc: the codec 4CC reg code / codec id for ffmpeg
+ *	u32 sample_rate: sampling rate or 0 if unknown
+ *	u16 nb_channels: num channels or 0 if unknown
+ *	u16 frame_size: num audio samples per frame or 0 if unknown
+ *	u8 nb_bits_per_sample: nb bits or 0 if unknown
+ *	u8 num_frames_per_au: num audio frames per AU (used in 3GPP, max 15), 0 if unknown
+ *	char *data: per-codec extensions till end of DSI bitstream
+ \endcode
+ \n
+ *	DSI Syntax for video streams
+ \code 
+ *	u32 codec_four_cc: the codec 4CC reg code  / codec id for ffmpeg
+ *	u16 width: video width or 0 if unknown
+ *	u16 height: video height or 0 if unknown
+ *	char *data: per-codec extensions till end of DSI bitstream
+ \endcode
+*/
+#define GPAC_OTI_MEDIA_GENERIC				0x80
+
+/*!
+ * \brief FFMPEG ObjectTypeIndication
+ *
+ *	ObjectTypeIndication for FFMPEG codecs not defined in MPEG-4. FFMPEG uses the base GPAC_OTI_MEDIA_GENERIC specific info formats, and extends it as follows:
+ \code 
+ *	u32 bit_rate: the stream rate or 0 if unknown
+ *	u32 codec_tag: FFMPEG codec tag as defined in libavcodec
+ *	char *data: codec extensions till end of DSI bitstream
+ \endcode
+ */
+#define GPAC_OTI_MEDIA_FFMPEG				0x81
+
+
+/*!
+ * \brief OGG ObjectTypeIndication
+ *
+ *	Object type indication for all OGG media. The DSI contains all intitialization ogg packets for the codec
+ * and is formated as follows:\n
+ *\code 
+	while (dsi_size) {
+		bit(16) packet_size;
+		char packet[packet_size];
+		dsi_size -= packet_size;
+	}\endcode
+*/
+#define GPAC_OTI_MEDIA_OGG				0xDD
+
+
+/*channel cfg flags - DECODERS MUST OUTPUT STEREO/MULTICHANNEL IN THIS ORDER*/
+/*!
+ * \brief Audio Channel Configuration
+ *
+ *	Audio channel flags for spatialization.
+ \note Decoders must output stereo/multichannel audio channels in this order in the decoded audio frame.
+ */
+enum
+{
+	/*!Left Audio Channel*/
+	GF_AUDIO_CH_FRONT_LEFT = (1),
+	/*!Right Audio Channel*/
+	GF_AUDIO_CH_FRONT_RIGHT = (1<<1),
+	/*!Center Audio Channel - may also be used to signal monophonic audio*/
+	GF_AUDIO_CH_FRONT_CENTER = (1<<2),
+	/*!LFE Audio Channel*/
+	GF_AUDIO_CH_LFE = (1<<3),
+	/*!Back Left Audio Channel*/
+	GF_AUDIO_CH_BACK_LEFT = (1<<4),
+	/*!Back Right Audio Channel*/
+	GF_AUDIO_CH_BACK_RIGHT = (1<<5),
+	/*!Back Center Audio Channel*/
+	GF_AUDIO_CH_BACK_CENTER = (1<<6),
+	/*!Side Left Audio Channel*/
+	GF_AUDIO_CH_SIDE_LEFT = (1<<7),
+	/*!Side Right Audio Channel*/
+	GF_AUDIO_CH_SIDE_RIGHT = (1<<8)
+};
+
+
+
+/*DIMS unit flags */
+/*!
+ * \brief DIMS Unit header flags
+ *
+ *	DIMS Unit header flags as 3GPP TS 26.142.
+ */
+enum
+{
+	/*!S: is-Scene: DIMS unit contains a complete document (<svg>*/
+	GF_DIMS_UNIT_S = 1,
+	/*!M: is-RAP: DIMS unit is a random access point*/
+	GF_DIMS_UNIT_M = 1<<1,
+	/*!I: is-Redundant: DIMS unit is made of redundant data*/
+	GF_DIMS_UNIT_I = 1<<2,
+	/*!D: redundant-exit: DIMS unit is the end of redundant data*/
+	GF_DIMS_UNIT_D = 1<<3,
+	/*!P: priority: DIMS unit is high priority*/
+	GF_DIMS_UNIT_P = 1<<4,
+	/*!C: compressed: DIMS unit is compressed*/
+	GF_DIMS_UNIT_C = 1<<5
+};
+
+
+/*!
+ \cond DUMMY_DOXY_SECTION
+*/
+
+/*AVC NAL unit types*/
+#define GF_AVC_NALU_NON_IDR_SLICE 0x1
+#define GF_AVC_NALU_DP_A_SLICE 0x2
+#define GF_AVC_NALU_DP_B_SLICE 0x3
+#define GF_AVC_NALU_DP_C_SLICE 0x4
+#define GF_AVC_NALU_IDR_SLICE 0x5
+#define GF_AVC_NALU_SEI 0x6
+#define GF_AVC_NALU_SEQ_PARAM 0x7
+#define GF_AVC_NALU_PIC_PARAM 0x8
+#define GF_AVC_NALU_ACCESS_UNIT 0x9
+#define GF_AVC_NALU_END_OF_SEQ 0xa
+#define GF_AVC_NALU_END_OF_STREAM 0xb
+#define GF_AVC_NALU_FILLER_DATA 0xc
+
+#define GF_AVC_TYPE_P 0
+#define GF_AVC_TYPE_B 1
+#define GF_AVC_TYPE_I 2
+#define GF_AVC_TYPE_SP 3
+#define GF_AVC_TYPE_SI 4
+#define GF_AVC_TYPE2_P 5
+#define GF_AVC_TYPE2_B 6
+#define GF_AVC_TYPE2_I 7
+#define GF_AVC_TYPE2_SP 8
+#define GF_AVC_TYPE2_SI 9
+
+
+/*rate sizes - note that these sizes INCLUDE the rate_type header byte*/
+static const u32 GF_QCELP_RATE_TO_SIZE [] = {0, 1, 1, 4, 2, 8, 3, 17, 4, 35, 5, 8, 14, 1};
+static const u32 GF_QCELP_RATE_TO_SIZE_NB = 7;
+static const u32 GF_SMV_EVRC_RATE_TO_SIZE [] = {0, 1, 1, 3, 2, 6, 3, 11, 4, 23, 5, 1};
+static const u32 GF_SMV_EVRC_RATE_TO_SIZE_NB = 6;
+static const u32 GF_AMR_FRAME_SIZE[16] = { 12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0 };
+static const u32 GF_AMR_WB_FRAME_SIZE[16] = { 17, 23, 32, 36, 40, 46, 50, 58, 60, 5, 5, 0, 0, 0, 0, 0 };
+
+
+/*!
+ \endcond
+*/
+
+
+/*! @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/*_GF_CONSTANTS_H_*/
diff --git a/tstools/DtsEdit/src/gpac/crypt.h b/tstools/DtsEdit/src/gpac/crypt.h
new file mode 100644
index 0000000..5c36175
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/crypt.h
@@ -0,0 +1,190 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Crypto Tools sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+/*
+	The GPAC crypto lib is a simplified version of libmcrypt - not all algos are included.
+	Doc here is man mcrypt
+	Original libmcrypt license
+*/
+
+/*
+ * Copyright (C) 1998,1999,2000 Nikos Mavroyanopoulos
+ * 
+ * This library is free software; you can redistribute it and/or modify it 
+ * under the terms of the GNU Library General Public License as published 
+ * by the Free Software Foundation; either version 2 of the License, or 
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _GF_CRYPT_H_
+#define _GF_CRYPT_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/tools.h>
+
+/*max number of possible key sizes for all supported modes*/
+#define MAX_KEY_SIZES	4
+
+/*crypto lib handler*/
+typedef struct _tag_crypt_stream GF_Crypt;
+
+/*supported modes (case insensitive): "CBC", "CFB", "CTR", "ECB", "nCFB", "nOFB", "OFB", "STREAM"*/
+/*supported algos (case insensitive): 
+	"AES-128" == "Rijndael-128"
+	"AES-192" == "Rijndael-192"
+	"AES-256" == "Rijndael-256"
+	"DES", "3DES"
+*/
+
+
+/*opens crypto context - algo and mode SHALL NOT be NULL*/
+GF_Crypt *gf_crypt_open(const char *algorithm, const char *mode);
+/*close crypto context*/
+void gf_crypt_close(GF_Crypt *gfc);
+
+/* sets the state of the algorithm. Can be used only with block algorithms and certain modes like CBC, CFB etc. 
+It is usefully if you want to restart or start a different encryption quickly. 
+*/
+GF_Err gf_crypt_set_state(GF_Crypt *gfc, const void *iv, int size);
+/*gets the state of the algorithm. Can be used only certain modes and algorithms. 
+The size will hold the size of the state and the state must have enough bytes to hold it.
+*/
+GF_Err gf_crypt_get_state(GF_Crypt *gfc, void *iv, int *size);
+/*Returns 1 if the algorithm is a block algorithm or 0 if it is a stream algorithm.*/
+Bool gf_crypt_is_block_algorithm(GF_Crypt *gfc);
+/*Returns 1 if the mode is for use with block algorithms, otherwise it returns 0.*/
+Bool gf_crypt_is_block_algorithm_mode(GF_Crypt *gfc);
+/*Returns 1 if the mode outputs blocks of bytes or 0 if it outputs bytes. (eg. 1 for cbc and ecb, and 0 for cfb and stream)*/
+Bool gf_crypt_is_block_mode(GF_Crypt *gfc);
+/*Returns the block size of the algorithm specified by the encryption descriptor in bytes.*/
+u32 gf_crypt_get_block_size(GF_Crypt *gfc);
+/*Returns the maximum supported key size of the algorithm specified by the encryption descriptor in bytes.*/
+u32 gf_crypt_get_key_size(GF_Crypt *gfc);
+/*Returns the number of supported key sizes.
+@keys: array of at least MAX_KEY_SIZES size - will hold the supported sizes*/
+u32 gf_crypt_get_supported_key_sizes(GF_Crypt *gfc, u32 *key_sizes);
+/*Returns size (in bytes) of the IV of the algorithm specified for the context. 
+If it is '0' then the IV is ignored in that algorithm. 
+IV is used in CBC, CFB, OFB modes, and in some algorithms in STREAM mode.
+*/
+u32 gf_crypt_get_iv_size(GF_Crypt *gfc);
+/*Returns 1 if the mode needs an IV, 0 otherwise. 
+Some 'stream' algorithms may need an IV even if the mode itself does not need an IV.
+*/
+Bool gf_crypt_mode_has_iv(GF_Crypt *gfc);
+
+/*guess what these do...*/
+const char *gf_crypt_get_algorithm_name(GF_Crypt *gfc);
+u32 gf_crypt_get_algorithm_version(GF_Crypt *gfc);
+const char *gf_crypt_get_mode_name(GF_Crypt *gfc);
+u32 gf_crypt_get_mode_version(GF_Crypt *gfc);
+
+
+/*
+This function initializes all buffers for the specified context
+@Lenofkey: key size in BYTES - maximum value of lenofkey should be the one obtained by 
+calling gf_crypt_get_key_size() and every value smaller than this is legal.
+@IV: usually size of the algorithms block size - get it by calling gf_crypt_get_iv_size().
+	IV is ignored in ECB. IV MUST exist in CFB, CBC, STREAM, nOFB and OFB modes.
+	It needs to be random and unique (but not secret). The same IV must be used
+	for encryption/decryption. 
+After calling this function you can use the descriptor for encryption or decryption (not both). 
+*/
+GF_Err gf_crypt_init(GF_Crypt *gfc, void *key, u32 lenofkey, const void *IV);
+/*releases context buffers - you may call gf_crypt_init after that, or gf_crypt_close*/
+void gf_crypt_deinit(GF_Crypt *gfc);
+/*changes key and IV*/
+GF_Err gf_crypt_set_key(GF_Crypt *gfc, void *key, u32 keysize, const void *iv);
+
+/*
+main encryption function. 
+@Plaintext, @len: plaintext to encrypt - len should be  k*algorithms_block_size if used in a mode
+which operated in blocks (cbc, ecb, nofb), or whatever when used in cfb or ofb which operate in streams.
+The plaintext is replaced by the ciphertext. 
+*/
+GF_Err gf_crypt_encrypt(GF_Crypt *gfc, void *plaintext, int len);
+/*decryption function. It is almost the same with gf_crypt_generic.*/
+GF_Err gf_crypt_decrypt(GF_Crypt *gfc, void *ciphertext, int len);
+
+/*various queries on both modes and algo*/
+u32 gf_crypt_str_get_algorithm_version(const char *algorithm);
+u32 gf_crypt_str_get_mode_version(const char *mode);
+Bool gf_crypt_str_is_block_algorithm(const char *algorithm);
+Bool gf_crypt_str_is_block_algorithm_mode(const char *algorithm);
+Bool gf_crypt_str_is_block_mode(const char *mode);
+u32 gf_crypt_str_module_get_algo_block_size(const char *algorithm);
+u32 gf_crypt_str_module_get_algo_key_size(const char *algorithm);
+u32 gf_crypt_str_get_algo_supported_key_sizes(const char *algorithm, int *keys);
+
+
+
+/*SHA1 from Christophe Devine*/
+typedef struct
+{
+    u32 total[2];
+    u32 state[5];
+    u8 buffer[64];
+} GF_SHA1Context;
+
+/*
+ * Core SHA-1 functions
+ */
+void gf_sha1_starts(GF_SHA1Context *ctx );
+void gf_sha1_update(GF_SHA1Context *ctx, u8 *input, u32 length);
+void gf_sha1_finish(GF_SHA1Context *ctx, u8 digest[20] );
+
+/*
+ * Output SHA-1(file contents), returns 0 if successful.
+ */
+int gf_sha1_file(char *filename, u8 digest[20]);
+
+/*
+ * Output SHA-1(buf)
+ */
+void gf_sha1_csum(u8 *buf, u32 buflen, u8 digest[20]);
+
+/*
+ * Output HMAC-SHA-1(key,buf)
+ */
+void gf_sha1_hmac(u8 *key, u32 keylen, u8 *buf, u32 buflen, u8 digest[20]);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/*_GF_CRYPT_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/download.h b/tstools/DtsEdit/src/gpac/download.h
new file mode 100644
index 0000000..6d56ffc
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/download.h
@@ -0,0 +1,277 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / common tools sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _GF_DOWNLOAD_H_
+#define _GF_DOWNLOAD_H_
+
+/*!
+ *	\file <gpac/download.h>
+ *	\brief Downloader functions.
+ */
+
+/*!
+ *	\addtogroup dld_grp downloader
+ *	\ingroup utils_grp
+ *	\brief File Downloader objects
+ *
+ *	This section documents the file downloading tools the GPAC framework. Currently HTTP is supported, HTTPS is under testing but may not be supported
+ *depending on GPAC compilation options (HTTPS in GPAC needs OpenSSL installed on the system).
+ *
+ *	@{
+ */
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/tools.h>
+#include <gpac/module.h>
+
+
+/*!the download manager object. This is usually not used by GPAC modules*/
+typedef struct __gf_download_manager GF_DownloadManager;
+/*!the download manager session.*/
+typedef struct __gf_download_session GF_DownloadSession;
+
+/*!
+ *\brief download manager constructor
+ *
+ *Creates a new download manager object.
+ *\param cfg optional configuration file. Currently the download manager needs a configuration file for cache location and 
+ *other options. The cache directory must be indicated in the section "General", key "CacheDirectory" of the configuration
+ *file. If the cache directory is not found, the cache will be disabled but the downloader will still work.
+ *\return the download manager object
+*/
+GF_DownloadManager *gf_dm_new(GF_Config *cfg);
+/*
+ *\brief download manager destructor
+ *
+ *Deletes the download manager. All running sessions are aborted
+ *\param dm the download manager object
+ */
+void gf_dm_del(GF_DownloadManager *dm);
+
+/*!
+ *\brief callback function for authentication
+ *
+ * The gf_dm_get_usr_pass type is the type for the callback of the \ref gf_dm_set_auth_callback function used for password retrieval
+ *\param usr_cbk opaque user data
+ *\param site_url url of the site the user and password are requested for
+ *\param usr_name the user name for this site. The allocated space for this buffer is 50 bytes. \note this varaibale may already be formatted.
+ *\param password the password for this site and user. The allocated space for this buffer is 50 bytes.
+ *\return 0 if user didn't fill in the information which will result in an authentication failure, 1 otherwise.
+*/
+typedef Bool (*gf_dm_get_usr_pass)(void *usr_cbk, const char *site_url, char *usr_name, char *password);
+
+/*!
+ *\brief password retrieval assignment
+ *
+ *Assigns the callback function used for user password retrieval. If no such function is assigned to the download manager, 
+ *all downloads requiring authentication will fail.
+ *\param dm the download manager object
+ *\param get_pass \ref gf_dm_get_usr_pass callback function for user and password retrieval. 
+ *\param usr_cbk opaque user data passed to callback function
+ */
+void gf_dm_set_auth_callback(GF_DownloadManager *dm, gf_dm_get_usr_pass get_pass, void *usr_cbk);
+
+/*!downloader session message types*/
+enum
+{
+	/*!signal that session is setup and waiting for connection request*/
+	GF_NETIO_SETUP = 0,
+	/*!signal that session connection is done*/
+	GF_NETIO_CONNECTED,
+	/*!request a protocol method from the user. Default value is "GET" for HTTP*/
+	GF_NETIO_GET_METHOD,
+	/*!request a header from the user. */
+	GF_NETIO_GET_HEADER,
+	/*!requesting content from the user, if any. Content is appended to the request*/
+	GF_NETIO_GET_CONTENT,
+	/*!signal that request is sent and waiting for server reply*/
+	GF_NETIO_WAIT_FOR_REPLY,
+	/*!signal a header to user. */
+	GF_NETIO_PARSE_HEADER,
+	/*!signal request reply to user. The reply is always sent after the headers*/
+	GF_NETIO_PARSE_REPLY,
+	/*!send data to the user*/
+	GF_NETIO_DATA_EXCHANGE,
+	/*!all data has been transfered*/
+	GF_NETIO_DATA_TRANSFERED,
+	/*!signal that the session has been deconnected*/
+	GF_NETIO_DISCONNECTED,
+	/*!downloader session failed (error code set) or done/destroyed (no error code)*/
+	GF_NETIO_STATE_ERROR
+};
+
+/*!session download flags*/
+enum
+{
+	/*!session is not threaded, the user must explicitely fetch the data */
+	GF_NETIO_SESSION_NOT_THREADED	=	1,
+	/*!session has no cache: data will be sent to the user if threaded mode (live streams like radios & co)*/
+	GF_NETIO_SESSION_NOT_CACHED	=	1<<1,
+};
+
+
+/*!protocol I/O parameter*/
+typedef struct
+{
+	/*!parameter message type*/
+	u32 msg_type;
+	/*error code if any. Valid for all message types.*/
+	GF_Err error;
+	/*!data received or data to send. Only valid for GF_NETIO_GET_CONTENT and GF_NETIO_DATA_EXCHANGE (when no cache is setup) messages*/
+	char *data;
+	/*!size of associated data. Only valid for GF_NETIO_GET_CONTENT and GF_NETIO_DATA_EXCHANGE messages*/
+	u32 size;
+	/*protocol header. Only valid for GF_NETIO_GET_HEADER, GF_NETIO_PARSE_HEADER and GF_NETIO_GET_METHOD*/
+	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*/
+	u32 reply;
+} GF_NETIO_Parameter;
+
+/*!
+ *\brief callback function for data reception and state signaling
+ *
+ * The gf_dm_user_io type is the type for the data callback function of a download session
+ *\param usr_cbk opaque user data
+ *\param parameter the input/output parameter structure 
+*/
+typedef void (*gf_dm_user_io)(void *usr_cbk, GF_NETIO_Parameter *parameter);
+
+
+
+/*!
+ *\brief download session constructor
+ *
+ *Creates a new download session
+ *\param dm the download manager object
+ *\param url file to retrieve (no PUT/POST yet, only downloading is supported)
+ *\param dl_flags combination of session download flags
+ *\param user_io \ref gf_dm_user_io callback function for data reception and service messages
+ *\param usr_cbk opaque user data passed to callback function
+ *\param error error for failure cases 
+ *\return the session object or NULL if error. If no error is indicated and a NULL session is returned, this means the file is local
+ */
+GF_DownloadSession * gf_dm_sess_new(GF_DownloadManager *dm, char *url, u32 dl_flags,
+									  gf_dm_user_io user_io,
+									  void *usr_cbk,
+									  GF_Err *error);
+
+/*!
+ *brief downloader session destructor
+ *
+ *Deletes the download session, cleaning the cache if indicated in the configuration file of the download manager (section "Downloader", key "CleanCache")
+ *\param sess the download session
+*/
+void gf_dm_sess_del(GF_DownloadSession * sess);
+/*!
+ *\brief aborts downloading
+ *
+ *Aborts all operations in the session, regardless of its state. The session cannot be reused once this is called.
+ *\param sess the download session
+ */
+void gf_dm_sess_abort(GF_DownloadSession * sess);
+/*!
+ *\brief sets private data
+ *
+ *associate private data with the session.
+ *\param sess the download session
+ *\param private_data the private data
+ *\warning the private_data parameter is reserved for bandwidth statistics per service when used in the GPAC terminal.
+ */
+void gf_dm_sess_set_private(GF_DownloadSession * sess, void *private_data);
+
+/*!
+ *\brief gets private data
+ *
+ *Gets private data associated with the session.
+ *\param sess the download session
+ *\return the private data
+ *\warning the private_data parameter is reserved for bandwidth statistics per service when used in the GPAC terminal.
+ */
+void *gf_dm_sess_get_private(GF_DownloadSession * sess);
+/*!
+ *\brief gets last session error 
+ *
+ *Gets the last error that occured in the session
+ *\param sess the download session
+ *\return the last error
+ */
+GF_Err gf_dm_sess_last_error(GF_DownloadSession *sess);
+
+/*!
+ *\brief fetches data on session
+ *
+ *Fetches data from the server. This will also performs connections and all needed exchange with server.
+ *\param sess the download session
+ *\param buffer destination buffer
+ *\param buffer_size destination buffer allocated size
+ *\param read_size amount of data actually fetched
+ *\note this can only be used when the session is not threaded
+ */
+GF_Err gf_dm_sess_fetch_data(GF_DownloadSession * sess, char *buffer, u32 buffer_size, u32 *read_size);
+
+/*!
+ *\brief get mime type 
+ *
+ *Fetches the mime type of the URL this session is fetching
+ *\param sess the download session
+ *\return the mime type of the URL, or NULL if error. You should get the error with \ref gf_dm_sess_last_error
+ */
+const char *gf_dm_sess_mime_type(GF_DownloadSession * sess);
+/*!
+ *\brief get cache file name
+ *
+ *Gets the cache file name for the session.
+ *\param sess the download session
+ *\return the absolute path of the cache file, or NULL if the session is not cached*/
+const char *gf_dm_sess_get_cache_name(GF_DownloadSession * sess);
+/*!
+ *\brief get statistics
+ *
+ *Gets download statistics for the session. All output parameters are optional and may be set to NULL.
+ *\param sess the download session
+ *\param server the remote server address
+ *\param path the path on the remote server
+ *\param total_size the total size in bytes the file fetched, 0 if unknown.
+ *\param bytes_done the amount of bytes received from the server
+ *\param bytes_per_sec the average data rate in bytes per seconds
+ *\param net_status the session status
+ */
+GF_Err gf_dm_sess_get_stats(GF_DownloadSession * sess, const char **server, const char **path, u32 *total_size, u32 *bytes_done, u32 *bytes_per_sec, u32 *net_status);
+
+
+/*! @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif		/*_GF_DOWNLOAD_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/esi.h b/tstools/DtsEdit/src/gpac/esi.h
new file mode 100644
index 0000000..b0b4800
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/esi.h
@@ -0,0 +1,183 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean le Feuvre
+ *				Copyright (c) 2005-200X ENST
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Elementary Stream Interface sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _GF_ESI_H_
+#define _GF_ESI_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/tools.h>
+
+/* ESI input control commands*/
+enum
+{
+	/*forces a data flush from interface to dest (caller) - used for non-threaded interfaces
+		corresponding parameter: unused
+	*/
+	GF_ESI_INPUT_DATA_FLUSH,
+	/*pulls a COMPLETE AU from the stream
+		corresponding parameter: pointer to a GF_ESIPacket to fill. The indut data_len in the packet is used to indicate any padding in bytes
+	*/
+	GF_ESI_INPUT_DATA_PULL,
+	/*releases the currently pulled AU from the stream - AU cannot be pulled after that, unless seek happens
+		corresponding parameter: unused
+	*/
+	GF_ESI_INPUT_DATA_RELEASE,
+
+	/*destroys any allocated resource by the stream interface*/
+	GF_ESI_INPUT_DESTROY,
+};
+
+/* ESI output control commands*/
+enum
+{
+	/*forces a data flush from interface to dest (caller) - used for non-threaded interfaces
+		corresponding parameter: unused
+	*/
+	GF_ESI_OUTPUT_DATA_DISPATCH
+};
+	
+/*
+	data packet flags
+*/
+enum
+{
+	GF_ESI_DATA_AU_START	=	1,
+	GF_ESI_DATA_AU_END		=	1<<1,
+	GF_ESI_DATA_AU_RAP		=	1<<2,
+	GF_ESI_DATA_HAS_CTS		=	1<<3,
+	GF_ESI_DATA_HAS_DTS		=	1<<4,
+	GF_ESI_DATA_ENCRYPTED	=	1<<5,
+};
+
+typedef struct __data_packet_ifce
+{
+	u32 flags;
+	char *data;
+	u32 data_len;
+	/*DTS, CTS/PTS and duration expressed in media timescale*/
+	u64 dts, cts;
+	u32 duration;
+	u32 pck_sn;
+	/*MPEG-4 stuff*/
+	u32 au_sn;
+	/*for packets using ISMACrypt/OMA/3GPP based crypto*/
+	u32 isma_bso;
+} GF_ESIPacket;
+
+struct __esi_video_info
+{
+	u32 width, height, par;
+	Double FPS;
+};
+struct __esi_audio_info
+{
+	u32 sample_rate, nb_channels;
+};
+
+enum
+{
+	/*data can be pulled from this stream*/
+	GF_ESI_AU_PULL_CAP	=	1,
+	/*DTS is signaled for this stream*/
+	GF_ESI_SIGNAL_DTS =	1<<1,
+	/*no more data to expect from this stream*/
+	GF_ESI_STREAM_IS_OVER	=	1<<2,
+};
+
+typedef struct __elementary_stream_ifce 
+{
+	/*misc caps of the stream*/
+	u32 caps;
+	/*matches PID for MPEG2, ES_ID for MPEG-4*/
+	u32 stream_id;
+	/*MPEG-TS program number if any*/
+	u16 program_number;
+	/*MPEG-4 ST/OTIs*/
+	u8 stream_type;
+	u8 object_type_indication;
+	/* MPEG-4 SL Config */
+	GF_SLConfig sl_config;
+	/*stream 4CC for non-mpeg codecs, 0 otherwise (stream is identified through StreamType/ObjectType)*/
+	u32 fourcc;
+	/*packed 3-char language code (4CC with last byte ' ')*/
+	u32 lang;
+	/*media timescale*/
+	u32 timescale;
+	/*duration in ms - 0 if unknown*/
+	Double duration;
+	/*average bit rate in bit/sec - 0 if unknown*/
+	u32 bit_rate;
+
+	struct __esi_video_info info_video;
+	struct __esi_audio_info info_audio;
+
+	/*input ES control from caller*/
+	GF_Err (*input_ctrl)(struct __elementary_stream_ifce *_self, u32 ctrl_type, void *param);
+	/*input user data of interface - usually set by interface owner*/
+	void *input_udta;
+
+	/*output ES control of destination*/
+	GF_Err (*output_ctrl)(struct __elementary_stream_ifce *_self, u32 ctrl_type, void *param);
+	/*output user data of interface - usually set during interface setup*/
+	void *output_udta;
+
+} GF_ESInterface;
+
+typedef struct __service_ifce
+{
+	u32 type;
+
+	/*input service control from caller*/
+	GF_Err (*input_ctrl)(struct __service_ifce *_self, u32 ctrl_type, void *param);
+	/*input user data of interface - usually set by interface owner*/
+	void *input_udta;
+
+	/*output service control of destination*/
+	GF_Err (*output_ctrl)(struct __service_ifce *_self, u32 ctrl_type, void *param);
+	/*output user data of interface - usually set during interface setup*/
+	void *output_udta;
+
+	GF_ESInterface **streams;
+	u32 nb_streams;
+} GF_ServiceInterface;
+
+
+typedef struct __data_io
+{
+	u32 (*read)(struct __data_io *_self, char *buffer, u32 nb_bytes);
+	u32 (*write)(struct __data_io *_self, char *buffer, u32 nb_bytes);
+	void *udta;
+} GF_DataIO;
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	//_GF_ESI_H_
+
diff --git a/tstools/DtsEdit/src/gpac/events.h b/tstools/DtsEdit/src/gpac/events.h
new file mode 100644
index 0000000..84f0d5e
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/events.h
@@ -0,0 +1,689 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Events management
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+
+#ifndef _GF_EVENTS_H_
+#define _GF_EVENTS_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/math.h>
+#include <gpac/tools.h>
+
+/*
+		minimal event system 
+
+	DO NOT CHANGE THEIR POSITION IN THE LIST, USED TO SPEED UP FILTERING OF USER INPUT EVENTS
+*/
+
+/*events*/
+enum {
+
+	/******************************************************
+
+		Events used for both GPAC internals and DOM Events
+
+	*******************************************************/
+	/*MouseEvents*/
+	GF_EVENT_CLICK, 
+	GF_EVENT_MOUSEUP, 
+	GF_EVENT_MOUSEDOWN, 
+	GF_EVENT_MOUSEOVER, 
+	GF_EVENT_MOUSEOUT, 
+	/*!! ALL MOUSE EVENTS SHALL BE DECLARED BEFORE MOUSEMOVE !! */
+	GF_EVENT_MOUSEMOVE, 
+	/*mouse wheel event*/
+	GF_EVENT_MOUSEWHEEL,
+
+	/*Key Events*/
+	GF_EVENT_KEYUP,
+	GF_EVENT_KEYDOWN, /* covers KeyDown, KeyPress and AccessKey */
+	GF_EVENT_LONGKEYPRESS,
+	/*character input*/
+	GF_EVENT_TEXTINPUT,
+
+
+	/******************************************************
+
+		Events used for DOM Events only
+
+	*******************************************************/
+	GF_EVENT_TEXTSELECT,
+
+	/*DOM UIEvents*/
+	GF_EVENT_FOCUSIN,
+	GF_EVENT_FOCUSOUT, 
+	GF_EVENT_ACTIVATE, 
+	GF_EVENT_CHANGE, 
+	GF_EVENT_FOCUS, 
+	GF_EVENT_BLUR, 
+	/*SVG (HTML) Events*/
+	GF_EVENT_LOAD, 
+	GF_EVENT_UNLOAD,
+	GF_EVENT_ABORT, 
+	GF_EVENT_ERROR, 
+	GF_EVENT_RESIZE, 
+	GF_EVENT_SCROLL, 
+	GF_EVENT_ZOOM,
+	GF_EVENT_BEGIN, /*this is a fake event, it is NEVER fired, only used in SMIL begin*/
+	GF_EVENT_BEGIN_EVENT,
+	GF_EVENT_END, /*this is a fake event, it is NEVER fired, only used in SMIL end*/
+	GF_EVENT_END_EVENT,
+	GF_EVENT_REPEAT, /*this is a fake event, it is NEVER fired, only used in SMIL repeat*/
+	GF_EVENT_REPEAT_EVENT,
+
+	/*DOM MutationEvents - NOT SUPPORTED YET*/
+	GF_EVENT_TREE_MODIFIED,
+	GF_EVENT_NODE_INSERTED,
+	GF_EVENT_NODE_REMOVED,
+	GF_EVENT_NODE_INSERTED_DOC,
+	GF_EVENT_NODE_REMOVED_DOC,
+	GF_EVENT_ATTR_MODIFIED,
+	GF_EVENT_CHAR_DATA_MODIFIED,
+	GF_EVENT_NODE_NAME_CHANGED,
+	GF_EVENT_ATTR_NAME_CHANGED,
+
+	GF_EVENT_DCCI_PROP_CHANGE,
+
+	/*LASeR events*/
+	GF_EVENT_ACTIVATED,
+	GF_EVENT_DEACTIVATED,
+	GF_EVENT_PAUSE,
+	GF_EVENT_PAUSED_EVENT,
+	GF_EVENT_PLAY,
+	GF_EVENT_REPEAT_KEY,
+	GF_EVENT_RESUME_EVENT,
+	GF_EVENT_SHORT_ACCESSKEY,
+	/*pseudo-event, only used in LASeR coding*/
+	GF_EVENT_EXECUTION_TIME,
+
+	/*MediaAccess events - cf http://www.w3.org/TR/MediaAccessEvents*/
+	GF_EVENT_MEDIA_BEGIN_SESSION_SETUP,
+	GF_EVENT_MEDIA_END_SESSION_SETUP,
+	GF_EVENT_MEDIA_DATA_REQUEST,
+	GF_EVENT_MEDIA_PLAYABLE,
+	GF_EVENT_MEDIA_NOT_PLAYABLE,
+	GF_EVENT_MEDIA_DATA_PROGRESS,
+	GF_EVENT_MEDIA_END_OF_DATA,
+	GF_EVENT_MEDIA_STOP,
+	GF_EVENT_MEDIA_ERROR,
+
+	GF_EVENT_BATTERY,
+	GF_EVENT_CPU,
+	GF_EVENT_UNKNOWN,
+
+
+	/******************************************************
+
+		Events used for GPAC internals only
+
+	*******************************************************/
+
+	/*same as mousedown, generated internally by GPAC*/
+	GF_EVENT_DBLCLICK,
+	
+	/*window events*/
+	/*size has changed - indicate new w & h in .x end .y fields of event. 
+	When sent from gpac to a video plugin, indicates the output size should be changed. This is only sent when the plugin
+	manages the output video himself
+	When sent from a video plugin to gpac, indicates the output size has been changed. This is only sent when the plugin
+	manages the output video himself
+	*/
+	GF_EVENT_SIZE,		
+	/*signals the scene size (if indicated in scene) upon connection (sent to the user event proc only)
+		if scene size hasn't changed (seeking or other) this event is not sent
+	*/
+	GF_EVENT_SCENE_SIZE,		
+	GF_EVENT_SHOWHIDE,	/*window show/hide (minimized or other). This is also sent to the user to signal focus switch in fullscreen*/
+	GF_EVENT_SET_CURSOR,	/*set mouse cursor*/
+	GF_EVENT_SET_CAPTION,	/*set window caption*/
+	GF_EVENT_MOVE,		/*move window*/
+	GF_EVENT_REFRESH, /*window needs repaint (whenever needed, eg restore, hide->show, background refresh, paint)*/
+	GF_EVENT_QUIT,	/*window is being closed*/
+	/*video hw setup message:
+		- when sent from gpac to plugin, indicates that the plugin should re-setup hardware context due to a window resize:
+			* for 2D output, this means resizing the backbuffer if needed (depending on HW constraints)
+			* for 3D output, this means re-setup of OpenGL context (depending on HW constraints). Depending on windowing systems 
+			and implementations, it could be possible to resize a window without destroying the GL context.
+
+		- when sent from plugin to gpac, indicates that hardware resources must be resetup before next render step (this is mainly
+		due to discard all openGL textures and cached objects)
+	*/
+	GF_EVENT_VIDEO_SETUP,
+
+	/*terminal events*/
+	GF_EVENT_CONNECT,	/*signal URL is connected*/
+	GF_EVENT_DURATION,	/*signal duration of presentation*/
+	GF_EVENT_AUTHORIZATION,	/*indicates a user and pass is queried*/
+	GF_EVENT_NAVIGATE, /*indicates the user app should load or jump to the given URL.*/
+	GF_EVENT_NAVIGATE_INFO, /*indicates the link or its description under the mouse pointer*/
+	GF_EVENT_MESSAGE, /*message from the MPEG-4 terminal*/
+	GF_EVENT_PROGRESS, /*progress message from the MPEG-4 terminal*/
+	GF_EVENT_VIEWPOINTS,	/*indicates viewpoint list has changed - no struct associated*/
+	GF_EVENT_STREAMLIST,	/*indicates stream list has changed - no struct associated - only used when no scene info is present*/
+	GF_EVENT_METADATA, /*indicates a change in associated metadata*/
+	GF_EVENT_MIGRATE, /*indicates a session migration request*/
+	GF_EVENT_DISCONNECT, /*indicates the current url should be disconnected*/
+	GF_EVENT_SYS_COLORS,	/*queries the list of system colors*/
+};
+
+/*GPAC/DOM3 key codes*/
+enum {
+	GF_KEY_UNIDENTIFIED = 0, 
+	GF_KEY_ACCEPT = 1, /* "Accept"    The Accept (Commit) key.*/
+	GF_KEY_AGAIN, /* "Again"  The Again key.*/
+	GF_KEY_ALLCANDIDATES, /* "AllCandidates"    The All Candidates key.*/
+	GF_KEY_ALPHANUM, /*"Alphanumeric"    The Alphanumeric key.*/
+	GF_KEY_ALT, /*"Alt"    The Alt (Menu) key.*/
+	GF_KEY_ALTGRAPH, /*"AltGraph"    The Alt-Graph key.*/
+	GF_KEY_APPS, /*"Apps"    The Application key.*/
+	GF_KEY_ATTN, /*"Attn"    The ATTN key.*/
+	GF_KEY_BROWSERBACK, /*"BrowserBack"    The Browser Back key.*/
+	GF_KEY_BROWSERFAVORITES, /*"BrowserFavorites"    The Browser Favorites key.*/
+	GF_KEY_BROWSERFORWARD, /*"BrowserForward"    The Browser Forward key.*/
+	GF_KEY_BROWSERHOME, /*"BrowserHome"    The Browser Home key.*/
+	GF_KEY_BROWSERREFRESH, /*"BrowserRefresh"    The Browser Refresh key.*/
+	GF_KEY_BROWSERSEARCH, /*"BrowserSearch"    The Browser Search key.*/
+	GF_KEY_BROWSERSTOP, /*"BrowserStop"    The Browser Stop key.*/
+	GF_KEY_CAPSLOCK, /*"CapsLock"    The Caps Lock (Capital) key.*/
+	GF_KEY_CLEAR, /*"Clear"    The Clear key.*/
+	GF_KEY_CODEINPUT, /*"CodeInput"    The Code Input key.*/
+	GF_KEY_COMPOSE, /*"Compose"    The Compose key.*/
+	GF_KEY_CONTROL, /*"Control"    The Control (Ctrl) key.*/
+	GF_KEY_CRSEL, /*"Crsel"    The Crsel key.*/
+	GF_KEY_CONVERT, /*"Convert"    The Convert key.*/
+	GF_KEY_COPY, /*"Copy"    The Copy key.*/
+	GF_KEY_CUT, /*"Cut"    The Cut key.*/
+	GF_KEY_DOWN, /*"Down"    The Down Arrow key.*/
+	GF_KEY_END, /*"End"    The End key.*/
+	GF_KEY_ENTER, /*"Enter"    The Enter key.
+                   Note: This key identifier is also used for the Return (Macintosh numpad) key.*/
+	GF_KEY_ERASEEOF, /*"EraseEof"    The Erase EOF key.*/
+	GF_KEY_EXECUTE, /*"Execute"    The Execute key.*/
+	GF_KEY_EXSEL, /*"Exsel"    The Exsel key.*/
+	GF_KEY_F1, /*"F1"    The F1 key.*/
+	GF_KEY_F2, /*"F2"    The F2 key.*/
+	GF_KEY_F3, /*"F3"    The F3 key.*/
+	GF_KEY_F4, /*"F4"    The F4 key.*/
+	GF_KEY_F5, /*"F5"    The F5 key.*/
+	GF_KEY_F6, /*"F6"    The F6 key.*/
+	GF_KEY_F7, /*"F7"    The F7 key.*/
+	GF_KEY_F8, /*"F8"    The F8 key.*/
+	GF_KEY_F9, /*"F9"    The F9 key.*/
+	GF_KEY_F10, /*"F10"    The F10 key.*/
+	GF_KEY_F11, /*"F11"    The F11 key.*/
+	GF_KEY_F12, /*"F12"    The F12 key.*/
+	GF_KEY_F13, /*"F13"    The F13 key.*/
+	GF_KEY_F14, /*"F14"    The F14 key.*/
+	GF_KEY_F15, /*"F15"    The F15 key.*/
+	GF_KEY_F16, /*"F16"    The F16 key.*/
+	GF_KEY_F17, /*"F17"    The F17 key.*/
+	GF_KEY_F18, /*"F18"    The F18 key.*/
+	GF_KEY_F19, /*"F19"    The F19 key.*/
+	GF_KEY_F20, /*"F20"    The F20 key.*/
+	GF_KEY_F21, /*"F21"    The F21 key.*/
+	GF_KEY_F22, /*"F22"    The F22 key.*/
+	GF_KEY_F23, /*"F23"    The F23 key.*/
+	GF_KEY_F24, /*"F24"    The F24 key.*/
+	GF_KEY_FINALMODE, /*"FinalMode"    The Final Mode (Final) key used on some asian keyboards.*/
+	GF_KEY_FIND, /*"Find"    The Find key.*/
+	GF_KEY_FULLWIDTH, /*"FullWidth"    The Full-Width Characters key.*/
+	GF_KEY_HALFWIDTH, /*"HalfWidth"    The Half-Width Characters key.*/
+	GF_KEY_HANGULMODE, /*"HangulMode"    The Hangul (Korean characters) Mode key.*/
+	GF_KEY_HANJAMODE, /*"HanjaMode"    The Hanja (Korean characters) Mode key.*/
+	GF_KEY_HELP, /*"Help"    The Help key.*/
+	GF_KEY_HIRAGANA, /*"Hiragana"    The Hiragana (Japanese Kana characters) key.*/
+	GF_KEY_HOME, /*"Home"    The Home key.*/
+	GF_KEY_INSERT, /*"Insert"    The Insert (Ins) key.*/
+	GF_KEY_JAPANESEHIRAGANA, /*"JapaneseHiragana"    The Japanese-Hiragana key.*/
+	GF_KEY_JAPANESEKATAKANA, /*"JapaneseKatakana"    The Japanese-Katakana key.*/
+	GF_KEY_JAPANESEROMAJI, /*"JapaneseRomaji"    The Japanese-Romaji key.*/
+	GF_KEY_JUNJAMODE, /*"JunjaMode"    The Junja Mode key.*/
+	GF_KEY_KANAMODE, /*"KanaMode"    The Kana Mode (Kana Lock) key.*/
+	GF_KEY_KANJIMODE, /*"KanjiMode"    The Kanji (Japanese name for ideographic characters of Chinese origin) Mode key.*/
+	GF_KEY_KATAKANA, /*"Katakana"    The Katakana (Japanese Kana characters) key.*/
+	GF_KEY_LAUNCHAPPLICATION1, /*"LaunchApplication1"    The Start Application One key.*/
+	GF_KEY_LAUNCHAPPLICATION2, /*"LaunchApplication2"    The Start Application Two key.*/
+	GF_KEY_LAUNCHMAIL, /*"LaunchMail"    The Start Mail key.*/
+	GF_KEY_LEFT, /*"Left"    The Left Arrow key.*/
+	GF_KEY_META, /*"Meta"    The Meta key.*/
+	GF_KEY_MEDIANEXTTRACK, /*"MediaNextTrack"    The Media Next Track key.*/
+	GF_KEY_MEDIAPLAYPAUSE, /*"MediaPlayPause"    The Media Play Pause key.*/
+	GF_KEY_MEDIAPREVIOUSTRACK, /*"MediaPreviousTrack"    The Media Previous Track key.*/
+	GF_KEY_MEDIASTOP, /*"MediaStop"    The Media Stok key.*/
+	GF_KEY_MODECHANGE, /*"ModeChange"    The Mode Change key.*/
+	GF_KEY_NONCONVERT, /*"Nonconvert"    The Nonconvert (Don't Convert) key.*/
+	GF_KEY_NUMLOCK, /*"NumLock"    The Num Lock key.*/
+	GF_KEY_PAGEDOWN, /*"PageDown"    The Page Down (Next) key.*/
+	GF_KEY_PAGEUP, /*"PageUp"    The Page Up key.*/
+	GF_KEY_PASTE, /*"Paste"    The Paste key.*/
+	GF_KEY_PAUSE, /*"Pause"    The Pause key.*/
+	GF_KEY_PLAY, /*"Play"    The Play key.*/
+	GF_KEY_PREVIOUSCANDIDATE, /*"PreviousCandidate"    The Previous Candidate function key.*/
+	GF_KEY_PRINTSCREEN, /*"PrintScreen"    The Print Screen (PrintScrn, SnapShot) key.*/
+	GF_KEY_PROCESS, /*"Process"    The Process key.*/
+	GF_KEY_PROPS, /*"Props"    The Props key.*/
+	GF_KEY_RIGHT, /*"Right"    The Right Arrow key.*/
+	GF_KEY_ROMANCHARACTERS, /*"RomanCharacters"    The Roman Characters function key.*/
+	GF_KEY_SCROLL, /*"Scroll"    The Scroll Lock key.*/
+	GF_KEY_SELECT, /*"Select"    The Select key.*/
+	GF_KEY_SELECTMEDIA, /*"SelectMedia"    The Select Media key.*/
+	GF_KEY_SHIFT, /*"Shift"    The Shift key.*/
+	GF_KEY_STOP, /*"Stop"    The Stop key.*/
+	GF_KEY_UP, /*"Up"    The Up Arrow key.*/
+	GF_KEY_UNDO, /*"Undo"    The Undo key.*/
+	GF_KEY_VOLUMEDOWN, /*"VolumeDown"    The Volume Down key.*/
+	GF_KEY_VOLUMEMUTE, /*"VolumeMute"    The Volume Mute key.*/
+	GF_KEY_VOLUMEUP, /*"VolumeUp"    The Volume Up key.*/
+	GF_KEY_WIN, /*"Win"    The Windows Logo key.*/
+	GF_KEY_ZOOM, /*"Zoom"    The Zoom key.*/
+	GF_KEY_BACKSPACE, /*"U+0008"    The Backspace (Back) key.*/
+	GF_KEY_TAB, /*"U+0009"    The Horizontal Tabulation (Tab) key.*/
+	GF_KEY_CANCEL, /*"U+0018"    The Cancel key.*/
+	GF_KEY_ESCAPE, /*"U+001B"    The Escape (Esc) key.*/
+	GF_KEY_SPACE, /*"U+0020"    The Space (Spacebar) key.*/
+	GF_KEY_EXCLAMATION, /*"U+0021"    The Exclamation Mark (Factorial, Bang) key (!).*/
+	GF_KEY_QUOTATION, /*"U+0022"    The Quotation Mark (Quote Double) key (").*/
+	GF_KEY_NUMBER, /*"U+0023"    The Number Sign (Pound Sign, Hash, Crosshatch, Octothorpe) key (#).*/
+	GF_KEY_DOLLAR, /*"U+0024"    The Dollar Sign (milreis, escudo) key ($).*/
+	GF_KEY_AMPERSAND, /*"U+0026"    The Ampersand key (&).*/
+	GF_KEY_APOSTROPHE, /*"U+0027"    The Apostrophe (Apostrophe-Quote, APL Quote) key (').*/
+	GF_KEY_LEFTPARENTHESIS, /*"U+0028"    The Left Parenthesis (Opening Parenthesis) key (().*/
+	GF_KEY_RIGHTPARENTHESIS, /*"U+0029"    The Right Parenthesis (Closing Parenthesis) key ()).*/
+	GF_KEY_STAR, /*"U+002A"    The Asterix (Star) key (*).*/
+	GF_KEY_PLUS, /*"U+002B"    The Plus Sign (Plus) key (+).*/
+	GF_KEY_COMMA, /*"U+002C"    The Comma (decimal separator) sign key (,).*/
+	GF_KEY_HYPHEN, /*"U+002D"    The Hyphen-minus (hyphen or minus sign) key (-).*/
+	GF_KEY_FULLSTOP, /*"U+002E"    The Full Stop (period, dot, decimal point) key (.).*/
+	GF_KEY_SLASH, /*"U+002F"    The Solidus (slash, virgule, shilling) key (/).*/
+	GF_KEY_0, /*"U+0030"    The Digit Zero key (0).*/
+	GF_KEY_1, /*"U+0031"    The Digit One key (1).*/
+	GF_KEY_2, /*"U+0032"    The Digit Two key (2).*/
+	GF_KEY_3, /*"U+0033"    The Digit Three key (3).*/
+	GF_KEY_4, /*"U+0034"    The Digit Four key (4).*/
+	GF_KEY_5, /*"U+0035"    The Digit Five key (5).*/
+	GF_KEY_6, /*"U+0036"    The Digit Six key (6).*/
+	GF_KEY_7, /*"U+0037"    The Digit Seven key (7).*/
+	GF_KEY_8, /*"U+0038"    The Digit Eight key (8).*/
+	GF_KEY_9, /*"U+0039"    The Digit Nine key (9).*/
+	GF_KEY_COLON, /*"U+003A"    The Colon key (:).*/
+	GF_KEY_SEMICOLON, /*"U+003B"    The Semicolon key (;).*/
+	GF_KEY_LESSTHAN, /*"U+003C"    The Less-Than Sign key (<).*/
+	GF_KEY_EQUALS, /*"U+003D"    The Equals Sign key (=).*/
+	GF_KEY_GREATERTHAN, /*"U+003E"    The Greater-Than Sign key (>).*/
+	GF_KEY_QUESTION, /*"U+003F"    The Question Mark key (?).*/
+	GF_KEY_AT, /*"U+0040"    The Commercial At (@) key.*/
+	GF_KEY_A, /*"U+0041"    The Latin Capital Letter A key (A).*/
+	GF_KEY_B, /*"U+0042"    The Latin Capital Letter B key (B).*/
+	GF_KEY_C, /*"U+0043"    The Latin Capital Letter C key (C).*/
+	GF_KEY_D, /*"U+0044"    The Latin Capital Letter D key (D).*/
+	GF_KEY_E, /*"U+0045"    The Latin Capital Letter E key (E).*/
+	GF_KEY_F, /*"U+0046"    The Latin Capital Letter F key (F).*/
+	GF_KEY_G, /*"U+0047"    The Latin Capital Letter G key (G).*/
+	GF_KEY_H, /*"U+0048"    The Latin Capital Letter H key (H).*/
+	GF_KEY_I, /*"U+0049"    The Latin Capital Letter I key (I).*/
+	GF_KEY_J, /*"U+004A"    The Latin Capital Letter J key (J).*/
+	GF_KEY_K, /*"U+004B"    The Latin Capital Letter K key (K).*/
+	GF_KEY_L, /*"U+004C"    The Latin Capital Letter L key (L).*/
+	GF_KEY_M, /*"U+004D"    The Latin Capital Letter M key (M).*/
+	GF_KEY_N, /*"U+004E"    The Latin Capital Letter N key (N).*/
+	GF_KEY_O, /*"U+004F"    The Latin Capital Letter O key (O).*/
+	GF_KEY_P, /*"U+0050"    The Latin Capital Letter P key (P).*/
+	GF_KEY_Q, /*"U+0051"    The Latin Capital Letter Q key (Q).*/
+	GF_KEY_R, /*"U+0052"    The Latin Capital Letter R key (R).*/
+	GF_KEY_S, /*"U+0053"    The Latin Capital Letter S key (S).*/
+	GF_KEY_T, /*"U+0054"    The Latin Capital Letter T key (T).*/
+	GF_KEY_U, /*"U+0055"    The Latin Capital Letter U key (U).*/
+	GF_KEY_V, /*"U+0056"    The Latin Capital Letter V key (V).*/
+	GF_KEY_W, /*"U+0057"    The Latin Capital Letter W key (W).*/
+	GF_KEY_X, /*"U+0058"    The Latin Capital Letter X key (X).*/
+	GF_KEY_Y, /*"U+0059"    The Latin Capital Letter Y key (Y).*/
+	GF_KEY_Z, /*"U+005A"    The Latin Capital Letter Z key (Z).*/
+	GF_KEY_LEFTSQUAREBRACKET, /*"U+005B"    The Left Square Bracket (Opening Square Bracket) key ([).*/
+	GF_KEY_BACKSLASH, /*"U+005C"    The Reverse Solidus (Backslash) key (\).*/
+	GF_KEY_RIGHTSQUAREBRACKET, /*"U+005D"    The Right Square Bracket (Closing Square Bracket) key (]).*/
+	GF_KEY_CIRCUM, /*"U+005E"    The Circumflex Accent key (^).*/
+	GF_KEY_UNDERSCORE, /*"U+005F"    The Low Sign (Spacing Underscore, Underscore) key (_).*/
+	GF_KEY_GRAVEACCENT, /*"U+0060"    The Grave Accent (Back Quote) key (`).*/
+	GF_KEY_LEFTCURLYBRACKET, /*"U+007B"    The Left Curly Bracket (Opening Curly Bracket, Opening Brace, Brace Left) key ({).*/
+	GF_KEY_PIPE, /*"U+007C"    The Vertical Line (Vertical Bar, Pipe) key (|).*/
+	GF_KEY_RIGHTCURLYBRACKET, /*"U+007D"    The Right Curly Bracket (Closing Curly Bracket, Closing Brace, Brace Right) key (}).*/
+	GF_KEY_DEL, /*"U+007F"    The Delete (Del) Key.*/
+	GF_KEY_INVERTEXCLAMATION, /*"U+00A1"    The Inverted Exclamation Mark key (�).*/
+	GF_KEY_DEADGRAVE, /*"U+0300"    The Combining Grave Accent (Greek Varia, Dead Grave) key.*/
+	GF_KEY_DEADEACUTE, /*"U+0301"    The Combining Acute Accent (Stress Mark, Greek Oxia, Tonos, Dead Eacute) key.*/
+	GF_KEY_DEADCIRCUM, /*"U+0302"    The Combining Circumflex Accent (Hat, Dead Circumflex) key.*/
+	GF_KEY_DEADTILDE, /*"U+0303"    The Combining Tilde (Dead Tilde) key.*/
+	GF_KEY_DEADMACRON, /*"U+0304"    The Combining Macron (Long, Dead Macron) key.*/
+	GF_KEY_DEADBREVE, /*"U+0306"    The Combining Breve (Short, Dead Breve) key.*/
+	GF_KEY_DEADABOVEDOT, /*"U+0307"    The Combining Dot Above (Derivative, Dead Above Dot) key.*/
+	GF_KEY_DEADDIARESIS, /*"U+0308"    The Combining Diaeresis (Double Dot Abode, Umlaut, Greek Dialytika, Double Derivative, Dead Diaeresis) key.*/
+	GF_KEY_DEADRINGABOVE, /*"U+030A"    The Combining Ring Above (Dead Above Ring) key.*/
+	GF_KEY_DEADDOUBLEACUTE, /*"U+030B"    The Combining Double Acute Accent (Dead Doubleacute) key.*/
+	GF_KEY_DEADCARON, /*"U+030C"    The Combining Caron (Hacek, V Above, Dead Caron) key.*/
+	GF_KEY_DEADCEDILLA, /*"U+0327"    The Combining Cedilla (Dead Cedilla) key.*/
+	GF_KEY_DEADOGONEK, /*"U+0328"    The Combining Ogonek (Nasal Hook, Dead Ogonek) key.*/
+	GF_KEY_DEADIOTA, /*"U+0345"    The Combining Greek Ypogegrammeni (Greek Non-Spacing Iota Below, Iota Subscript, Dead Iota) key.*/
+	GF_KEY_EURO, /*"U+20AC"    The Euro Currency Sign key (�).*/
+	GF_KEY_DEADVOICESOUND, /*"U+3099"    The Combining Katakana-Hiragana Voiced Sound Mark (Dead Voiced Sound) key.*/
+	GF_KEY_DEADSEMIVOICESOUND, /*"U+309A"    The Combining Katakana-Hiragana Semi-Voiced Sound Mark (Dead Semivoiced Sound) key. */
+
+	/*non-dom keys, used in LASeR*/
+	GF_KEY_CELL_SOFT1,	/*soft1 key of cell phones*/
+	GF_KEY_CELL_SOFT2,	/*soft2 key of cell phones*/
+	
+	/*for joystick handling*/
+	GF_KEY_JOYSTICK
+};
+
+
+/*key modifiers state - set by terminal (not set by video driver)*/
+enum
+{
+	GF_KEY_MOD_SHIFT = (1),
+	GF_KEY_MOD_CTRL = (1<<2),
+	GF_KEY_MOD_ALT = (1<<3),
+
+	GF_KEY_EXT_NUMPAD = (1<<4),
+	GF_KEY_EXT_LEFT = (1<<5),
+	GF_KEY_EXT_RIGHT = (1<<6)
+};
+
+/*mouse button modifiers*/
+enum
+{
+	GF_MOUSE_LEFT = 0,
+	GF_MOUSE_MIDDLE,
+	GF_MOUSE_RIGHT
+};
+
+/*event proc return value: ignored*/
+typedef struct
+{
+	/*GF_EVENT_MOUSEMOVE, GF_EVENT_MOUSEWHEEL, GF_EVENT_MOUSEDOWN, GF_EVENT_MOUSEUP*/
+	u8 type;
+	/*mouse location in output window, 2D-like:  top-left (0,0), increasing y towards bottom*/
+	s32 x, y;
+	/*wheel position (wheel current delta / wheel absolute delta) for GF_EVENT_MouseWheel*/
+	Fixed wheel_pos;
+	/*0: left - 1: middle, 2- right*/
+	u32 button;
+	/*key modifier*/
+	u32 key_states;
+} GF_EventMouse;
+
+/*event proc return value: ignored*/
+typedef struct
+{
+	/*GF_EVENT_KEYDOWN and GF_EVENT_KEYUP*/
+	u8 type;
+	/*above GPAC/DOM key code*/
+	u32 key_code;
+	/* hadrware key value (matching ASCI) */
+	u32 hw_code;
+	/*key modifier*/
+	u32 flags;
+} GF_EventKey;
+
+/*event proc return value: ignored*/
+typedef struct
+{
+	/*GF_EVENT_TEXTINPUT*/
+	u8 type;
+	/*above virtual key code*/
+	u32 unicode_char;
+} GF_EventChar;
+
+/*event proc return value: ignored*/
+typedef struct
+{
+	/*GF_EVENT_SIZE*/
+	u8 type;
+	/*width and height*/
+	u16 width, height;
+} GF_EventSize;
+
+/*event proc return value: ignored*/
+typedef struct
+{
+	/*GF_EVENT_VIDEO_SETUP*/
+	u8 type;
+	/*width and height of visual surface to allocate*/
+	u16 width, height;
+	/*indicates whether double buffering is desired*/
+	Bool back_buffer;
+	/*indicates whether system memory for the backbuffer is desired (no video blitting)*/
+	Bool system_memory;
+	/*indicates whether opengl context shall be created. Values are:
+		0: no opengl context shall be created
+		1: opengl context shall be created for the main window and set as the current one
+		2: an extra opengl context shall be created for offscreen rendering and set as the current one
+			if not supported, mix of 2D (raster) and 3D (openGL) will be disabled
+	*/
+	u32 opengl_mode;
+} GF_EventVideoSetup;
+
+/*event proc return value: ignored
+this event may be triggered by the compositor if owning window or if shortcut fullscreen is detected*/
+typedef struct
+{
+	/*GF_EVENT_SHOWHIDE*/
+	u8 type;
+	/*0: hidden - 1: visible - 2: fullscreen*/
+	u32 show_type;
+} GF_EventShow;
+
+
+/*sensor signaling*/
+enum
+{
+	GF_CURSOR_NORMAL = 0x00,
+	GF_CURSOR_ANCHOR, 
+	GF_CURSOR_TOUCH,
+	/*discSensor, cylinderSensor, sphereSensor*/
+	GF_CURSOR_ROTATE, 
+	/*proximitySensor & proximitySensor2D*/
+	GF_CURSOR_PROXIMITY, 
+	/*planeSensor & planeSensor2D*/
+	GF_CURSOR_PLANE,
+	/*collision*/
+	GF_CURSOR_COLLIDE, 
+	GF_CURSOR_HIDE, 
+};
+
+/*event proc return value: ignored*/
+typedef struct
+{
+	/*GF_EVENT_SET_CURSOR*/
+	u8 type;
+	/*set if is visible*/
+	u32 cursor_type;
+} GF_EventCursor;
+
+/*event proc return value: ignored*/
+typedef struct
+{
+	/*GF_EVENT_SET_CAPTION*/
+	u8 type;
+	/*window style flags - NOT USED YET*/
+	const char *caption;
+} GF_EventCaption;
+
+/*event proc: never posted*/
+typedef struct
+{
+	/*GF_EVENT_MOVE*/
+	u8 type;
+	s32 x, y;
+	/*0: absolute positionning, 1: relative move, 2: use alignment constraints*/
+	Bool relative;
+	/*0: left/top, 1: middle, 2: right/bottom*/
+	u8 align_x, align_y;
+} GF_EventMove;
+
+/*duration may be signaled several times: it may change when setting up streams
+event proc return value: ignored*/
+typedef struct
+{
+	/*GF_EVENT_DURATION*/
+	u8 type;
+	/*duration in seconds*/
+	Double duration;
+	/*is seeking supported for service*/
+	Bool can_seek;
+} GF_EventDuration;
+
+/*event proc return value: 0 if URL not supported, 1 if accepted (it is the user responsability to load the url)
+YOU SHALL NOT DIRECTLY OPEN THE NEW URL IN THE EVENT PROC, THIS WOULD DEADLOCK THE TERMINAL
+*/
+typedef struct
+{
+	/*GF_EVENT_NAVIGATE and GF_EVENT_NAVIGATE_INFO*/
+	u8 type;
+	/*new url to open / data to handle*/
+	const char *to_url;
+	/*parameters (cf vrml spec) - UNUSED for GF_EVENT_NAVIGATE_INFO*/
+	u32 param_count;
+	const char **parameters;
+} GF_EventNavigate;
+
+
+/*event proc return value: ignored*/
+typedef struct
+{
+	/*GF_EVENT_MESSAGE*/
+	u8 type;
+	/*name of service issuing the message*/
+	const char *service;
+	/*message*/
+	const char *message;
+	/*error if any*/
+	GF_Err error;
+} GF_EventMessage;
+
+/*event proc return value: ignored*/
+typedef struct
+{
+	/*GF_EVENT_PROGRESS*/
+	u8 type;
+	/*name of service issuing the progress notif*/
+	const char *service;
+	/*progress type: 0: buffering, 1: downloading, 2: importing (BT/VRML/...)*/
+	u32 progress_type;
+	/*amount done and total amount of operation.
+		For buffer events, expresses current and total desired stream buffer in scene in milliseconds
+		For download events, expresses current and total size of download in bytes
+		For import events, no units defined (depends on importers)
+	*/
+	u32 done, total;
+} GF_EventProgress;
+
+/*event proc return value: ignored*/
+typedef struct
+{
+	/*GF_EVENT_CONNECT*/
+	u8 type;
+	/*sent upon connection/deconnection completion. if any error, it is signaled through message event*/
+	Bool is_connected;
+} GF_EventConnect;
+
+/*event proc return value: 1 if info has been completed, 0 otherwise (and operation this request was for
+will then fail)*/
+typedef struct
+{
+	/*GF_EVENT_AUTHORIZATION*/
+	u8 type;
+	/*the URL the auth request is for*/
+	const char *site_url;
+	/*user name (provided buffer can hold 50 bytes). It may already be formated, or an empty ("") string*/
+	char *user;
+	/*password (provided buffer can hold 50 bytes)*/
+	char *password;
+} GF_EventAuthorize;
+
+
+/*event proc return value: 1 if info has been completed, 0 otherwise */
+typedef struct
+{
+	/*GF_EVENT_SYS_COLORS*/
+	u8 type;
+	/*ARGB colors, in order:
+	ActiveBorder, ActiveCaption, AppWorkspace, Background, ButtonFace, ButtonHighlight, ButtonShadow, 
+	ButtonText, CaptionText, GrayText, Highlight, HighlightText, InactiveBorder, InactiveCaption, 
+	InactiveCaptionText, InfoBackground, InfoText, Menu, MenuText, Scrollbar, ThreeDDarkShadow, 
+	ThreeDFace, ThreeDHighlight, ThreeDLightShadow, ThreeDShadow, Window, WindowFrame, WindowText
+	*/
+	u32 sys_colors[28];
+} GF_EventSysColors;
+
+/*Mutation AttrChangeType Signaling*/
+enum
+{
+	GF_MUTATION_ATTRCHANGE_MODIFICATION = 0x01,
+	GF_MUTATION_ATTRCHANGE_ADDITION = 0x02,
+	GF_MUTATION_ATTRCHANGE_REMOVAL = 0x03,
+};
+
+typedef struct {
+	/* GF_EVENT_TREE_MODIFIED, GF_EVENT_NODE_INSERTED, GF_EVENT_NODE_REMOVED, GF_EVENT_NODE_INSERTED_DOC, GF_EVENT_NODE_REMOVED_DOC, GF_EVENT_ATTR_MODIFIED, GF_EVENT_CHAR_DATA_MODIFIED */
+	u8 type;
+	void *relatedNode;
+	void *prevValue;
+	void *newValue;
+	void *attrName;
+	u8 attrChange;
+} GF_EventMutation;
+
+typedef union
+{
+	u8 type;
+	GF_EventMouse mouse;
+	GF_EventKey key;
+	GF_EventChar character;
+	GF_EventSize size;
+	GF_EventShow show;
+	GF_EventDuration duration;
+	GF_EventNavigate navigate;
+	GF_EventMessage message;
+	GF_EventProgress progress;
+	GF_EventConnect connect;
+	GF_EventCaption caption;
+	GF_EventCursor cursor;
+	GF_EventAuthorize auth;
+	GF_EventSysColors sys_cols;
+	GF_EventMove move;
+	GF_EventVideoSetup setup;
+	GF_EventMutation mutation;
+} GF_Event;
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/*_GF_EVENTS_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/ietf.h b/tstools/DtsEdit/src/gpac/ietf.h
new file mode 100644
index 0000000..e6552e5
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/ietf.h
@@ -0,0 +1,1319 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / IETF RTP/RTSP/SDP sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+#ifndef	_GF_IETF_H_
+#define _GF_IETF_H_
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/list.h>
+#include <gpac/bitstream.h>
+#include <gpac/sync_layer.h>
+#include <gpac/network.h>
+
+
+/****************************************************************************
+
+				RTSP VERSION 1.0 LIBRARY EXPORTS
+
+****************************************************************************/
+
+#define GF_RTSP_VERSION		"RTSP/1.0"
+
+
+/*
+ *		RTSP NOTIF CODES
+ */
+enum
+{
+	NC_RTSP_Continue		=		100,
+	NC_RTSP_OK				=		200,
+	NC_RTSP_Created			=		201,
+	NC_RTSP_Low_on_Storage_Space	=	250,
+
+	NC_RTSP_Multiple_Choice	=	300,
+	NC_RTSP_Moved_Permanently	=	301,
+	NC_RTSP_Moved_Temporarily	=	302,
+	NC_RTSP_See_Other	=	303,
+	NC_RTSP_Use_Proxy	=	305,
+
+	NC_RTSP_Bad_Request	=	400,
+	NC_RTSP_Unauthorized	=	401,
+	NC_RTSP_Payment_Required	=	402,
+	NC_RTSP_Forbidden	=	403,
+	NC_RTSP_Not_Found	=	404,
+	NC_RTSP_Method_Not_Allowed	=	405,
+	NC_RTSP_Not_Acceptable	=	406,
+	NC_RTSP_Proxy_Authentication_Required	=	407,
+	NC_RTSP_Request_Timeout	=	408,
+	NC_RTSP_Gone	=	410,
+	NC_RTSP_Length_Required	=	411,
+	NC_RTSP_Precondition_Failed	=	412,
+	NC_RTSP_Request_Entity_Too_Large	=	413,
+	NC_RTSP_Request_URI_Too_Long	=	414,
+	NC_RTSP_Unsupported_Media_Type	=	415,
+
+	NC_RTSP_Invalid_parameter	=	451,
+	NC_RTSP_Illegal_Conference_Identifier	=	452,
+	NC_RTSP_Not_Enough_Bandwidth	=	453,
+	NC_RTSP_Session_Not_Found	=	454,
+	NC_RTSP_Method_Not_Valid_In_This_State	=	455,
+	NC_RTSP_Header_Field_Not_Valid	=	456,
+	NC_RTSP_Invalid_Range	=	457,
+	NC_RTSP_Parameter_Is_ReadOnly	=	458,
+	NC_RTSP_Aggregate_Operation_Not_Allowed	=	459,
+	NC_RTSP_Only_Aggregate_Operation_Allowed	=	460,
+	NC_RTSP_Unsupported_Transport	=	461,
+	NC_RTSP_Destination_Unreachable	=	462,
+	
+	NC_RTSP_Internal_Server_Error	=	500,
+	NC_RTSP_Not_Implemented	=	501,
+	NC_RTSP_Bad_Gateway	=	502,
+	NC_RTSP_Service_Unavailable	=	503,
+	NC_RTSP_Gateway_Timeout	=	504,
+	NC_RTSP_RTSP_Version_Not_Supported	=	505,
+
+	NC_RTSP_Option_not_support	=	551,
+};
+
+const char *gf_rtsp_nc_to_string(u32 ErrCode);
+
+/*
+		Common structures between commands and responses
+*/
+
+/*
+	RTSP Range information - RTSP Session level only (though this is almost the same
+	format as an SDP range, this is not used in the SDP lib as "a=range" is not part of SDP
+	but part of RTSP
+*/
+typedef struct {
+	/* start and end range. If end is -1, the range is open (from start to unknown) */
+	Double start, end;
+	/* use SMPTE range (Start and End specify the number of frames) (currently not supported) */
+	u32 UseSMPTE;
+	/* framerate for SMPTE range */
+	Double FPS;
+} GF_RTSPRange;
+
+/*
+parses a Range line and returns range header structure. can be used for RTSP extension of SDP
+NB: Only support for npt for now
+*/
+GF_RTSPRange *gf_rtsp_range_parse(char *range_buf);
+
+GF_RTSPRange *gf_rtsp_range_new();
+void gf_rtsp_range_del(GF_RTSPRange *range);
+
+/*
+			Transport structure 
+		contains all network info for RTSP sessions (ports, uni/multi-cast, ...)
+*/
+
+/*
+	Transport Profiles as defined in RFC 2326
+*/
+#define GF_RTSP_PROFILE_RTP_AVP			"RTP/AVP"
+#define GF_RTSP_PROFILE_RTP_AVP_TCP		"RTP/AVP/TCP"
+#define GF_RTSP_PROFILE_UDP				"udp"
+
+
+typedef struct
+{
+	/* set to 1 if unicast */
+	Bool IsUnicast;
+	/* for multicast */
+	char *destination;
+	/* for redirections internal to servers */
+	char *source;
+	/*IsRecord is usually 0 (PLAY) . If set, Append specify that the stream should
+	be concatenated to existing resources */
+	Bool IsRecord, Append;
+	/* in case transport is on TCP/RTSP, If only 1 ID is specified, it is stored in rtpID (this
+	is not RTP interleaving) */
+	Bool IsInterleaved, rtpID, rtcpID;
+	/* Multicast specific */
+	u32 MulticastLayers;
+	u8 TTL;
+	/*RTP specific*/
+
+	/*port for multicast*/
+	/*server port in unicast - RTP implies low is even , and last is low+1*/
+	u16 port_first, port_last;
+	/*client port in unicast - RTP implies low is even , and last is low+1*/
+	u16 client_port_first, client_port_last;
+	u32 SSRC;
+
+	/*Transport protocol. In this version we only support RTP/AVP, the following flag tells 
+	us if this is RTP/AVP/TCP or RTP/AVP (default)*/
+	char *Profile;
+} GF_RTSPTransport;
+
+
+GF_RTSPTransport *gf_rtsp_transport_clone(GF_RTSPTransport *original);
+void gf_rtsp_transport_del(GF_RTSPTransport *transp);
+
+
+/*
+				RTSP Command
+		the RTSP Response is sent by a client / received by a server
+	text Allocation is done by the lib when parsing a command, and
+	is automatically freed when calling reset / delete. Therefore you must
+	set/allocate the fields yourself when writing a command (client)
+
+*/
+
+/*ALL RTSP METHODS - all other methods will be ignored*/
+#define GF_RTSP_DESCRIBE		"DESCRIBE"
+#define GF_RTSP_SETUP			"SETUP"
+#define GF_RTSP_PLAY			"PLAY"
+#define GF_RTSP_PAUSE			"PAUSE"
+#define GF_RTSP_RECORD			"RECORD"
+#define GF_RTSP_TEARDOWN		"TEARDOWN"
+#define GF_RTSP_GET_PARAMETER	"GET_PARAMETER"
+#define GF_RTSP_SET_PARAMETER	"SET_PARAMETER"
+#define GF_RTSP_OPTIONS		"OPTIONS"
+#define GF_RTSP_ANNOUNCE		"ANNOUNCE"
+#define GF_RTSP_REDIRECTE		"REDIRECT"
+
+
+typedef struct
+{
+	char *Accept;
+	char *Accept_Encoding;
+	char *Accept_Language;
+	char *Authorization;
+	u32 Bandwidth;
+	u32 Blocksize;
+	char *Cache_Control;
+	char *Conference;
+	char *Connection;
+	u32 Content_Length;
+	u32 CSeq;
+	char *From;
+	char *Proxy_Authorization;
+	char *Proxy_Require;
+	GF_RTSPRange *Range;
+	char *Referer;
+	Double Scale;
+	char *Session;
+	Double Speed;
+	/*nota : RTSP allows several configurations for a single channel (multicast and 
+	unicast , ...). Usually only 1*/
+	GF_List *Transports;
+	char *User_Agent;
+
+	/*type of the command, one of the described above*/
+	char *method;
+	
+	/*Header extensions*/
+	GF_List *Xtensions;
+
+	/*body of the command, size is Content-Length (auto computed when sent). It is not 
+	terminated by a NULL char*/
+	char *body;
+
+	/*
+			Specify ControlString if your request targets
+		a specific media stream in the service. If null, the service name only will be used
+		for control (for ex, both A and V streams in a single file)
+		If the request is GF_RTSP_OPTIONS, you must provide a control string containing the options 
+		you want to query
+	*/
+	char *ControlString;
+
+	/*user data: this is never touched by the lib, its intend is to help stacking
+	RTSP commands in your app*/
+	void *user_data;
+
+
+	/*
+		Server side Extensions
+	*/
+
+	/*full URL of the command. Not used at client side, as the URL is ALWAYS relative
+	to the server / service of the RTSP session 
+	On the server side however redirections are up to the server, so we cannot decide for it	*/
+	char *service_name;
+	/*RTSP status code of the command as parsed. One of the above RTSP StatusCode*/
+	u32 StatusCode;
+} GF_RTSPCommand;
+
+
+GF_RTSPCommand *gf_rtsp_command_new();
+void gf_rtsp_command_del(GF_RTSPCommand *com);
+void gf_rtsp_command_reset(GF_RTSPCommand *com);
+
+
+
+/*
+				RTSP Response
+		the RTSP Response is received by a client / sent by a server
+	text Allocation is done by the lib when parsing a response, and
+	is automatically freed when calling reset / delete. Therefore you must
+	allocate the fields yourself when writing a response (server)
+
+*/
+
+/*
+	RTP-Info for RTP channels. There may be several RTP-Infos in one response
+	based on the server implementation (DSS/QTSS begaves this way)
+*/
+typedef struct
+{
+	/*control string of the channel*/
+	char *url;
+	/*seq num for asociated rtp_time*/
+	u32 seq;
+	/*rtp TimeStamp corresponding to the Range start specified in the PLAY request*/
+	u32 rtp_time;
+	/*ssrc of sender if known, 0 otherwise*/
+	u32 ssrc;
+} GF_RTPInfo;
+
+
+
+/*
+	RTSP Response
+*/
+typedef struct
+{
+	/* response code*/
+	u32 ResponseCode;
+	/* comment from the server */
+	char *ResponseInfo;
+	
+	/*	Header Fields	*/
+	char *Accept;
+	char *Accept_Encoding;
+	char *Accept_Language;
+	char *Allow;
+	char *Authorization;
+	u32 Bandwidth;
+	u32 Blocksize;
+	char *Cache_Control;
+	char *Conference;
+	char *Connection;
+	char *Content_Base;
+	char *Content_Encoding;
+	char *Content_Language;
+	u32 Content_Length;
+	char *Content_Location;
+	char *Content_Type;
+	u32 CSeq;
+	char *Date;
+	char *Expires;
+	char *From;
+	char *Host;
+	char *If_Match;
+	char *If_Modified_Since;
+	char *Last_Modified;
+	char *Location;
+	char *Proxy_Authenticate;
+	char *Proxy_Require;
+	char *Public;
+	GF_RTSPRange *Range;
+	char *Referer;
+	char *Require;
+	char *Retry_After;
+	GF_List *RTP_Infos;
+	Double Scale;
+	char *Server;
+	char *Session;
+	u32 SessionTimeOut;
+	Double Speed;
+	char *Timestamp;
+	/*nota : RTSP allows several configurations for a single channel (multicast and 
+	unicast , ...). Usually only 1*/
+	GF_List *Transports;
+	char *Unsupported;
+	char *User_Agent;
+	char *Vary;
+	char *Via;
+	char *WWW_Authenticate;
+
+	/*Header extensions*/
+	GF_List *Xtensions;
+
+	/*body of the response, size is Content-Length (auto computed when sent). It is not 
+	terminated by a NULL char when response is parsed but must be null-terminated when 
+	response is being sent*/
+	char *body;
+} GF_RTSPResponse;
+
+
+GF_RTSPResponse *gf_rtsp_response_new();
+void gf_rtsp_response_del(GF_RTSPResponse *rsp);
+void gf_rtsp_response_reset(GF_RTSPResponse *rsp);
+
+
+
+typedef struct _tag_rtsp_session GF_RTSPSession;
+
+GF_RTSPSession *gf_rtsp_session_new(char *sURL, u16 DefaultPort);
+void gf_rtsp_session_del(GF_RTSPSession *sess);
+
+GF_Err gf_rtsp_set_buffer_size(GF_RTSPSession *sess, u32 BufferSize);
+
+/*force the IP address the client is using*/
+void gf_rtsp_set_mobile_ip(GF_RTSPSession *sess, char *MobileIP);
+
+
+/*Reset state machine, invalidate SessionID
+NOTE: RFC2326 requires that the session is reseted when all RTP streams
+are closed. As this lib doesn't maintain the number of valid streams
+you MUST call reset when all your streams are shutdown (either requested through
+TEARDOWN or signaled through RTCP BYE packets for RTP, or any other signaling means
+for other protocols)
+reset connection will destroy the socket - this is isefull in case of timeouts, because
+some servers do not restart with the right CSeq...*/
+void gf_rtsp_session_reset(GF_RTSPSession *sess, Bool ResetConnection);
+
+u32 gf_rtsp_is_my_session(GF_RTSPSession *sess, char *url);
+const char *gf_rtsp_get_last_session_id(GF_RTSPSession *sess);
+char *gf_rtsp_get_server_name(GF_RTSPSession *sess);
+char *gf_rtsp_get_service_name(GF_RTSPSession *sess);
+u16 gf_rtsp_get_session_port(GF_RTSPSession *sess);
+
+/*Fetch an RTSP response from the server the GF_RTSPResponse will be reseted before fetch*/
+GF_Err gf_rtsp_get_response(GF_RTSPSession *sess, GF_RTSPResponse *rsp);
+
+
+/*RTSP State Machine. The only non blocking mode is GF_RTSP_STATE_WAIT_FOR_CONTROL*/
+enum
+{
+	/*Initialized (connection might be off, but all structures are in place)
+	This is the default state between # requests (aka, DESCRIBE and SETUP
+	or SETUP and PLAY ...)*/
+	GF_RTSP_STATE_INIT	=	0,
+	/*Waiting*/
+	GF_RTSP_STATE_WAITING,
+	/*PLAY, PAUSE, RECORD. Aggregation is allowed for the same type, you can send several command
+	in a row. However the session will return GF_SERVICE_ERROR if you do not have 
+	a valid SessionID in the command
+	You cannot issue a SETUP / DESCRIBE while in this state*/
+	GF_RTSP_STATE_WAIT_FOR_CONTROL,
+
+	/*FATAL ERROR: session is invalidated by server. Call reset and restart from SETUP if needed*/
+	GF_RTSP_STATE_INVALIDATED
+};
+
+u32 gf_rtsp_get_session_state(GF_RTSPSession *sess);
+/*aggregate command state-machine: the PLAY/PAUSE can be aggregated 
+(sent before the reply is received). This function gets the last command sent*/
+char *gf_rtsp_get_last_request(GF_RTSPSession *sess);
+/*foce a reset in case of pbs*/
+void gf_rtsp_reset_aggregation(GF_RTSPSession *sess);
+
+/*
+	Send an RTSP request to the server.
+*/
+GF_Err gf_rtsp_send_command(GF_RTSPSession *sess, GF_RTSPCommand *com);
+
+
+GF_Err gf_rtsp_set_interleave_callback(GF_RTSPSession *sess,
+						GF_Err (*SignalData)(GF_RTSPSession *sess, void *cbk_ptr, char *buffer, u32 bufferSize, Bool IsRTCP)
+				);
+
+
+GF_Err gf_rtsp_session_read(GF_RTSPSession *sess);
+
+GF_Err gf_rtsp_register_interleave(GF_RTSPSession *sess, void *the_ch, u8 LowInterID, u8 HighInterID);
+u32 gf_rtsp_unregister_interleave(GF_RTSPSession *sess, u8 LowInterID);
+
+
+
+/*
+			Server side session constructor
+	create a new RTSP session from an existing socket in listen state. If no pending connection
+	is detected, return NULL
+*/
+GF_RTSPSession *gf_rtsp_session_new_server(GF_Socket *rtsp_listener);
+
+/*fetch an RTSP request. The GF_RTSPCommand will be reseted before fetch*/
+GF_Err gf_rtsp_get_command(GF_RTSPSession *sess, GF_RTSPCommand *com);
+
+/*unpack the URL, check the service name / server. Typically used when a client sends a 
+ DESCRIBE || SETUP url RTSP/1.0. Server / service name check must be performed by your app as redirection
+or services available are unknown here.*/
+GF_Err gf_rtsp_load_service_name(GF_RTSPSession *sess, char *URL);
+
+/*geenrates a session ID fpor the given session*/
+char *gf_rtsp_generate_session_id(GF_RTSPSession *sess);
+
+/*send the RTSP response*/
+GF_Err gf_rtsp_send_response(GF_RTSPSession *sess, GF_RTSPResponse *rsp);
+
+/*gets the IP address of the local host running the session
+buffer shall be GF_MAX_IP_NAME_LEN long*/
+GF_Err gf_rtsp_get_session_ip(GF_RTSPSession *sess, char *buffer);
+
+/*returns the next available ID for interleaving. It is recommended that you use 2 
+consecutive IDs for RTP/RTCP interleaving*/
+u8 gf_rtsp_get_next_interleave_id(GF_RTSPSession *sess);
+
+/*gets the IP address of the connected peer - buffer shall be GF_MAX_IP_NAME_LEN long*/
+GF_Err gf_rtsp_get_remote_address(GF_RTSPSession *sess, char *buffer);
+
+
+/*
+		RTP LIB EXPORTS
+*/
+
+
+typedef struct tagRTP_HEADER {
+	/*version, must be 2*/
+	u8 Version;
+	/*padding bits in the payload*/
+	u8 Padding;
+	/*header extension is defined*/
+	u8 Extension;
+	/*number of CSRC (<=15)*/
+	u8 CSRCCount;
+	/*Marker Bit*/
+	u8 Marker;
+	/*payload type on 7 bits*/
+	u8 PayloadType;
+	/*packet seq number*/
+	u16 SequenceNumber;
+	/*packet time stamp*/
+	u32 TimeStamp;
+	/*sync source identifier*/
+	u32 SSRC;
+	/*in our basic client, CSRC should always be NULL*/
+	u32 CSRC[16];
+} GF_RTPHeader;
+
+
+
+
+/*
+	structure containing the rtpmap information
+*/
+typedef struct
+{
+	/*dynamic payload type of this map*/
+	u32 PayloadType;
+	/*registered payload name of this map*/
+	char *payload_name;
+	/*RTP clock rate (TS resolution) of this map*/
+	u32 ClockRate;
+	/*optional parameters for audio, specifying number of channels. Unused for other media types.*/
+	u32 AudioChannels;
+} GF_RTPMap;
+
+
+
+typedef struct __tag_rtp_channel GF_RTPChannel;
+
+GF_RTPChannel *gf_rtp_new();
+void gf_rtp_del(GF_RTPChannel *ch);
+
+/*you configure a server channel through the transport structure, with the same info as a 
+client channel, the client_port_* info designing the REMOTE client and port_* designing
+your server channel*/
+GF_Err gf_rtp_setup_transport(GF_RTPChannel *ch, GF_RTSPTransport *trans_info, char *remote_address);
+
+/*auto-setup of rtp/rtcp transport ports - only effective in unicast, non interleaved cases. 
+for multicast port setup MUST be done through the above gf_rtp_setup_transport function
+this will take care of port reuse*/
+GF_Err gf_rtp_set_ports(GF_RTPChannel *ch, u16 first_port);
+
+/*init of payload information. only ONE payload per sync source is supported in this
+version of the library (a sender cannot switch payload types on a single media)*/
+GF_Err gf_rtp_setup_payload(GF_RTPChannel *ch, GF_RTPMap *map);
+
+/*enables sending of NAT keep-alive packets for NAT traversal
+	@nat_timeout: specifies the inactivity period in ms after which NAT keepalive packets are sent. 
+	If 0, disables NAT keep-alive packets 
+*/
+void gf_rtp_enable_nat_keepalive(GF_RTPChannel *ch, u32 nat_timeout);
+
+
+/*initialize the RTP channel.
+
+UDPBufferSize: UDP stack buffer size if configurable by OS/ISP - ignored otherwise
+NOTE: on WinCE devices, this is not configurable on an app bases but for the whole OS
+you must update the device registry with:
+	[HKEY_LOCAL_MACHINE\Comm\Afd]
+	DgramBuffer=dword:N
+
+	where N is the number of UDP datagrams a socket should be able to buffer. For multimedia
+app you should set N as large as possible. The device MUST be reseted for the param to take effect
+
+ReorederingSize: max number of packets to queue for reordering. 0 means no reordering
+MaxReorderDelay: max time to wait in ms before releasing first packet in reoderer when only one packet is present.
+If 0 and reordering size is specified, defaults to 200 ms (usually enough).
+IsSource: if true, the channel is a sender (media data, sender report, Receiver report processing)
+if source, you must specify the Path MTU size. The RTP lib won't send any packet bigger than this size
+your application shall perform payload size splitting if needed
+local_interface_ip: local interface address to use for multicast. If NULL, default address is used
+*/
+GF_Err gf_rtp_initialize(GF_RTPChannel *ch, u32 UDPBufferSize, Bool IsSource, u32 PathMTU, u32 ReorederingSize, u32 MaxReorderDelay, char *local_interface_ip);
+
+/*init the RTP info after a PLAY or PAUSE, rtp_time is the rtp TimeStamp of the RTP packet
+with seq_num sequence number. This info is needed to compute the CurrentTime of the RTP channel 
+ssrc may not be known if sender hasn't indicated it (use 0 then)*/
+GF_Err gf_rtp_set_info_rtp(GF_RTPChannel *ch, u32 seq_num, u32 rtp_time, u32 ssrc);
+
+/*retrieve current RTP time in sec. If rtp_time was unknown (not on demand media) the time is absolute.
+Otherwise this is the time in ms elapsed since the last PLAY range start value
+Not supported yet if played without RTSP (aka RTCP time not supported)*/
+Double gf_rtp_get_current_time(GF_RTPChannel *ch);
+
+
+void gf_rtp_reset_buffers(GF_RTPChannel *ch);
+
+/*read any data on UDP only (not valid for TCP). Performs re-ordering if configured for it
+returns amount of data read (raw UDP packet size)*/
+u32 gf_rtp_read_rtp(GF_RTPChannel *ch, char *buffer, u32 buffer_size);
+u32 gf_rtp_read_rtcp(GF_RTPChannel *ch, char *buffer, u32 buffer_size);
+
+/*decodes an RTP packet and gets the begining of the RTP payload*/
+GF_Err gf_rtp_decode_rtp(GF_RTPChannel *ch, char *pck, u32 pck_size, GF_RTPHeader *rtp_hdr, u32 *PayloadStart);
+
+/*decodes an RTCP packet and update timing info, send RR too*/
+GF_Err gf_rtp_decode_rtcp(GF_RTPChannel *ch, char *pck, u32 pck_size);
+
+/*computes and send Receiver report. If the channel is a TCP channel, you must specify
+the callback function. NOTE: many RTP implementation do NOT process RTCP info received on TCP...
+the lib will decide whether the report shall be sent or not, therefore you should call
+this function at regular times*/
+GF_Err gf_rtp_send_rtcp_report(GF_RTPChannel *ch, 
+						GF_Err (*RTP_TCPCallback)(void *cbk, char *pck, u32 pck_size),
+						void *rtsp_cbk);
+
+/*send a BYE info (leaving the session)*/
+GF_Err gf_rtp_send_bye(GF_RTPChannel *ch,
+						GF_Err (*RTP_TCPCallback)(void *cbk, char *pck, u32 pck_size),
+						void *rtsp_cbk);
+
+
+/*send RTP packet*/
+GF_Err gf_rtp_send_packet(GF_RTPChannel *ch, GF_RTPHeader *rtp_hdr, char *extra_header, u32 extra_header_size, char *pck, u32 pck_size);
+
+enum
+{
+	GF_RTCP_INFO_NAME = 0,
+	GF_RTCP_INFO_EMAIL,
+	GF_RTCP_INFO_PHONE,
+	GF_RTCP_INFO_LOCATION,
+	GF_RTCP_INFO_TOOL,
+	GF_RTCP_INFO_NOTE,
+	GF_RTCP_INFO_PRIV
+};
+
+/*sets RTCP info sent in RTCP reports. info_string shall NOT exceed 255 chars*/
+GF_Err gf_rtp_set_info_rtcp(GF_RTPChannel *ch, u32 InfoCode, char *info_string);
+
+u32 gf_rtp_is_unicast(GF_RTPChannel *ch);
+u32 gf_rtp_is_interleaved(GF_RTPChannel *ch);
+u32 gf_rtp_get_clockrate(GF_RTPChannel *ch);
+u32 gf_rtp_is_active(GF_RTPChannel *ch);
+u8 gf_rtp_get_low_interleave_id(GF_RTPChannel *ch);
+u8 gf_rtp_get_hight_interleave_id(GF_RTPChannel *ch);
+GF_RTSPTransport *gf_rtp_get_transport(GF_RTPChannel *ch);
+u32 gf_rtp_get_local_ssrc(GF_RTPChannel *ch);
+
+Float gf_rtp_get_loss(GF_RTPChannel *ch);
+u32 gf_rtp_get_tcp_bytes_sent(GF_RTPChannel *ch);
+void gf_rtp_get_ports(GF_RTPChannel *ch, u16 *rtp_port, u16 *rtcp_port);
+
+
+
+
+	
+/****************************************************************************
+
+					SDP LIBRARY EXPORTS
+		
+		  Note: SDP is mainly a text protocol with 
+	well defined containers. The following structures are used to write / read
+	SDP informations, and the library also provides consistency checking
+
+  When reading SDP, all text items/structures are allocated by the lib, and you
+  must call gf_sdp_info_reset(GF_SDPInfo *sdp) or gf_sdp_info_del(GF_SDPInfo *sdp) to release the memory
+
+  When writing the SDP from a GF_SDPInfo, the output buffer is allocated by the library, 
+  and you must release it yourself
+
+  Some quick constructors are available for GF_SDPConnection and GF_SDPMedia in order to set up
+  some specific parameters to their default value
+
+  An extra function gf_sdp_info_check(GF_SDPInfo *sdp) is provided for compliency check 
+  with RFC2327: all requested fields are checked as well as conflicting information forbidden
+  in RFC 2327
+****************************************************************************/
+
+/*
+	All attributes x-ZZZZ are considered as extensions attributes. If no "x-" is found 
+	the attributes in the RTSP response is SKIPPED. The "x-" radical is removed in the structure
+	when parsing commands / responses
+*/
+typedef struct
+{
+	char *Name;
+	char *Value;
+} GF_X_Attribute;
+
+
+/*
+	Structure for bandwidth info
+*/
+typedef struct
+{
+	/*"CT", "AS" are defined. Private extensions must be "X-*" ( * "are recommended to be short")*/
+	char *name;
+	/*in kBitsPerSec*/
+	u32 value;
+} GF_SDPBandwidth;
+
+/*
+	Structure for Time info
+*/
+/*we do not support more than ... time offsets / zone adjustment
+if more are needed, RFC recommends to use several entries rather than a big*/
+#define GF_SDP_MAX_TIMEOFFSET	10
+
+typedef struct
+{
+	/*NPT time in sec*/
+	u32 StartTime;
+	/*if 0, session is unbound. NPT time in sec*/
+	u32 StopTime;
+	/*if 0 session is not repeated. Expressed in sec.
+	Session is signaled repeated every repeatInterval*/
+	u32 RepeatInterval;
+	/*active duration of the session in sec*/
+	u32 ActiveDuration;
+
+	/*time offsets to use with repeat. Specify a non-regular repeat time from the Start time*/
+	u32 OffsetFromStart[GF_SDP_MAX_TIMEOFFSET];
+	/*Number of offsets*/
+	u32 NbRepeatOffsets;
+
+	/*EX of repeat:
+	a session happens 3 times a week, on mon 1PM, thu 3PM and fri 10AM
+	1- StartTime should be NPT for the session on the very first monday, StopTime
+	the end of this session
+	2- the repeatInterval should be 1 week, ActiveDuration the length of the session
+	3- 3 offsets: 0 (for monday) (3*24+2)*3600 for thu and (4*24-3) for fri
+	*/
+
+
+	/*timezone adjustments, to cope with #timezones, daylight saving countries and co ...
+	Ex: adjTime = [2882844526 2898848070] adjOffset=[-1h 0]
+	[0]: at 2882844526 the time base by which the session's repeat times are calculated 
+	is shifted back by 1 hour
+	[1]: at time 2898848070 the session's original time base is restored
+	*/
+
+	/*Adjustment time at which the corresponding time offset is to be applied to the 
+	session time line (time used to compute the "repeat session"). 
+	All Expressed in NPT*/
+	u32 AdjustmentTime[GF_SDP_MAX_TIMEOFFSET];
+	/* Offset with the session time line, ALWAYS ABSOLUTE OFFSET TO the specified StartTime*/
+	s32 AdjustmentOffset[GF_SDP_MAX_TIMEOFFSET];
+	/*Number of offsets.*/
+	u32 NbZoneOffsets;
+} GF_SDPTiming;
+
+
+typedef struct
+{
+	/*only "IN" currently defined*/
+	char *net_type;
+	/*"IP4","IP6"*/
+	char *add_type;
+	/*hex IPv6 address or doted IPv4 address*/
+	char *host;
+	/*TTL - MUST BE PRESENT if IP is multicast - -1 otherwise*/
+	s32 TTL;
+	/*multiple address counts - ONLY in media descriptions if needed. This
+	is used for content scaling, when # quality of the same media are multicasted on
+	# IP addresses*/
+	u32 add_count;
+} GF_SDPConnection;
+
+/*
+	FMTP: description of dynamic payload types. This is opaque at the SDP level.
+	Each attributes is assumed to be formatted as <param_name=param_val; ...>
+	If not the case the attribute will have an empty value string and only the
+	parameter name.
+*/
+typedef struct
+{
+	/*payload type of the format described*/
+	u32 PayloadType;
+	/*list of GF_X_Attribute elements. The Value field may be NULL*/
+	GF_List *Attributes;
+} GF_SDP_FMTP;
+
+typedef struct
+{
+	/*m=
+	0: application - 1:video - 2: audio - 3: text - 4:data - 5: control*/
+	u32 Type;
+	/*Port Number - For transports based on UDP, the value should be in the range 1024 
+	to 65535 inclusive. For RTP compliance it should be an even number*/
+	u32 PortNumber;
+	/*number of ports described. If >= 2, the next media(s) in the SDP will be configured
+	to use the next tuple (for RTP). If 0 or 1, ignored
+	Note: this is used for scalable media: PortNumber indicates the port of the base 
+	media and NumPorts the ports||total number of the upper layers*/
+	u32 NumPorts;
+	/*currently ony "RTP/AVP" and "udp" defined*/
+	char *Profile;
+
+	/*list of GF_SDPConnection's. A media can have several connection in case of scalable content*/
+	GF_List *Connections;
+
+	/*RTPMaps contains a list SDPRTPMaps*/
+	GF_List *RTPMaps;
+
+	/*FMTP contains a list of FMTP structures*/
+	GF_List *FMTP;
+	
+	/*for RTP this is PayloadType, but can be opaque (string) depending on the app.
+	Formated as XX WW QQ FF
+	When reading the SDP, the payloads defined in RTPMap are removed from this list
+	When writing the SDP for RTP, you should only specify static payload types here,
+	as dynamic ones are stored in RTPMaps and automatically written*/
+	char *fmt_list;
+
+	/*all attributes not defined in RFC 2327 for the media*/
+	GF_List *Attributes;
+
+	/*Other SDP attributes for media desc*/
+
+	/*k=
+	method is 'clear' (key follows), 'base64' (key in base64), 'uri' (key is the URI) 
+	or 'prompt' (key not included)*/
+	char *k_method, *k_key;
+
+	GF_List *Bandwidths;
+
+	/*0 if not present*/
+	u32 PacketTime;
+	/*0: none - 1: recv, 2: send, 3 both*/
+	u32 SendReceive;
+	char *orientation, *sdplang, *lang;
+	/*for video only, 0.0 if not present*/
+	Double FrameRate;
+	/*between 0 and 10, -1 if not present*/
+	s32 Quality;
+} GF_SDPMedia;
+
+typedef struct
+{
+	/*v=*/
+	u32 Version;
+	/*o=*/
+	char *o_username, *o_session_id, *o_version, *o_address;
+	/*"IN" for Net, "IP4" or "IP6" for address are currently valid*/
+	char *o_net_type, *o_add_type;
+
+	/*s=*/
+	char *s_session_name;
+	/*i=*/
+	char *i_description;
+	/*u=*/
+	char *u_uri;
+	/*e=*/
+	char *e_email;
+	/*p=*/
+	char *p_phone;
+	/*c= either 1 or 0 GF_SDPConnection */
+	GF_SDPConnection *c_connection;	
+	/*b=*/
+	GF_List *b_bandwidth;
+	/*All time info (t, r, z)*/
+	GF_List *Timing;
+	/*k=
+	method is 'clear' (key follows), 'base64' (key in base64), 'uri' (key is the URI) 
+	or 'prompt' (key not included)*/
+	char *k_method, *k_key;
+	/*all possible attributes (a=), session level*/
+	char *a_cat, *a_keywds, *a_tool;
+	/*0: none, 1: recv, 2: send, 3 both*/
+	u32 a_SendReceive;
+	/*should be `broadcast', `meeting', `moderated', `test' or `H332'*/
+	char *a_type;
+	char *a_charset;
+	char *a_sdplang, *a_lang;
+
+	/*all attributes not defined in RFC 2327 for the presentation*/
+	GF_List *Attributes;
+	
+	/*list of media in the SDP*/
+	GF_List *media_desc;
+} GF_SDPInfo;
+
+
+/*
+  Memory Consideration: the destructors free all non-NULL string. You should therefore 
+  be carefull while (de-)assigning the strings. The function gf_sdp_info_parse() performs a complete 
+  reset of the GF_SDPInfo
+*/
+/*constructor*/
+GF_SDPInfo *gf_sdp_info_new();
+/*destructor*/
+void gf_sdp_info_del(GF_SDPInfo *sdp);
+/*reset all structures (destroys substructure too)*/
+void gf_sdp_info_reset(GF_SDPInfo *sdp);
+/*Parses a memory SDP buffer*/
+GF_Err gf_sdp_info_parse(GF_SDPInfo *sdp, char *sdp_text, u32 text_size);
+/*check the consistency of the GF_SDPInfo*/
+GF_Err gf_sdp_info_check(GF_SDPInfo *sdp);
+/*write the SDP to a new buffer and returns it. Automatically checks the SDP before calling*/
+GF_Err gf_sdp_info_write(GF_SDPInfo *sdp, char **out_str_buf);
+
+
+/*
+	Const/dest for GF_SDPMedia
+*/
+GF_SDPMedia *gf_sdp_media_new();
+void gf_sdp_media_del(GF_SDPMedia *media);
+
+/*
+	Const/dest for GF_SDPConnection
+*/
+GF_SDPConnection *gf_sdp_conn_new();
+void gf_sdp_conn_del(GF_SDPConnection *conn);
+
+/*
+	Const/dest for SDP FMTP
+*/
+GF_SDP_FMTP *gf_sdp_fmtp_new();
+void gf_sdp_fmtp_del(GF_SDP_FMTP *fmtp);
+
+
+
+/*
+	RTP packetizer
+*/
+
+
+/*RTP<->SL mapping*/
+typedef struct 
+{
+	/*1 - required options*/
+
+	/*mode, or "" if no mode ("generic" should be used instead)*/
+	char mode[30];
+	
+	/*config of the stream if carried in SDP*/
+	char *config;
+	u32 configSize;
+	/* Stream Type*/
+	u8 StreamType;
+	/* stream profile and level indication - for AVC/H264, 0xPPCCLL, with PP:profile, CC:compatibility, LL:level*/
+	u32 PL_ID;
+
+
+	/*2 - optional options*/
+	
+	/*size of AUs if constant*/
+	u32 ConstantSize;
+	/*duration of AUs if constant, in RTP timescale*/
+	u32 ConstantDuration;
+
+	/* Object Type Indication */
+	u8 ObjectTypeIndication;
+	/*audio max displacement when interleaving (eg, de-interleaving window buffer max length) in RTP timescale*/
+	u32 maxDisplacement;
+	/*de-interleaveBufferSize if not recomputable from maxDisplacement*/
+	u32 deinterleaveBufferSize;
+	
+	/*The number of bits on which the AU-size field is encoded in the AU-header*/
+	u32 SizeLength;
+	/*The number of bits on which the AU-Index is encoded in the first AU-header*/
+	u32 IndexLength;
+	/*The number of bits on which the AU-Index-delta field is encoded in any non-first AU-header*/
+	u32 IndexDeltaLength;
+
+	/*The number of bits on which the DTS-delta field is encoded in the AU-header*/
+	u32 DTSDeltaLength;
+	/*The number of bits on which the CTS-delta field is encoded in the AU-header*/
+	u32 CTSDeltaLength;
+	/*random access point flag present*/
+	Bool RandomAccessIndication;
+	
+	/*The number of bits on which the Stream-state field is encoded in the AU-header (systems only)*/
+	u32 StreamStateIndication;
+	/*The number of bits that is used to encode the auxiliary-data-size field 
+	(no normative usage of this section)*/
+	u32 AuxiliaryDataSizeLength;
+
+	/*ISMACryp stuff*/
+	u8 IV_length, IV_delta_length;
+	u8 KI_length;
+
+	/*internal stuff*/
+	/*len of first AU header in an RTP payload*/
+	u32 auh_first_min_len;
+	u32 auh_min_len;
+} GP_RTPSLMap;
+	
+
+/*packetizer config flags - some flags are dynamically re-assigned when detecting multiSL / B-Frames / ...*/
+enum
+{
+	/*forces MPEG-4 generic transport if MPEG-4 systems mapping is available*/
+	GP_RTP_PCK_FORCE_MPEG4 =	(1),
+	/*Enables AUs concatenation in an RTP packet (if payload supports it) - this forces GP_RTP_PCK_SIGNAL_SIZE for MPEG-4*/
+	GP_RTP_PCK_USE_MULTI	=	(1<<1),
+	/*if set, audio interleaving is used if payload supports it (forces GP_RTP_PCK_USE_MULTI flag)
+		THIS IS CURRENTLY NOT IMPLEMENTED*/
+	GP_RTP_PCK_USE_INTERLEAVING =	(1<<2),
+	/*uses static RTP payloadID if any defined*/
+	GP_RTP_PCK_USE_STATIC_ID =	(1<<3),
+
+	/*MPEG-4 generic transport option*/
+	/*if flag set, RAP flag is signaled in RTP payload*/
+	GP_RTP_PCK_SIGNAL_RAP	=	(1<<4),
+	/*if flag set, AU indexes are signaled in RTP payload*/
+	GP_RTP_PCK_SIGNAL_AU_IDX	=	(1<<5),
+	/*if flag set, AU size is signaled in RTP payload*/
+	GP_RTP_PCK_SIGNAL_SIZE	=	(1<<6),
+	/*if flag set, CTS is signaled in RTP payload - DTS is automatically set if needed*/
+	GP_RTP_PCK_SIGNAL_TS	=	(1<<7),
+
+	/*setup payload for carouseling of systems streams*/
+	GP_RTP_PCK_AUTO_CAROUSEL = (1<<8),
+
+	/*use LATM payload for AAC-LC*/
+	GP_RTP_PCK_USE_LATM_AAC	=	(1<<9),
+
+	/*ISMACryp options*/
+	/*signals that input data is selectively encrypted (eg not all input frames are encrypted) 
+	- this is usually automatically set by hinter*/
+	GP_RTP_PCK_SELECTIVE_ENCRYPTION =	(1<<10),
+	/*signals that each sample will have its own key indicator - ignored in non-multi modes
+	if not set and key indicator changes, a new RTP packet will be forced*/
+	GP_RTP_PCK_KEY_IDX_PER_AU =	(1<<11),
+};
+
+
+
+/*
+		Generic packetization tools - used by track hinters and future live tools
+*/
+
+/*currently supported payload types*/
+enum 
+{
+	/*not defined*/
+	GF_RTP_PAYT_UNKNOWN,
+	/*use generic MPEG-4 transport - RFC 3016 and RFC 3640*/
+	GF_RTP_PAYT_MPEG4,
+	/*use generic MPEG-1/2 video transport - RFC 2250*/
+	GF_RTP_PAYT_MPEG12_VIDEO,
+	/*use generic MPEG-1/2 audio transport - RFC 2250*/
+	GF_RTP_PAYT_MPEG12_AUDIO,
+	/*use H263 transport - RFC 2429*/
+	GF_RTP_PAYT_H263,
+	/*use AMR transport - RFC 3267*/
+	GF_RTP_PAYT_AMR,
+	/*use AMR-WB transport - RFC 3267*/
+	GF_RTP_PAYT_AMR_WB,
+	/*use QCELP transport - RFC 2658*/
+	GF_RTP_PAYT_QCELP,
+	/*use EVRC/SMV transport - RFC 3558*/
+	GF_RTP_PAYT_EVRC_SMV,
+	/*use 3GPP Text transport - no RFC yet, only draft*/
+	GF_RTP_PAYT_3GPP_TEXT,
+	/*use H264 transport - no RFC yet, only draft*/
+	GF_RTP_PAYT_H264_AVC,
+	/*use LATM for AAC-LC*/
+	GF_RTP_PAYT_LATM,
+	/*use 3GPP DIMS format*/
+	GF_RTP_PAYT_3GPP_DIMS,
+	/*use AC3 audio format*/
+	GF_RTP_PAYT_AC3,
+};
+
+
+
+/*
+	RTP packetizer
+*/
+
+
+
+/*
+		RTP -> SL packetization tool
+	You should ONLY modify the GF_SLHeader while packetizing, all the rest is private
+	to the tool.
+	Also note that AU start/end is automatically updated, therefore you should only
+	set CTS-DTS-OCR-sequenceNumber (which is automatically incremented when spliting a payload)
+	-padding-idle infos
+	SL flags are computed on the fly, but you may wish to modify them in case of 
+	packet drop/... at the encoder side
+
+*/
+struct __tag_rtp_packetizer
+{
+	/*input packet sl header cfg. modify only if needed*/
+	GF_SLHeader sl_header;
+
+	/*
+	
+		PRIVATE _ DO NOT TOUCH
+	*/
+	
+	/*RTP payload type (RFC type, NOT the RTP hdr payT)*/
+	u32 rtp_payt;
+	/*packetization flags*/
+	u32 flags;
+	/*Path MTU size without 12-bytes RTP header*/
+	u32 Path_MTU;
+	/*max packet duration in RTP TS*/
+	u32 max_ptime;
+
+	/*payload type of RTP packets - only one payload type can be used in GPAC*/
+	u8 PayloadType;
+
+	/*RTP header of current packet*/
+	GF_RTPHeader rtp_header;
+
+	/*RTP packet handling callbacks*/
+	void (*OnNewPacket)(void *cbk_obj, GF_RTPHeader *header);
+	void (*OnPacketDone)(void *cbk_obj, GF_RTPHeader *header);
+	void (*OnDataReference)(void *cbk_obj, u32 payload_size, u32 offset_from_orig);
+	void (*OnData)(void *cbk_obj, char *data, u32 data_size, Bool is_header);
+	void *cbk_obj;
+	
+		/*********************************
+			MPEG-4 Generic hinting 
+		*********************************/
+
+	/*SL to RTP map*/
+	GP_RTPSLMap slMap;
+	/*SL conf and state*/
+	GF_SLConfig sl_config;
+
+	/*set to 1 if firstSL in RTP packet*/
+	Bool first_sl_in_rtp;
+	Bool has_AU_header;
+	/*current info writers*/
+	GF_BitStream *pck_hdr, *payload;
+
+	/*AU SN of last au*/
+	u32 last_au_sn;
+
+	/*info for the current packet*/
+	u32 auh_size, bytesInPacket;
+
+		/*********************************
+				ISMACryp info
+		*********************************/
+	Bool force_flush, is_encrypted;
+	u64 IV, first_AU_IV;
+	char *key_indicator;
+
+		/*********************************
+				AVC-H264 info
+		*********************************/
+	/*AVC non-IDR flag: set if all NAL in current packet are non-IDR (disposable)*/
+	Bool avc_non_idr;
+
+		/*********************************
+				AC3 info
+		*********************************/
+	/*ac3 ft flags*/
+	u8 ac3_ft;
+
+};
+
+/*generic rtp builder (packetizer)*/
+typedef struct __tag_rtp_packetizer GP_RTPPacketizer;
+
+/*creates a new builder
+	@hintType: hint media type, one of the above
+	@flags: hint flags (cf above)
+	@slc: user-given SL config to use. If none specified, default RFC config is used
+	@cbk_obj: callback object passed back in functions
+	@OnNewPacket: callback function starting new RTP packet
+		@header: rtp header for new packet - note that RTP header flags are not used until PacketDone is called
+	@OnPacketDone: callback function closing current RTP packet
+		@header: final rtp header for packet
+	@OnDataReference: optional, to call each time data from input buffer is added to current RTP packet. 
+		If not set, data must be added through OnData
+		@payload_size: size of reference data
+		@offset_from_orig: start offset in input buffer
+	@OnData: to call each time data is added to current RTP packet (either extra data from payload or
+		data from input when not using referencing)
+		@is_head: signal the data added MUST be inserted at the begining of the payload. Otherwise data
+		is concatenated as received
+*/
+GP_RTPPacketizer *gf_rtp_builder_new(u32 hintType, 
+						GF_SLConfig *slc, 
+						u32 flags,
+						void *cbk_obj, 
+						void (*OnNewPacket)(void *cbk, GF_RTPHeader *header),
+						void (*OnPacketDone)(void *cbk, GF_RTPHeader *header),
+						void (*OnDataReference)(void *cbk, u32 payload_size, u32 offset_from_orig),
+						void (*OnData)(void *cbk, char *data, u32 data_size, Bool is_head)
+					);
+
+/*destroy builder*/
+void gf_rtp_builder_del(GP_RTPPacketizer *builder);
+
+/*
+		init the builder
+	@MaxPayloadSize: maximum payload size of RTP packets (eg MTU minus IP/UDP/RTP headers)
+	@max_ptime: maximum packet duration IN RTP TIMESCALE
+	@StreamType: MPEG-4 system stream type - MUST always be provided for payloads format specifying 
+		audio or video streams
+	@OTI : MPEG-4 system objectTypeIndication - may be 0 if stream is not mpeg4 systems
+
+			*** all other params are for MultiSL draft ***
+	
+	  @avgSize: average size of an AU. This is not always known (real-time encoding). 
+In this case you should specify a rough compute indicating how many packets could be 
+stored per RTP packet. for ex AAC stereo at 44100 k / 64kbps , one AU ~= 380 bytes
+so 3 AUs for 1500 MTU is ok - BE CAREFULL: MultiSL adds some SL info on top of the 12
+byte RTP header so you should specify a smaller size
+The packetizer will ALWAYS make sure there's no pb storing the packets so specifying 
+more will result in a slight overhead in the SL mapping but the gain to singleSL 
+will still be worth it.
+	-Nota: at init, the packetizer can decide to switch to SingleSL if the average size 
+specified is too close to the PathMTU
+
+	@maxSize: max size of an AU. If unknown (real-time) set to 0
+	@avgTS: average CTS progression (1000/FPS for video)
+	@maxDTS: maximum DTS offset in case of bidirectional coding. 
+	@IV_length: size (in bytes) of IV when ISMACrypted
+	@KI_length: size (in bytes) of key indicator when ISMACrypted
+	@pref_mode: MPEG-4 generic only, specifies the payload mode - can be NULL (mode generic)
+*/
+
+void gf_rtp_builder_init(GP_RTPPacketizer *builder, u8 PayloadType, u32 MaxPayloadSize, u32 max_ptime,
+					   u32 StreamType, u32 OTI, u32 PL_ID,
+					   u32 avgSize, u32 maxSize, 
+					   u32 avgTS, u32 maxDTS,
+					   u32 IV_length, u32 KI_length,
+					   char *pref_mode);
+
+/*set frame crypto info*/
+void gp_rtp_builder_set_cryp_info(GP_RTPPacketizer *builder, u64 IV, char *key_indicator, Bool is_encrypted);
+/*packetize input buffer
+@data, @data_size: input buffer
+@IsAUEnd: set to one if this buffer is the last of the AU
+@FullAUSize: complete access unit size if known, 0 otherwise
+@duration: sample duration in rtp timescale (only needed for 3GPP text streams)
+@descIndex: sample description index (only needed for 3GPP text streams)
+*/
+GF_Err gf_rtp_builder_process(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize, u32 duration, u8 descIndex);
+
+/*format the "fmtp: " attribute for the MPEG-4 generic packetizer. sdpline shall be at least 2000 char*/
+GF_Err gf_rtp_builder_format_sdp(GP_RTPPacketizer *builder, char *payload_name, char *sdpLine, char *dsi, u32 dsi_size);
+/*formats SDP payload name and media name - both MUST be at least 20 bytes*/
+Bool gf_rtp_builder_get_payload_name(GP_RTPPacketizer *builder, char *szPayloadName, char *szMediaName);
+
+
+
+
+
+/*rtp payload flags*/
+enum
+{
+	/*AU end was detected (eg next packet is AU start)*/
+	GF_RTP_NEW_AU = (1),
+	/*AMR config*/
+	GF_RTP_AMR_ALIGN = (1<<1),
+	/*for RFC3016, signals bitstream inspection for RAP discovery*/
+	GF_RTP_M4V_CHECK_RAP = (1<<2),
+	/*flag set when unreliable usage of the M bit is detected*/
+	GF_RTP_UNRELIABLE_M = (1<<3),
+
+	/*AWFULL hack at rtp level to cope with ffmpeg h264 crashes when jumping in stream without IDR*/
+	GF_RTP_AVC_WAIT_RAP = (1<<4),
+	/*ISMACryp stuff*/
+	GF_RTP_HAS_ISMACRYP = (1<<5),
+	GF_RTP_ISMA_SEL_ENC = (1<<6),
+	GF_RTP_ISMA_HAS_KEY_IDX = (1<<7)
+};
+
+/*
+		SL -> RTP packetization tool
+
+*/
+struct __tag_rtp_depacketizer
+{
+	/*depacketize routine*/
+	void (*depacketize)(struct __tag_rtp_depacketizer *rtp, GF_RTPHeader *hdr, char *payload, u32 size);
+
+	/*output packet sl header cfg*/
+	GF_SLHeader sl_hdr;
+
+	/*RTP payload type (RFC type, NOT the RTP hdr payT)*/
+	u32 payt;
+	/*depacketization flags*/
+	u32 flags;
+
+	/*callback routine*/
+	void (*on_sl_packet)(void *udta, char *payload, u32 size, GF_SLHeader *hdr, GF_Err e);
+	void *udta;
+
+	/*SL <-> RTP map*/
+	GP_RTPSLMap sl_map;
+	u32 clock_rate;
+
+	/*inter-packet reconstruction bitstream (for 3GP text and H264)*/
+	GF_BitStream *inter_bs;
+
+	/*H264/AVC config*/
+	u32 h264_pck_mode;
+	
+	/*3GP text reassembler state*/
+	u8 nb_txt_frag, cur_txt_frag, sidx, txt_len, nb_mod_frag;
+
+	/*ISMACryp*/
+	u32 isma_scheme;
+	char *key;
+};
+
+/*generic rtp builder (packetizer)*/
+typedef struct __tag_rtp_depacketizer GF_RTPDepacketizer;
+
+GF_RTPDepacketizer *gf_rtp_depacketizer_new(GF_SDPMedia *media, void (*sl_packet_cbk)(void *udta, char *payload, u32 size, GF_SLHeader *hdr, GF_Err e), void *udta);
+void gf_rtp_depacketizer_del(GF_RTPDepacketizer *rtp);
+void gf_rtp_depacketizer_reset(GF_RTPDepacketizer *rtp, Bool full_reset);
+void gf_rtp_depacketizer_process(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, char *payload, u32 size);
+
+void gf_rtp_depacketizer_get_slconfig(GF_RTPDepacketizer *rtp, GF_SLConfig *sl);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif		/*_GF_IETF_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/internal/avilib.h b/tstools/DtsEdit/src/gpac/internal/avilib.h
new file mode 100644
index 0000000..5d34594
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/internal/avilib.h
@@ -0,0 +1,434 @@
+/*
+ *  avilib.h
+ *
+ *  Copyright (C) Thomas Östreich - June 2001
+ *  multiple audio track support Copyright (C) 2002 Thomas Östreich
+ *
+ *  Original code:
+ *  Copyright (C) 1999 Rainer Johanni <Rainer@Johanni.de> 
+ *
+ *  This file is part of transcode, a linux video stream processing tool
+ *      
+ *  transcode is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  transcode is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _GF_AVILIB_H_
+#define _GF_AVILIB_H_
+
+#include <gpac/tools.h>
+
+#define AVI_MAX_TRACKS 8
+
+typedef struct
+{
+  u64 key;
+  u64 pos;
+  u64 len;
+} video_index_entry;
+
+typedef struct
+{
+   u64 pos;
+   u64 len;
+   u64 tot;
+} audio_index_entry;
+
+
+// Index types
+
+
+#define AVI_INDEX_OF_INDEXES 0x00             // when each entry in aIndex
+                                              // array points to an index chunk
+#define AVI_INDEX_OF_CHUNKS  0x01             // when each entry in aIndex
+                                              // array points to a chunk in the file
+#define AVI_INDEX_IS_DATA    0x80             // when each entry is aIndex is
+                                              // really the data
+// bIndexSubtype codes for INDEX_OF_CHUNKS
+//
+#define AVI_INDEX_2FIELD     0x01             // when fields within frames
+                                              // are also indexed
+
+
+
+typedef struct _avisuperindex_entry {
+    u64 qwOffset;           // absolute file offset
+    u32 dwSize;                  // size of index chunk at this offset
+    u32 dwDuration;              // time span in stream ticks
+} avisuperindex_entry;
+
+typedef struct _avistdindex_entry {
+    u32 dwOffset;                // qwBaseOffset + this is absolute file offset
+    u32 dwSize;                  // bit 31 is set if this is NOT a keyframe
+} avistdindex_entry;
+
+// Standard index 
+typedef struct _avistdindex_chunk {
+    char           fcc[4];                 // ix##
+    u32 dwSize;                 // size of this chunk
+    u16 wLongsPerEntry;         // must be sizeof(aIndex[0])/sizeof(DWORD)
+    u8  bIndexSubType;          // must be 0
+    u8  bIndexType;             // must be AVI_INDEX_OF_CHUNKS
+    u32  nEntriesInUse;          //
+    char           dwChunkId[4];           // '##dc' or '##db' or '##wb' etc..
+    u64 qwBaseOffset;       // all dwOffsets in aIndex array are relative to this
+    u32  dwReserved3;            // must be 0
+    avistdindex_entry *aIndex;
+} avistdindex_chunk;
+    
+
+// Base Index Form 'indx'
+typedef struct _avisuperindex_chunk {
+    char           fcc[4];
+    u32  dwSize;                 // size of this chunk
+    u16 wLongsPerEntry;         // size of each entry in aIndex array (must be 8 for us)
+    u8  bIndexSubType;          // future use. must be 0
+    u8 bIndexType;             // one of AVI_INDEX_* codes
+    u32 nEntriesInUse;          // index of first unused member in aIndex array
+    char           dwChunkId[4];           // fcc of what is indexed
+    u32 dwReserved[3];          // meaning differs for each index type/subtype.
+                                           // 0 if unused
+    avisuperindex_entry *aIndex;           // where are the ix## chunks
+    avistdindex_chunk **stdindex;          // the ix## chunks itself (array)
+} avisuperindex_chunk;
+    
+
+
+typedef struct track_s
+{
+
+    long   a_fmt;             /* Audio format, see #defines below */
+    long   a_chans;           /* Audio channels, 0 for no audio */
+    long   a_rate;            /* Rate in Hz */
+    long   a_bits;            /* bits per audio sample */
+    long   mp3rate;           /* mp3 bitrate kbs*/
+    long   a_vbr;             /* 0 == no Variable BitRate */
+    long   padrate;	      /* byte rate used for zero padding */
+
+    long   audio_strn;        /* Audio stream number */
+    u64  audio_bytes;       /* Total number of bytes of audio data */
+    long   audio_chunks;      /* Chunks of audio data in the file */
+
+    char   audio_tag[4];      /* Tag of audio data */
+    long   audio_posc;        /* Audio position: chunk */
+    long   audio_posb;        /* Audio position: byte within chunk */
+ 
+    u64  a_codech_off;       /* absolut offset of audio codec information */ 
+    u64  a_codecf_off;       /* absolut offset of audio codec information */ 
+
+    audio_index_entry *audio_index;
+    avisuperindex_chunk *audio_superindex;
+
+} track_t;
+
+typedef struct
+{
+  u32  bi_size;
+  u32  bi_width;
+  u32  bi_height;
+  u16  bi_planes;
+  u16  bi_bit_count;
+  u32  bi_compression;
+  u32  bi_size_image;
+  u32  bi_x_pels_per_meter;
+  u32  bi_y_pels_per_meter;
+  u32  bi_clr_used;
+  u32  bi_clr_important;
+} alBITMAPINFOHEADER;
+
+typedef struct
+{
+  u16  w_format_tag;
+  u16  n_channels;
+  u32  n_samples_per_sec;
+  u32  n_avg_bytes_per_sec;
+  u16  n_block_align;
+  u16  w_bits_per_sample;
+  u16  cb_size;
+} alWAVEFORMATEX;
+
+typedef struct
+{
+  u32 fcc_type; 
+  u32 fcc_handler; 
+  u32 dw_flags; 
+  u32 dw_caps; 
+  u16 w_priority;
+  u16 w_language;
+  u32 dw_scale;
+  u32 dw_rate;
+  u32 dw_start;
+  u32 dw_length;
+  u32 dw_initial_frames;
+  u32 dw_suggested_buffer_size;
+  u32 dw_quality;
+  u32 dw_sample_size;
+  u16 dw_left;
+  u16 dw_top;
+  u16 dw_right;
+  u16 dw_bottom;
+} alAVISTREAMHEADER;
+
+typedef struct
+{
+  
+  FILE *fdes;              /* File descriptor of AVI file */
+  long   mode;              /* 0 for reading, 1 for writing */
+  
+  long   width;             /* Width  of a video frame */
+  long   height;            /* Height of a video frame */
+  double fps;               /* Frames per second */
+  char   compressor[8];     /* Type of compressor, 4 bytes + padding for 0 byte */
+  char   compressor2[8];     /* Type of compressor, 4 bytes + padding for 0 byte */
+  u32   video_strn;        /* Video stream number */
+  long   video_frames;      /* Number of video frames */
+  char   video_tag[4];      /* Tag of video data */
+  long   video_pos;         /* Number of next frame to be read
+			       (if index present) */
+  alAVISTREAMHEADER video_stream_header;
+  
+  u32 max_len;    /* maximum video chunk present */
+  
+  track_t track[AVI_MAX_TRACKS];  // up to AVI_MAX_TRACKS audio tracks supported
+  
+  s64  pos;               /* position in file */
+  long   n_idx;             /* number of index entries actually filled */
+  long   max_idx;           /* number of index entries actually allocated */
+  
+  s64  v_codech_off;      /* absolut offset of video codec (strh) info */ 
+  s64  v_codecf_off;      /* absolut offset of video codec (strf) info */ 
+  
+  u8 (*idx)[16]; /* index entries (AVI idx1 tag) */
+
+  video_index_entry *video_index;
+  avisuperindex_chunk *video_superindex;  /* index of indices */
+  int is_opendml;           /* set to 1 if this is an odml file with multiple index chunks */
+  
+  s64  last_pos;          /* Position of last frame written */
+  u32 last_len;   /* Length of last frame written */
+  int must_use_index;       /* Flag if frames are duplicated */
+  s64  movi_start;
+  int total_frames;         /* total number of frames if dmlh is present */
+  
+  u32 anum;            // total number of audio tracks 
+  u32 aptr;            // current audio working track 
+  char *index_file;    // read the avi index from this file
+  
+  alBITMAPINFOHEADER *bitmap_info_header;
+  alWAVEFORMATEX *wave_format_ex[AVI_MAX_TRACKS];
+  alAVISTREAMHEADER stream_headers[AVI_MAX_TRACKS];
+
+  void*		extradata;
+  unsigned long	extradata_size;
+} avi_t;
+
+#define AVI_MODE_WRITE  0
+#define AVI_MODE_READ   1
+
+/* The error codes delivered by avi_open_input_file */
+
+#define AVI_ERR_SIZELIM      1     /* The write of the data would exceed
+                                      the maximum size of the AVI file.
+                                      This is more a warning than an error
+                                      since the file may be closed safely */
+
+#define AVI_ERR_OPEN         2     /* Error opening the AVI file - wrong path
+                                      name or file nor readable/writable */
+
+#define AVI_ERR_READ         3     /* Error reading from AVI File */
+
+#define AVI_ERR_WRITE        4     /* Error writing to AVI File,
+                                      disk full ??? */
+
+#define AVI_ERR_WRITE_INDEX  5     /* Could not write index to AVI file
+                                      during close, file may still be
+                                      usable */
+
+#define AVI_ERR_CLOSE        6     /* Could not write header to AVI file
+                                      or not truncate the file during close,
+                                      file is most probably corrupted */
+
+#define AVI_ERR_NOT_PERM     7     /* Operation not permitted:
+                                      trying to read from a file open
+                                      for writing or vice versa */
+
+#define AVI_ERR_NO_MEM       8     /* malloc failed */
+
+#define AVI_ERR_NO_AVI       9     /* Not an AVI file */
+
+#define AVI_ERR_NO_HDRL     10     /* AVI file has no has no header list,
+                                      corrupted ??? */
+
+#define AVI_ERR_NO_MOVI     11     /* AVI file has no has no MOVI list,
+                                      corrupted ??? */
+
+#define AVI_ERR_NO_VIDS     12     /* AVI file contains no video data */
+
+#define AVI_ERR_NO_IDX      13     /* The file has been opened with
+                                      getIndex==0, but an operation has been
+                                      performed that needs an index */
+
+/* Possible Audio formats */
+
+#ifndef WAVE_FORMAT_PCM
+#define WAVE_FORMAT_UNKNOWN             (0x0000)
+#ifndef WAVE_FORMAT_PCM
+#define WAVE_FORMAT_PCM                 (0x0001)
+#endif
+#define WAVE_FORMAT_ADPCM               (0x0002)
+#define WAVE_FORMAT_IBM_CVSD            (0x0005)
+#define WAVE_FORMAT_ALAW                (0x0006)
+#define WAVE_FORMAT_MULAW               (0x0007)
+#define WAVE_FORMAT_OKI_ADPCM           (0x0010)
+#define WAVE_FORMAT_DVI_ADPCM           (0x0011)
+#define WAVE_FORMAT_DIGISTD             (0x0015)
+#define WAVE_FORMAT_DIGIFIX             (0x0016)
+#define WAVE_FORMAT_YAMAHA_ADPCM        (0x0020)
+#define WAVE_FORMAT_DSP_TRUESPEECH      (0x0022)
+#define WAVE_FORMAT_GSM610              (0x0031)
+#define IBM_FORMAT_MULAW                (0x0101)
+#define IBM_FORMAT_ALAW                 (0x0102)
+#define IBM_FORMAT_ADPCM                (0x0103)
+#endif
+
+avi_t* AVI_open_output_file(char * filename);
+void AVI_set_video(avi_t *AVI, int width, int height, double fps, char *compressor);
+void AVI_set_audio(avi_t *AVI, int channels, long rate, int bits, int format, long mp3rate);
+int  AVI_write_frame(avi_t *AVI, char *data, long bytes, int keyframe);
+int  AVI_dup_frame(avi_t *AVI);
+int  AVI_write_audio(avi_t *AVI, char *data, long bytes);
+int  AVI_append_audio(avi_t *AVI, char *data, long bytes);
+u64 AVI_bytes_remain(avi_t *AVI);
+int  AVI_close(avi_t *AVI);
+u64 AVI_bytes_written(avi_t *AVI);
+
+avi_t *AVI_open_input_file(char *filename, int getIndex);
+avi_t *AVI_open_input_indexfile(char *filename, int getIndex, char *indexfile);
+avi_t *AVI_open_fd(FILE *fd, int getIndex);
+avi_t *AVI_open_indexfd(FILE *fd, int getIndex, char *indexfile);
+int avi_parse_input_file(avi_t *AVI, int getIndex);
+int avi_parse_index_from_file(avi_t *AVI, char *filename);
+long AVI_audio_mp3rate(avi_t *AVI);
+long AVI_audio_padrate(avi_t *AVI);
+long AVI_video_frames(avi_t *AVI);
+int  AVI_video_width(avi_t *AVI);
+int  AVI_video_height(avi_t *AVI);
+double AVI_frame_rate(avi_t *AVI);
+char* AVI_video_compressor(avi_t *AVI);
+
+int  AVI_audio_channels(avi_t *AVI);
+int  AVI_audio_bits(avi_t *AVI);
+int  AVI_audio_format(avi_t *AVI);
+long AVI_audio_rate(avi_t *AVI);
+u64 AVI_audio_bytes(avi_t *AVI);
+long AVI_audio_chunks(avi_t *AVI);
+int  AVI_can_read_audio(avi_t *AVI);
+
+long AVI_max_video_chunk(avi_t *AVI);
+
+long AVI_frame_size(avi_t *AVI, long frame);
+long AVI_audio_size(avi_t *AVI, long frame);
+int  AVI_seek_start(avi_t *AVI);
+int  AVI_set_video_position(avi_t *AVI, long frame);
+u64 AVI_get_video_position(avi_t *AVI, long frame);
+long AVI_read_frame(avi_t *AVI, char *vidbuf, int *keyframe);
+
+int  AVI_set_audio_position(avi_t *AVI, long byte);
+int  AVI_set_audio_bitrate(avi_t *AVI, long bitrate);
+
+long AVI_get_audio_position_index(avi_t *AVI);
+int  AVI_set_audio_position_index(avi_t *AVI, long indexpos);
+
+long AVI_read_audio(avi_t *AVI, char *audbuf, long bytes, int *continuous);
+
+int  AVI_read_data(avi_t *AVI, char *vidbuf, long max_vidbuf,
+                               char *audbuf, long max_audbuf,
+                               long *len);
+
+int AVI_scan(char *name);
+int AVI_dump(char *name, int mode);
+
+char *AVI_codec2str(short cc);
+int AVI_file_check(char *import_file);
+
+void AVI_info(avi_t *avifile);
+u64 AVI_max_size(void);
+int avi_update_header(avi_t *AVI);
+
+int AVI_set_audio_track(avi_t *AVI, u32 track);
+int AVI_get_audio_track(avi_t *AVI);
+int AVI_audio_tracks(avi_t *AVI);
+
+void AVI_set_audio_vbr(avi_t *AVI, long is_vbr);
+long AVI_get_audio_vbr(avi_t *AVI);
+
+void AVI_set_comment_fd(avi_t *AVI, int fd);
+int  AVI_get_comment_fd(avi_t *AVI);
+
+struct riff_struct 
+{
+  u8 id[4];   /* RIFF */
+  u32 len;
+  u8 wave_id[4]; /* WAVE */
+};
+
+
+struct chunk_struct 
+{
+	u8 id[4];
+	u32 len;
+};
+
+struct common_struct 
+{
+	u16 wFormatTag;
+	u16 wChannels;
+	u32 dwSamplesPerSec;
+	u32 dwAvgBytesPerSec;
+	u16 wBlockAlign;
+	u16 wBitsPerSample;  /* Only for PCM */
+};
+
+struct wave_header 
+{
+	struct riff_struct   riff;
+	struct chunk_struct  format;
+	struct common_struct common;
+	struct chunk_struct  data;
+};
+
+// Simple WAV IO
+int AVI_read_wave_header( int fd, struct wave_header * wave );
+int AVI_write_wave_header( int fd, const struct wave_header * wave );
+size_t AVI_read_wave_pcm_data( int fd, void * buffer, size_t buflen );
+size_t AVI_write_wave_pcm_data( int fd, const void * buffer, size_t buflen );
+
+
+struct AVIStreamHeader {
+  long  fccType;
+  long  fccHandler;
+  long  dwFlags;
+  long  dwPriority;
+  long  dwInitialFrames;
+  long  dwScale;
+  long  dwRate;
+  long  dwStart;
+  long  dwLength;
+  long  dwSuggestedBufferSize;
+  long  dwQuality;
+  long  dwSampleSize;
+};
+
+#endif	/*_GF_AVILIB_H_*/
diff --git a/tstools/DtsEdit/src/gpac/internal/bifs_dev.h b/tstools/DtsEdit/src/gpac/internal/bifs_dev.h
new file mode 100644
index 0000000..a053a11
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/internal/bifs_dev.h
@@ -0,0 +1,223 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / BIFS codec sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+#ifndef _GF_BIFS_DEV_H_
+#define _GF_BIFS_DEV_H_
+
+
+#include <gpac/nodes_mpeg4.h>
+#include <gpac/bitstream.h>
+#include <gpac/bifs.h>
+#include <gpac/thread.h>
+#include <gpac/internal/scenegraph_dev.h>
+
+typedef struct {
+	/*node this mask is for*/
+	GF_Node *node;
+	/*in case node is not defined yet*/
+	u32 node_id;
+	/*the rest is not needed at the current time, we only support simple sugnaling for FDP, BDP and IFS2D
+	which are using pre-defs masks*/
+} BIFSElementaryMask;
+
+typedef struct
+{
+	/*v1 or v2*/
+	u8 version;
+	/*BIFS config - common fields*/
+	u16 NodeIDBits;
+	u16 RouteIDBits;
+	Bool PixelMetrics;
+	/*set to 0, 0 if no size is specified*/
+	u16 Width, Height;
+
+	/*BIFS-Anim - not supported */
+	/*if 1 the BIFS_Anim codec is reset at each intra frame*/
+	Bool BAnimRAP;
+	/*list of elementary masks for BIFS anim*/
+	GF_List *elementaryMasks;
+
+	/*BIFS v2 add-on*/
+	Bool Use3DMeshCoding;
+	Bool UsePredictiveMFField;
+	u16 ProtoIDBits;
+} BIFSConfig;
+
+
+
+/*per_stream config support*/
+typedef struct 
+{
+	BIFSConfig config;
+	u16 ESID;
+} BIFSStreamInfo;
+
+/*per_stream config support*/
+typedef struct 
+{
+	GF_Node *node;
+	SFCommandBuffer *cb;
+} CommandBufferItem;
+
+
+struct __tag_bifs_dec
+{
+	GF_Err LastError;
+	/*all attached streams*/
+	GF_List *streamInfo;
+	/*active stream*/
+	BIFSStreamInfo *info;
+
+	Bool UseName;
+
+	GF_SceneGraph *scenegraph;
+	/*modified during conditional execution / proto parsing*/
+	GF_SceneGraph *current_graph;
+
+	/*Quantization*/
+	/*QP stack*/
+	GF_List *QPs;
+	/*active QP*/
+	M_QuantizationParameter *ActiveQP;
+
+	/*QP 14 stuff: we need to store the last numb of fields in the last received Coord //field (!!!)*/
+	
+	/*number of iten in the Coord field*/
+	u32 NumCoord;
+	Bool coord_stored, storing_coord;
+
+	/*only set at SceneReplace during proto parsing, NULL otherwise*/
+	GF_Proto *pCurrentProto;
+
+	/*when set the decoder works with commands rather than modifying the scene graph directly*/
+	Bool dec_memory_mode;
+	Bool force_keep_qp;
+	/*only set in mem mode. Conditionals/InputSensors are stacked while decoding, then decoded once the AU is decoded
+	to make sure all nodes potentially used by the conditional command buffer are created*/
+	GF_List *command_buffers;
+
+	Bool ignore_size;
+	Bool is_com_dec;
+	Double cts_offset;
+};
+
+
+/*decodes an GF_Node*/
+GF_Node *gf_bifs_dec_node(GF_BifsDecoder * codec, GF_BitStream *bs, u32 NDT_Tag);
+/*decodes an SFField (to get a ptr to the field, use gf_node_get_field )
+the FieldIndex is used for Quantzation*/
+GF_Err gf_bifs_dec_sf_field(GF_BifsDecoder * codec, GF_BitStream *bs, GF_Node *node, GF_FieldInfo *field);
+/*decodes a Field (either SF or MF). The field MUST BE EMPTY*/
+GF_Err gf_bifs_dec_field(GF_BifsDecoder * codec, GF_BitStream *bs, GF_Node *node, GF_FieldInfo *field);
+/*decodes a route*/
+GF_Err gf_bifs_dec_route(GF_BifsDecoder * codec, GF_BitStream *bs, Bool is_insert);
+/*get name*/
+void gf_bifs_dec_name(GF_BitStream *bs, char *name);
+
+BIFSStreamInfo *gf_bifs_dec_get_stream(GF_BifsDecoder * codec, u16 ESID);
+/*decodes a BIFS command frame*/
+GF_Err gf_bifs_dec_command(GF_BifsDecoder * codec, GF_BitStream *bs);
+/*decodes proto list - if proto_list is not NULL, protos parsed are not registered with the parent graph
+and added to the list*/
+GF_Err gf_bifs_dec_proto_list(GF_BifsDecoder * codec, GF_BitStream *bs, GF_List *proto_list);
+/*decodes field(s) of a node - exported for MultipleReplace*/
+GF_Err gf_bifs_dec_node_list(GF_BifsDecoder * codec, GF_BitStream *bs, GF_Node *node, Bool is_proto);
+GF_Err gf_bifs_dec_node_mask(GF_BifsDecoder * codec, GF_BitStream *bs, GF_Node *node, Bool is_proto);
+
+/*called once a field has been modified through a command, send eventOut or propagate eventIn if needed*/
+void gf_bifs_check_field_change(GF_Node *node, GF_FieldInfo *field);
+
+GF_Err gf_bifs_flush_command_list(GF_BifsDecoder *codec);
+
+struct __tag_bifs_enc
+{
+	GF_Err LastError;
+	/*all attached streams*/
+	GF_List *streamInfo;
+	/*active stream*/
+	BIFSStreamInfo *info;
+
+	Bool UseName;
+
+	/*the scene graph the codec is encoding (set htrough ReplaceScene or manually)*/
+	GF_SceneGraph *scene_graph;
+	/*current proto graph for DEF/USE*/
+	GF_SceneGraph *current_proto_graph;
+
+	/*Quantization*/
+	/*QP stack*/
+	GF_List *QPs;
+	/*active QP*/
+	M_QuantizationParameter *ActiveQP;
+
+	u32 NumCoord;
+	Bool coord_stored, storing_coord;
+
+	GF_Proto *encoding_proto;
+
+	/*keep track of DEF/USE*/
+	GF_List *encoded_nodes;
+	Bool is_encoding_command;
+};
+
+GF_Err gf_bifs_enc_commands(GF_BifsEncoder *codec, GF_List *comList, GF_BitStream *bs);
+
+GF_Err gf_bifs_enc_node(GF_BifsEncoder * codec, GF_Node *node, u32 NDT_Tag, GF_BitStream *bs);
+GF_Err gf_bifs_enc_sf_field(GF_BifsEncoder *codec, GF_BitStream *bs, GF_Node *node, GF_FieldInfo *field);
+GF_Err gf_bifs_enc_field(GF_BifsEncoder * codec, GF_BitStream *bs, GF_Node *node, GF_FieldInfo *field);
+GF_Err gf_bifs_enc_mf_field(GF_BifsEncoder *codec, GF_BitStream *bs, GF_Node *node, GF_FieldInfo *field);
+GF_Err gf_bifs_enc_route(GF_BifsEncoder *codec, GF_Route *r, GF_BitStream *bs);
+void gf_bifs_enc_name(GF_BifsEncoder *codec, GF_BitStream *bs, char *name);
+GF_Node *gf_bifs_enc_find_node(GF_BifsEncoder *codec, u32 nodeID);
+
+#define GF_BIFS_WRITE_INT(codec, bs, val, nbBits, str, com)	{\
+		gf_bs_write_int(bs, val, nbBits);	\
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[BIFS] %s\t\t%d\t\t%d\t\t%s\n", str, nbBits, val, com ? com : "") );	\
+	} \
+
+GF_Route *gf_bifs_enc_is_field_ised(GF_BifsEncoder *codec, GF_Node *node, u32 fieldIndex);
+
+/*get field QP and anim info*/
+Bool gf_bifs_get_aq_info(GF_Node *Node, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits);
+
+/*get the absolute field 0_based index (or ALL mode) given the field index in IndexMode*/
+GF_Err gf_bifs_get_field_index(GF_Node *Node, u32 inField, u8 IndexMode, u32 *allField);
+
+/*returns the opaque NodeDataType of the node "children" field if any, or 0*/
+u32 gf_bifs_get_child_table(GF_Node *Node);
+
+/*returns binary type of node in the given version of the desired NDT*/
+u32 gf_bifs_get_node_type(u32 NDT_Tag, u32 NodeTag, u32 Version);
+
+/*converts field index from all_mode to given mode*/
+GF_Err gf_bifs_field_index_by_mode(GF_Node *node, u32 all_ind, u8 indexMode, u32 *outField);
+
+/*return number of bits needed to code all nodes present in the specified NDT*/
+u32 gf_bifs_get_ndt_bits(u32 NDT_Tag, u32 Version);
+/*return absolute node tag given its type in the NDT and the NDT version number*/
+u32 gf_bifs_ndt_get_node_type(u32 NDT_Tag, u32 NodeType, u32 Version);
+
+#endif	//_GF_BIFS_DEV_H_
+
diff --git a/tstools/DtsEdit/src/gpac/internal/bifs_tables.h b/tstools/DtsEdit/src/gpac/internal/bifs_tables.h
new file mode 100644
index 0000000..f642d23
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/internal/bifs_tables.h
@@ -0,0 +1,661 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / BIFS codec 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.
+ *
+ */
+
+
+/*
+	DO NOT MOFIFY - File generated on GMT Thu Aug 07 11:43:26 2008
+
+	BY MPEG4Gen for GPAC Version 0.4.5-DEV
+*/
+
+#ifndef _NDT_H
+#define _NDT_H
+
+#include <gpac/nodes_mpeg4.h>
+
+
+
+u32 ALL_GetNodeType(const u32 *table, const u32 count, u32 NodeTag, u32 Version);
+
+
+
+/* NDT BIFS Version 1 */
+
+#define SFWorldNode_V1_NUMBITS		7
+#define SFWorldNode_V1_Count	100
+
+static const u32 SFWorldNode_V1_TypeToTag[100] = {
+ TAG_MPEG4_Anchor, TAG_MPEG4_AnimationStream, TAG_MPEG4_Appearance, TAG_MPEG4_AudioBuffer, TAG_MPEG4_AudioClip, TAG_MPEG4_AudioDelay, TAG_MPEG4_AudioFX, TAG_MPEG4_AudioMix, TAG_MPEG4_AudioSource, TAG_MPEG4_AudioSwitch, TAG_MPEG4_Background, TAG_MPEG4_Background2D, TAG_MPEG4_Billboard, TAG_MPEG4_Bitmap, TAG_MPEG4_Box, TAG_MPEG4_Circle, TAG_MPEG4_Collision, TAG_MPEG4_Color, TAG_MPEG4_ColorInterpolator, TAG_MPEG4_CompositeTexture2D, TAG_MPEG4_CompositeTexture3D, TAG_MPEG4_Conditional, TAG_MPEG4_Cone, TAG_MPEG4_Coordinate, TAG_MPEG4_Coordinate2D, TAG_MPEG4_CoordinateInterpolator, TAG_MPEG4_CoordinateInterpolator2D, TAG_MPEG4_Curve2D, TAG_MPEG4_Cylinder, TAG_MPEG4_CylinderSensor, TAG_MPEG4_DirectionalLight, TAG_MPEG4_DiscSensor, TAG_MPEG4_ElevationGrid, TAG_MPEG4_Expression, TAG_MPEG4_Extrusion, TAG_MPEG4_Face, TAG_MPEG4_FaceDefMesh, TAG_MPEG4_FaceDefTables, TAG_MPEG4_FaceDefTransform, TAG_MPEG4_FAP, TAG_MPEG4_FDP, TAG_MPEG4_FIT, TAG_MPEG4_Fog, TAG_MPEG4_FontStyle, TAG_MPEG4_Form, TAG_MPEG4_Group, TAG_MPEG4_ImageTexture, TAG_MPEG4_IndexedFaceSet, TAG_MPEG4_IndexedFaceSet2D, TAG_MPEG4_IndexedLineSet, TAG_MPEG4_IndexedLineSet2D, TAG_MPEG4_Inline, TAG_MPEG4_LOD, TAG_MPEG4_Layer2D, TAG_MPEG4_Layer3D, TAG_MPEG4_Layout, TAG_MPEG4_LineProperties, TAG_MPEG4_ListeningPoint, TAG_MPEG4_Material, TAG_MPEG4_Material2D, TAG_MPEG4_MovieTexture, TAG_MPEG4_NavigationInfo, TAG_MPEG4_Normal, TAG_MPEG4_NormalInterpolator, TAG_MPEG4_OrderedGroup, TAG_MPEG4_OrientationInterpolator, TAG_MPEG4_PixelTexture, TAG_MPEG4_PlaneSensor, TAG_MPEG4_PlaneSensor2D, TAG_MPEG4_PointLight, TAG_MPEG4_PointSet, TAG_MPEG4_PointSet2D, TAG_MPEG4_PositionInterpolator, TAG_MPEG4_PositionInterpolator2D, TAG_MPEG4_ProximitySensor2D, TAG_MPEG4_ProximitySensor, TAG_MPEG4_QuantizationParameter, TAG_MPEG4_Rectangle, TAG_MPEG4_ScalarInterpolator, TAG_MPEG4_Script, TAG_MPEG4_Shape, TAG_MPEG4_Sound, TAG_MPEG4_Sound2D, TAG_MPEG4_Sphere, TAG_MPEG4_SphereSensor, TAG_MPEG4_SpotLight, TAG_MPEG4_Switch, TAG_MPEG4_TermCap, TAG_MPEG4_Text, TAG_MPEG4_TextureCoordinate, TAG_MPEG4_TextureTransform, TAG_MPEG4_TimeSensor, TAG_MPEG4_TouchSensor, TAG_MPEG4_Transform, TAG_MPEG4_Transform2D, TAG_MPEG4_Valuator, TAG_MPEG4_Viewpoint, TAG_MPEG4_VisibilitySensor, TAG_MPEG4_Viseme, TAG_MPEG4_WorldInfo
+};
+
+#define SF3DNode_V1_NUMBITS		6
+#define SF3DNode_V1_Count	52
+
+static const u32 SF3DNode_V1_TypeToTag[52] = {
+ TAG_MPEG4_Anchor, TAG_MPEG4_AnimationStream, TAG_MPEG4_Background, TAG_MPEG4_Background2D, TAG_MPEG4_Billboard, TAG_MPEG4_Collision, TAG_MPEG4_ColorInterpolator, TAG_MPEG4_Conditional, TAG_MPEG4_CoordinateInterpolator, TAG_MPEG4_CoordinateInterpolator2D, TAG_MPEG4_CylinderSensor, TAG_MPEG4_DirectionalLight, TAG_MPEG4_DiscSensor, TAG_MPEG4_Face, TAG_MPEG4_Fog, TAG_MPEG4_Form, TAG_MPEG4_Group, TAG_MPEG4_Inline, TAG_MPEG4_LOD, TAG_MPEG4_Layer2D, TAG_MPEG4_Layer3D, TAG_MPEG4_Layout, TAG_MPEG4_ListeningPoint, TAG_MPEG4_NavigationInfo, TAG_MPEG4_NormalInterpolator, TAG_MPEG4_OrderedGroup, TAG_MPEG4_OrientationInterpolator, TAG_MPEG4_PlaneSensor, TAG_MPEG4_PlaneSensor2D, TAG_MPEG4_PointLight, TAG_MPEG4_PositionInterpolator, TAG_MPEG4_PositionInterpolator2D, TAG_MPEG4_ProximitySensor2D, TAG_MPEG4_ProximitySensor, TAG_MPEG4_QuantizationParameter, TAG_MPEG4_ScalarInterpolator, TAG_MPEG4_Script, TAG_MPEG4_Shape, TAG_MPEG4_Sound, TAG_MPEG4_Sound2D, TAG_MPEG4_SphereSensor, TAG_MPEG4_SpotLight, TAG_MPEG4_Switch, TAG_MPEG4_TermCap, TAG_MPEG4_TimeSensor, TAG_MPEG4_TouchSensor, TAG_MPEG4_Transform, TAG_MPEG4_Transform2D, TAG_MPEG4_Valuator, TAG_MPEG4_Viewpoint, TAG_MPEG4_VisibilitySensor, TAG_MPEG4_WorldInfo
+};
+
+#define SF2DNode_V1_NUMBITS		5
+#define SF2DNode_V1_Count	31
+
+static const u32 SF2DNode_V1_TypeToTag[31] = {
+ TAG_MPEG4_Anchor, TAG_MPEG4_AnimationStream, TAG_MPEG4_Background2D, TAG_MPEG4_ColorInterpolator, TAG_MPEG4_Conditional, TAG_MPEG4_CoordinateInterpolator2D, TAG_MPEG4_DiscSensor, TAG_MPEG4_Face, TAG_MPEG4_Form, TAG_MPEG4_Group, TAG_MPEG4_Inline, TAG_MPEG4_LOD, TAG_MPEG4_Layer2D, TAG_MPEG4_Layer3D, TAG_MPEG4_Layout, TAG_MPEG4_OrderedGroup, TAG_MPEG4_PlaneSensor2D, TAG_MPEG4_PositionInterpolator2D, TAG_MPEG4_ProximitySensor2D, TAG_MPEG4_QuantizationParameter, TAG_MPEG4_ScalarInterpolator, TAG_MPEG4_Script, TAG_MPEG4_Shape, TAG_MPEG4_Sound2D, TAG_MPEG4_Switch, TAG_MPEG4_TermCap, TAG_MPEG4_TimeSensor, TAG_MPEG4_TouchSensor, TAG_MPEG4_Transform2D, TAG_MPEG4_Valuator, TAG_MPEG4_WorldInfo
+};
+
+#define SFStreamingNode_V1_NUMBITS		3
+#define SFStreamingNode_V1_Count	5
+
+static const u32 SFStreamingNode_V1_TypeToTag[5] = {
+ TAG_MPEG4_AnimationStream, TAG_MPEG4_AudioClip, TAG_MPEG4_AudioSource, TAG_MPEG4_Inline, TAG_MPEG4_MovieTexture
+};
+
+#define SFAppearanceNode_V1_NUMBITS		1
+#define SFAppearanceNode_V1_Count	1
+
+static const u32 SFAppearanceNode_V1_TypeToTag[1] = {
+ TAG_MPEG4_Appearance
+};
+
+#define SFAudioNode_V1_NUMBITS		3
+#define SFAudioNode_V1_Count	7
+
+static const u32 SFAudioNode_V1_TypeToTag[7] = {
+ TAG_MPEG4_AudioBuffer, TAG_MPEG4_AudioClip, TAG_MPEG4_AudioDelay, TAG_MPEG4_AudioFX, TAG_MPEG4_AudioMix, TAG_MPEG4_AudioSource, TAG_MPEG4_AudioSwitch
+};
+
+#define SFBackground3DNode_V1_NUMBITS		1
+#define SFBackground3DNode_V1_Count	1
+
+static const u32 SFBackground3DNode_V1_TypeToTag[1] = {
+ TAG_MPEG4_Background
+};
+
+#define SFBackground2DNode_V1_NUMBITS		1
+#define SFBackground2DNode_V1_Count	1
+
+static const u32 SFBackground2DNode_V1_TypeToTag[1] = {
+ TAG_MPEG4_Background2D
+};
+
+#define SFGeometryNode_V1_NUMBITS		5
+#define SFGeometryNode_V1_Count	17
+
+static const u32 SFGeometryNode_V1_TypeToTag[17] = {
+ TAG_MPEG4_Bitmap, TAG_MPEG4_Box, TAG_MPEG4_Circle, TAG_MPEG4_Cone, TAG_MPEG4_Curve2D, TAG_MPEG4_Cylinder, TAG_MPEG4_ElevationGrid, TAG_MPEG4_Extrusion, TAG_MPEG4_IndexedFaceSet, TAG_MPEG4_IndexedFaceSet2D, TAG_MPEG4_IndexedLineSet, TAG_MPEG4_IndexedLineSet2D, TAG_MPEG4_PointSet, TAG_MPEG4_PointSet2D, TAG_MPEG4_Rectangle, TAG_MPEG4_Sphere, TAG_MPEG4_Text
+};
+
+#define SFColorNode_V1_NUMBITS		1
+#define SFColorNode_V1_Count	1
+
+static const u32 SFColorNode_V1_TypeToTag[1] = {
+ TAG_MPEG4_Color
+};
+
+#define SFTextureNode_V1_NUMBITS		3
+#define SFTextureNode_V1_Count	5
+
+static const u32 SFTextureNode_V1_TypeToTag[5] = {
+ TAG_MPEG4_CompositeTexture2D, TAG_MPEG4_CompositeTexture3D, TAG_MPEG4_ImageTexture, TAG_MPEG4_MovieTexture, TAG_MPEG4_PixelTexture
+};
+
+#define SFCoordinateNode_V1_NUMBITS		1
+#define SFCoordinateNode_V1_Count	1
+
+static const u32 SFCoordinateNode_V1_TypeToTag[1] = {
+ TAG_MPEG4_Coordinate
+};
+
+#define SFCoordinate2DNode_V1_NUMBITS		1
+#define SFCoordinate2DNode_V1_Count	1
+
+static const u32 SFCoordinate2DNode_V1_TypeToTag[1] = {
+ TAG_MPEG4_Coordinate2D
+};
+
+#define SFExpressionNode_V1_NUMBITS		1
+#define SFExpressionNode_V1_Count	1
+
+static const u32 SFExpressionNode_V1_TypeToTag[1] = {
+ TAG_MPEG4_Expression
+};
+
+#define SFFaceDefMeshNode_V1_NUMBITS		1
+#define SFFaceDefMeshNode_V1_Count	1
+
+static const u32 SFFaceDefMeshNode_V1_TypeToTag[1] = {
+ TAG_MPEG4_FaceDefMesh
+};
+
+#define SFFaceDefTablesNode_V1_NUMBITS		1
+#define SFFaceDefTablesNode_V1_Count	1
+
+static const u32 SFFaceDefTablesNode_V1_TypeToTag[1] = {
+ TAG_MPEG4_FaceDefTables
+};
+
+#define SFFaceDefTransformNode_V1_NUMBITS		1
+#define SFFaceDefTransformNode_V1_Count	1
+
+static const u32 SFFaceDefTransformNode_V1_TypeToTag[1] = {
+ TAG_MPEG4_FaceDefTransform
+};
+
+#define SFFAPNode_V1_NUMBITS		1
+#define SFFAPNode_V1_Count	1
+
+static const u32 SFFAPNode_V1_TypeToTag[1] = {
+ TAG_MPEG4_FAP
+};
+
+#define SFFDPNode_V1_NUMBITS		1
+#define SFFDPNode_V1_Count	1
+
+static const u32 SFFDPNode_V1_TypeToTag[1] = {
+ TAG_MPEG4_FDP
+};
+
+#define SFFITNode_V1_NUMBITS		1
+#define SFFITNode_V1_Count	1
+
+static const u32 SFFITNode_V1_TypeToTag[1] = {
+ TAG_MPEG4_FIT
+};
+
+#define SFFogNode_V1_NUMBITS		1
+#define SFFogNode_V1_Count	1
+
+static const u32 SFFogNode_V1_TypeToTag[1] = {
+ TAG_MPEG4_Fog
+};
+
+#define SFFontStyleNode_V1_NUMBITS		1
+#define SFFontStyleNode_V1_Count	1
+
+static const u32 SFFontStyleNode_V1_TypeToTag[1] = {
+ TAG_MPEG4_FontStyle
+};
+
+#define SFTopNode_V1_NUMBITS		3
+#define SFTopNode_V1_Count	4
+
+static const u32 SFTopNode_V1_TypeToTag[4] = {
+ TAG_MPEG4_Group, TAG_MPEG4_Layer2D, TAG_MPEG4_Layer3D, TAG_MPEG4_OrderedGroup
+};
+
+#define SFLinePropertiesNode_V1_NUMBITS		1
+#define SFLinePropertiesNode_V1_Count	1
+
+static const u32 SFLinePropertiesNode_V1_TypeToTag[1] = {
+ TAG_MPEG4_LineProperties
+};
+
+#define SFMaterialNode_V1_NUMBITS		2
+#define SFMaterialNode_V1_Count	2
+
+static const u32 SFMaterialNode_V1_TypeToTag[2] = {
+ TAG_MPEG4_Material, TAG_MPEG4_Material2D
+};
+
+#define SFNavigationInfoNode_V1_NUMBITS		1
+#define SFNavigationInfoNode_V1_Count	1
+
+static const u32 SFNavigationInfoNode_V1_TypeToTag[1] = {
+ TAG_MPEG4_NavigationInfo
+};
+
+#define SFNormalNode_V1_NUMBITS		1
+#define SFNormalNode_V1_Count	1
+
+static const u32 SFNormalNode_V1_TypeToTag[1] = {
+ TAG_MPEG4_Normal
+};
+
+#define SFTextureCoordinateNode_V1_NUMBITS		1
+#define SFTextureCoordinateNode_V1_Count	1
+
+static const u32 SFTextureCoordinateNode_V1_TypeToTag[1] = {
+ TAG_MPEG4_TextureCoordinate
+};
+
+#define SFTextureTransformNode_V1_NUMBITS		1
+#define SFTextureTransformNode_V1_Count	1
+
+static const u32 SFTextureTransformNode_V1_TypeToTag[1] = {
+ TAG_MPEG4_TextureTransform
+};
+
+#define SFViewpointNode_V1_NUMBITS		1
+#define SFViewpointNode_V1_Count	1
+
+static const u32 SFViewpointNode_V1_TypeToTag[1] = {
+ TAG_MPEG4_Viewpoint
+};
+
+#define SFVisemeNode_V1_NUMBITS		1
+#define SFVisemeNode_V1_Count	1
+
+static const u32 SFVisemeNode_V1_TypeToTag[1] = {
+ TAG_MPEG4_Viseme
+};
+
+
+u32 NDT_V1_GetNumBits(u32 NDT_Tag);
+u32 NDT_V1_GetNodeTag(u32 Context_NDT_Tag, u32 NodeType);
+u32 NDT_V1_GetNodeType(u32 NDT_Tag, u32 NodeTag);
+
+
+
+
+/* NDT BIFS Version 2 */
+
+#define SFWorldNode_V2_NUMBITS		4
+#define SFWorldNode_V2_Count	12
+
+static const u32 SFWorldNode_V2_TypeToTag[12] = {
+ TAG_MPEG4_AcousticMaterial, TAG_MPEG4_AcousticScene, TAG_MPEG4_ApplicationWindow, TAG_MPEG4_BAP, TAG_MPEG4_BDP, TAG_MPEG4_Body, TAG_MPEG4_BodyDefTable, TAG_MPEG4_BodySegmentConnectionHint, TAG_MPEG4_DirectiveSound, TAG_MPEG4_Hierarchical3DMesh, TAG_MPEG4_MaterialKey, TAG_MPEG4_PerceptualParameters
+};
+
+#define SF3DNode_V2_NUMBITS		3
+#define SF3DNode_V2_Count	3
+
+static const u32 SF3DNode_V2_TypeToTag[3] = {
+ TAG_MPEG4_AcousticScene, TAG_MPEG4_Body, TAG_MPEG4_DirectiveSound
+};
+
+#define SF2DNode_V2_NUMBITS		2
+#define SF2DNode_V2_Count	2
+
+static const u32 SF2DNode_V2_TypeToTag[2] = {
+ TAG_MPEG4_ApplicationWindow, TAG_MPEG4_Body
+};
+
+#define SFGeometryNode_V2_NUMBITS		2
+#define SFGeometryNode_V2_Count	1
+
+static const u32 SFGeometryNode_V2_TypeToTag[1] = {
+ TAG_MPEG4_Hierarchical3DMesh
+};
+
+#define SFMaterialNode_V2_NUMBITS		2
+#define SFMaterialNode_V2_Count	2
+
+static const u32 SFMaterialNode_V2_TypeToTag[2] = {
+ TAG_MPEG4_AcousticMaterial, TAG_MPEG4_MaterialKey
+};
+
+#define SFBAPNode_V2_NUMBITS		2
+#define SFBAPNode_V2_Count	1
+
+static const u32 SFBAPNode_V2_TypeToTag[1] = {
+ TAG_MPEG4_BAP
+};
+
+#define SFBDPNode_V2_NUMBITS		2
+#define SFBDPNode_V2_Count	1
+
+static const u32 SFBDPNode_V2_TypeToTag[1] = {
+ TAG_MPEG4_BDP
+};
+
+#define SFBodyDefTableNode_V2_NUMBITS		2
+#define SFBodyDefTableNode_V2_Count	1
+
+static const u32 SFBodyDefTableNode_V2_TypeToTag[1] = {
+ TAG_MPEG4_BodyDefTable
+};
+
+#define SFBodySegmentConnectionHintNode_V2_NUMBITS		2
+#define SFBodySegmentConnectionHintNode_V2_Count	1
+
+static const u32 SFBodySegmentConnectionHintNode_V2_TypeToTag[1] = {
+ TAG_MPEG4_BodySegmentConnectionHint
+};
+
+#define SFPerceptualParameterNode_V2_NUMBITS		2
+#define SFPerceptualParameterNode_V2_Count	1
+
+static const u32 SFPerceptualParameterNode_V2_TypeToTag[1] = {
+ TAG_MPEG4_PerceptualParameters
+};
+
+
+u32 NDT_V2_GetNumBits(u32 NDT_Tag);
+u32 NDT_V2_GetNodeTag(u32 Context_NDT_Tag, u32 NodeType);
+u32 NDT_V2_GetNodeType(u32 NDT_Tag, u32 NodeTag);
+
+
+
+
+/* NDT BIFS Version 3 */
+
+#define SFWorldNode_V3_NUMBITS		2
+#define SFWorldNode_V3_Count	3
+
+static const u32 SFWorldNode_V3_TypeToTag[3] = {
+ TAG_MPEG4_TemporalTransform, TAG_MPEG4_TemporalGroup, TAG_MPEG4_ServerCommand
+};
+
+#define SF3DNode_V3_NUMBITS		2
+#define SF3DNode_V3_Count	3
+
+static const u32 SF3DNode_V3_TypeToTag[3] = {
+ TAG_MPEG4_TemporalTransform, TAG_MPEG4_TemporalGroup, TAG_MPEG4_ServerCommand
+};
+
+#define SF2DNode_V3_NUMBITS		2
+#define SF2DNode_V3_Count	3
+
+static const u32 SF2DNode_V3_TypeToTag[3] = {
+ TAG_MPEG4_TemporalTransform, TAG_MPEG4_TemporalGroup, TAG_MPEG4_ServerCommand
+};
+
+#define SFTemporalNode_V3_NUMBITS		2
+#define SFTemporalNode_V3_Count	2
+
+static const u32 SFTemporalNode_V3_TypeToTag[2] = {
+ TAG_MPEG4_TemporalTransform, TAG_MPEG4_TemporalGroup
+};
+
+
+u32 NDT_V3_GetNumBits(u32 NDT_Tag);
+u32 NDT_V3_GetNodeTag(u32 Context_NDT_Tag, u32 NodeType);
+u32 NDT_V3_GetNodeType(u32 NDT_Tag, u32 NodeTag);
+
+
+
+
+/* NDT BIFS Version 4 */
+
+#define SFWorldNode_V4_NUMBITS		3
+#define SFWorldNode_V4_Count	5
+
+static const u32 SFWorldNode_V4_TypeToTag[5] = {
+ TAG_MPEG4_InputSensor, TAG_MPEG4_MatteTexture, TAG_MPEG4_MediaBuffer, TAG_MPEG4_MediaControl, TAG_MPEG4_MediaSensor
+};
+
+#define SF3DNode_V4_NUMBITS		3
+#define SF3DNode_V4_Count	5
+
+static const u32 SF3DNode_V4_TypeToTag[5] = {
+ TAG_MPEG4_InputSensor, TAG_MPEG4_MatteTexture, TAG_MPEG4_MediaBuffer, TAG_MPEG4_MediaControl, TAG_MPEG4_MediaSensor
+};
+
+#define SF2DNode_V4_NUMBITS		3
+#define SF2DNode_V4_Count	5
+
+static const u32 SF2DNode_V4_TypeToTag[5] = {
+ TAG_MPEG4_InputSensor, TAG_MPEG4_MatteTexture, TAG_MPEG4_MediaBuffer, TAG_MPEG4_MediaControl, TAG_MPEG4_MediaSensor
+};
+
+#define SFTextureNode_V4_NUMBITS		1
+#define SFTextureNode_V4_Count	1
+
+static const u32 SFTextureNode_V4_TypeToTag[1] = {
+ TAG_MPEG4_MatteTexture
+};
+
+
+u32 NDT_V4_GetNumBits(u32 NDT_Tag);
+u32 NDT_V4_GetNodeTag(u32 Context_NDT_Tag, u32 NodeType);
+u32 NDT_V4_GetNodeType(u32 NDT_Tag, u32 NodeTag);
+
+
+
+
+/* NDT BIFS Version 5 */
+
+#define SFWorldNode_V5_NUMBITS		6
+#define SFWorldNode_V5_Count	39
+
+static const u32 SFWorldNode_V5_TypeToTag[39] = {
+ TAG_MPEG4_BitWrapper, TAG_MPEG4_CoordinateInterpolator4D, TAG_MPEG4_DepthImage, TAG_MPEG4_FFD, TAG_MPEG4_Implicit, TAG_MPEG4_XXLFM_Appearance, TAG_MPEG4_XXLFM_BlendList, TAG_MPEG4_XXLFM_FrameList, TAG_MPEG4_XXLFM_LightMap, TAG_MPEG4_XXLFM_SurfaceMapList, TAG_MPEG4_XXLFM_ViewMapList, TAG_MPEG4_MeshGrid, TAG_MPEG4_NonLinearDeformer, TAG_MPEG4_NurbsCurve, TAG_MPEG4_NurbsCurve2D, TAG_MPEG4_NurbsSurface, TAG_MPEG4_OctreeImage, TAG_MPEG4_XXParticles, TAG_MPEG4_XXParticleInitBox, TAG_MPEG4_XXPlanarObstacle, TAG_MPEG4_XXPointAttractor, TAG_MPEG4_PointTexture, TAG_MPEG4_PositionAnimator, TAG_MPEG4_PositionAnimator2D, TAG_MPEG4_PositionInterpolator4D, TAG_MPEG4_ProceduralTexture, TAG_MPEG4_Quadric, TAG_MPEG4_SBBone, TAG_MPEG4_SBMuscle, TAG_MPEG4_SBSegment, TAG_MPEG4_SBSite, TAG_MPEG4_SBSkinnedModel, TAG_MPEG4_SBVCAnimation, TAG_MPEG4_ScalarAnimator, TAG_MPEG4_SimpleTexture, TAG_MPEG4_SolidRep, TAG_MPEG4_SubdivisionSurface, TAG_MPEG4_SubdivSurfaceSector, TAG_MPEG4_WaveletSubdivisionSurface
+};
+
+#define SF3DNode_V5_NUMBITS		5
+#define SF3DNode_V5_Count	17
+
+static const u32 SF3DNode_V5_TypeToTag[17] = {
+ TAG_MPEG4_BitWrapper, TAG_MPEG4_CoordinateInterpolator4D, TAG_MPEG4_DepthImage, TAG_MPEG4_FFD, TAG_MPEG4_OctreeImage, TAG_MPEG4_XXParticles, TAG_MPEG4_PositionAnimator, TAG_MPEG4_PositionAnimator2D, TAG_MPEG4_PositionInterpolator4D, TAG_MPEG4_SBBone, TAG_MPEG4_SBMuscle, TAG_MPEG4_SBSegment, TAG_MPEG4_SBSite, TAG_MPEG4_SBSkinnedModel, TAG_MPEG4_SBVCAnimation, TAG_MPEG4_ScalarAnimator, TAG_MPEG4_WaveletSubdivisionSurface
+};
+
+#define SF2DNode_V5_NUMBITS		4
+#define SF2DNode_V5_Count	9
+
+static const u32 SF2DNode_V5_TypeToTag[9] = {
+ TAG_MPEG4_BitWrapper, TAG_MPEG4_PositionAnimator2D, TAG_MPEG4_SBBone, TAG_MPEG4_SBMuscle, TAG_MPEG4_SBSegment, TAG_MPEG4_SBSite, TAG_MPEG4_SBSkinnedModel, TAG_MPEG4_SBVCAnimation, TAG_MPEG4_ScalarAnimator
+};
+
+#define SFAppearanceNode_V5_NUMBITS		1
+#define SFAppearanceNode_V5_Count	1
+
+static const u32 SFAppearanceNode_V5_TypeToTag[1] = {
+ TAG_MPEG4_XXLFM_Appearance
+};
+
+#define SFGeometryNode_V5_NUMBITS		4
+#define SFGeometryNode_V5_Count	10
+
+static const u32 SFGeometryNode_V5_TypeToTag[10] = {
+ TAG_MPEG4_BitWrapper, TAG_MPEG4_Implicit, TAG_MPEG4_MeshGrid, TAG_MPEG4_NonLinearDeformer, TAG_MPEG4_NurbsCurve, TAG_MPEG4_NurbsCurve2D, TAG_MPEG4_NurbsSurface, TAG_MPEG4_Quadric, TAG_MPEG4_SolidRep, TAG_MPEG4_SubdivisionSurface
+};
+
+#define SFTextureNode_V5_NUMBITS		1
+#define SFTextureNode_V5_Count	1
+
+static const u32 SFTextureNode_V5_TypeToTag[1] = {
+ TAG_MPEG4_ProceduralTexture
+};
+
+#define SFDepthImageNode_V5_NUMBITS		1
+#define SFDepthImageNode_V5_Count	1
+
+static const u32 SFDepthImageNode_V5_TypeToTag[1] = {
+ TAG_MPEG4_DepthImage
+};
+
+#define SFBlendListNode_V5_NUMBITS		1
+#define SFBlendListNode_V5_Count	1
+
+static const u32 SFBlendListNode_V5_TypeToTag[1] = {
+ TAG_MPEG4_XXLFM_BlendList
+};
+
+#define SFFrameListNode_V5_NUMBITS		1
+#define SFFrameListNode_V5_Count	1
+
+static const u32 SFFrameListNode_V5_TypeToTag[1] = {
+ TAG_MPEG4_XXLFM_FrameList
+};
+
+#define SFLightMapNode_V5_NUMBITS		1
+#define SFLightMapNode_V5_Count	1
+
+static const u32 SFLightMapNode_V5_TypeToTag[1] = {
+ TAG_MPEG4_XXLFM_LightMap
+};
+
+#define SFSurfaceMapNode_V5_NUMBITS		1
+#define SFSurfaceMapNode_V5_Count	1
+
+static const u32 SFSurfaceMapNode_V5_TypeToTag[1] = {
+ TAG_MPEG4_XXLFM_SurfaceMapList
+};
+
+#define SFViewMapNode_V5_NUMBITS		1
+#define SFViewMapNode_V5_Count	1
+
+static const u32 SFViewMapNode_V5_TypeToTag[1] = {
+ TAG_MPEG4_XXLFM_ViewMapList
+};
+
+#define SFParticleInitializerNode_V5_NUMBITS		1
+#define SFParticleInitializerNode_V5_Count	1
+
+static const u32 SFParticleInitializerNode_V5_TypeToTag[1] = {
+ TAG_MPEG4_XXParticleInitBox
+};
+
+#define SFInfluenceNode_V5_NUMBITS		2
+#define SFInfluenceNode_V5_Count	2
+
+static const u32 SFInfluenceNode_V5_TypeToTag[2] = {
+ TAG_MPEG4_XXPlanarObstacle, TAG_MPEG4_XXPointAttractor
+};
+
+#define SFDepthTextureNode_V5_NUMBITS		2
+#define SFDepthTextureNode_V5_Count	2
+
+static const u32 SFDepthTextureNode_V5_TypeToTag[2] = {
+ TAG_MPEG4_PointTexture, TAG_MPEG4_SimpleTexture
+};
+
+#define SFSBBoneNode_V5_NUMBITS		1
+#define SFSBBoneNode_V5_Count	1
+
+static const u32 SFSBBoneNode_V5_TypeToTag[1] = {
+ TAG_MPEG4_SBBone
+};
+
+#define SFSBMuscleNode_V5_NUMBITS		1
+#define SFSBMuscleNode_V5_Count	1
+
+static const u32 SFSBMuscleNode_V5_TypeToTag[1] = {
+ TAG_MPEG4_SBMuscle
+};
+
+#define SFSBSegmentNode_V5_NUMBITS		1
+#define SFSBSegmentNode_V5_Count	1
+
+static const u32 SFSBSegmentNode_V5_TypeToTag[1] = {
+ TAG_MPEG4_SBSegment
+};
+
+#define SFSBSiteNode_V5_NUMBITS		1
+#define SFSBSiteNode_V5_Count	1
+
+static const u32 SFSBSiteNode_V5_TypeToTag[1] = {
+ TAG_MPEG4_SBSite
+};
+
+#define SFBaseMeshNode_V5_NUMBITS		1
+#define SFBaseMeshNode_V5_Count	1
+
+static const u32 SFBaseMeshNode_V5_TypeToTag[1] = {
+ TAG_MPEG4_SubdivisionSurface
+};
+
+#define SFSubdivSurfaceSectorNode_V5_NUMBITS		1
+#define SFSubdivSurfaceSectorNode_V5_Count	1
+
+static const u32 SFSubdivSurfaceSectorNode_V5_TypeToTag[1] = {
+ TAG_MPEG4_SubdivSurfaceSector
+};
+
+
+u32 NDT_V5_GetNumBits(u32 NDT_Tag);
+u32 NDT_V5_GetNodeTag(u32 Context_NDT_Tag, u32 NodeType);
+u32 NDT_V5_GetNodeType(u32 NDT_Tag, u32 NodeTag);
+
+
+
+
+/* NDT BIFS Version 6 */
+
+#define SFWorldNode_V6_NUMBITS		4
+#define SFWorldNode_V6_Count	12
+
+static const u32 SFWorldNode_V6_TypeToTag[12] = {
+ TAG_MPEG4_Clipper2D, TAG_MPEG4_ColorTransform, TAG_MPEG4_Ellipse, TAG_MPEG4_LinearGradient, TAG_MPEG4_PathLayout, TAG_MPEG4_RadialGradient, TAG_MPEG4_SynthesizedTexture, TAG_MPEG4_TransformMatrix2D, TAG_MPEG4_Viewport, TAG_MPEG4_XCurve2D, TAG_MPEG4_XFontStyle, TAG_MPEG4_XLineProperties
+};
+
+#define SF3DNode_V6_NUMBITS		3
+#define SF3DNode_V6_Count	5
+
+static const u32 SF3DNode_V6_TypeToTag[5] = {
+ TAG_MPEG4_Clipper2D, TAG_MPEG4_ColorTransform, TAG_MPEG4_PathLayout, TAG_MPEG4_TransformMatrix2D, TAG_MPEG4_Viewport
+};
+
+#define SF2DNode_V6_NUMBITS		3
+#define SF2DNode_V6_Count	5
+
+static const u32 SF2DNode_V6_TypeToTag[5] = {
+ TAG_MPEG4_Clipper2D, TAG_MPEG4_ColorTransform, TAG_MPEG4_PathLayout, TAG_MPEG4_TransformMatrix2D, TAG_MPEG4_Viewport
+};
+
+#define SFGeometryNode_V6_NUMBITS		2
+#define SFGeometryNode_V6_Count	2
+
+static const u32 SFGeometryNode_V6_TypeToTag[2] = {
+ TAG_MPEG4_Ellipse, TAG_MPEG4_XCurve2D
+};
+
+#define SFTextureNode_V6_NUMBITS		2
+#define SFTextureNode_V6_Count	3
+
+static const u32 SFTextureNode_V6_TypeToTag[3] = {
+ TAG_MPEG4_LinearGradient, TAG_MPEG4_RadialGradient, TAG_MPEG4_SynthesizedTexture
+};
+
+#define SFFontStyleNode_V6_NUMBITS		1
+#define SFFontStyleNode_V6_Count	1
+
+static const u32 SFFontStyleNode_V6_TypeToTag[1] = {
+ TAG_MPEG4_XFontStyle
+};
+
+#define SFLinePropertiesNode_V6_NUMBITS		1
+#define SFLinePropertiesNode_V6_Count	1
+
+static const u32 SFLinePropertiesNode_V6_TypeToTag[1] = {
+ TAG_MPEG4_XLineProperties
+};
+
+#define SFTextureTransformNode_V6_NUMBITS		1
+#define SFTextureTransformNode_V6_Count	1
+
+static const u32 SFTextureTransformNode_V6_TypeToTag[1] = {
+ TAG_MPEG4_TransformMatrix2D
+};
+
+#define SFViewportNode_V6_NUMBITS		1
+#define SFViewportNode_V6_Count	1
+
+static const u32 SFViewportNode_V6_TypeToTag[1] = {
+ TAG_MPEG4_Viewport
+};
+
+
+u32 NDT_V6_GetNumBits(u32 NDT_Tag);
+u32 NDT_V6_GetNodeTag(u32 Context_NDT_Tag, u32 NodeType);
+u32 NDT_V6_GetNodeType(u32 NDT_Tag, u32 NodeTag);
+
+
+
+u32 NDT_GetChildTable(u32 NodeTag);
+
+
+
+
+#endif		/*_NDT_H*/
+
diff --git a/tstools/DtsEdit/src/gpac/internal/camera.h b/tstools/DtsEdit/src/gpac/internal/camera.h
new file mode 100644
index 0000000..bf83140
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/internal/camera.h
@@ -0,0 +1,184 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Scene Compositor sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _CAMERA_H_
+#define _CAMERA_H_
+
+//#include <gpac/internal/compositor_dev.h>
+#include <gpac/scenegraph_vrml.h>
+
+/*camera flags*/
+enum
+{
+	/*if set frustum needs to be recomputed
+	we avoid computing it at each frame/interaction since that's a lot of matrix maths*/
+	CAM_IS_DIRTY = 1,
+	/*if set when ortho, indicates the viewport matrix shall be used when computing modelview (2D only)*/
+	CAM_HAS_VIEWPORT = 1<<2,
+};
+
+enum
+{
+	/*only valid at root node*/
+	CULL_NOT_SET = 0,
+	/*subtree completely outside view vol*/
+	CULL_OUTSIDE,
+	/*subtree completely inside view vol*/
+	CULL_INSIDE,
+	/*subtree overlaps view vol - FIXME: would be nice to keep track of intersecting planes*/
+	CULL_INTERSECTS
+};
+
+/*navigation info flags - non-VRML ones are simply blaxxun contact ones */
+enum
+{
+	/*headlight is on*/
+	NAV_HEADLIGHT = 1,
+	/*any navigation (eg, user-interface navigation control allowed)*/
+	NAV_ANY = 1<<1
+};
+
+/*frustum object*/
+enum
+{
+	FRUS_NEAR_PLANE = 0,
+	FRUS_FAR_PLANE,
+	FRUS_LEFT_PLANE,
+	FRUS_RIGHT_PLANE,
+	FRUS_BOTTOM_PLANE,
+	FRUS_TOP_PLANE
+};
+
+
+
+enum
+{
+	/*nothing detected*/
+	CF_NONE = 0,
+	/*collision detected*/
+	CF_COLLISION = 1,
+	/*gravity detecion enabled*/
+	CF_DO_GRAVITY = (1<<1),
+	/*gravity detected*/
+	CF_GRAVITY = (1<<2),
+	/*viewpoint is stored at end of animation*/
+	CF_STORE_VP = (1<<3),
+};
+
+typedef struct _camera
+{
+	/*this flag MUST be set by the owner of the camera*/
+	Bool is_3D;
+
+	u32 flags;
+
+	/*viewport info*/
+	GF_Rect vp;
+	/*not always same as VP due to aspect ratio*/
+	Fixed width, height;
+	Fixed z_near, z_far;
+
+	/*current vectors*/
+	Fixed fieldOfView;
+	SFVec3f up, position, target;
+
+	/*initial vp for reset*/
+	SFVec3f vp_position;
+	SFRotation vp_orientation;
+	Fixed vp_fov, vp_dist;
+
+	/*animation path*/
+	SFVec3f start_pos, end_pos;
+	SFRotation start_ori, end_ori;
+	Fixed start_fov, end_fov;
+	/*for 2D cameras we never animate except for vp reset*/
+	Fixed start_zoom;
+	SFVec2f start_trans, start_rot;
+
+	/*center of examine movement*/
+	SFVec3f examine_center;
+
+	/*anim*/
+	u32 anim_len, anim_start;
+	Bool jumping;
+	Fixed dheight;
+
+	/*navigation info - overwridden by any bindable NavigationInfo node*/
+	u32 navigation_flags, navigate_mode;
+	SFVec3f avatar_size;
+	Fixed visibility, speed;
+	Bool had_viewpoint, had_nav_info;
+
+	/*last camera position before collision& gravity detection*/
+	SFVec3f last_pos;
+	u32 collide_flags;
+	/*collision point in world coord*/
+	SFVec3f collide_point;
+	/*collide dist in world coord, used to check if we have a closer collision*/
+	Fixed collide_dist;
+	/*ground in world coord*/
+	SFVec3f ground_point;
+	/*ground dist in world coord, used to check if we have a closer ground*/
+	Fixed ground_dist;
+	/*for obstacle detection*/
+	Bool last_had_ground;
+	Bool last_had_col;
+
+	/*projection & modelview matrices*/
+	GF_Matrix projection, modelview;
+	/*unprojection matrix = INV(P*M) used for screen->world compute*/
+	GF_Matrix unprojection;
+	/*viewport matrix*/
+	GF_Matrix viewport;
+	/*frustum planes*/
+	GF_Plane planes[6];
+	/*p vertex idx per plane (for bbox-frustum intersection checks)*/
+	u32 p_idx[6];
+	/*frustrum bounding sphere (for sphere-sphere frustum intersection checks)*/
+	SFVec3f center;
+	Fixed radius;
+} GF_Camera;
+
+/*invalidate camera to force recompute of all params*/
+void camera_invalidate(GF_Camera *cam);
+/*updates camera. user transform is only used in 2D to set global user zoom/pan/translate*/
+void camera_update(GF_Camera *cam, GF_Matrix2D *user_transform, Bool center_coords);
+/*reset to last viewport*/
+void camera_reset_viewpoint(GF_Camera *cam, Bool animate);
+/*move camera to given vp*/
+void camera_move_to(GF_Camera *cam, SFVec3f pos, SFVec3f target, SFVec3f up);
+Bool camera_animate(GF_Camera *cam);
+void camera_stop_anim(GF_Camera *cam);
+/*start jump mode*/
+void camera_jump(GF_Camera *cam);
+
+void camera_set_vectors(GF_Camera *cam, SFVec3f pos, SFRotation ori, Fixed fov);
+
+SFRotation camera_get_orientation(SFVec3f pos, SFVec3f target, SFVec3f up);
+SFVec3f camera_get_pos_dir(GF_Camera *cam);
+SFVec3f camera_get_target_dir(GF_Camera *cam);
+SFVec3f camera_get_right_dir(GF_Camera *cam);
+
+#endif
+
diff --git a/tstools/DtsEdit/src/gpac/internal/compositor_dev.h b/tstools/DtsEdit/src/gpac/internal/compositor_dev.h
new file mode 100644
index 0000000..ee2accd
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/internal/compositor_dev.h
@@ -0,0 +1,1161 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Scene Rendering sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _COMPOSITOR_DEV_H_
+#define _COMPOSITOR_DEV_H_
+
+
+#include <gpac/compositor.h>
+/*include scene graph API*/
+#include <gpac/thread.h>
+/*bridge between the rendering engine and the systems media engine*/
+#include <gpac/mediaobject.h>
+
+/*raster2D API*/
+#include <gpac/modules/raster2d.h>
+/*font engine API*/
+#include <gpac/modules/font.h>
+/*AV hardware API*/
+#include <gpac/modules/video_out.h>
+#include <gpac/modules/audio_out.h>
+
+/*SVG properties*/
+#ifndef GPAC_DISABLE_SVG
+#include <gpac/scenegraph_svg.h>
+#endif
+
+
+/*if defined, events are queued before being processed, otherwise they are handled whenever triggered*/
+//#define GF_SR_EVENT_QUEUE	
+
+
+/*use 2D caching for groups*/
+//#define GF_SR_USE_VIDEO_CACHE
+
+
+/*FPS computed on this number of frame*/
+#define GF_SR_FPS_COMPUTE_SIZE	30
+
+enum
+{
+	GF_SR_CFG_OVERRIDE_SIZE = 1,
+	GF_SR_CFG_SET_SIZE = 1<<1,
+	GF_SR_CFG_AR = 1<<2,
+	GF_SR_CFG_FULLSCREEN = 1<<3,
+	/*flag is set whenever we're reconfiguring visual. This will discard all UI
+	messages during this phase in order to avoid any deadlocks*/
+	GF_SR_IN_RECONFIG = 1<<4,
+	/*special flag indicating the set size is actually due to a notif by the plugin*/
+	GF_SR_CFG_WINDOWSIZE_NOTIF = 1<<10,
+};
+
+
+
+/*forward definition of the visual manager*/
+typedef struct _visual_manager GF_VisualManager;
+typedef struct _draw_aspect_2d DrawAspect2D;
+typedef struct _traversing_state GF_TraverseState;
+typedef struct _gf_ft_mgr GF_FontManager;
+
+#ifndef GPAC_DISABLE_3D
+#include <gpac/internal/camera.h>
+#include <gpac/internal/mesh.h>
+
+#ifdef WIN32
+#include <windows.h>
+typedef void (APIENTRY * PFNGLARBMULTITEXTUREPROC)(unsigned int target);
+#else
+typedef void (*PFNGLARBMULTITEXTUREPROC) (unsigned int target);
+#endif
+
+typedef struct 
+{
+	Bool multisample;
+	Bool bgra_texture;
+	Bool abgr_texture;
+	Bool npot_texture;
+	Bool rect_texture;
+	u32 yuv_texture;
+	PFNGLARBMULTITEXTUREPROC glActiveTextureARB;
+	PFNGLARBMULTITEXTUREPROC glClientActiveTextureARB;
+} GLCaps;
+
+#endif
+
+#define DOUBLECLICK_TIME_MS		250
+
+enum
+{
+	/*no text selection*/
+	GF_SC_TSEL_NONE = 0,
+	/*text selection in progress*/
+	GF_SC_TSEL_ACTIVE,
+	/*text selection frozen*/
+	GF_SC_TSEL_FROZEN,
+	/*text selection has just been released*/
+	GF_SC_TSEL_RELEASED,
+};
+
+struct __tag_compositor
+{
+	/*the main user*/
+	GF_User *user;
+	/*terminal - only used for InputSensor*/
+	GF_Terminal *term;
+
+	/*audio renderer*/
+	struct _audio_render *audio_renderer;
+	/*video out*/
+	GF_VideoOutput *video_out;
+	/*2D rasterizer*/
+	GF_Raster2D *rasterizer;
+
+	/*visual rendering thread if used*/
+	GF_Thread *VisualThread;
+	/*0: not init, 1: running, 2: exit requested, 3: done*/
+	u32 video_th_state;
+
+	/*compositor exclusive access to the scene and display*/
+	GF_Mutex *mx;
+
+	/*the main scene graph*/
+	GF_SceneGraph *scene;
+	/*extra scene graphs (OSD, etc), always registered in draw order. That's the module responsability
+	to draw them*/
+	GF_List *extra_scenes;
+
+	u32 inherit_type_3d;
+	
+	/*all time nodes registered*/
+	GF_List *time_nodes;
+	/*all textures (texture handlers)*/
+	GF_List *textures;
+
+#ifdef GF_SR_EVENT_QUEUE
+	/*event queue*/
+	GF_List *events;
+	GF_Mutex *ev_mx;
+#endif
+
+	/*simulation frame rate*/
+	Double frame_rate;
+	u32 frame_duration;
+	u32 frame_time[GF_SR_FPS_COMPUTE_SIZE];
+	u32 current_frame;
+
+	u32 last_click_time;
+
+	/*display size*/
+	u32 display_width, display_height;
+
+	/*visual output location on window (we may draw background color outside of it) 
+		vp_x & vp_y: horizontal & vertical offset of the drawing area in the video output
+		vp_width & vp_height: width & height of the drawing area
+			* in scalable mode, this is the display size
+			* in not scalable mode, this is the final drawing area size (dst_w & dst_h of the blit)
+	*/
+	u32 vp_x, vp_y, vp_width, vp_height;
+	/*backbuffer size - in scalable mode, matches display size, otherwise matches scene size*/
+	u32 output_width, output_height;
+
+	/*scene size if any*/
+	u32 scene_width, scene_height;
+	Bool has_size_info;
+	Bool fullscreen;
+	/*!! paused will not stop display (this enables pausing a VRML world and still examining it)*/
+	Bool paused, step_mode;
+	Bool draw_next_frame;
+	/*freeze_display prevents any screen updates - needed when output driver uses direct video memory access*/
+	Bool is_hidden, freeze_display;
+
+	/*current frame number*/
+	u32 frame_number;
+	/*count number of initialized sensors*/
+	u32 interaction_sensors;
+
+	/*set whenever 3D HW ctx changes (need to rebuild dlists/textures if any used)*/
+	Bool reset_graphics;
+
+	/*font engine*/
+	GF_FontManager *font_manager;
+	/*set whenever a new font has been received*/
+	Bool reset_fonts;
+
+	/*options*/
+	u32 aspect_ratio, antiAlias, texture_text_mode;
+	Bool high_speed, stress_mode;
+	Bool force_opengl_2d;
+
+	/*key modif*/
+	u32 key_states;
+	u32 interaction_level;
+
+	/*size override when no size info is present
+		flags:	1: size override is requested (cfg)
+				2: size override has been applied
+	*/
+	u32 override_size_flags;
+
+	/*any of the above flags - reseted at each simulation tick*/
+	u32 msg_type;
+	/*for size*/
+	u32 new_width, new_height;
+
+	/*current background color*/
+	u32 back_color;
+
+	/*bounding box draw type: none, unit box/rect and sphere (3D only)*/
+	u32 draw_bvol;
+
+	/*list of system colors*/
+	u32 sys_colors[28];
+
+	/*all visual managers created*/
+	GF_List *visuals;
+	/*all outlines cached*/
+	GF_List *strike_bank;
+
+	/*main visual manager - the one managing the primary video output*/
+	GF_VisualManager *visual;
+	/*set to false whenever a new scene is attached to compositor*/
+	Bool root_visual_setup;
+	
+	/*indicates whether the aspect ratio shall be recomputed:
+		1: AR changed
+		2: AR changed and root visual type changed between 2D and 3D
+	*/
+	u32 recompute_ar;
+
+	Bool zoom_changed;
+
+	/*traversing context*/
+	struct _traversing_state *traverse_state;
+
+	/*current picked node if any*/
+	GF_Node *grab_node;
+	/*current picked node's parent use if any*/
+	GF_Node *grab_use;
+	/*current focus node if any*/
+	GF_Node *focus_node;
+	/*parent use node of the current focus node if any*/
+	GF_Node *focus_used;
+	/*current parent focus node if any - needed to navigate within PROTOs*/
+	GF_List *focus_ancestors;
+	GF_List *focus_use_stack;
+	/*focus node uses dom events*/
+	Bool focus_uses_dom_events;
+	/*current sensor type*/
+	u32 sensor_type;
+	/*list of VRML sensors active before the picking phase (eg active at the previous pass)*/
+	GF_List *previous_sensors;
+	/*list of VRML sensors active after the picking phase*/
+	GF_List *sensors;
+	/*indicates a sensor is currently active*/
+	Bool grabbed_sensor;
+
+	/*hardware handle for 2D screen access - currently only used with win32 (HDC) */
+	void *hw_context;
+	/*indicates whether HW is locked*/
+	Bool hw_locked;
+	/*screen buffer for direct access*/
+	GF_VideoSurface hw_surface;
+	/*output buffer is configured in video memory*/
+	Bool video_memory;
+	/*indicate if overlays were prezsent in the previous frame*/
+	Bool last_had_overlays;
+
+	/*options*/
+	Bool scalable_zoom;
+	Bool enable_yuv_hw;
+	/*disables partial hardware blit (eg during dirty rect) to avoid artefacts*/
+	Bool disable_partial_hw_blit;
+
+	/*user navigation mode*/
+	u32 navigate_mode;
+	/*set if content doesn't allow navigation*/
+	Bool navigation_disabled;
+
+	/*user mouse navigation state:
+	 0: not active
+	 1: pre-active phase: mouse has been clicked and waiting for mouse move to confirm. This allows
+		for clicking on objects in the navigation mode
+	 2: navigation is grabbed
+	*/
+	u32 navigation_state;
+	/*navigation x & y grab point in scene coord system*/
+	Fixed grab_x, grab_y;
+	/*aspect ratio scale factor*/
+	Fixed scale_x, scale_y;
+	/*user zoom level*/
+	Fixed zoom;
+	/*user pan*/
+	Fixed trans_x, trans_y;
+	/*user rotation angle - ALWAYS CENTERED*/
+	Fixed rotation;
+
+	Bool skip_flush;
+#ifndef GPAC_DISABLE_SVG
+	u32 num_clicks;
+#endif
+
+	/*a dedicated drawable for focus highlight */
+	struct _drawable *focus_highlight;
+	/*highlight fill and stroke colors (ARGB)*/
+	u32 highlight_fill, highlight_stroke;
+
+	/*picking info*/
+
+	/*picked node*/
+	GF_Node *hit_node;
+	/*appearance at hit point - used for composite texture*/
+	GF_Node *hit_appear;
+	/*parent use stack - SVG only*/
+	GF_List *hit_use_stack, *prev_hit_use_stack;
+	/*picked node uses DOM event or VRML events ?*/
+	Bool hit_use_dom_events;
+
+	/*world->local and local->world transform at hit point*/
+	GF_Matrix hit_world_to_local, hit_local_to_world;
+	/*hit point in local coord & world coord*/
+	SFVec3f hit_local_point, hit_world_point;
+	/*tex coords at hit point*/
+	SFVec2f hit_texcoords;
+	/*picking ray in world coord system*/
+	GF_Ray hit_world_ray;
+	/*normal at hit point, local coord system*/
+	SFVec3f hit_normal;
+	/*distance from ray origin used to discards further hits - FIXME: may not properly work with transparent layer3D*/
+	Fixed hit_square_dist;
+
+	/*text selection and edition*/
+
+	/*the active parent text node under selection*/
+	GF_Node *text_selection;
+	/*text selection start/end in world coord system*/
+	SFVec2f start_sel, end_sel;	
+	/*text selection state*/ 
+	u32 store_text_state;
+	/*parent text node when a text is hit (to handle tspan selection)*/
+	GF_Node *hit_text;
+	u32 sel_buffer_len, sel_buffer_alloc;
+	u16 *sel_buffer;
+	u8 *selected_text;
+	/*text selection color - reverse video not yet supported*/
+	u32 text_sel_color;
+
+	/*set whenever the focus node is a text node*/
+	u32 focus_text_type;
+	Bool edit_is_tspan;
+	/*pointer to edited text*/
+	char **edited_text;
+	u32 caret_pos, dom_text_pos;
+
+#ifndef GPAC_DISABLE_3D
+	/*options*/
+	/*emulate power-of-2 for video texturing by using a po2 texture and texture scaling. If any textureTransform
+	is applied to this texture, black stripes will appear on the borders.
+	If not set video is written through glDrawPixels with bitmap (slow scaling), or converted to
+	po2 texture*/
+	Bool emul_pow2;
+	/*use openGL for outline rather than vectorial ones*/
+	Bool raster_outlines;
+	/*disable RECT extensions (except for Bitmap...)*/
+	Bool disable_rect_ext;
+	/*disable RECT extensions (except for Bitmap...)*/
+	Bool bitmap_use_pixels;
+	/*disable RECT extensions (except for Bitmap...)*/
+	u32 draw_normals;
+	/*backface cull type: 0 off, 1: on, 2: on with transparency*/
+	u32 backcull;
+	/*polygon atialiasing*/
+	Bool poly_aa;
+	/*disable gluScaleImage*/
+	Bool disable_glu_scale;
+	/*wireframe/solid mode*/
+	u32 wiremode;
+	/*collision detection mode*/
+	u32 collide_mode;
+	/*gravity enabled*/
+	Bool gravity_on;
+	/*AABB tree-based culling is disabled*/
+	Bool disable_gl_cull;
+	/*YUV textures in OpenGL are disabled (soft YUV->RGB )*/
+	Bool disable_yuvgl;
+
+	/*unit box (1.0 size) and unit sphere (1.0 radius)*/
+	GF_Mesh *unit_bbox;
+
+	/*active layer3D for layer navigation - may be NULL*/
+	GF_Node *active_layer;
+
+	GLCaps gl_caps;
+
+	u32 offscreen_width, offscreen_height;
+
+#ifdef GPAC_USE_TINYGL
+	void *tgl_ctx;
+#endif
+
+#endif
+	
+	u32 networks_time;
+	u32 decoders_time;
+
+	u32 visual_config_time;
+	u32 traverse_setup_time;
+	u32 traverse_and_direct_draw_time;
+	u32 indirect_draw_time;
+
+#ifdef GF_SR_USE_VIDEO_CACHE
+	/*video cache size / max size in kbytes*/
+	u32 video_cache_current_size, video_cache_max_size;
+	u32 cache_scale, cache_tolerance;
+	/*sorted list (by cache priority) of cached groups - permanent for the lifetime of the scene/cache object*/
+	GF_List *cached_groups;
+	/*list of groups being cached in one frame */
+	GF_List *cached_groups_queue;
+#endif
+
+	/*used for -depth dump*/
+	Fixed OGLDepthGain; /*gain applied to OpenGL depth buffer, a float [0..1])*/
+	Fixed OGLDepthOffset; /*offset applied to OpenGL depth buffer*/
+	
+#ifdef GPAC_TRISCOPE_MODE
+	void *RenoirHandler;
+#endif
+	
+};
+
+
+/*base stack for timed nodes (nodes that activate themselves at given times)
+	@UpdateTimeNode: shall be setup by the node handler and is called once per simulation frame
+	@is_registerd: all handlers indicate store their state if wanted (provided for conveniency but not inspected by the compositor)
+	@needs_unregister: all handlers indicate they can be removed from the list of active time nodes
+in order to save time. THIS IS INSPECTED by the compositor at each simulation tick after calling UpdateTimeNode
+and if set, the node is removed right away from the list
+*/
+typedef struct _time_node
+{
+	void (*UpdateTimeNode)(struct _time_node *);
+	Bool is_registered, needs_unregister;
+	/*user data*/
+	void *udta;
+} GF_TimeNode;
+
+void gf_sc_register_time_node(GF_Compositor *sr, GF_TimeNode *tn);
+void gf_sc_unregister_time_node(GF_Compositor *sr, GF_TimeNode *tn);
+
+enum
+{
+	/*texture repeat along s*/
+	GF_SR_TEXTURE_REPEAT_S = (1<<0),
+	/*texture repeat along t*/
+	GF_SR_TEXTURE_REPEAT_T = (1<<1),
+	/*texture is a matte texture*/
+	GF_SR_TEXTURE_MATTE = (1<<2),
+	/*texture doesn't need vertical flip for OpenGL*/
+	GF_SR_TEXTURE_NO_GL_FLIP = (1<<3),
+	/*Set durin a composition cycle. If not set at the end of the cycle, 
+	the hardware binding is released*/
+	GF_SR_TEXTURE_USED = (1<<4),
+};
+
+typedef struct _gf_sc_texture_handler
+{
+	GF_Node *owner;
+	GF_Compositor *compositor;
+	/*low-level texture object - this is not exposed out of libgpac*/
+	struct __texture_wrapper *tx_io;
+	/*media stream*/
+	GF_MediaObject *stream;
+	/*texture is open (for DEF/USE)*/
+	Bool is_open;
+	/*this is needed in case the Url is changed - note that media nodes cannot point to different
+	URLs (when they could in VRML), the MF is only holding media segment descriptions*/
+	MFURL current_url;
+	/*to override by each texture node*/
+	void (*update_texture_fcnt)(struct _gf_sc_texture_handler *txh);
+	/*needs_release if a visual frame is grabbed (not used by modules)*/
+	Bool needs_release;
+	/*stream_finished: indicates stream is over (not used by modules)*/
+	Bool stream_finished;
+	/*needs_refresh: indicates texture content has been changed - needed by modules performing tile drawing*/
+	Bool needs_refresh;
+	/*needed to discard same frame fetch*/
+	u32 last_frame_time;
+	/*active display in the texture (0, 0 == top, left)*/
+	//GF_Rect active_window;
+	/*texture is transparent*/		
+	Bool transparent;
+	/*flags for user - the repeatS and repeatT are set upon creation, the rest is NEVER touched by compositor*/
+	u32 flags;
+	/*gradients are relative to the object bounds, therefore a gradient is not the same if used on 2 different
+	objects - since we don't want to build an offscreen texture for the gradient, gradients have to be updated 
+	at each draw - the matrix shall be updated to the gradient transformation in the local system
+	MUST be set for gradient textures*/
+	void (*compute_gradient_matrix)(struct _gf_sc_texture_handler *txh, GF_Rect *bounds, GF_Matrix2D *mat, Bool for_3d);
+
+	/*image data for natural media*/
+	char *data;
+	u32 width, height, stride, pixelformat, pixel_ar;
+	/*if set texture has been transformed by MatteTexture -> disable blit*/
+	Bool has_cmat;
+
+	/*matteTexture parent if any*/
+	GF_Node *matteTexture;
+	
+
+#ifdef GPAC_TRISCOPE_MODE
+
+	void *RenoirObject;
+	
+#endif
+	
+	
+} GF_TextureHandler;
+
+/*setup texturing object*/
+void gf_sc_texture_setup(GF_TextureHandler *hdl, GF_Compositor *sr, GF_Node *owner);
+/*destroy texturing object*/
+void gf_sc_texture_destroy(GF_TextureHandler *txh);
+
+/*return texture handle for built-in textures (movieTexture, ImageTexture and PixelTexture)*/
+GF_TextureHandler *gf_sc_texture_get_handler(GF_Node *n);
+
+/*these ones are needed by modules only for Background(2D) handling*/
+
+/*returns 1 if url changed from current one*/
+Bool gf_sc_texture_check_url_change(GF_TextureHandler *txh, MFURL *url);
+/*starts associated object*/
+GF_Err gf_sc_texture_play(GF_TextureHandler *txh, MFURL *url);
+GF_Err gf_sc_texture_play_from_to(GF_TextureHandler *txh, MFURL *url, Double start_offset, Double end_offset, Bool can_loop, Bool lock_scene_timeline);
+/*stops associated object*/
+void gf_sc_texture_stop(GF_TextureHandler *txh);
+/*restarts associated object - DO NOT CALL stop/start*/
+void gf_sc_texture_restart(GF_TextureHandler *txh);
+/*common routine for all video texture: fetches a frame and update the 2D texture object */
+void gf_sc_texture_update_frame(GF_TextureHandler *txh, Bool disable_resync);
+/*release video memory if needed*/
+void gf_sc_texture_release_stream(GF_TextureHandler *txh);
+
+
+
+/*sensor node handler - this is not defined as a stack because Anchor is both a grouping node and a 
+sensor node, and we DO need the groupingnode stack...*/
+typedef struct _sensor_handler
+{
+	/*sensor enabled or not ?*/
+	Bool (*IsEnabled)(GF_Node *node);
+	/*user input on sensor:
+	is_over: pointing device is over a shape the sensor is attached to
+	evt_type: mouse event type
+	compositor: pointer to compositor - hit info is stored at compositor level
+	*/
+	void (*OnUserEvent)(struct _sensor_handler *sh, Bool is_over, GF_Event *ev, GF_Compositor *compositor);
+	/*pointer to the sensor node*/
+	GF_Node *sensor;
+} GF_SensorHandler;
+
+/*returns TRUE if the node is a pointing device sensor node that can be stacked during traversing (all sensor except anchor)*/
+Bool compositor_mpeg4_is_sensor_node(GF_Node *node);
+/*returns associated sensor handler from traversable stack (the node handler is always responsible for creation/deletion)
+returns NULL if not a sensor or sensor is not activated*/
+GF_SensorHandler *compositor_mpeg4_get_sensor_handler(GF_Node *n);
+
+/*rendering modes*/
+enum
+{
+	/*regular traversing mode for z-sorting:
+		- 2D mode: builds the display list (may draw directly if requested)
+		- 3D mode: sort & queue transparent objects
+	*/
+	TRAVERSE_SORT = 0,
+	/*explicit draw routine used when flushing 2D display list*/
+	TRAVERSE_DRAW_2D,
+	/*pick routine*/
+	TRAVERSE_PICK,
+	/*get bounds routine: returns bounds in local coord system (including node transform if any)*/
+	TRAVERSE_GET_BOUNDS,
+	/*set to signal bindable render - only called on bindable stack top if present.
+	for background (drawing request), viewports/viewpoints fog and navigation (setup)
+	all other nodes SHALL NOT RESPOND TO THIS CALL
+	*/
+	TRAVERSE_BINDABLE,
+
+	/*writes the text selection into the compositor buffer - we need a traversing mode for this operation
+	to handle properly text and tspans*/
+	TRAVERSE_GET_TEXT,
+
+#ifndef GPAC_DISABLE_3D
+	/*explicit draw routine used when flushing 3D display list*/
+	TRAVERSE_DRAW_3D,
+	/*set global lights on. Since the model_matrix is not pushed to the target in this 
+	pass, global lights shall not forget to do it (cf lighting.c)*/
+	TRAVERSE_LIGHTING,
+	/*collision routine*/
+	TRAVERSE_COLLIDE,
+#endif
+};
+
+
+typedef struct _group_cache_candidate GF_CacheCandidate;
+
+
+
+#define MAX_USER_CLIP_PLANES		4
+
+/*the traversing context: set_up at top-level and passed through SFNode_Render. Each node is responsible for 
+restoring the context state before returning*/
+struct _traversing_state
+{
+	struct _audio_group *audio_parent;
+	struct _soundinterface *sound_holder;
+
+#ifndef GPAC_DISABLE_SVG
+	SVGPropertiesPointers *svg_props;
+	u32 svg_flags;
+#endif
+
+	/*current traversing mode*/
+	u32 traversing_mode;
+	/*for 2D drawing, indicates objects are to be drawn as soon as traversed, at each frame*/
+	Bool direct_draw;
+	/*current subtree is part of a switched-off subtree (needed for audio)*/
+	Bool switched_off;
+	/*set by the traversed subtree to indicate no cull shall be performed*/
+	Bool disable_cull;
+
+	/*indicates if we are in a layer or not*/
+	Bool is_layer;
+	/*current graph traversed is in pixel metrics*/
+	Bool pixel_metrics;
+	/*minimal half-dimension (w/2, h/2)*/
+	Fixed min_hsize;
+
+	/*indicates if the current subtree is fliped compared to the target visual*/
+	Bool fliped_coords;
+
+	/*current size of viewport being traverse (root scene, layers)*/
+	SFVec2f vp_size;
+
+	/*the one and only visual manager currently being traversed*/
+	GF_VisualManager *visual;
+	
+	/*current background and viewport stacks*/
+	GF_List *backgrounds;
+	GF_List *viewpoints;
+
+	/*current transformation from top-level*/
+	GF_Matrix2D transform;
+	/*current color transformation from top-level*/
+	GF_ColorMatrix color_mat;
+	/* Contains the viewbox transform, used for svg ref() transform */
+	GF_Matrix2D vb_transform;
+
+	/*if set all nodes shall be redrawn - set only at specific places in the tree*/
+	Bool invalidate_all;
+
+	/*text splitting: 0: no splitting, 1: word by word, 2:letter by letter*/
+	u32 text_split_mode;
+	/*1-based idx of text element drawn*/
+	u32 text_split_idx;
+
+	/*all VRML sensors for the current level*/
+	GF_List *vrml_sensors;
+
+	/*current appearance when traversing geometry nodes*/
+	GF_Node *appear;
+	/*parent group for composition: can be Form, Layout or Layer2D*/
+	struct _parent_node_2d *parent;
+
+	/*group/object bounds in local coordinate system*/
+	GF_Rect bounds;
+
+	/*node for which bounds should be fetched - SVG only*/
+	GF_Node *for_node;
+	Bool abort_bounds_traverse;
+	GF_Matrix2D mx_at_node;
+	Bool ignore_strike;
+	
+	GF_List *use_stack;
+	/* Styling Property and others for SVG context */
+#ifndef GPAC_DISABLE_SVG
+	SVG_Number *parent_use_opacity;
+	SVGAllAttributes *parent_anim_atts;
+
+	/*SVG text rendering state*/
+	Bool in_svg_text;
+	Bool in_svg_text_area;
+
+	/* current chunk & position of last placed text chunk*/
+	u32 chunk_index;
+	Fixed text_end_x, text_end_y;
+
+	/* text & tspan state*/
+	GF_List *x_anchors;
+	SVG_Coordinates *text_x, *text_y, *text_rotate;
+	u32 count_x, count_y, count_rotate, idx_rotate;
+
+	/* textArea state*/
+	Fixed max_length, max_height;
+	Fixed base_x, base_y;
+	Fixed line_spacing;
+	Fixed base_shift;
+	/*quick and dirty hack to try to solve xml:space across text and tspans without 
+	flattening the DOMText nodes
+	0: first block of text
+	1: previous block of text ended with a space
+	2: previous block of text did NOT end with a space
+	*/
+	u32 last_char_type;
+	/*in textArea, indicates that the children bounds must be refreshed due to a baseline adjustment*/
+	u32 refresh_children_bounds;
+#endif
+	GF_Node *text_parent;
+
+	/*current context to be drawn - only set when drawing in 2D mode or 3D for SVG*/
+	struct _drawable_context *ctx;
+
+	/*world ray for picking - in 2D, orig is 2D mouse pos and direction is -z*/
+	GF_Ray ray;
+
+	/*we have 2 clippers, one for regular clipping (layout, form if clipping) which is maintained in world coord system
+	and one for layer2D which is maintained in parent coord system (cf layer rendering). The layer clipper
+	is used only when cascading layers - layer3D doesn't use clippers*/
+	Bool has_clip, has_layer_clip;
+	/*active clipper in world coord system */
+	GF_Rect clipper, layer_clipper;
+
+	
+	/*set when traversing a cached group during offscreen bitmap construction.*/
+	Bool in_group_cache;
+
+
+#ifndef GPAC_DISABLE_3D
+	/*the current camera*/
+	GF_Camera *camera;
+
+	/*current object (model) transformation from top-level, view is NOT included*/
+	GF_Matrix model_matrix;
+
+	/*fog bind stack*/
+	GF_List *fogs; /*holds fogs info*/
+	/*navigation bind stack*/
+	GF_List *navigations;
+
+	/*when drawing, signals the mesh is transparent (enables blending)*/
+	Bool mesh_is_transparent;
+	/*when drawing, signals the number of textures used by the mesh*/
+	u32 mesh_num_textures;
+
+	/*bounds for TRAVERSE_GET_BOUNDS and background rendering*/
+	GF_BBox bbox;
+
+	/*cull flag (used to skip culling of children when parent bbox is completely inside/outside frustum)*/
+	u32 cull_flag;
+
+	/*toggle local lights on/off - field is ONLY valid in TRAVERSE_RENDER mode, and local lights
+	are always set off in reverse order as when set on*/
+	Bool local_light_on;
+	/*current directional ligths contexts - only valid in TRAVERSE_RENDER*/
+	GF_List *local_lights;
+
+	/*clip planes in world coords*/
+	GF_Plane clip_planes[MAX_USER_CLIP_PLANES];
+	u32 num_clip_planes;
+
+
+	/*layer traversal state:
+		set to the first traversed layer3D when picking
+		set to the current layer3D traversed when rendering 3D to an offscreen bitmap. This alows other 
+			nodes (typically bindables) seting the layer dirty flags to force a redraw 
+	*/
+	GF_Node *layer3d;
+#endif
+
+	
+	/*depth z-axis info for 2D scenes in triscope mode*/
+	Fixed depth;
+
+#ifdef GF_SR_USE_VIDEO_CACHE
+	/*set to 1 if cache evaluation can be skipped - this is only set when there is not enough memory 
+	to cache a sub-group, in which case the group cannot be cached (we're caching in display coordinates)*/
+	Bool cache_too_small;
+#endif
+};
+
+/*
+	Audio mixer - MAX 6 CHANNELS SUPPORTED
+*/
+
+/*the audio object as used by the mixer. All audio nodes need to implement this interface*/
+typedef struct _audiointerface
+{
+	/*fetch audio data for a given audio delay (~soundcard drift) - if delay is 0 sync should not be performed 
+	(eg intermediate mix) */
+	char *(*FetchFrame) (void *callback, u32 *size, u32 audio_delay_ms);
+	/*release a number of bytes in the indicated frame (ts)*/
+	void (*ReleaseFrame) (void *callback, u32 nb_bytes);
+	/*get media speed*/
+	Fixed (*GetSpeed)(void *callback);
+	/*gets volume for each channel - vol = Fixed[6]. returns 1 if volume shall be changed (!= 1.0)*/
+	Bool (*GetChannelVolume)(void *callback, Fixed *vol);
+	/*returns 1 if muted*/
+	Bool (*IsMuted)(void *callback);
+	/*user callback*/
+	void *callback;
+	/*returns 0 if config is not known yet or changed, 
+	otherwise AND IF @for_reconf is set, updates member var below and return TRUE
+	You may return 0 to force parent user invalidation*/
+	Bool (*GetConfig)(struct _audiointerface *ai, Bool for_reconf);
+	/*updated cfg, or 0 otherwise*/
+	u32 chan, bps, samplerate, ch_cfg;
+} GF_AudioInterface;
+
+typedef struct __audiomix GF_AudioMixer;
+
+/*create mixer - ar is NULL for any sub-mixers, or points to the main audio renderer (mixer outputs to sound driver)*/
+GF_AudioMixer *gf_mixer_new(struct _audio_render *ar);
+void gf_mixer_del(GF_AudioMixer *am);
+void gf_mixer_remove_all(GF_AudioMixer *am);
+void gf_mixer_add_input(GF_AudioMixer *am, GF_AudioInterface *src);
+void gf_mixer_remove_input(GF_AudioMixer *am, GF_AudioInterface *src);
+void gf_mixer_lock(GF_AudioMixer *am, Bool lockIt);
+/*mix inputs in buffer, return number of bytes written to output*/
+u32 gf_mixer_get_output(GF_AudioMixer *am, void *buffer, u32 buffer_size);
+/*reconfig all sources if needed - returns TRUE if main audio config changed
+NOTE: this is called at each gf_mixer_get_output by the mixer. To call externally for audio hardware
+reconfiguration only*/
+Bool gf_mixer_reconfig(GF_AudioMixer *am);
+/*retrieves mixer cfg*/
+void gf_mixer_get_config(GF_AudioMixer *am, u32 *outSR, u32 *outCH, u32 *outBPS, u32 *outChCfg);
+/*called by audio renderer in case the hardware used a different setup than requested*/
+void gf_mixer_set_config(GF_AudioMixer *am, u32 outSR, u32 outCH, u32 outBPS, u32 ch_cfg);
+Bool gf_mixer_is_src_present(GF_AudioMixer *am, GF_AudioInterface *ifce);
+u32 gf_mixer_get_src_count(GF_AudioMixer *am);
+void gf_mixer_force_chanel_out(GF_AudioMixer *am, u32 num_channels);
+u32 gf_mixer_get_block_align(GF_AudioMixer *am);
+Bool gf_mixer_must_reconfig(GF_AudioMixer *am);
+Bool gf_mixer_empty(GF_AudioMixer *am);
+
+/*the audio renderer*/
+typedef struct _audio_render
+{
+	GF_AudioOutput *audio_out;
+
+	Bool disable_resync;
+	Bool disable_multichannel;
+
+	/*startup time (the audio renderer is used when present as the system clock)*/
+	u32 startTime;
+	/*frozen time counter if set*/
+	Bool Frozen;
+	u32 FreezeTime;
+	
+	/*final output*/
+	GF_AudioMixer *mixer;
+	Bool need_reconfig;
+	/*client*/
+	GF_User *user;
+
+	/*audio thread if output not self-threaded*/
+	GF_Thread *th;
+	/*thread state: 0: not intit, 1: running, 2: waiting for stop, 3: done*/
+	u32 audio_th_state;
+
+	u32 audio_delay, volume, pan;
+} GF_AudioRenderer;
+
+/*creates audio renderer*/
+GF_AudioRenderer *gf_sc_ar_load(GF_User *user);
+/*deletes audio renderer*/
+void gf_sc_ar_del(GF_AudioRenderer *ar);
+/*control audio renderer - CtrlType:
+	0: pause
+	1: resume
+	2: clean HW buffer and play
+*/
+void gf_sc_ar_control(GF_AudioRenderer *ar, u32 CtrlType);
+/*set volume and pan*/
+void gf_sc_ar_set_volume(GF_AudioRenderer *ar, u32 Volume);
+void gf_sc_ar_set_pan(GF_AudioRenderer *ar, u32 Balance);
+/*set audio priority*/
+void gf_sc_ar_set_priority(GF_AudioRenderer *ar, u32 priority);
+/*gets time in msec - this is the only clock used by the whole ESM system - depends on the audio driver*/
+u32 gf_sc_ar_get_clock(GF_AudioRenderer *ar);
+/*reset all input nodes*/
+void gf_sc_ar_reset(GF_AudioRenderer *ar);
+/*add audio node*/
+void gf_sc_ar_add_src(GF_AudioRenderer *ar, GF_AudioInterface *source);
+/*remove audio node*/
+void gf_sc_ar_remove_src(GF_AudioRenderer *ar, GF_AudioInterface *source);
+/*reconfig audio hardware if needed*/
+void gf_sc_ar_reconfig(GF_AudioRenderer *ar);
+u32 gf_sc_ar_get_delay(GF_AudioRenderer *ar);
+
+/*the sound node interface for intensity & spatialization*/
+typedef struct _soundinterface
+{
+	/*gets volume for each channel - vol = Fixed[6]. returns 1 if volume shall be changed (!= 1.0)
+	if NULL channels are always at full intensity*/
+	Bool (*GetChannelVolume)(GF_Node *owner, Fixed *vol);
+	/*get sound priority (0: min, 255: max) - used by mixer to determine*/
+	u8 (*GetPriority) (GF_Node *owner);
+	/*node owning the structure*/
+	GF_Node *owner;
+} GF_SoundInterface;
+
+/*audio common to AudioClip and AudioSource*/
+typedef struct
+{
+	GF_Node *owner;
+	GF_Compositor *compositor;
+	GF_AudioInterface input_ifce;
+	/*can be NULL if the audio node generates its output from other input*/
+	GF_MediaObject *stream;
+	/*object speed and intensity*/
+	Fixed speed, intensity;
+	Bool stream_finished;
+	Bool need_release;
+	MFURL url;
+	u32 is_open;
+	Bool is_muted;
+	Bool register_with_renderer, register_with_parent;
+
+	GF_SoundInterface *snd;
+} GF_AudioInput;
+/*setup interface with audio renderer - overwrite any functions needed after setup EXCEPT callback object*/
+void gf_sc_audio_setup(GF_AudioInput *ai, GF_Compositor *sr, GF_Node *node);
+/*open audio object*/
+GF_Err gf_sc_audio_open(GF_AudioInput *ai, MFURL *url, Double clipBegin, Double clipEnd);
+/*closes audio object*/
+void gf_sc_audio_stop(GF_AudioInput *ai);
+/*restarts audio object (cf note in MediaObj)*/
+void gf_sc_audio_restart(GF_AudioInput *ai);
+
+Bool gf_sc_audio_check_url(GF_AudioInput *ai, MFURL *url);
+
+/*base grouping audio node (nodes with several audio sources as children)*/
+#define AUDIO_GROUP_NODE	\
+	GF_AudioInput output;		\
+	void (*add_source)(struct _audio_group *_this, GF_AudioInput *src);	\
+
+typedef struct _audio_group
+{
+	AUDIO_GROUP_NODE
+} GF_AudioGroup;
+
+
+/*register audio node with parent audio renderer (mixer or main renderer)*/
+void gf_sc_audio_register(GF_AudioInput *ai, GF_TraverseState *tr_state);
+void gf_sc_audio_unregister(GF_AudioInput *ai);
+
+
+#ifndef GPAC_DISABLE_SVG
+GF_Err gf_term_get_mfurl_from_xlink(GF_Node *node, MFURL *mfurl);
+Fixed gf_sc_svg_convert_length_to_display(GF_Compositor *sr, SVG_Length *length);
+
+char *gf_term_resolve_xlink(GF_Node *node, char *the_url);
+#endif
+
+GF_Err compositor_2d_set_aspect_ratio(GF_Compositor *sr);
+void compositor_2d_set_user_transform(GF_Compositor *sr, Fixed zoom, Fixed tx, Fixed ty, Bool is_resize) ;
+GF_Err compositor_2d_get_video_access(GF_VisualManager *surf);
+void compositor_2d_release_video_access(GF_VisualManager *surf);
+Bool compositor_2d_draw_bitmap(GF_VisualManager *visual, GF_TraverseState *tr_state, struct _drawable_context *ctx, GF_ColorKey *col_key);
+GF_Rect compositor_2d_update_clipper(GF_TraverseState *tr_state, GF_Rect this_clip, Bool *need_restore, GF_Rect *original, Bool for_layer);
+
+Bool compositor_get_2d_plane_intersection(GF_Ray *ray, SFVec3f *res);
+
+void compositor_send_resize_event(GF_Compositor *compositor, Fixed old_z, Fixed old_tx, Fixed old_ty, Bool is_resize);
+
+void compositor_set_cache_memory(GF_Compositor *compositor, u32 memory);
+/*checks whether the background node is transparent or not*/
+Bool compositor_background_transparent(GF_Node *node);
+
+#ifndef GPAC_DISABLE_3D
+
+GF_Err compositor_3d_set_aspect_ratio(GF_Compositor *sr);
+GF_Camera *compositor_3d_get_camera(GF_Compositor *sr);
+void compositor_3d_reset_camera(GF_Compositor *sr);
+GF_Camera *compositor_layer3d_get_camera(GF_Node *node);
+void compositor_layer3d_bind_camera(GF_Node *node, Bool do_bind, u32 nav_value);
+void compositor_3d_draw_bitmap(struct _drawable *stack, DrawAspect2D *asp, GF_TraverseState *tr_state, Fixed width, Fixed height, Fixed bmp_scale_x, Fixed bmp_scale_y);
+
+GF_Err compositor_3d_get_screen_buffer(GF_Compositor *sr, GF_VideoSurface *fb, Bool depth_buffer);
+GF_Err compositor_3d_release_screen_buffer(GF_Compositor *sr, GF_VideoSurface *framebuffer);
+
+void gf_sc_load_opengl_extensions(GF_Compositor *sr);
+
+#endif
+
+Bool gf_sc_exec_event(GF_Compositor *sr, GF_Event *evt);
+void gf_sc_get_nodes_bounds(GF_Node *self, GF_ChildNodeItem *children, GF_TraverseState *tr_state, s32 *child_idx);
+
+
+void gf_sc_visual_register(GF_Compositor *sr, GF_VisualManager *surf);
+void gf_sc_visual_unregister(GF_Compositor *sr, GF_VisualManager *surf);
+Bool gf_sc_visual_is_registered(GF_Compositor *sr, GF_VisualManager *surf);
+
+Bool gf_sc_pick_in_clipper(GF_TraverseState *tr_state, GF_Rect *clip);
+
+void compositor_gradient_update(GF_TextureHandler *txh);
+void compositor_set_ar_scale(GF_Compositor *sr, Fixed scaleX, Fixed scaleY);
+
+/*reset focus if node being deleted has the focus - must be called for each focusable node (internally called for 2D & 3D drawable nodes)*/
+void gf_sc_check_focus_upon_destroy(GF_Node *n);
+
+#ifndef GPAC_DISABLE_SVG
+
+void compositor_svg_build_gradient_texture(GF_TextureHandler *txh);
+
+/*base routine fo all svg elements:
+	- check for conditional processing (requiredXXX, ...)
+	- apply animation and inheritance
+
+	returns 0 if the node shall not be traversed due to conditional processing
+*/
+Bool compositor_svg_traverse_base(GF_Node *node, SVGAllAttributes *all_atts, GF_TraverseState *tr_state, SVGPropertiesPointers *backup_props, u32 *backup_flags);
+Bool compositor_svg_is_display_off(SVGPropertiesPointers *props);
+void compositor_svg_apply_local_transformation(GF_TraverseState *tr_state, SVGAllAttributes *atts, GF_Matrix2D *backup_matrix_2d, GF_Matrix *backup_matrix);
+void compositor_svg_restore_parent_transformation(GF_TraverseState *tr_state, GF_Matrix2D *backup_matrix_2d, GF_Matrix *backup_matrix);
+
+void compositor_svg_traverse_children(GF_ChildNodeItem *children, GF_TraverseState *tr_state);
+
+Bool compositor_svg_evaluate_conditional(GF_Compositor *compositor, SVGAllAttributes *all_atts);
+
+/*returns the node associated with the given xlink - this is not always the target node of the xlink structure due
+to async restart of animation nodes*/
+GF_Node *compositor_svg_get_xlink_resource_node(GF_Node *node, XMLRI *xlink);
+
+#endif
+
+/*Text handling*/
+
+typedef struct _gf_font GF_Font;
+
+struct _gf_font 
+{
+	/*fonts are linked within the font manager*/
+	GF_Font *next;
+	/*list of glyphs in the font*/
+	GF_Glyph *glyph;
+
+	char *name;
+	u32 em_size;
+	u32 styles;
+	/*font uits in em size*/
+	s32 ascent, descent, underline, line_spacing, max_advance_h, max_advance_v;
+	s32 baseline;
+
+	/*only set for embedded font engines (SVG fonts)*/
+	GF_Font *(*get_alias)(void *udta);
+	GF_Err (*get_glyphs)(void *udta, const char *utf_string, u32 *glyph_ids_buffer, u32 *io_glyph_ids_buffer_size, const char *xml_lang, Bool *is_rtl);
+	GF_Glyph *(*load_glyph)(void *udta, u32 glyph_name);
+	void *udta;
+
+	Bool not_loaded;
+
+	struct _gf_ft_mgr *ft_mgr;
+	/*list of spans currently using the font - this is needed to allow for dynamic discard of the font*/
+	GF_List *spans;
+};
+
+enum 
+{
+	/*span direction is horizontal*/
+	GF_TEXT_SPAN_HORIZONTAL = 1,
+	/*span is underlined*/
+	GF_TEXT_SPAN_UNDERLINE = 1<<1,
+	/*span is fliped (coord systems with Y-axis pointing downwards like SVG)*/
+	GF_TEXT_SPAN_FLIP = 1<<2,
+	/*span is in the current text selection*/
+	GF_TEXT_SPAN_RIGHT_TO_LEFT = 1<<3,
+	/*span is in the current text selection*/
+	GF_TEXT_SPAN_SELECTED = 1<<4
+};
+
+typedef struct __text_span
+{
+	GF_Font *font;
+	
+	GF_Glyph **glyphs;
+	u32 nb_glyphs;
+
+	u32 flags;
+
+	Fixed font_size;
+
+	/*scale to apply to get to requested font size*/
+	Fixed font_scale;
+	GF_Rect bounds;
+
+	/*MPEG-4 span scaling (length & maxExtend)*/
+	Fixed x_scale, y_scale;
+	/*x (resp. y) offset in local coord system. Ignored if per-glyph dx (resp dy) are specified*/
+	Fixed off_x, off_y;
+
+	/*per-glyph positioning - when allocated, this is the same number as the glyphs*/
+	Fixed *dx, *dy, *rot;
+
+	/*span language*/
+//	const char *lang;
+
+	/*span texturing and 3D tools*/
+	struct _span_internal *ext;
+
+	/*SVG stuff :(*/
+	GF_Node *anchor;
+	GF_Node *user;
+} GF_TextSpan;
+
+GF_FontManager *gf_font_manager_new(GF_User *user);
+void gf_font_manager_del(GF_FontManager *fm);
+
+GF_Font *gf_font_manager_set_font(GF_FontManager *fm, char **alt_fonts, u32 nb_fonts, u32 styles);
+GF_Font *gf_font_manager_set_font_ex(GF_FontManager *fm, char **alt_fonts, u32 nb_fonts, u32 styles, Bool check_only);
+
+GF_TextSpan *gf_font_manager_create_span(GF_FontManager *fm, GF_Font *font, char *span, Fixed font_size, Bool needs_x_offset, Bool needs_y_offset, Bool needs_rotate, const char *lang, Bool fliped_text, u32 styles, GF_Node *user);
+void gf_font_manager_delete_span(GF_FontManager *fm, GF_TextSpan *tspan);
+
+GF_Err gf_font_manager_register_font(GF_FontManager *fm, GF_Font *font);
+GF_Err gf_font_manager_unregister_font(GF_FontManager *fm, GF_Font *font);
+
+void gf_font_manager_refresh_span_bounds(GF_TextSpan *span);
+GF_Path *gf_font_span_create_path(GF_TextSpan *span);
+
+
+void gf_font_spans_draw_2d(GF_List *spans, GF_TraverseState *tr_state, u32 hl_color, Bool force_texture_text, GF_Rect *bounds);
+void gf_font_spans_draw_3d(GF_List *spans, GF_TraverseState *tr_state, DrawAspect2D *asp, u32 text_hl, Bool force_texturing);
+void gf_font_spans_pick(GF_Node *node, GF_List *spans, GF_TraverseState *tr_state, GF_Rect *node_bounds, Bool use_dom_events, struct _drawable *drawable);
+void gf_font_spans_get_selection(GF_Node *node, GF_List *spans, GF_TraverseState *tr_state);
+
+GF_Font *gf_compositor_svg_set_font(GF_FontManager *fm, char *a_font, u32 styles, Bool check_only);
+
+
+GF_SceneGraph *gf_sc_get_subscene(GF_Node *inline_node);
+GF_Node *gf_sc_get_subscene_root(GF_Node *inline_node);
+
+#endif	/*_COMPOSITOR_DEV_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/internal/config.h b/tstools/DtsEdit/src/gpac/internal/config.h
new file mode 100644
index 0000000..207a982
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/internal/config.h
@@ -0,0 +1,5 @@
+/* Automatically generated by configure */
+#ifndef GF_CONFIG_H
+#define GF_CONFIG_H
+#define GPAC_CONFIG_WIN32
+#endif
diff --git a/tstools/DtsEdit/src/gpac/internal/config_static.h b/tstools/DtsEdit/src/gpac/internal/config_static.h
new file mode 100644
index 0000000..ee3d0d3
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/internal/config_static.h
@@ -0,0 +1,89 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *			Copyright (c) ENST 2008 - 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC 
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+#ifndef _GF_CONFIG_H_
+#define _GF_CONFIG_H_
+
+/*this file defines all common macros for libgpac compilation*/
+
+/*platform is big endian*/
+//#define GPAC_BIG_ENDIAN
+
+/*SSL enabled*/
+//#define GPAC_HAS_SSL
+
+/*spidermonkey enabled*/
+#define GPAC_HAS_SPIDERMONKEY
+
+/*libjpeg enabled*/
+#define GPAC_HAS_JPEG
+
+/*pnj enabled*/
+#define GPAC_HAS_PNG
+
+/*IPv6 enabled - for win32, this is evaluated at compile time, !! do not uncomment !!*/
+//#define GPAC_HAS_IPV6
+
+/*SVG disabled*/
+//#define GPAC_DISABLE_SVG
+
+/*3D compositor disabled*/
+//#define GPAC_DISABLE_3D
+
+/*use TinyGL instead of OpenGL*/
+//#define GPAC_USE_TINYGL
+
+/*use OpenGL ES instead of OpenGL*/
+//#define GPAC_USE_OGL_ES
+
+
+#if defined(_WIN32_WCE)
+
+/*use intel fixed-point*/
+//#define GPAC_USE_IGPP
+/*use intel fixed-point with high precision*/
+//#define GPAC_USE_IGPP_HP
+
+#if defined(GPAC_USE_IGPP) && defined(GPAC_USE_IGPP_HP)
+#error "Only one of GPAC_USE_IGPP and GPAC_USE_IGPP_HP can be defined"
+#endif
+
+
+#if !defined(GPAC_DISABLE_3D) && !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_OGL_ES)
+#define GPAC_USE_OGL_ES
+#endif
+
+#endif
+
+
+#if !defined(GPAC_USE_OGL_ES) && !defined(GPAC_USE_TINYGL)
+#define GPAC_HAS_GLU
+#endif
+
+
+
+#endif		/*_GF_CONFIG_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/internal/crypt_dev.h b/tstools/DtsEdit/src/gpac/internal/crypt_dev.h
new file mode 100644
index 0000000..8e00a5f
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/internal/crypt_dev.h
@@ -0,0 +1,158 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Crypto Tools sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _GF_CRYPT_DEV_H_
+#define _GF_CRYPT_DEV_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/crypt.h>
+
+/*the samllest version of the lib: only AES-128-CTR supported*/
+#define GPAC_CRYPT_ISMA_ONLY
+
+
+#if !defined(GPAC_CRYPT_ISMA_ONLY) && defined(GPAC_READ_ONLY)
+#define GPAC_CRYPT_ISMA_ONLY
+#endif
+
+typedef void (*mcryptfunc)(void*,void*);
+typedef GF_Err (*mcrypt_setkeystream)(void *, const void *, int, const void *, int);
+typedef GF_Err (*mcrypt_setkeyblock) (void *, const void *, int);
+typedef GF_Err (*mcrypt_docrypt) (void *, const void *, int);
+
+/*private - do not use*/
+typedef struct _tag_crypt_stream
+{
+	const char *algo_name;
+	u32 algo_version;
+	const char *mode_name;
+	u32 mode_version;
+
+	/* Holds the algorithm's internal key */
+	char *akey;
+	/* holds the mode's internal buffers */
+	char *abuf;
+	/* holds the key */
+	char *keyword_given;
+
+	/*all below are static vars for mode and algo - sizes are in bytes*/
+
+	/*modes access*/
+	GF_Err (*_init_mcrypt) (void *, void *, int, void *, int);
+	void (*_end_mcrypt) (void *);
+	GF_Err (*_mcrypt) (void *, void *, int, int, void *, mcryptfunc func, mcryptfunc func2);
+	GF_Err (*_mdecrypt) (void *, void *, int, int, void *, mcryptfunc func, mcryptfunc func2);
+	GF_Err (*_mcrypt_set_state) (void *, void *, int );
+	GF_Err (*_mcrypt_get_state) (void *, void *, int *);
+	/*algo access*/
+	void *a_encrypt;
+	void *a_decrypt;
+	void *a_set_key;
+
+	u32 algo_size;
+	u32 algo_block_size;
+	u32 key_size;
+	u32 num_key_sizes;
+	u32 key_sizes[MAX_KEY_SIZES];
+	u32 algo_IV_size;
+
+	u32 mode_size;
+	Bool is_block_algo, is_block_algo_mode, is_block_mode, has_IV;
+} GF_CryptStream;
+
+/*modes*/
+void gf_crypt_register_cbc(GF_Crypt *td);
+void gf_crypt_register_cfb(GF_Crypt *td);
+void gf_crypt_register_ctr(GF_Crypt *td);
+void gf_crypt_register_ecb(GF_Crypt *td);
+void gf_crypt_register_ncfb(GF_Crypt *td);
+void gf_crypt_register_nofb(GF_Crypt *td);
+void gf_crypt_register_ofb(GF_Crypt *td);
+void gf_crypt_register_stream(GF_Crypt *td);
+/*algos*/
+void gf_crypt_register_des(GF_Crypt *td);
+void gf_crypt_register_3des(GF_Crypt *td);
+void gf_crypt_register_rijndael_128(GF_Crypt *td);
+void gf_crypt_register_rijndael_192(GF_Crypt *td);
+void gf_crypt_register_rijndael_256(GF_Crypt *td);
+
+
+#define rotl32(x,n)   (((x) << ((u32)(n))) | ((x) >> (32 - (u32)(n))))
+#define rotr32(x,n)   (((x) >> ((u32)(n))) | ((x) << (32 - (u32)(n))))
+#define rotl16(x,n)   (((x) << ((u16)(n))) | ((x) >> (16 - (u16)(n))))
+#define rotr16(x,n)   (((x) >> ((u16)(n))) | ((x) << (16 - (u16)(n))))
+
+/* Use hardware rotations.. when available */
+#ifdef swap32
+# define byteswap32(x) swap32(x)
+#else
+# ifdef swap_32
+#  define byteswap32(x) swap_32(x)
+# else
+#  ifdef bswap_32
+#   define byteswap32(x) bswap_32(x)
+#  else
+#   define byteswap32(x)	((rotl32(x, 8) & 0x00ff00ff) | (rotr32(x, 8) & 0xff00ff00))
+#  endif
+# endif
+#endif
+
+#ifdef swap16
+# define byteswap16(x) swap16(x)
+#else
+# ifdef swap_16
+#  define byteswap16(x) swap_16(x)
+# else
+#  ifdef bswap_16
+#   define byteswap16(x) bswap_16(x)
+#  else
+#   define byteswap16(x)	((rotl16(x, 8) & 0x00ff) | (rotr16(x, 8) & 0xff00))
+#  endif
+# endif
+#endif
+
+GFINLINE static
+void memxor(unsigned char *o1, unsigned char *o2, int length)
+{
+	int i;
+
+	for (i = 0; i < length; i++) {
+		o1[i] ^= o2[i];
+	}
+	return;
+}
+
+
+#define Bzero(x, y) memset(x, 0, y)
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/*_GF_CRYPT_DEV_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/internal/ietf_dev.h b/tstools/DtsEdit/src/gpac/internal/ietf_dev.h
new file mode 100644
index 0000000..8e5f38b
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/internal/ietf_dev.h
@@ -0,0 +1,327 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / IETF RTP/RTSP/SDP sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef	_GF_IETF_DEV_H_
+#define _GF_IETF_DEV_H_
+
+#include <gpac/ietf.h>
+#include <gpac/thread.h>
+
+/*
+			RTP intern
+*/
+
+typedef struct
+{
+	/*version of the packet. Must be 2*/
+	u8 Version;
+	/*padding bits at the end of the payload*/
+	u8 Padding;
+	/*number of reports*/
+	u8 Count;
+	/*payload type of RTCP pck*/
+	u8 PayloadType;
+	/*The length of this RTCP packet in 32-bit words minus one including the header and any padding*/
+	u16 Length;
+	/*sync source identifier*/
+	u32 SSRC;
+} GF_RTCPHeader;	
+
+
+typedef struct __PRO_item
+{
+	struct __PRO_item *next;
+	u32 pck_seq_num;
+	void *pck;
+	u32 size;
+} GF_POItem;
+
+typedef struct __PO
+{
+	struct __PRO_item *in;
+	u32 head_seqnum;
+	u32 Count;
+	u32 MaxCount;
+	u32 IsInit;
+	u32 MaxDelay, LastTime;
+} GF_RTPReorder;
+
+/* creates new RTP reorderer
+	@MaxCount: forces automatic packet flush. 0 means no flush
+	@MaxDelay: is the max time in ms the queue will wait for a missing packet
+*/
+GF_RTPReorder *gf_rtp_reorderer_new(u32 MaxCount, u32 MaxDelay);
+void gf_rtp_reorderer_del(GF_RTPReorder *po);
+/*reset the Queue*/
+void gf_rtp_reorderer_reset(GF_RTPReorder *po);
+
+/*Adds a packet to the queue. Packet Data is memcopied*/
+GF_Err gf_rtp_reorderer_add(GF_RTPReorder *po, void *pck, u32 pck_size, u32 pck_seqnum);
+/*gets the output of the queue. Packet Data IS YOURS to delete*/
+void *gf_rtp_reorderer_get(GF_RTPReorder *po, u32 *pck_size);
+
+
+/*the RTP channel with both RTP and RTCP sockets and buffers
+each channel is identified by a control string given in RTSP Describe
+this control string is used with Darwin
+*/
+struct __tag_rtp_channel
+{
+	/*global transport info for the session*/
+	GF_RTSPTransport net_info;
+	
+	/*RTP CHANNEL*/
+	GF_Socket *rtp;
+	/*RTCP CHANNEL*/
+	GF_Socket *rtcp;
+	
+	/*RTP Packet reordering. Turned on/off during initialization. The library forces a 200 ms
+	max latency at the reordering queue*/
+	GF_RTPReorder *po;
+
+	/*RTCP report times*/
+	u32 last_report_time;
+	u32 next_report_time;
+
+	/*NAT keep-alive*/
+	u32 last_nat_keepalive_time, nat_keepalive_time_period;
+
+	
+	/*the seq number of the first packet as signaled by the server if any, or first
+	RTP SN received (RTP multicast)*/
+	u32 rtp_first_SN;
+	/*the TS of the associated first packet as signaled by the server if any, or first
+	RTP TS received (RTP multicast)*/
+	u32 rtp_time;
+	/*NPT from the rtp_time*/
+	u32 CurrentTime;
+	/*num loops of pck sn*/
+	u32 num_sn_loops;
+	/*some mapping info - we should support # payloads*/
+	u8 PayloadType;
+	u32 TimeScale;
+
+	/*static buffer for RTP sending*/
+	char *send_buffer;
+	u32 send_buffer_size;
+	u32 pck_sent_since_last_sr;
+	u32 last_pck_ts;
+	u32 last_pck_ntp_sec, last_pck_ntp_frac;
+	u32 num_pck_sent, num_payload_bytes;
+
+	/*RTCP info*/
+	char *s_name, *s_email, *s_location, *s_phone, *s_tool, *s_note, *s_priv;
+//	s8 first_rtp_pck;
+	s8 first_SR;
+	u32 SSRC;
+	u32 SenderSSRC;
+
+	u32 last_pck_sn;
+
+	char *CName;
+
+	u32 rtcp_bytes_sent;
+	/*total pck rcv*/
+	u32 tot_num_pck_rcv, tot_num_pck_expected;
+	/*stats since last SR*/
+	u32 last_num_pck_rcv, last_num_pck_expected, last_num_pck_loss;
+	/*jitter compute*/
+	u32 Jitter, ntp_init;
+	s32 last_deviance;	
+	/*NTP of last SR*/
+	u32 last_SR_NTP_sec, last_SR_NTP_frac;
+	/*RTP time at last SR as indicated in SR*/
+	u32 last_SR_rtp_time;
+	/*payload info*/
+	u32 total_pck, total_bytes;
+};
+
+/*gets UTC in the channel RTP timescale*/
+u32 gf_rtp_channel_time(GF_RTPChannel *ch);
+/*gets time in 1/65536 seconds (for reports)*/
+u32 gf_rtp_get_report_time();
+/*updates the time for the next report (SR, RR)*/
+void gf_rtp_get_next_report_time(GF_RTPChannel *ch);
+
+
+/*
+			RTSP intern
+*/
+
+#define GF_RTSP_DEFAULT_BUFFER		2048
+#define GF_RTSP_VERSION		"RTSP/1.0"
+
+/*macros for RTSP command and response formmating*/
+#define RTSP_WRITE_STEPALLOC	250
+
+#define RTSP_WRITE_ALLOC_STR(buf, buf_size, pos, str)		\
+	if (str) { \
+		if (strlen((const char *) str)+pos >= buf_size) {	\
+			buf_size += RTSP_WRITE_STEPALLOC;	\
+			buf = (char *) realloc(buf, buf_size);		\
+		}	\
+		strcpy(buf+pos, (const char *) str);		\
+		pos += strlen((const char *) str);		\
+	}\
+
+#define RTSP_WRITE_HEADER(buf, buf_size, pos, type, str)		\
+	if (str) { \
+		RTSP_WRITE_ALLOC_STR(buf, buf_size, pos, type);		\
+		RTSP_WRITE_ALLOC_STR(buf, buf_size, pos, ": ");		\
+		RTSP_WRITE_ALLOC_STR(buf, buf_size, pos, str);		\
+		RTSP_WRITE_ALLOC_STR(buf, buf_size, pos, "\r\n");		\
+	} \
+
+#define RTSP_WRITE_INT(buf, buf_size, pos, d, sig)		\
+	if (sig) { \
+		sprintf(temp, "%d", d);		\
+	} else { \
+		sprintf(temp, "%u", d);		\
+	}	\
+	RTSP_WRITE_ALLOC_STR(buf, buf_size, pos, temp);
+
+#define RTSP_WRITE_FLOAT(buf, buf_size, pos, d)		\
+	sprintf(temp, "%.4f", d);		\
+	RTSP_WRITE_ALLOC_STR(buf, buf_size, pos, temp);
+
+/*default packet size, but resize on the fly if needed*/
+#define RTSP_PCK_SIZE			6000
+#define RTSP_TCP_BUF_SIZE		0x10000ul
+
+
+typedef struct
+{
+	u8 rtpID;
+	u8 rtcpID;
+	void *ch_ptr;
+} GF_TCPChan;
+
+/**************************************
+		RTSP Session
+***************************************/
+struct _tag_rtsp_session
+{
+	/*service name (extracted from URL) ex: news/latenight.mp4, vod.mp4 ...*/
+	char *Service;	
+	/*server name (extracted from URL)*/
+	char *Server;
+	/*server port (extracted from URL)*/
+	u16 Port;
+
+	/*if RTSP is on UDP*/
+	u8 ConnectionType;
+	/*TCP interleaving ID*/
+	u8 InterID;
+	/*http tunnel*/
+	Bool HasTunnel;
+	GF_Socket *http;
+	char HTTP_Cookie[30];
+	u32 CookieRadLen;
+
+	/*RTSP CHANNEL*/
+	GF_Socket *connection;
+	u32 SockBufferSize;
+	/*needs connection*/
+	u32 NeedConnection;
+
+	/*the RTSP sequence number*/
+	u32 CSeq;
+	/*this is for aggregated request in order to check SeqNum*/
+	u32 NbPending;
+
+	/*RTSP sessionID, arbitrary length, alpha-numeric*/
+	const char *last_session_id;
+
+	/*RTSP STATE machine*/
+	u32 RTSP_State;
+	char RTSPLastRequest[40];
+
+	/*current buffer from TCP if any*/
+	char TCPBuffer[RTSP_TCP_BUF_SIZE];
+	u32 CurrentSize, CurrentPos;
+
+	/*RTSP interleaving*/
+	GF_Err (*RTSP_SignalData)(GF_RTSPSession *sess, void *chan, char *buffer, u32 bufferSize, Bool IsRTCP);
+	
+	/*buffer for pck reconstruction*/
+	char *rtsp_pck_buf;
+	u32 rtsp_pck_size;
+	u32 pck_start, payloadSize;
+
+	/*all RTP channels in an interleaved RTP on RTSP session*/
+	GF_List *TCPChannels;
+	/*thread-safe, full duplex library for PLAY and RECORD*/
+	GF_Mutex *mx;
+
+	char *MobileIP;	
+};
+
+GF_RTSPSession *gf_rtsp_session_new(char *sURL, u16 DefaultPort);
+
+/*check connection status*/
+GF_Err gf_rtsp_check_connection(GF_RTSPSession *sess);
+/*send data on RTSP*/
+GF_Err gf_rtsp_send_data(GF_RTSPSession *sess, char *buffer, u32 Size);
+
+/* 
+			Common RTSP tools
+*/
+
+/*locate body-start and body size in response/commands*/
+void gf_rtsp_get_body_info(GF_RTSPSession *sess, u32 *body_start, u32 *body_size);
+/*read TCP until a full command/response is received*/
+GF_Err gf_rtsp_read_reply(GF_RTSPSession *sess);
+/*fill the TCP buffer*/
+GF_Err gf_rtsp_fill_buffer(GF_RTSPSession *sess);
+/*force a fill on TCP buffer - used for de-interleaving and TCP-fragmented RTSP messages*/
+GF_Err gf_rtsp_refill_buffer(GF_RTSPSession *sess);
+/*parses a transport string and returns a transport structure*/
+GF_RTSPTransport *gf_rtsp_transport_parse(char *buffer);
+/*parsing of header for com and rsp*/
+GF_Err gf_rtsp_parse_header(char *buffer, u32 BufferSize, u32 BodyStart, GF_RTSPCommand *com, GF_RTSPResponse *rsp);
+void gf_rtsp_set_command_value(GF_RTSPCommand *com, char *Header, char *Value);
+void gf_rtsp_set_response_value(GF_RTSPResponse *rsp, char *Header, char *Value);
+/*deinterleave a data packet*/
+GF_Err gf_rtsp_set_deinterleave(GF_RTSPSession *sess);
+/*start session through HTTP tunnel (QTSS)*/
+GF_Err gf_rtsp_http_tunnel_start(GF_RTSPSession *sess, char *UserAgent);
+
+
+/*packetization routines*/
+GF_Err gp_rtp_builder_do_mpeg4(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
+GF_Err gp_rtp_builder_do_h263(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
+GF_Err gp_rtp_builder_do_amr(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
+GF_Err gp_rtp_builder_do_mpeg12_video(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
+GF_Err gp_rtp_builder_do_mpeg12_audio(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
+GF_Err gp_rtp_builder_do_tx3g(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize, u32 duration, u8 descIndex);
+GF_Err gp_rtp_builder_do_avc(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
+GF_Err gp_rtp_builder_do_qcelp(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
+GF_Err gp_rtp_builder_do_smv(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
+GF_Err gp_rtp_builder_do_latm(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize, u32 duration); 
+GF_Err gp_rtp_builder_do_dims(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize, u32 duration);
+GF_Err gp_rtp_builder_do_ac3(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
+
+
+#endif	/*_GF_IETF_DEV_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/internal/isomedia_dev.h b/tstools/DtsEdit/src/gpac/internal/isomedia_dev.h
new file mode 100644
index 0000000..c00df4b
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/internal/isomedia_dev.h
@@ -0,0 +1,3140 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					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. 
+ *
+ */
+
+#ifndef _GF_ISOMEDIA_DEV_H_
+#define _GF_ISOMEDIA_DEV_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/isomedia.h>
+
+
+//the default size is 64, cause we need to handle large boxes...
+#define GF_ISOM_BOX			\
+	u32 type;			\
+	u64 size;			\
+
+#define GF_ISOM_FULL_BOX		\
+	GF_ISOM_BOX			\
+	u8 version;			\
+	u32 flags;			\
+
+#define GF_ISOM_UUID_BOX	\
+	GF_ISOM_BOX			\
+	u8 uuid[16];		\
+
+typedef struct
+{
+	GF_ISOM_BOX
+} GF_Box;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+} GF_FullBox;
+
+typedef struct
+{
+	GF_ISOM_UUID_BOX
+} GF_UUIDBox;
+
+/*constructor*/
+GF_Box *gf_isom_box_new(u32 boxType);
+
+GF_Err gf_isom_box_write(GF_Box *ptr, GF_BitStream *bs);
+GF_Err gf_isom_box_read(GF_Box *ptr, GF_BitStream *bs);
+void gf_isom_box_del(GF_Box *ptr);
+GF_Err gf_isom_box_size(GF_Box *ptr);
+
+GF_Err gf_isom_parse_box(GF_Box **outBox, GF_BitStream *bs);
+GF_Err gf_isom_read_box_list(GF_Box *s, GF_BitStream *bs, GF_Err (*add_box)(GF_Box *par, GF_Box *b));
+GF_Err gf_isom_read_box_list_ex(GF_Box *parent, GF_BitStream *bs, GF_Err (*add_box)(GF_Box *par, GF_Box *b), u32 parent_type);
+
+GF_Err gf_isom_box_get_size(GF_Box *ptr);
+GF_Err gf_isom_full_box_get_size(GF_Box *ptr);
+GF_Err gf_isom_box_write_header(GF_Box *ptr, GF_BitStream *bs);
+GF_Err gf_isom_full_box_read(GF_Box *ptr, GF_BitStream *bs);
+GF_Err gf_isom_full_box_write(GF_Box *s, GF_BitStream *bs);
+void gf_isom_full_box_init(GF_Box *ptr);
+void gf_isom_box_array_del(GF_List *boxList);
+GF_Err gf_isom_box_array_write(GF_Box *parent, GF_List *list, GF_BitStream *bs);
+GF_Err gf_isom_box_array_size(GF_Box *parent, GF_List *list);
+
+
+enum
+{
+	GF_ISOM_BOX_TYPE_CO64	= GF_4CC( 'c', 'o', '6', '4' ),
+	GF_ISOM_BOX_TYPE_STCO	= GF_4CC( 's', 't', 'c', 'o' ),
+	GF_ISOM_BOX_TYPE_CRHD	= GF_4CC( 'c', 'r', 'h', 'd' ),
+	GF_ISOM_BOX_TYPE_CTTS	= GF_4CC( 'c', 't', 't', 's' ),
+	GF_ISOM_BOX_TYPE_CPRT	= GF_4CC( 'c', 'p', 'r', 't' ),
+	GF_ISOM_BOX_TYPE_CHPL	= GF_4CC( 'c', 'h', 'p', 'l' ),
+	GF_ISOM_BOX_TYPE_URL	= GF_4CC( 'u', 'r', 'l', ' ' ),
+	GF_ISOM_BOX_TYPE_URN	= GF_4CC( 'u', 'r', 'n', ' ' ),
+	GF_ISOM_BOX_TYPE_DINF	= GF_4CC( 'd', 'i', 'n', 'f' ),
+	GF_ISOM_BOX_TYPE_DREF	= GF_4CC( 'd', 'r', 'e', 'f' ),
+	GF_ISOM_BOX_TYPE_STDP	= GF_4CC( 's', 't', 'd', 'p' ),
+	GF_ISOM_BOX_TYPE_EDTS	= GF_4CC( 'e', 'd', 't', 's' ),
+	GF_ISOM_BOX_TYPE_ELST	= GF_4CC( 'e', 'l', 's', 't' ),
+	GF_ISOM_BOX_TYPE_UUID	= GF_4CC( 'u', 'u', 'i', 'd' ),
+	GF_ISOM_BOX_TYPE_FREE	= GF_4CC( 'f', 'r', 'e', 'e' ),
+	GF_ISOM_BOX_TYPE_HDLR	= GF_4CC( 'h', 'd', 'l', 'r' ),
+	GF_ISOM_BOX_TYPE_GMHD	= GF_4CC( 'g', 'm', 'h', 'd' ),
+	GF_ISOM_BOX_TYPE_HMHD	= GF_4CC( 'h', 'm', 'h', 'd' ),
+	GF_ISOM_BOX_TYPE_HINT	= GF_4CC( 'h', 'i', 'n', 't' ),
+	GF_ISOM_BOX_TYPE_MDIA	= GF_4CC( 'm', 'd', 'i', 'a' ),
+	GF_ISOM_BOX_TYPE_MDAT	= GF_4CC( 'm', 'd', 'a', 't' ),
+	GF_ISOM_BOX_TYPE_MDHD	= GF_4CC( 'm', 'd', 'h', 'd' ),
+	GF_ISOM_BOX_TYPE_MINF	= GF_4CC( 'm', 'i', 'n', 'f' ),
+	GF_ISOM_BOX_TYPE_MOOV	= GF_4CC( 'm', 'o', 'o', 'v' ),
+	GF_ISOM_BOX_TYPE_MVHD	= GF_4CC( 'm', 'v', 'h', 'd' ),
+	GF_ISOM_BOX_TYPE_STSD	= GF_4CC( 's', 't', 's', 'd' ),
+	GF_ISOM_BOX_TYPE_STSZ	= GF_4CC( 's', 't', 's', 'z' ),
+	GF_ISOM_BOX_TYPE_STZ2	= GF_4CC( 's', 't', 'z', '2' ),
+	GF_ISOM_BOX_TYPE_STBL	= GF_4CC( 's', 't', 'b', 'l' ),
+	GF_ISOM_BOX_TYPE_STSC	= GF_4CC( 's', 't', 's', 'c' ),
+	GF_ISOM_BOX_TYPE_STSH	= GF_4CC( 's', 't', 's', 'h' ),
+	GF_ISOM_BOX_TYPE_SKIP	= GF_4CC( 's', 'k', 'i', 'p' ),
+	GF_ISOM_BOX_TYPE_SMHD	= GF_4CC( 's', 'm', 'h', 'd' ),
+	GF_ISOM_BOX_TYPE_STSS	= GF_4CC( 's', 't', 's', 's' ),
+	GF_ISOM_BOX_TYPE_STTS	= GF_4CC( 's', 't', 't', 's' ),
+	GF_ISOM_BOX_TYPE_TRAK	= GF_4CC( 't', 'r', 'a', 'k' ),
+	GF_ISOM_BOX_TYPE_TKHD	= GF_4CC( 't', 'k', 'h', 'd' ),
+	GF_ISOM_BOX_TYPE_TREF	= GF_4CC( 't', 'r', 'e', 'f' ),
+	GF_ISOM_BOX_TYPE_UDTA	= GF_4CC( 'u', 'd', 't', 'a' ),
+	GF_ISOM_BOX_TYPE_VMHD	= GF_4CC( 'v', 'm', 'h', 'd' ),
+	GF_ISOM_BOX_TYPE_FTYP	= GF_4CC( 'f', 't', 'y', 'p' ),
+	GF_ISOM_BOX_TYPE_FADB	= GF_4CC( 'p', 'a', 'd', 'b' ),
+	GF_ISOM_BOX_TYPE_PDIN	= GF_4CC( 'p', 'd', 'i', 'n' ),
+	GF_ISOM_BOX_TYPE_SDTP	= GF_4CC( 's', 'd', 't', 'p' ),
+
+#ifndef	GPAC_ISOM_NO_FRAGMENTS
+	/*Movie Fragments*/
+	GF_ISOM_BOX_TYPE_MVEX	= GF_4CC( 'm', 'v', 'e', 'x' ),
+	GF_ISOM_BOX_TYPE_MEHD	= GF_4CC( 'm', 'e', 'h', 'd' ),
+	GF_ISOM_BOX_TYPE_TREX	= GF_4CC( 't', 'r', 'e', 'x' ),
+	GF_ISOM_BOX_TYPE_MOOF	= GF_4CC( 'm', 'o', 'o', 'f' ),
+	GF_ISOM_BOX_TYPE_MFHD	= GF_4CC( 'm', 'f', 'h', 'd' ),
+	GF_ISOM_BOX_TYPE_TRAF	= GF_4CC( 't', 'r', 'a', 'f' ),
+	GF_ISOM_BOX_TYPE_TFHD	= GF_4CC( 't', 'f', 'h', 'd' ),
+	GF_ISOM_BOX_TYPE_TRUN	= GF_4CC( 't', 'r', 'u', 'n' ),
+#endif
+
+	/*MP4 extensions*/
+	GF_ISOM_BOX_TYPE_DPND	= GF_4CC( 'd', 'p', 'n', 'd' ),
+	GF_ISOM_BOX_TYPE_IODS	= GF_4CC( 'i', 'o', 'd', 's' ),
+	GF_ISOM_BOX_TYPE_ESDS	= GF_4CC( 'e', 's', 'd', 's' ),
+	GF_ISOM_BOX_TYPE_MPOD	= GF_4CC( 'm', 'p', 'o', 'd' ),
+	GF_ISOM_BOX_TYPE_SYNC	= GF_4CC( 's', 'y', 'n', 'c' ),
+	GF_ISOM_BOX_TYPE_IPIR	= GF_4CC( 'i', 'p', 'i', 'r' ),
+	GF_ISOM_BOX_TYPE_SDHD	= GF_4CC( 's', 'd', 'h', 'd' ),
+	GF_ISOM_BOX_TYPE_ODHD	= GF_4CC( 'o', 'd', 'h', 'd' ),
+	GF_ISOM_BOX_TYPE_NMHD	= GF_4CC( 'n', 'm', 'h', 'd' ),
+	GF_ISOM_BOX_TYPE_MP4S	= GF_4CC( 'm', 'p', '4', 's' ),
+	GF_ISOM_BOX_TYPE_MP4A	= GF_4CC( 'm', 'p', '4', 'a' ),
+	GF_ISOM_BOX_TYPE_MP4V	= GF_4CC( 'm', 'p', '4', 'v' ),
+
+	/*AVC / H264 extension*/
+	GF_ISOM_BOX_TYPE_AVCC	= GF_4CC( 'a', 'v', 'c', 'C' ),
+	GF_ISOM_BOX_TYPE_BTRT	= GF_4CC( 'b', 't', 'r', 't' ),
+	GF_ISOM_BOX_TYPE_M4DS	= GF_4CC( 'm', '4', 'd', 's' ),
+	GF_ISOM_BOX_TYPE_AVC1	= GF_4CC( 'a', 'v', 'c', '1' ),
+	GF_ISOM_BOX_TYPE_PASP	= GF_4CC( 'p', 'a', 's', 'p' ),
+
+	/*3GPP extensions*/
+	GF_ISOM_BOX_TYPE_DAMR	= GF_4CC( 'd', 'a', 'm', 'r' ),
+	GF_ISOM_BOX_TYPE_D263	= GF_4CC( 'd', '2', '6', '3' ),
+	GF_ISOM_BOX_TYPE_DEVC	= GF_4CC( 'd', 'e', 'v', 'c' ),
+	GF_ISOM_BOX_TYPE_DQCP	= GF_4CC( 'd', 'q', 'c', 'p' ),
+	GF_ISOM_BOX_TYPE_DSMV	= GF_4CC( 'd', 's', 'm', 'v' ),
+	GF_ISOM_BOX_TYPE_TSEL	= GF_4CC( 't', 's', 'e', 'l' ),
+
+	/*3GPP text / MPEG-4 StreamingText*/
+	GF_ISOM_BOX_TYPE_FTAB	= GF_4CC( 'f', 't', 'a', 'b' ),
+	GF_ISOM_BOX_TYPE_TX3G	= GF_4CC( 't', 'x', '3', 'g' ),
+	GF_ISOM_BOX_TYPE_STYL	= GF_4CC( 's', 't', 'y', 'l' ),
+	GF_ISOM_BOX_TYPE_HLIT	= GF_4CC( 'h', 'l', 'i', 't' ),
+	GF_ISOM_BOX_TYPE_HCLR	= GF_4CC( 'h', 'c', 'l', 'r' ),
+	GF_ISOM_BOX_TYPE_KROK	= GF_4CC( 'k', 'r', 'o', 'k' ),
+	GF_ISOM_BOX_TYPE_DLAY	= GF_4CC( 'd', 'l', 'a', 'y' ),
+	GF_ISOM_BOX_TYPE_HREF	= GF_4CC( 'h', 'r', 'e', 'f' ),
+	GF_ISOM_BOX_TYPE_TBOX	= GF_4CC( 't', 'b', 'o', 'x' ),
+	GF_ISOM_BOX_TYPE_BLNK	= GF_4CC( 'b', 'l', 'n', 'k' ),
+	GF_ISOM_BOX_TYPE_TWRP	= GF_4CC( 't', 'w', 'r', 'p' ),
+
+	/* ISO Base Media File Format Extensions for MPEG-21 */
+	GF_ISOM_BOX_TYPE_META	= GF_4CC( 'm', 'e', 't', 'a' ),
+	GF_ISOM_BOX_TYPE_XML	= GF_4CC( 'x', 'm', 'l', ' ' ),
+	GF_ISOM_BOX_TYPE_BXML	= GF_4CC( 'b', 'x', 'm', 'l' ),
+	GF_ISOM_BOX_TYPE_ILOC	= GF_4CC( 'i', 'l', 'o', 'c' ),
+	GF_ISOM_BOX_TYPE_PITM	= GF_4CC( 'p', 'i', 't', 'm' ),
+	GF_ISOM_BOX_TYPE_IPRO	= GF_4CC( 'i', 'p', 'r', 'o' ),
+	GF_ISOM_BOX_TYPE_INFE	= GF_4CC( 'i', 'n', 'f', 'e' ),
+	GF_ISOM_BOX_TYPE_IINF	= GF_4CC( 'i', 'i', 'n', 'f' ),
+	GF_ISOM_BOX_TYPE_ENCA	= GF_4CC( 'e', 'n', 'c', 'a' ),
+	GF_ISOM_BOX_TYPE_ENCV	= GF_4CC( 'e', 'n', 'c', 'v' ),
+	GF_ISOM_BOX_TYPE_ENCT	= GF_4CC( 'e', 'n', 'c', 't' ),
+	GF_ISOM_BOX_TYPE_ENCS	= GF_4CC( 'e', 'n', 'c', 's' ),
+	GF_ISOM_BOX_TYPE_SINF	= GF_4CC( 's', 'i', 'n', 'f' ),
+	GF_ISOM_BOX_TYPE_FRMA	= GF_4CC( 'f', 'r', 'm', 'a' ),
+	GF_ISOM_BOX_TYPE_SCHM	= GF_4CC( 's', 'c', 'h', 'm' ),
+	GF_ISOM_BOX_TYPE_SCHI	= GF_4CC( 's', 'c', 'h', 'i' ),
+
+	GF_ISOM_BOX_TYPE_METX	= GF_4CC( 'm', 'e', 't', 'x' ),
+	GF_ISOM_BOX_TYPE_METT	= GF_4CC( 'm', 'e', 't', 't' ),
+
+	/* ISMA 1.0 Encryption and Authentication V 1.0 */
+	GF_ISOM_BOX_TYPE_IKMS	= GF_4CC( 'i', 'K', 'M', 'S' ),
+	GF_ISOM_BOX_TYPE_ISFM	= GF_4CC( 'i', 'S', 'F', 'M' ),
+
+	/* Hinting boxes */
+	GF_ISOM_BOX_TYPE_RTP_STSD	= GF_4CC( 'r', 't', 'p', ' ' ),
+	GF_ISOM_BOX_TYPE_HNTI	= GF_4CC( 'h', 'n', 't', 'i' ),
+	GF_ISOM_BOX_TYPE_RTP	= GF_4CC( 'r', 't', 'p', ' ' ),
+	GF_ISOM_BOX_TYPE_SDP	= GF_4CC( 's', 'd', 'p', ' ' ),
+	GF_ISOM_BOX_TYPE_HINF	= GF_4CC( 'h', 'i', 'n', 'f' ),
+	GF_ISOM_BOX_TYPE_NAME	= GF_4CC( 'n', 'a', 'm', 'e' ),
+	GF_ISOM_BOX_TYPE_TRPY	= GF_4CC( 't', 'r', 'p', 'y' ),
+	GF_ISOM_BOX_TYPE_NUMP	= GF_4CC( 'n', 'u', 'm', 'p' ),
+	GF_ISOM_BOX_TYPE_TOTL	= GF_4CC( 't', 'o', 't', 'l' ),
+	GF_ISOM_BOX_TYPE_NPCK	= GF_4CC( 'n', 'p', 'c', 'k' ),
+	GF_ISOM_BOX_TYPE_TPYL	= GF_4CC( 't', 'p', 'y', 'l' ),
+	GF_ISOM_BOX_TYPE_TPAY	= GF_4CC( 't', 'p', 'a', 'y' ),
+	GF_ISOM_BOX_TYPE_MAXR	= GF_4CC( 'm', 'a', 'x', 'r' ),
+	GF_ISOM_BOX_TYPE_DMED	= GF_4CC( 'd', 'm', 'e', 'd' ),
+	GF_ISOM_BOX_TYPE_DIMM	= GF_4CC( 'd', 'i', 'm', 'm' ),
+	GF_ISOM_BOX_TYPE_DREP	= GF_4CC( 'd', 'r', 'e', 'p' ),
+	GF_ISOM_BOX_TYPE_TMIN	= GF_4CC( 't', 'm', 'i', 'n' ),
+	GF_ISOM_BOX_TYPE_TMAX	= GF_4CC( 't', 'm', 'a', 'x' ),
+	GF_ISOM_BOX_TYPE_PMAX	= GF_4CC( 'p', 'm', 'a', 'x' ),
+	GF_ISOM_BOX_TYPE_DMAX	= GF_4CC( 'd', 'm', 'a', 'x' ),
+	GF_ISOM_BOX_TYPE_PAYT	= GF_4CC( 'p', 'a', 'y', 't' ),
+	GF_ISOM_BOX_TYPE_RELY	= GF_4CC( 'r', 'e', 'l', 'y' ),
+	GF_ISOM_BOX_TYPE_TIMS	= GF_4CC( 't', 'i', 'm', 's' ),
+	GF_ISOM_BOX_TYPE_TSRO	= GF_4CC( 't', 's', 'r', 'o' ),
+	GF_ISOM_BOX_TYPE_SNRO	= GF_4CC( 's', 'n', 'r', 'o' ),
+	GF_ISOM_BOX_TYPE_RTPO	= GF_4CC( 'r', 't', 'p', 'o' ),
+	
+	/*internal type for track references*/
+	GF_ISOM_BOX_TYPE_REFT	= GF_4CC( 'R', 'E', 'F', 'T' ),
+
+	/* Apple extensions */
+
+	GF_ISOM_BOX_TYPE_ILST	= GF_4CC( 'i', 'l', 's', 't' ),
+	GF_ISOM_BOX_TYPE_0xA9NAM	= GF_4CC( 0xA9, 'n', 'a', 'm' ),
+	GF_ISOM_BOX_TYPE_0xA9CMT	= GF_4CC( 0xA9, 'c', 'm', 't' ),
+	GF_ISOM_BOX_TYPE_0xA9DAY	= GF_4CC( 0xA9, 'd', 'a', 'y' ),
+	GF_ISOM_BOX_TYPE_0xA9ART	= GF_4CC( 0xA9, 'A', 'R', 'T' ),
+	GF_ISOM_BOX_TYPE_0xA9TRK	= GF_4CC( 0xA9, 't', 'r', 'k' ),
+	GF_ISOM_BOX_TYPE_0xA9ALB	= GF_4CC( 0xA9, 'a', 'l', 'b' ),
+	GF_ISOM_BOX_TYPE_0xA9COM	= GF_4CC( 0xA9, 'c', 'o', 'm' ),
+	GF_ISOM_BOX_TYPE_0xA9WRT	= GF_4CC( 0xA9, 'w', 'r', 't' ),
+	GF_ISOM_BOX_TYPE_0xA9TOO	= GF_4CC( 0xA9, 't', 'o', 'o' ),
+	GF_ISOM_BOX_TYPE_0xA9CPY	= GF_4CC( 0xA9, 'c', 'p', 'y' ),
+	GF_ISOM_BOX_TYPE_0xA9DES	= GF_4CC( 0xA9, 'd', 'e', 's' ),
+	GF_ISOM_BOX_TYPE_0xA9GEN	= GF_4CC( 0xA9, 'g', 'e', 'n' ),
+	GF_ISOM_BOX_TYPE_0xA9GRP	= GF_4CC( 0xA9, 'g', 'r', 'p' ),
+	GF_ISOM_BOX_TYPE_0xA9ENC	= GF_4CC( 0xA9, 'e', 'n', 'c' ),
+	GF_ISOM_BOX_TYPE_aART		= GF_4CC( 'a', 'A', 'R', 'T' ),
+	GF_ISOM_BOX_TYPE_PGAP = GF_4CC( 'p', 'g', 'a', 'p' ),
+	GF_ISOM_BOX_TYPE_GNRE	= GF_4CC( 'g', 'n', 'r', 'e' ),
+	GF_ISOM_BOX_TYPE_DISK	= GF_4CC( 'd', 'i', 's', 'k' ),
+	GF_ISOM_BOX_TYPE_TRKN	= GF_4CC( 't', 'r', 'k', 'n' ),
+	GF_ISOM_BOX_TYPE_TMPO	= GF_4CC( 't', 'm', 'p', 'o' ),
+	GF_ISOM_BOX_TYPE_CPIL	= GF_4CC( 'c', 'p', 'i', 'l' ),
+	GF_ISOM_BOX_TYPE_COVR	= GF_4CC( 'c', 'o', 'v', 'r' ),
+	GF_ISOM_BOX_TYPE_iTunesSpecificInfo	= GF_4CC( '-', '-', '-', '-' ),
+	GF_ISOM_BOX_TYPE_DATA	= GF_4CC( 'd', 'a', 't', 'a' ),
+
+	GF_ISOM_HANDLER_TYPE_MDIR	= GF_4CC( 'm', 'd', 'i', 'r' ),
+	GF_ISOM_BOX_TYPE_CHAP	= GF_4CC( 'c', 'h', 'a', 'p' ),
+	
+	/*OMA (P)DCF boxes*/
+	GF_ISOM_BOX_TYPE_OHDR	= GF_4CC( 'o', 'h', 'd', 'r' ),
+	GF_ISOM_BOX_TYPE_GRPI	= GF_4CC( 'g', 'r', 'p', 'i' ),
+	GF_ISOM_BOX_TYPE_MDRI	= GF_4CC( 'm', 'd', 'r', 'i' ),
+	GF_ISOM_BOX_TYPE_ODTT	= GF_4CC( 'o', 'd', 't', 't' ),
+	GF_ISOM_BOX_TYPE_ODRB	= GF_4CC( 'o', 'd', 'r', 'b' ),
+	GF_ISOM_BOX_TYPE_ODKM	= GF_4CC( 'o', 'd', 'k', 'm' ),
+	GF_ISOM_BOX_TYPE_ODAF	= GF_4CC( 'o', 'd', 'a', 'f' ),
+
+	/*3GPP DIMS */
+	GF_ISOM_BOX_TYPE_DIMS	= GF_4CC( 'd', 'i', 'm', 's' ),
+	GF_ISOM_BOX_TYPE_DIMC	= GF_4CC( 'd', 'i', 'm', 'C' ),
+	GF_ISOM_BOX_TYPE_DIST	= GF_4CC( 'd', 'i', 'S', 'T' ),
+
+
+	GF_ISOM_BOX_TYPE_AC3	= GF_4CC( 'a', 'c', '-', '3' ),
+	GF_ISOM_BOX_TYPE_DAC3	= GF_4CC( 'd', 'a', 'c', '3' ),
+
+	/*ALL INTERNAL BOXES - NEVER WRITTEN TO FILE!!*/
+
+	/*generic handlers*/
+	GF_ISOM_BOX_TYPE_GNRM	= GF_4CC( 'g', 'n', 'r', 'm' ),
+	GF_ISOM_BOX_TYPE_GNRV	= GF_4CC( 'g', 'n', 'r', 'v' ),
+	GF_ISOM_BOX_TYPE_GNRA	= GF_4CC( 'g', 'n', 'r', 'a' ),
+	/*storage of AU fragments (for MPEG-4 visual resync marker (video packets), located in stbl.*/
+	GF_ISOM_BOX_TYPE_STSF	=  GF_4CC( 'S', 'T', 'S', 'F' ),
+	/*base constructor of all hint formats (currently only RTP uses it)*/
+	GF_ISOM_BOX_TYPE_GHNT	= GF_4CC( 'g', 'h', 'n', 't' ),
+	/*for compatibility with old files hinted for DSS - needs special parsing*/
+	GF_ISOM_BOX_TYPE_VOID	= GF_4CC( 'V', 'O', 'I', 'D' ),
+};
+
+
+typedef struct
+{
+	GF_ISOM_BOX
+	/*note: the data is NEVER loaded to the mdat in this lib*/
+	u64 dataSize;
+	char *data;
+} GF_MediaDataBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	char *data;
+	u32 dataSize;
+} GF_UnknownBox;
+
+typedef struct
+{
+	GF_ISOM_UUID_BOX
+	char *data;
+	u32 dataSize;
+} GF_UnknownUUIDBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u64 creationTime;
+	u64 modificationTime;
+	u32 timeScale;
+	u64 duration;
+	u32 nextTrackID;
+	u32 preferredRate;
+	u16 preferredVolume;
+	char reserved[10];
+	u32 matrixA;
+	u32 matrixB;
+	u32 matrixU;
+	u32 matrixC;
+	u32 matrixD;
+	u32 matrixV;
+	u32 matrixW;
+	u32 matrixX;
+	u32 matrixY;
+	u32 previewTime;
+	u32 previewDuration;
+	u32 posterTime;
+	u32 selectionTime;
+	u32 selectionDuration;
+	u32 currentTime;
+} GF_MovieHeaderBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	GF_Descriptor *descriptor;
+} GF_ObjectDescriptorBox;
+
+/*used for entry list*/
+typedef struct
+{
+	u64 segmentDuration;
+	s64 mediaTime;
+	u32 mediaRate;
+} GF_EdtsEntry;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	GF_List *entryList;
+} GF_EditListBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	GF_EditListBox *editList;
+} GF_EditBox;
+
+
+/*used to classify boxes in the UserData GF_Box*/
+typedef struct
+{
+	u32 boxType;
+	u8 uuid[16];
+	GF_List *boxList;
+} GF_UserDataMap;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	GF_List *recordList;
+} GF_UserDataBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	GF_MovieHeaderBox *mvhd;
+	GF_ObjectDescriptorBox *iods;
+	GF_UserDataBox *udta;
+#ifndef	GPAC_ISOM_NO_FRAGMENTS
+	struct __tag_mvex_box *mvex;
+#endif
+	/*meta box if any*/
+	struct __tag_meta_box *meta;
+	/*track boxes*/
+	GF_List *trackList;
+	/*other boxes*/
+	GF_List *boxes;
+
+	GF_ISOFile *mov;
+
+} GF_MovieBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u64 creationTime;
+	u64 modificationTime;
+	u32 trackID;
+	u32 reserved1;
+	u64 duration;
+	u32 reserved2[2];
+	u16 layer;
+	u16 alternate_group;
+	u16 volume;
+	u16 reserved3;
+	u32 matrix[9];
+	u32 width, height;
+} GF_TrackHeaderBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	GF_List *boxList;
+} GF_TrackReferenceBox;
+
+
+
+typedef struct
+{
+	GF_ISOM_BOX
+	GF_UserDataBox *udta;
+	GF_TrackHeaderBox *Header;
+	struct __tag_media_box *Media;
+	GF_EditBox *editBox;
+	GF_TrackReferenceBox *References;
+	/*meta box if any*/
+	struct __tag_meta_box *meta;
+	/*other*/
+	GF_List *boxes;
+
+	GF_MovieBox *moov;
+	/*private for media padding*/
+	u32 padding_bytes;
+	/*private for editing*/
+	char *name;
+	/*private for editing*/
+	Bool is_unpacked;
+} GF_TrackBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u64 creationTime;
+	u64 modificationTime;
+	u32 timeScale;
+	u64 duration;
+	char packedLanguage[4];
+	u16 reserved;
+} GF_MediaHeaderBox;
+
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u32 reserved1;
+	u32 handlerType;
+	u8 reserved2[12];
+	char *nameUTF8;
+} GF_HandlerBox;
+
+typedef struct __tag_media_box
+{
+	GF_ISOM_BOX
+	GF_TrackBox *mediaTrack;
+	GF_MediaHeaderBox *mediaHeader;
+	GF_HandlerBox *handler;
+	struct __tag_media_info_box *information;
+	u64 BytesMissing;
+} GF_MediaBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u64 reserved;
+} GF_VideoMediaHeaderBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u32 reserved;
+} GF_SoundMediaHeaderBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	/*this is used for us INTERNALLY*/
+	u32 subType;
+	u32 maxPDUSize;
+	u32 avgPDUSize;
+	u32 maxBitrate;
+	u32 avgBitrate;
+	u32 slidingAverageBitrate;
+} GF_HintMediaHeaderBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+} GF_MPEGMediaHeaderBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+} GF_ODMediaHeaderBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+} GF_OCRMediaHeaderBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+} GF_SceneMediaHeaderBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	GF_List *boxList;
+} GF_DataReferenceBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	GF_DataReferenceBox *dref;
+} GF_DataInformationBox;
+
+#define GF_ISOM_DATAENTRY_FIELDS	\
+	char *location;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	GF_ISOM_DATAENTRY_FIELDS
+} GF_DataEntryBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	GF_ISOM_DATAENTRY_FIELDS
+} GF_DataEntryURLBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	GF_ISOM_DATAENTRY_FIELDS
+	char *nameURN;
+} GF_DataEntryURNBox;
+
+typedef struct
+{
+	u32 sampleCount;
+	u32 sampleDelta;
+} GF_SttsEntry;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	GF_SttsEntry *entries;
+	u32 nb_entries, alloc_size;
+
+#ifndef GPAC_READ_ONLY
+	/*cache for WRITE*/
+	u32 w_currentSampleNum;
+	u64 w_LastDTS;
+#endif
+	/*cache for READ*/
+	u32 r_FirstSampleInEntry;
+	u32 r_currentEntryIndex;
+	u64 r_CurrentDTS;
+} GF_TimeToSampleBox;
+
+
+/*TO CHECK - it could be reasonnable to only use 16bits for both count and offset*/
+typedef struct
+{
+	u32 sampleCount;
+	u32 decodingOffset;
+} GF_DttsEntry;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	GF_DttsEntry *entries;
+	u32 nb_entries, alloc_size;
+
+#ifndef GPAC_READ_ONLY
+	u32 w_LastSampleNumber;
+	/*force one sample per entry*/
+	Bool unpack_mode;
+#endif
+	/*Cache for read*/
+	u32 r_currentEntryIndex;
+	u32 r_FirstSampleInEntry;
+} GF_CompositionOffsetBox;
+
+
+typedef struct
+{
+	u32 SampleNumber;
+	u32 fragmentCount;
+	u16 *fragmentSizes;
+} GF_StsfEntry;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	GF_List *entryList;
+#ifndef GPAC_READ_ONLY
+	/*Cache for write*/
+	GF_StsfEntry *w_currentEntry;
+	u32 w_currentEntryIndex;
+#endif
+	/*Cache for read*/
+	u32 r_currentEntryIndex;
+	GF_StsfEntry *r_currentEntry;
+} GF_SampleFragmentBox;
+
+
+#define GF_ISOM_SAMPLE_ENTRY_FIELDS		\
+	GF_ISOM_UUID_BOX					\
+	u16 dataReferenceIndex;				\
+	char reserved[ 6 ];					\
+	struct __tag_protect_box *protection_info;
+
+/*base sample entry box (never used but for typecasting)*/
+typedef struct
+{
+	GF_ISOM_SAMPLE_ENTRY_FIELDS
+} GF_SampleEntryBox;
+
+typedef struct
+{
+	GF_ISOM_SAMPLE_ENTRY_FIELDS
+	/*box type as specified in the file (not this box's type!!)*/
+	u32 EntryType;
+
+	char *data;
+	u32 data_size;
+} GF_GenericSampleEntryBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	GF_ESD *desc;
+} GF_ESDBox;
+
+/*for all MPEG4 media except audio and video*/
+typedef struct
+{
+	GF_ISOM_SAMPLE_ENTRY_FIELDS
+	GF_ESDBox *esd;
+	/*used for hinting when extracting the OD stream...*/
+	GF_SLConfig *slc;
+} GF_MPEGSampleEntryBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	u32 hSpacing;
+	u32 vSpacing;
+} GF_PixelAspectRatioBox;
+
+
+#define GF_ISOM_VISUAL_SAMPLE_ENTRY		\
+	GF_ISOM_SAMPLE_ENTRY_FIELDS			\
+	u16 version;						\
+	u16 revision;						\
+	u32 vendor;							\
+	u32 temporal_quality;				\
+	u32 spacial_quality;				\
+	u16 Width, Height;					\
+	u32 horiz_res, vert_res;			\
+	u32 entry_data_size;				\
+	u16 frames_per_sample;				\
+	char compressor_name[33];			\
+	u16 bit_depth;						\
+	s16 color_table_index;				\
+	GF_PixelAspectRatioBox *pasp;		
+
+typedef struct
+{
+	GF_ISOM_VISUAL_SAMPLE_ENTRY
+} GF_VisualSampleEntryBox;
+
+void gf_isom_video_sample_entry_init(GF_VisualSampleEntryBox *ent);
+GF_Err gf_isom_video_sample_entry_read(GF_VisualSampleEntryBox *ptr, GF_BitStream *bs);
+#ifndef GPAC_READ_ONLY
+void gf_isom_video_sample_entry_write(GF_VisualSampleEntryBox *ent, GF_BitStream *bs);
+void gf_isom_video_sample_entry_size(GF_VisualSampleEntryBox *ent);
+#endif
+
+typedef struct
+{
+	GF_ISOM_BOX
+	u32 bufferSizeDB;
+	u32 maxBitrate;
+	u32 avgBitrate;
+} GF_MPEG4BitRateBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	GF_List *descriptors;
+} GF_MPEG4ExtensionDescriptorsBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	GF_AVCConfig *config;
+} GF_AVCConfigurationBox;
+
+typedef struct
+{
+	GF_ISOM_VISUAL_SAMPLE_ENTRY
+	GF_ESDBox *esd;
+	/*used for Publishing*/
+	GF_SLConfig *slc;
+
+	/*avc extensions - we merged with regular 'mp4v' box to handle isma E&A signaling of AVC*/
+	GF_AVCConfigurationBox *avc_config;
+	GF_MPEG4BitRateBox *bitrate;
+	/*ext descriptors*/
+	GF_MPEG4ExtensionDescriptorsBox *descr;
+	/*internally emulated esd*/
+	GF_ESD *emul_esd;
+	/*iPod's hack*/
+	GF_UnknownUUIDBox *ipod_ext;
+
+} GF_MPEGVisualSampleEntryBox;
+
+
+/*this is the default visual sdst (to handle unknown media)*/
+typedef struct
+{
+	GF_ISOM_VISUAL_SAMPLE_ENTRY
+	/*box type as specified in the file (not this box's type!!)*/
+	u32 EntryType;
+	/*opaque description data (ESDS in MP4, SMI in SVQ3, ...)*/
+	char *data;
+	u32 data_size;
+} GF_GenericVisualSampleEntryBox;
+
+
+#define GF_ISOM_AUDIO_SAMPLE_ENTRY	\
+	GF_ISOM_SAMPLE_ENTRY_FIELDS		\
+	u16 version;					\
+	u16 revision;					\
+	u32 vendor;						\
+	u16 channel_count;				\
+	u16 bitspersample;				\
+	u16 compression_id;				\
+	u16 packet_size;				\
+	u16 samplerate_hi;				\
+	u16 samplerate_lo;
+
+
+typedef struct 
+{
+	GF_ISOM_AUDIO_SAMPLE_ENTRY
+} GF_AudioSampleEntryBox;
+
+void gf_isom_audio_sample_entry_init(GF_AudioSampleEntryBox *ptr);
+GF_Err gf_isom_audio_sample_entry_read(GF_AudioSampleEntryBox *ptr, GF_BitStream *bs);
+#ifndef GPAC_READ_ONLY
+void gf_isom_audio_sample_entry_write(GF_AudioSampleEntryBox *ptr, GF_BitStream *bs);
+void gf_isom_audio_sample_entry_size(GF_AudioSampleEntryBox *ptr);
+#endif
+
+
+typedef struct
+{
+	GF_ISOM_AUDIO_SAMPLE_ENTRY
+	GF_ESDBox *esd;
+	GF_SLConfig *slc;
+} GF_MPEGAudioSampleEntryBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	GF_3GPConfig cfg;
+} GF_3GPPConfigBox;
+
+typedef struct
+{
+	GF_ISOM_AUDIO_SAMPLE_ENTRY
+	GF_3GPPConfigBox *info;
+} GF_3GPPAudioSampleEntryBox;
+
+typedef struct
+{
+	GF_ISOM_VISUAL_SAMPLE_ENTRY
+	GF_3GPPConfigBox *info;
+} GF_3GPPVisualSampleEntryBox;
+
+/*this is the default visual sdst (to handle unknown media)*/
+typedef struct
+{
+	GF_ISOM_AUDIO_SAMPLE_ENTRY
+	/*box type as specified in the file (not this box's type!!)*/
+	u32 EntryType;
+	/*opaque description data (ESDS in MP4, ...)*/
+	char *data;
+	u32 data_size;
+} GF_GenericAudioSampleEntryBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	GF_AC3Config cfg;
+} GF_AC3ConfigBox;
+
+typedef struct
+{
+	GF_ISOM_AUDIO_SAMPLE_ENTRY
+	GF_AC3ConfigBox *info;
+} GF_AC3SampleEntryBox;
+
+
+
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u8 profile;
+	u8 level;
+	u8 pathComponents;
+	Bool fullRequestHost;
+	Bool streamType;
+	u8 containsRedundant;
+	char *textEncoding;
+	char *contentEncoding;
+} GF_DIMSSceneConfigBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	char *content_script_types;
+} GF_DIMSScriptTypesBox;
+
+typedef struct
+{
+	GF_ISOM_SAMPLE_ENTRY_FIELDS
+	GF_DIMSSceneConfigBox *config;
+	GF_MPEG4BitRateBox *bitrate;
+	GF_DIMSScriptTypesBox *scripts;
+} GF_DIMSSampleEntryBox;
+
+
+/*base sample entry box (never used but for typecasting)*/
+typedef struct
+{
+	GF_ISOM_SAMPLE_ENTRY_FIELDS
+	char *content_encoding;	//optional
+	char *mime_type_or_namespace;	//not optional
+	char *xml_schema_loc;	// optional
+	GF_MPEG4BitRateBox *bitrate; // optional
+} GF_MetaDataSampleEntryBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	GF_List *boxList;
+} GF_SampleDescriptionBox;
+
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	/*if this is the compact version, sample size is actually fieldSize*/
+	u32 sampleSize;
+	u32 sampleCount;
+ 	u32 alloc_size;
+	u32 *sizes;
+} GF_SampleSizeBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u32 nb_entries;
+	u32 alloc_size;
+	u32 *offsets;
+} GF_ChunkOffsetBox;
+
+typedef struct 
+{
+	GF_ISOM_FULL_BOX
+	u32 nb_entries;
+	u32 alloc_size;
+	u64 *offsets;
+} GF_ChunkLargeOffsetBox;
+
+typedef struct
+{
+	u32 firstChunk;
+	u32 nextChunk;
+	u32 samplesPerChunk;
+	u32 sampleDescriptionIndex;
+	u8 isEdited;
+} GF_StscEntry;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	GF_StscEntry *entries;
+	u32 alloc_size, nb_entries;
+
+	/*0-based cache for READ. In WRITE mode, we always have 1 sample per chunk so no need for a cache*/
+	u32 currentIndex;
+	/*first sample number in this chunk*/
+	u32 firstSampleInCurrentChunk;
+	u32 currentChunk;
+	u32 ghostNumber;
+} GF_SampleToChunkBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u32 alloc_size, nb_entries;
+	u32 *sampleNumbers;
+	/*cache for READ mode (in write we realloc no matter what)*/
+	u32 r_LastSyncSample;
+	/*0-based index in the array*/
+	u32 r_LastSampleIndex;
+} GF_SyncSampleBox;
+
+typedef struct
+{
+	u32 shadowedSampleNumber;
+	s32 syncSampleNumber;
+} GF_StshEntry;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	GF_List *entries;
+	/*Cache for read mode*/
+	u32 r_LastEntryIndex;
+	u32 r_LastFoundSample;
+} GF_ShadowSyncBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u32 nb_entries;
+	u16 *priorities;
+} GF_DegradationPriorityBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u32 SampleCount;
+	u8 *padbits;
+} GF_PaddingBitsBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u32 sampleCount;
+	/*each dep type is packed on 1 byte*/
+	u8 *sample_info;
+} GF_SampleDependencyTypeBox;
+
+
+typedef struct
+{
+	GF_ISOM_BOX
+	GF_TimeToSampleBox *TimeToSample;
+	GF_CompositionOffsetBox *CompositionOffset;
+	GF_SyncSampleBox *SyncSample;
+	GF_SampleDescriptionBox *SampleDescription;
+	GF_SampleSizeBox *SampleSize;
+	GF_SampleToChunkBox *SampleToChunk;
+	/*untyped, to handle 32 bits and 64 bits chunkOffsets*/
+	GF_Box *ChunkOffset;
+	GF_ShadowSyncBox *ShadowSync;
+	GF_DegradationPriorityBox *DegradationPriority;
+	GF_PaddingBitsBox *PaddingBits;
+	GF_SampleDependencyTypeBox *SampleDep;
+	GF_SampleFragmentBox *Fragments;
+
+	u32 MaxSamplePerChunk;
+	u16 groupID;
+	u16 trackPriority;
+	u32 currentEntryIndex;
+} GF_SampleTableBox;
+
+typedef struct __tag_media_info_box
+{
+	GF_ISOM_BOX
+	GF_DataInformationBox *dataInformation;
+	GF_SampleTableBox *sampleTable;
+	GF_Box *InfoHeader;
+	struct __tag_data_map *dataHandler;
+	u32 dataEntryIndex;
+	GF_List *boxes;
+} GF_MediaInformationBox;
+
+
+typedef struct
+{
+	GF_ISOM_BOX
+	char *data;
+	u32 dataSize;
+} GF_FreeSpaceBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	char packedLanguageCode[4];
+	char *notice;
+} GF_CopyrightBox;
+
+
+typedef struct
+{
+	char *name;
+	u64 start_time;
+} GF_ChapterEntry;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	GF_List *list;
+} GF_ChapterListBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	u32 reference_type;
+	u32 trackIDCount;
+	u32 *trackIDs;
+} GF_TrackReferenceTypeBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	u32 majorBrand;
+	u32 minorVersion;
+	u32 altCount;
+	u32 *altBrand;
+} GF_FileTypeBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u32 *rates;
+	u32 *times;
+	u32 count;
+} GF_ProgressiveDownloadBox;
+
+
+/*
+	3GPP streaming text boxes
+*/
+
+typedef struct
+{
+	GF_ISOM_BOX
+	u32 entry_count;
+	GF_FontRecord *fonts;
+} GF_FontTableBox;
+
+typedef struct
+{
+	GF_ISOM_SAMPLE_ENTRY_FIELDS				\
+	u32 displayFlags;
+	s8 horizontal_justification;
+	s8 vertical_justification;
+	/*ARGB*/
+	u32 back_color;
+	GF_BoxRecord default_box; 
+	GF_StyleRecord	default_style;
+	GF_FontTableBox *font_table;
+} GF_TextSampleEntryBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	u32 entry_count;
+	GF_StyleRecord *styles;
+} GF_TextStyleBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	u16 startcharoffset;
+	u16 endcharoffset; 
+} GF_TextHighlightBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	/*ARGB*/
+	u32 hil_color;
+} GF_TextHighlightColorBox;
+
+typedef struct
+{
+	u32 highlight_endtime;
+	u16 start_charoffset;
+	u16 end_charoffset;
+} KaraokeRecord;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	u32 highlight_starttime;
+	u16 nb_entries;
+	KaraokeRecord *records;
+} GF_TextKaraokeBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	u32 scroll_delay;
+} GF_TextScrollDelayBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	u16 startcharoffset;
+	u16 endcharoffset;
+	char *URL;
+	char *URL_hint;
+} GF_TextHyperTextBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	GF_BoxRecord box;
+} GF_TextBoxBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	u16 startcharoffset;
+	u16 endcharoffset;
+} GF_TextBlinkBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	u8 wrap_flag;
+} GF_TextWrapBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u32 switchGroup;
+	u32 *attributeList;
+	u32 attributeListCount;
+} GF_TrackSelectionBox;
+
+/*
+	MPEG-21 extensions
+*/
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u32 xml_length;
+	char *xml;
+} GF_XMLBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u32 data_length;
+	char *data;
+} GF_BinaryXMLBox;
+
+typedef struct
+{
+	u64 extent_offset;
+	u64 extent_length;
+#ifndef GPAC_READ_OLNLY
+	/*for storage only*/
+	u64 original_extent_offset;
+#endif
+} GF_ItemExtentEntry;
+
+typedef struct 
+{
+	u16 item_ID;
+	u16 data_reference_index;
+	u64 base_offset;
+#ifndef GPAC_READ_OLNLY
+	/*for storage only*/
+	u64 original_base_offset;
+#endif
+	GF_List *extent_entries;
+} GF_ItemLocationEntry;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u8 offset_size;
+    u8 length_size;
+	u8 base_offset_size;
+	GF_List *location_entries;
+} GF_ItemLocationBox;
+
+typedef	struct 
+{
+	GF_ISOM_FULL_BOX
+	u16 item_ID;
+} GF_PrimaryItemBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	GF_List *protection_information;
+} GF_ItemProtectionBox;
+
+typedef struct 
+{
+	GF_ISOM_FULL_BOX
+	u16 item_ID;
+	u16 item_protection_index;
+	/*zero-terminated strings*/
+	char *item_name;
+	char *content_type;
+	char *content_encoding;
+	// needed to actually read the resource file, but not written in the MP21 file.
+	char *full_path;
+} GF_ItemInfoEntryBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	GF_List *item_infos;
+} GF_ItemInfoBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	u32 data_format;
+} GF_OriginalFormatBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u32 scheme_type;
+	u32 scheme_version;
+	char *URI;
+} GF_SchemeTypeBox;
+
+/*ISMACryp specific*/
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	/*zero-terminated string*/
+	char *URI;
+} GF_ISMAKMSBox;
+
+/*ISMACryp specific*/
+typedef struct __isma_format_box
+{
+	GF_ISOM_FULL_BOX
+	u8 selective_encryption;
+	u8 key_indicator_length;
+	u8 IV_length;
+} GF_ISMASampleFormatBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	GF_ISMAKMSBox *ikms;
+	GF_ISMASampleFormatBox *isfm;
+	struct __oma_kms_box *okms;
+} GF_SchemeInformationBox;
+
+typedef struct __tag_protect_box
+{
+	GF_ISOM_BOX
+	GF_OriginalFormatBox *original_format;
+	GF_SchemeTypeBox *scheme_type;
+	GF_SchemeInformationBox *info;
+} GF_ProtectionInfoBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	GF_List *descriptors;
+} GF_IPMPInfoBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	GF_IPMP_ToolList *ipmp_tools;
+	GF_List *descriptors;
+} GF_IPMPControlBox;
+
+
+typedef struct __tag_meta_box
+{
+	GF_ISOM_FULL_BOX
+	GF_HandlerBox *handler;	
+	GF_PrimaryItemBox *primary_resource;
+	GF_DataInformationBox *file_locations;
+	GF_ItemLocationBox *item_locations;
+	GF_ItemProtectionBox *protections;
+	GF_ItemInfoBox *item_infos;
+	GF_IPMPControlBox *IPMP_control;
+	GF_List *other_boxes;
+} GF_MetaBox;
+
+
+
+
+#ifndef	GPAC_ISOM_NO_FRAGMENTS
+
+/*V2 boxes - Movie Fragments*/
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u64 fragment_duration;
+} GF_MovieExtendsHeaderBox;
+
+
+typedef struct __tag_mvex_box
+{
+	GF_ISOM_BOX
+	GF_List *TrackExList;
+	GF_MovieExtendsHeaderBox *mehd;
+	GF_ISOFile *mov;
+} GF_MovieExtendsBox;
+
+/*the TrackExtends contains default values for the track fragments*/
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u32 trackID;
+	u32 def_sample_desc_index;
+	u32 def_sample_duration;
+	u32 def_sample_size;
+	u32 def_sample_flags;
+	GF_TrackBox *track;
+} GF_TrackExtendsBox;
+
+/*indicates the seq num of this fragment*/
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u32 sequence_number;
+} GF_MovieFragmentHeaderBox;
+
+/*MovieFragment is a container IN THE FILE, contains 1 fragment*/
+typedef struct
+{
+	GF_ISOM_BOX
+	GF_MovieFragmentHeaderBox *mfhd;
+	GF_List *TrackList;
+	GF_ISOFile *mov;
+} GF_MovieFragmentBox;
+
+
+/*FLAGS for TRAF*/
+enum
+{
+	GF_ISOM_TRAF_BASE_OFFSET	=	0x01,
+	GF_ISOM_TRAF_SAMPLE_DESC	=	0x02,
+	GF_ISOM_TRAF_SAMPLE_DUR	=	0x08,
+	GF_ISOM_TRAF_SAMPLE_SIZE	=	0x10,
+	GF_ISOM_TRAF_SAMPLE_FLAGS	=	0x20,
+	GF_ISOM_TRAF_DUR_EMPTY	=	0x10000
+};
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u32 trackID;
+	/* all the following are optional fields */
+	u64 base_data_offset;
+	u32 sample_desc_index;
+	u32 def_sample_duration;
+	u32 def_sample_size;
+	u32 def_sample_flags;
+	u32 EmptyDuration;
+	u8 IFrameSwitching;
+} GF_TrackFragmentHeaderBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	GF_TrackFragmentHeaderBox *tfhd;
+	GF_List *TrackRuns;
+	/*keep a pointer to default flags*/
+	GF_TrackExtendsBox *trex;
+	/*when data caching is on*/
+	u32 DataCache;
+} GF_TrackFragmentBox;
+
+/*FLAGS for TRUN : specify what is written in the SampleTable of TRUN*/
+enum
+{
+	GF_ISOM_TRUN_DATA_OFFSET	= 0x01,
+	GF_ISOM_TRUN_FIRST_FLAG		= 0x04,
+	GF_ISOM_TRUN_DURATION		= 0x100,
+	GF_ISOM_TRUN_SIZE			= 0x200,
+	GF_ISOM_TRUN_FLAGS			= 0x400,
+	GF_ISOM_TRUN_CTS_OFFSET		= 0x800
+};
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u32 sample_count;
+	/*the following are optional fields */
+	s32 data_offset;
+	u32 first_sample_flags;
+	/*can be empty*/
+	GF_List *entries;
+
+	/*in write mode with data caching*/
+	GF_BitStream *cache;
+} GF_TrackFragmentRunBox;
+
+typedef struct
+{
+	u32 Duration;
+	u32 size;
+	u32 flags;
+	u32 CTS_Offset;
+} GF_TrunEntry;
+
+#endif
+
+
+/*RTP Hint Track Sample Entry*/
+typedef struct
+{
+	GF_ISOM_SAMPLE_ENTRY_FIELDS
+	u16 HintTrackVersion;
+	u16 LastCompatibleVersion;
+	u32 MaxPacketSize;
+	GF_List *HintDataTable;
+	/*this is where we store the current RTP sample in read/write mode*/
+	struct __tag_hint_sample *hint_sample;
+	/*current hint sample in read mode, 1-based (0 is reset)*/
+	u32 cur_sample;
+	u32 pck_sn, ts_offset, ssrc;
+	GF_TrackReferenceTypeBox *hint_ref;
+} GF_HintSampleEntryBox;
+
+
+typedef struct
+{
+	GF_ISOM_BOX
+	u32 subType;
+	char *sdpText;
+} GF_RTPBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	char *sdpText;
+} GF_SDPBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	s32 timeOffset;
+} GF_RTPOBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	/*contains GF_SDPBox if in track, GF_RTPBox if in movie*/
+	GF_Box *SDP;
+	GF_List *boxList;
+} GF_HintTrackInfoBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	u8 reserved;
+	u8 prefered;
+	u8 required;
+} GF_RelyHintBox;
+
+/***********************************************************
+			data entry tables for RTP
+***********************************************************/
+typedef struct
+{
+	GF_ISOM_BOX
+	u32 timeScale;
+} GF_TSHintEntryBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	u32 TimeOffset;	
+} GF_TimeOffHintEntryBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	u32 SeqOffset;
+} GF_SeqOffHintEntryBox;
+
+
+
+/***********************************************************
+			hint track information boxes for RTP
+***********************************************************/
+
+/*Total number of bytes that will be sent, including 12-byte RTP headers, but not including any network headers*/
+typedef struct
+{
+	GF_ISOM_BOX
+	u64 nbBytes;
+} GF_TRPYBox;
+
+/*32-bits version of trpy used in Darwin*/
+typedef struct
+{
+	GF_ISOM_BOX
+	u32 nbBytes;
+} GF_TOTLBox;
+
+/*Total number of network packets that will be sent*/
+typedef struct
+{
+	GF_ISOM_BOX
+	u64 nbPackets;
+} GF_NUMPBox;
+
+/*32-bits version of nump used in Darwin*/
+typedef struct
+{
+	GF_ISOM_BOX
+	u32 nbPackets;
+} GF_NPCKBox;
+
+
+/*Total number of bytes that will be sent, not including 12-byte RTP headers*/
+typedef struct
+{
+	GF_ISOM_BOX
+	u64 nbBytes;
+} GF_NTYLBox;
+
+/*32-bits version of tpyl used in Darwin*/
+typedef struct
+{
+	GF_ISOM_BOX
+	u32 nbBytes;
+} GF_TPAYBox;
+
+/*Maximum data rate in bits per second.*/
+typedef struct
+{
+	GF_ISOM_BOX
+	u32 granularity;
+	u32 maxDataRate;
+} GF_MAXRBox;
+
+
+/*Total number of bytes from the media track to be sent*/
+typedef struct
+{
+	GF_ISOM_BOX
+	u64 nbBytes;
+} GF_DMEDBox;
+
+/*Number of bytes of immediate data to be sent*/
+typedef struct
+{
+	GF_ISOM_BOX
+	u64 nbBytes;
+} GF_DIMMBox;
+
+
+/*Number of bytes of repeated data to be sent*/
+typedef struct
+{
+	GF_ISOM_BOX
+	u64 nbBytes;
+} GF_DREPBox;
+
+/*Smallest relative transmission time, in milliseconds. signed integer for smoothing*/
+typedef struct
+{
+	GF_ISOM_BOX
+	s32 minTime;
+} GF_TMINBox;
+
+/*Largest relative transmission time, in milliseconds.*/
+typedef struct
+{
+	GF_ISOM_BOX
+	s32 maxTime;
+} GF_TMAXBox;
+
+/*Largest packet, in bytes, including 12-byte RTP header*/
+typedef struct
+{
+	GF_ISOM_BOX
+	u32 maxSize;
+} GF_PMAXBox;
+
+/*Longest packet duration, in milliseconds*/
+typedef struct
+{
+	GF_ISOM_BOX
+	u32 maxDur;
+} GF_DMAXBox;
+
+/*32-bit payload type number, followed by rtpmap payload string */
+typedef struct
+{
+	GF_ISOM_BOX
+	u32 payloadCode;
+	char *payloadString;
+} GF_PAYTBox;
+
+
+typedef struct
+{
+	GF_ISOM_BOX
+	char *string;
+} GF_NameBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	GF_List *dataRates;
+	GF_List *boxList;
+} GF_HintInfoBox;
+
+/*Apple extension*/
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u32 reserved;
+	char *data;
+	u32 dataSize;
+} GF_DataBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	GF_DataBox *data;
+} GF_ListItemBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	GF_List *tags;
+} GF_ItemListBox;
+
+/*OMA (P)DCF extensions*/
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u8 EncryptionMethod;
+	u8 PaddingScheme;
+	u64 PlaintextLength;
+	char *ContentID;
+	char *RightsIssuerURL;
+	char *TextualHeaders;
+	u32 TextualHeadersLen;
+	GF_List *ExtendedHeaders;
+} GF_OMADRMCommonHeaderBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u8 GKEncryptionMethod;
+	char *GroupID;
+	u16 GKLength;
+	char *GroupKey;
+} GF_OMADRMGroupIDBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	GF_List *boxes;
+} GF_OMADRMMutableInformationBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	char TransactionID[16];
+} GF_OMADRMTransactionTrackingBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	char *oma_ro;
+	u32 oma_ro_size;
+} GF_OMADRMRightsObjectBox;
+
+/*identical*/
+typedef struct __isma_format_box GF_OMADRMAUFormatBox;
+
+typedef struct __oma_kms_box
+{
+	GF_ISOM_FULL_BOX
+	GF_OMADRMCommonHeaderBox *hdr;
+	GF_OMADRMAUFormatBox *fmt;
+} GF_OMADRMKMSBox;
+
+
+
+/*
+		Data Map (media storage) stuff
+*/
+
+/*regular file IO*/
+#define GF_ISOM_DATA_FILE			0x01
+/*File Mapaing object, read-only mode on complete files (no download)*/
+#define GF_ISOM_DATA_FILE_MAPPING		0x02
+/*External file object. Needs implementation*/
+#define GF_ISOM_DATA_FILE_EXTERN		0x03
+
+/*Data Map modes*/
+enum
+{
+	/*read mode*/
+	GF_ISOM_DATA_MAP_READ = 1,
+	/*write mode*/
+	GF_ISOM_DATA_MAP_WRITE = 2,
+	/*the following modes are just ways of signaling extended functionalities
+	edit mode, to make sure the file is here, set to GF_ISOM_DATA_MAP_READ afterwards*/
+	GF_ISOM_DATA_MAP_EDIT = 3,
+	/*read-only access to the movie file: we create a file mapping object
+	mode is set to GF_ISOM_DATA_MAP_READ afterwards*/
+	GF_ISOM_DATA_MAP_READ_ONLY = 4,
+};
+
+/*this is the DataHandler structure each data handler has its own bitstream*/
+#define GF_ISOM_BASE_DATA_HANDLER	\
+	u8	type;		\
+	u64	curPos;		\
+	u8	mode;		\
+	GF_BitStream *bs;
+
+typedef struct __tag_data_map
+{
+	GF_ISOM_BASE_DATA_HANDLER
+} GF_DataMap;
+
+typedef struct 
+{
+	GF_ISOM_BASE_DATA_HANDLER
+	FILE *stream;
+	Bool last_acces_was_read;
+#ifndef GPAC_READ_ONLY
+	char *temp_file;
+#endif
+} GF_FileDataMap;
+
+/*file mapping handler. used if supported, only on read mode for complete files  (not in file download)*/
+typedef struct 
+{
+	GF_ISOM_BASE_DATA_HANDLER
+	char *name;
+	u32 file_size;
+	char *byte_map;
+	u32 byte_pos;
+} GF_FileMappingDataMap;
+
+GF_Err gf_isom_datamap_new(const char *location, const char *parentPath, u8 mode, GF_DataMap **outDataMap);
+void gf_isom_datamap_del(GF_DataMap *ptr);
+GF_Err gf_isom_datamap_open(GF_MediaBox *minf, u32 dataRefIndex, u8 Edit);
+void gf_isom_datamap_close(GF_MediaInformationBox *minf);
+u32 gf_isom_datamap_get_data(GF_DataMap *map, char *buffer, u32 bufferLength, u64 Offset);
+
+/*File-based data map*/
+GF_DataMap *gf_isom_fdm_new(const char *sPath, u8 mode);
+void gf_isom_fdm_del(GF_FileDataMap *ptr);
+u32 gf_isom_fdm_get_data(GF_FileDataMap *ptr, char *buffer, u32 bufferLength, u64 fileOffset);
+
+#ifndef GPAC_READ_ONLY
+GF_DataMap *gf_isom_fdm_new_temp(const char *sTempPath);
+#endif
+
+/*file-mapping, read only*/
+GF_DataMap *gf_isom_fmo_new(const char *sPath, u8 mode);
+void gf_isom_fmo_del(GF_FileMappingDataMap *ptr);
+u32 gf_isom_fmo_get_data(GF_FileMappingDataMap *ptr, char *buffer, u32 bufferLength, u64 fileOffset);
+
+#ifndef GPAC_READ_ONLY
+u64 gf_isom_datamap_get_offset(GF_DataMap *map);
+GF_Err gf_isom_datamap_add_data(GF_DataMap *ptr, char *data, u32 dataSize);
+#endif	
+
+/*
+		Movie stuff
+*/
+
+
+/*time def for MP4/QT/MJ2K files*/
+#define GF_ISOM_MAC_TIME_OFFSET 2082758400/*208284480 */
+
+#ifndef	GPAC_ISOM_NO_FRAGMENTS
+#define GF_ISOM_FORMAT_FRAG_FLAGS(pad, sync, deg) ( ( (pad) << 17) | ( ( !(sync) ) << 16) | (deg) );
+#define GF_ISOM_GET_FRAG_PAD(flag) ( (flag) >> 17) & 0x7
+#define GF_ISOM_GET_FRAG_SYNC(flag) ( ! ( ( (flag) >> 16) & 0x1))
+#define GF_ISOM_GET_FRAG_DEG(flag)	(flag) & 0x7FFF
+#endif
+
+enum
+{
+	GF_ISOM_FRAG_WRITE_READY	=	0x01,
+	GF_ISOM_FRAG_READ_DEBUG		=	0x02,
+};
+
+/*this is our movie object*/
+struct __tag_isom {
+	/*the last fatal error*/
+	GF_Err LastError;
+	/*the original filename*/
+	char *fileName;
+	/*the original file in read/edit, and also used in fragments mode
+	once the first moov has been written
+	Nota: this API doesn't allow fragments BEFORE the MOOV in order
+	to make easily parsable files (note there could be some data (mdat) before
+	the moov*/
+	GF_DataMap *movieFileMap;
+
+#ifndef GPAC_READ_ONLY
+	/*the final file name*/
+	char *finalName;
+	/*the file where we store edited samples (for READ_WRITE and WRITE mode only)*/
+	GF_DataMap *editFileMap;
+	/*the interleaving time for dummy mode (in movie TimeScale)*/
+	u32 interleavingTime;
+#endif
+
+	u8 openMode;
+	u8 storageMode;
+	/*if true 3GPP text streams are read as MPEG-4 StreamingText*/
+	u8 convert_streaming_text;
+	u8 is_jp2;
+
+	/*main boxes for fast access*/
+	/*moov*/
+	GF_MovieBox *moov;
+	/*our MDAT box (one and only one when we store the file)*/
+	GF_MediaDataBox *mdat;
+	/*file brand (since v2, NULL means mp4 v1)*/
+	GF_FileTypeBox *brand;
+	/*progressive download info*/
+	GF_ProgressiveDownloadBox *pdin;
+	/*meta box if any*/
+	GF_MetaBox *meta;
+
+#ifndef	GPAC_ISOM_NO_FRAGMENTS
+	u32 FragmentsFlags, NextMoofNumber;
+	/*active fragment*/
+	GF_MovieFragmentBox *moof;
+	/*in WRITE mode, this is the current MDAT where data is written*/
+	/*in READ mode this is the last valid file position before a gf_isom_box_read failed*/
+	u64 current_top_box_start;
+#endif
+
+	/*this contains ALL the root boxes excepts fragments*/
+	GF_List *TopBoxes;
+
+	/*default track for sync of MPEG4 streams - this is the first accessed stream without OCR info - only set in READ mode*/
+	s32 es_id_default_sync;
+};
+
+/*time function*/
+u64 gf_isom_get_mp4time();
+/*set the last error of the file. if file is NULL, set the static error (used for IO errors*/
+void gf_isom_set_last_error(GF_ISOFile *the_file, GF_Err error);
+GF_Err gf_isom_parse_movie_boxes(GF_ISOFile *mov, u64 *bytesMissing);
+GF_ISOFile *gf_isom_new_movie();
+/*Movie and Track access functions*/
+GF_TrackBox *gf_isom_get_track_from_file(GF_ISOFile *the_file, u32 trackNumber);
+GF_TrackBox *gf_isom_get_track(GF_MovieBox *moov, u32 trackNumber);
+GF_TrackBox *gf_isom_get_track_from_id(GF_MovieBox *moov, u32 trackID);
+u32 gf_isom_get_tracknum_from_id(GF_MovieBox *moov, u32 trackID);
+/*open a movie*/
+GF_ISOFile *gf_isom_open_file(const char *fileName, u32 OpenMode, const char *tmp_dir);
+/*close and delete a movie*/
+void gf_isom_delete_movie(GF_ISOFile *mov);
+/*StreamDescription reconstruction Functions*/
+GF_Err GetESD(GF_MovieBox *moov, u32 trackID, u32 StreamDescIndex, GF_ESD **outESD);
+GF_Err GetESDForTime(GF_MovieBox *moov, u32 trackID, u64 CTS, GF_ESD **outESD);
+GF_Err Media_GetSampleDesc(GF_MediaBox *mdia, u32 SampleDescIndex, GF_SampleEntryBox **out_entry, u32 *dataRefIndex);
+GF_Err Media_GetSampleDescIndex(GF_MediaBox *mdia, u64 DTS, u32 *sampleDescIndex);
+/*get esd for given sample desc - 
+	@true_desc_only: if true doesn't emulate desc and returns native ESD,
+				otherwise emulates if needed/possible (TimedText) and return a hard copy of the desc
+*/
+GF_Err Media_GetESD(GF_MediaBox *mdia, u32 sampleDescIndex, GF_ESD **esd, Bool true_desc_only);
+Bool Track_IsMPEG4Stream(u32 HandlerType);
+Bool IsMP4Description(u32 entryType);
+/*Find a reference of a given type*/
+GF_Err Track_FindRef(GF_TrackBox *trak, u32 ReferenceType, GF_TrackReferenceTypeBox **dpnd);
+/*Time and sample*/
+GF_Err GetMediaTime(GF_TrackBox *trak, u64 movieTime, u64 *MediaTime, s64 *SegmentStartTime, s64 *MediaOffset, u8 *useEdit);
+GF_Err Media_GetSample(GF_MediaBox *mdia, u32 sampleNumber, GF_ISOSample **samp, u32 *sampleDescriptionIndex, Bool no_data, u64 *out_offset);
+GF_Err Media_CheckDataEntry(GF_MediaBox *mdia, u32 dataEntryIndex);
+GF_Err Media_FindSyncSample(GF_SampleTableBox *stbl, u32 searchFromTime, u32 *sampleNumber, u8 mode);
+GF_Err Media_RewriteODFrame(GF_MediaBox *mdia, GF_ISOSample *sample);
+GF_Err Media_FindDataRef(GF_DataReferenceBox *dref, char *URLname, char *URNname, u32 *dataRefIndex);
+Bool Media_IsSelfContained(GF_MediaBox *mdia, u32 StreamDescIndex);
+
+/*check the TimeToSample for the given time and return the Sample number
+if the entry is not found, return the closest sampleNumber in prevSampleNumber and 0 in sampleNumber
+if the DTS required is after all DTSs in the list, set prevSampleNumber and SampleNumber to 0
+useCTS specifies that we're looking for a composition time
+*/
+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_GetSampleDTS(GF_TimeToSampleBox *stts, u32 SampleNumber, u64 *DTS);
+/*find a RAP or set the prev / next RAPs if vars are passed*/
+GF_Err stbl_GetSampleRAP(GF_SyncSampleBox *stss, u32 SampleNumber, u8 *IsRAP, u32 *prevRAP, u32 *nextRAP);
+GF_Err stbl_GetSampleInfos(GF_SampleTableBox *stbl, u32 sampleNumber, u64 *offset, u32 *chunkNumber, u32 *descIndex, u8 *isEdited);
+GF_Err stbl_GetSampleShadow(GF_ShadowSyncBox *stsh, u32 *sampleNumber, u32 *syncNum);
+GF_Err stbl_GetPaddingBits(GF_PaddingBitsBox *padb, u32 SampleNumber, u8 *PadBits);
+u32 stbl_GetSampleFragmentCount(GF_SampleFragmentBox *stsf, u32 sampleNumber);
+u32 stbl_GetSampleFragmentSize(GF_SampleFragmentBox *stsf, u32 sampleNumber, u32 FragmentIndex);
+GF_Err stbl_GetSampleDepType(GF_SampleDependencyTypeBox *stbl, u32 SampleNumber, u32 *dependsOn, u32 *dependedOn, u32 *redundant);
+
+/*unpack sample2chunk and chunk offset so that we have 1 sample per chunk (edition mode only)*/
+GF_Err stbl_UnpackOffsets(GF_SampleTableBox *stbl);
+GF_Err SetTrackDuration(GF_TrackBox *trak);
+GF_Err Media_SetDuration(GF_TrackBox *trak);
+
+/*rewrites 3GP samples desc as MPEG-4 ESD*/
+GF_Err gf_isom_get_ttxt_esd(GF_MediaBox *mdia, GF_ESD **out_esd);
+/*inserts TTU header - only used when conversion to StreamingText is on*/
+GF_Err gf_isom_rewrite_text_sample(GF_ISOSample *samp, u32 sampleDescriptionIndex, u32 sample_dur);
+
+GF_UserDataMap *udta_getEntry(GF_UserDataBox *ptr, u32 box_type, bin128 *uuid);
+
+#ifndef GPAC_READ_ONLY
+
+GF_Err FlushCaptureMode(GF_ISOFile *movie);
+GF_Err CanAccessMovie(GF_ISOFile *movie, u32 Mode);
+GF_ISOFile *gf_isom_create_movie(const char *fileName, u32 OpenMode, const char *tmp_dir);
+void gf_isom_insert_moov(GF_ISOFile *file);
+
+GF_Err WriteToFile(GF_ISOFile *movie);
+GF_Err Track_SetStreamDescriptor(GF_TrackBox *trak, u32 StreamDescriptionIndex, u32 DataReferenceIndex, GF_ESD *esd, u32 *outStreamIndex);
+u8 RequestTrack(GF_MovieBox *moov, u32 TrackID);
+/*Track-Media setup*/
+GF_Err NewMedia(GF_MediaBox **mdia, u32 MediaType, u32 TimeScale);
+GF_Err Media_ParseODFrame(GF_MediaBox *mdia, GF_ISOSample *sample, GF_ISOSample **od_samp);
+GF_Err Media_AddSample(GF_MediaBox *mdia, u64 data_offset, GF_ISOSample *sample, u32 StreamDescIndex, u32 syncShadowNumber);
+GF_Err Media_CreateDataRef(GF_DataReferenceBox *dref, char *URLname, char *URNname, u32 *dataRefIndex);
+/*update a media sample. ONLY in edit mode*/
+GF_Err Media_UpdateSample(GF_MediaBox *mdia, u32 sampleNumber, GF_ISOSample *sample, Bool data_only);
+GF_Err Media_UpdateSampleReference(GF_MediaBox *mdia, u32 sampleNumber, GF_ISOSample *sample, u64 data_offset);
+/*addition in the sample tables*/
+GF_Err stbl_AddDTS(GF_SampleTableBox *stbl, u64 DTS, u32 *sampleNumber, u32 LastAUDefDuration);
+GF_Err stbl_AddCTS(GF_SampleTableBox *stbl, u32 sampleNumber, u32 CTSoffset);
+GF_Err stbl_AddSize(GF_SampleSizeBox *stsz, u32 sampleNumber, u32 size);
+GF_Err stbl_AddRAP(GF_SyncSampleBox *stss, u32 sampleNumber);
+GF_Err stbl_AddShadow(GF_ShadowSyncBox *stsh, u32 sampleNumber, u32 shadowNumber);
+GF_Err stbl_AddChunkOffset(GF_MediaBox *mdia, u32 sampleNumber, u32 StreamDescIndex, u64 offset);
+/*NB - no add for padding, this is done only through SetPaddingBits*/
+
+GF_Err stbl_AddSampleFragment(GF_SampleTableBox *stbl, u32 sampleNumber, u16 size);
+
+/*update of the sample table
+all these functions are called in edit and we always have 1 sample per chunk*/
+GF_Err stbl_SetChunkOffset(GF_MediaBox *mdia, u32 sampleNumber, u64 offset);
+GF_Err stbl_SetSampleCTS(GF_SampleTableBox *stbl, u32 sampleNumber, u32 offset);
+GF_Err stbl_SetSampleSize(GF_SampleSizeBox *stsz, u32 SampleNumber, u32 size);
+GF_Err stbl_SetSampleRAP(GF_SyncSampleBox *stss, u32 SampleNumber, u8 isRAP);
+GF_Err stbl_SetSyncShadow(GF_ShadowSyncBox *stsh, u32 sampleNumber, u32 syncSample);
+GF_Err stbl_SetPaddingBits(GF_SampleTableBox *stbl, u32 SampleNumber, u8 bits);
+/*for adding fragmented samples*/
+GF_Err stbl_SampleSizeAppend(GF_SampleSizeBox *stsz, u32 data_size);
+/*writing of the final chunk info in edit mode*/
+GF_Err stbl_SetChunkAndOffset(GF_SampleTableBox *stbl, u32 sampleNumber, u32 StreamDescIndex, GF_SampleToChunkBox *the_stsc, GF_Box **the_stco, u64 data_offset, u8 forceNewChunk);
+/*EDIT LIST functions*/
+GF_EdtsEntry *CreateEditEntry(u64 EditDuration, u64 MediaTime, u8 EditMode);
+
+GF_Err stbl_SetRedundant(GF_SampleTableBox *stbl, u32 sampleNumber);
+GF_Err stbl_AddRedundant(GF_SampleTableBox *stbl, u32 sampleNumber);
+
+/*REMOVE functions*/
+GF_Err stbl_RemoveDTS(GF_SampleTableBox *stbl, u32 sampleNumber, u32 LastAUDefDuration);
+GF_Err stbl_RemoveCTS(GF_SampleTableBox *stbl, u32 sampleNumber);
+GF_Err stbl_RemoveSize(GF_SampleSizeBox *stsz, u32 sampleNumber);
+GF_Err stbl_RemoveChunk(GF_SampleTableBox *stbl, u32 sampleNumber);
+GF_Err stbl_RemoveRAP(GF_SampleTableBox *stbl, u32 sampleNumber);
+GF_Err stbl_RemoveShadow(GF_ShadowSyncBox *stsh, u32 sampleNumber);
+GF_Err stbl_RemovePaddingBits(GF_SampleTableBox *stbl, u32 SampleNumber);
+GF_Err stbl_RemoveSampleFragments(GF_SampleTableBox *stbl, u32 sampleNumber);
+GF_Err stbl_RemoveRedundant(GF_SampleTableBox *stbl, u32 SampleNumber);
+
+#ifndef	GPAC_ISOM_NO_FRAGMENTS
+GF_Err StoreFragment(GF_ISOFile *movie);
+#endif
+
+#endif	
+
+
+GF_Err GetNextMediaTime(GF_TrackBox *trak, u64 movieTime, u64 *OutMovieTime);
+GF_Err GetPrevMediaTime(GF_TrackBox *trak, u64 movieTime, u64 *OutMovieTime);
+
+Bool IsHintTrack(GF_TrackBox *trak);
+Bool CheckHintFormat(GF_TrackBox *trak, u32 HintType);
+u32 GetHintFormat(GF_TrackBox *trak);
+
+
+/*locate a box by its type or UUID*/
+GF_ItemListBox *gf_ismo_locate_box(GF_List *list, u32 boxType, bin128 UUID);
+
+GF_Err moov_AddBox(GF_Box *ptr, GF_Box *a);
+GF_Err tref_AddBox(GF_Box *ptr, GF_Box *a);
+GF_Err trak_AddBox(GF_Box *ptr, GF_Box *a);
+GF_Err mvex_AddBox(GF_Box *ptr, GF_Box *a);
+GF_Err stsd_AddBox(GF_SampleDescriptionBox *ptr, GF_Box *a);
+GF_Err hnti_AddBox(GF_HintTrackInfoBox *hnti, GF_Box *a);
+GF_Err udta_AddBox(GF_UserDataBox *ptr, GF_Box *a);
+GF_Err edts_AddBox(GF_Box *s, GF_Box *a);
+GF_Err stdp_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err sdtp_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err dinf_AddBox(GF_Box *s, GF_Box *a);
+GF_Err minf_AddBox(GF_Box *s, GF_Box *a);
+GF_Err mdia_AddBox(GF_Box *s, GF_Box *a);
+GF_Err stbl_AddBox(GF_SampleTableBox *ptr, GF_Box *a);
+
+GF_Err AVC_UpdateESD(GF_MPEGVisualSampleEntryBox *avc, GF_ESD *esd);
+void AVC_RewriteESDescriptor(GF_MPEGVisualSampleEntryBox *avc);
+GF_Err reftype_AddRefTrack(GF_TrackReferenceTypeBox *ref, u32 trackID, u16 *outRefIndex);
+
+
+/*
+		Hinting stuff
+*/
+
+/*the HintType for each protocol*/
+enum
+{
+	GF_ISMO_HINT_RTP	= 1,
+	/*not supported yet*/
+	GF_ISMO_MPEG2_TS	= 2
+};
+
+/*****************************************************
+		RTP Data Entries
+*****************************************************/
+
+#define GF_ISMO_BASE_DTE_ENTRY	\
+	u8 source;
+
+typedef struct
+{
+	GF_ISMO_BASE_DTE_ENTRY
+} GF_GenericDTE;
+
+typedef struct
+{
+	GF_ISMO_BASE_DTE_ENTRY
+} GF_EmptyDTE;
+
+typedef struct
+{
+	GF_ISMO_BASE_DTE_ENTRY
+	u8 dataLength;
+	char data[14];
+} GF_ImmediateDTE;
+
+typedef struct
+{
+	GF_ISMO_BASE_DTE_ENTRY
+	s8 trackRefIndex;
+	u32 sampleNumber;
+	u16 dataLength;
+	u32 byteOffset;
+	u16 bytesPerComp;
+	u16 samplesPerComp;
+} GF_SampleDTE;
+
+typedef struct
+{
+	GF_ISMO_BASE_DTE_ENTRY
+	s8 trackRefIndex;
+	u32 streamDescIndex;
+	u16 dataLength;
+	u32 byteOffset;
+	u32 reserved;
+} GF_StreamDescDTE;
+
+GF_GenericDTE *NewDTE(u8 type);
+void DelDTE(GF_GenericDTE *dte);
+GF_Err ReadDTE(GF_GenericDTE *dte, GF_BitStream *bs);
+GF_Err WriteDTE(GF_GenericDTE *dte, GF_BitStream *bs);
+GF_Err OffsetDTE(GF_GenericDTE *dte, u32 offset, u32 HintSampleNumber);
+
+/*****************************************************
+		RTP Sample
+*****************************************************/
+
+/*data cache when reading*/
+typedef struct __tag_hint_data_cache
+{
+	GF_ISOSample *samp;
+	GF_TrackBox *trak;
+	u32 sample_num;
+} GF_HintDataCache;
+
+
+typedef struct __tag_hint_sample
+{
+	/*used internally for future protocol support (write only)*/
+	u8 HintType;
+	/*QT packets*/
+	u16 reserved;
+	GF_List *packetTable;
+	char *AdditionalData;
+	u32 dataLength;
+	/*used internally for hinting*/
+	u64 TransmissionTime;
+	/*for read only, used to store samples fetched while building packets*/
+	GF_List *sample_cache;
+} GF_HintSample;
+
+GF_HintSample *gf_isom_hint_sample_new(u32 ProtocolType);
+void gf_isom_hint_sample_del(GF_HintSample *ptr);
+GF_Err gf_isom_hint_sample_read(GF_HintSample *ptr, GF_BitStream *bs, u32 sampleSize);
+GF_Err gf_isom_hint_sample_write(GF_HintSample *ptr, GF_BitStream *bs);
+u32 gf_isom_hint_sample_size(GF_HintSample *ptr);
+
+/*****************************************************
+		Hint Packets (generic packet for future protocol support)
+*****************************************************/
+#define GF_ISOM_BASE_PACKET			\
+	s32 relativeTransTime;
+
+
+typedef struct
+{
+	GF_ISOM_BASE_PACKET
+} GF_HintPacket;
+
+GF_HintPacket *gf_isom_hint_pck_new(u8 HintType);
+void gf_isom_hint_pck_del(u8 HintType, GF_HintPacket *ptr);
+GF_Err gf_isom_hint_pck_read(u8 HintType, GF_HintPacket *ptr, GF_BitStream *bs);
+GF_Err gf_isom_hint_pck_write(u8 HintType, GF_HintPacket *ptr, GF_BitStream *bs);
+u32 gf_isom_hint_pck_size(u8 HintType, GF_HintPacket *ptr);
+GF_Err gf_isom_hint_pck_offset(u8 HintType, GF_HintPacket *ptr, u32 offset, u32 HintSampleNumber);
+GF_Err gf_isom_hint_pck_add_dte(u8 HintType, GF_HintPacket *ptr, GF_GenericDTE *dte, u8 AtBegin);
+/*get the size of the packet AS RECONSTRUCTED BY THE SERVER (without CSRC)*/
+u32 gf_isom_hint_pck_length(u8 HintType, GF_HintPacket *ptr);
+
+/*the RTP packet*/
+typedef struct
+{
+	GF_ISOM_BASE_PACKET	
+	
+	/*RTP Header*/
+	u8 P_bit;
+	u8 X_bit;
+	u8 M_bit;
+	/*on 7 bits */
+	u8 payloadType;
+	u16 SequenceNumber;
+	/*Hinting flags*/
+	u8 B_bit;
+	u8 R_bit;
+	/*ExtraInfos TLVs - not really used */
+	GF_List *TLV;
+	/*DataTable - contains the DTEs...*/
+	GF_List *DataTable;
+} GF_RTPPacket;
+
+GF_RTPPacket *gf_isom_hint_rtp_new();
+void gf_isom_hint_rtp_del(GF_RTPPacket *ptr);
+GF_Err gf_isom_hint_rtp_read(GF_RTPPacket *ptr, GF_BitStream *bs);
+GF_Err gf_isom_hint_rtp_write(GF_RTPPacket *ptr, GF_BitStream *bs);
+u32 gf_isom_hint_rtp_size(GF_RTPPacket *ptr);
+GF_Err gf_isom_hint_rtp_offset(GF_RTPPacket *ptr, u32 offset, u32 HintSampleNumber);
+u32 gf_isom_hint_rtp_length(GF_RTPPacket *ptr);
+
+
+
+struct _3gpp_text_sample 
+{
+	char *text;
+	u32 len;
+	
+	GF_TextStyleBox *styles;
+	/*at most one of these*/
+	GF_TextHighlightColorBox *highlight_color;
+	GF_TextScrollDelayBox *scroll_delay;
+	GF_TextBoxBox *box;
+	GF_TextWrapBox *wrap;
+
+	GF_List *others;
+	GF_TextKaraokeBox *cur_karaoke;
+};
+
+GF_TextSample *gf_isom_parse_texte_sample(GF_BitStream *bs);
+GF_TextSample *gf_isom_parse_texte_sample_from_data(char *data, u32 dataLength);
+
+
+
+/*
+	these are exported just in case, there should never be needed outside the lib
+*/
+
+GF_Box *reftype_New();
+GF_Box *free_New();
+GF_Box *mdat_New();
+GF_Box *moov_New();
+GF_Box *mvhd_New();
+GF_Box *mdhd_New();
+GF_Box *vmhd_New();
+GF_Box *smhd_New();
+GF_Box *hmhd_New();
+GF_Box *nmhd_New();
+GF_Box *stbl_New();
+GF_Box *dinf_New();
+GF_Box *url_New();
+GF_Box *urn_New();
+GF_Box *cprt_New();
+GF_Box *chpl_New();
+GF_Box *hdlr_New();
+GF_Box *iods_New();
+GF_Box *trak_New();
+GF_Box *mp4s_New();
+GF_Box *mp4v_New();
+GF_Box *mp4a_New();
+GF_Box *edts_New();
+GF_Box *udta_New();
+GF_Box *dref_New();
+GF_Box *stsd_New();
+GF_Box *stts_New();
+GF_Box *ctts_New();
+GF_Box *stsh_New();
+GF_Box *elst_New();
+GF_Box *stsc_New();
+GF_Box *stsz_New();
+GF_Box *stco_New();
+GF_Box *stss_New();
+GF_Box *stdp_New();
+GF_Box *sdtp_New();
+GF_Box *co64_New();
+GF_Box *esds_New();
+GF_Box *minf_New();
+GF_Box *tkhd_New();
+GF_Box *tref_New();
+GF_Box *mdia_New();
+GF_Box *defa_New();
+GF_Box *uuid_New();
+GF_Box *void_New();
+GF_Box *stsf_New();
+GF_Box *gnrm_New();
+GF_Box *gnrv_New();
+GF_Box *gnra_New();
+GF_Box *pdin_New();
+
+void reftype_del(GF_Box *);
+void free_del(GF_Box *);
+void mdat_del(GF_Box *);
+void moov_del(GF_Box *);
+void mvhd_del(GF_Box *);
+void mdhd_del(GF_Box *);
+void vmhd_del(GF_Box *);
+void smhd_del(GF_Box *);
+void hmhd_del(GF_Box *);
+void nmhd_del(GF_Box *);
+void stbl_del(GF_Box *);
+void dinf_del(GF_Box *);
+void url_del(GF_Box *);
+void urn_del(GF_Box *);
+void chpl_del(GF_Box *);
+void cprt_del(GF_Box *);
+void hdlr_del(GF_Box *);
+void iods_del(GF_Box *);
+void trak_del(GF_Box *);
+void mp4s_del(GF_Box *);
+void mp4v_del(GF_Box *);
+void mp4a_del(GF_Box *);
+void edts_del(GF_Box *);
+void udta_del(GF_Box *);
+void dref_del(GF_Box *);
+void stsd_del(GF_Box *);
+void stts_del(GF_Box *);
+void ctts_del(GF_Box *);
+void stsh_del(GF_Box *);
+void elst_del(GF_Box *);
+void stsc_del(GF_Box *);
+void stsz_del(GF_Box *);
+void stco_del(GF_Box *);
+void stss_del(GF_Box *);
+void stdp_del(GF_Box *);
+void sdtp_del(GF_Box *);
+void co64_del(GF_Box *);
+void esds_del(GF_Box *);
+void minf_del(GF_Box *);
+void tkhd_del(GF_Box *);
+void tref_del(GF_Box *);
+void mdia_del(GF_Box *);
+void defa_del(GF_Box *);
+void uuid_del(GF_Box *);
+void void_del(GF_Box *);
+void stsf_del(GF_Box *);
+void gnrm_del(GF_Box *);
+void gnrv_del(GF_Box *);
+void gnra_del(GF_Box *);
+void pdin_del(GF_Box *);
+
+GF_Err reftype_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err free_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err mdat_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err moov_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err mvhd_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err mdhd_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err vmhd_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err smhd_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err hmhd_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err nmhd_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err stbl_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err dinf_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err url_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err urn_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err chpl_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err cprt_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err hdlr_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err iods_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err trak_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err mp4s_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err mp4v_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err mp4a_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err edts_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err udta_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err dref_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err stsd_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err stts_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err ctts_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err stsh_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err elst_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err stsc_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err stsz_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err stco_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err stss_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err stdp_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err sdtp_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err co64_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err esds_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err minf_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err tkhd_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err tref_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err mdia_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err defa_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err uuid_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err void_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err stsf_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err gnrm_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err gnrv_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err gnra_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err pdin_Write(GF_Box *s, GF_BitStream *bs);
+
+GF_Err reftype_Size(GF_Box *);
+GF_Err free_Size(GF_Box *);
+GF_Err mdat_Size(GF_Box *);
+GF_Err moov_Size(GF_Box *);
+GF_Err mvhd_Size(GF_Box *);
+GF_Err mdhd_Size(GF_Box *);
+GF_Err vmhd_Size(GF_Box *);
+GF_Err smhd_Size(GF_Box *);
+GF_Err hmhd_Size(GF_Box *);
+GF_Err nmhd_Size(GF_Box *);
+GF_Err stbl_Size(GF_Box *);
+GF_Err dinf_Size(GF_Box *);
+GF_Err url_Size(GF_Box *);
+GF_Err urn_Size(GF_Box *);
+GF_Err chpl_Size(GF_Box *);
+GF_Err cprt_Size(GF_Box *);
+GF_Err hdlr_Size(GF_Box *);
+GF_Err iods_Size(GF_Box *);
+GF_Err trak_Size(GF_Box *);
+GF_Err mp4s_Size(GF_Box *);
+GF_Err mp4v_Size(GF_Box *);
+GF_Err mp4a_Size(GF_Box *);
+GF_Err edts_Size(GF_Box *);
+GF_Err udta_Size(GF_Box *);
+GF_Err dref_Size(GF_Box *);
+GF_Err stsd_Size(GF_Box *);
+GF_Err stts_Size(GF_Box *);
+GF_Err ctts_Size(GF_Box *);
+GF_Err stsh_Size(GF_Box *);
+GF_Err elst_Size(GF_Box *);
+GF_Err stsc_Size(GF_Box *);
+GF_Err stsz_Size(GF_Box *);
+GF_Err stco_Size(GF_Box *);
+GF_Err stss_Size(GF_Box *);
+GF_Err stdp_Size(GF_Box *);
+GF_Err sdtp_Size(GF_Box *);
+GF_Err co64_Size(GF_Box *);
+GF_Err esds_Size(GF_Box *);
+GF_Err minf_Size(GF_Box *);
+GF_Err tkhd_Size(GF_Box *);
+GF_Err tref_Size(GF_Box *);
+GF_Err mdia_Size(GF_Box *);
+GF_Err defa_Size(GF_Box *);
+GF_Err uuid_Size(GF_Box *);
+GF_Err void_Size(GF_Box *);
+GF_Err stsf_Size(GF_Box *);
+GF_Err gnrm_Size(GF_Box *);
+GF_Err gnrv_Size(GF_Box *);
+GF_Err gnra_Size(GF_Box *);
+GF_Err pdin_Size(GF_Box *);
+
+GF_Err reftype_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err free_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err mdat_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err moov_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err mvhd_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err mdhd_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err vmhd_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err smhd_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err hmhd_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err nmhd_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err stbl_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err dinf_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err url_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err urn_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err chpl_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err cprt_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err hdlr_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err iods_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err trak_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err mp4s_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err mp4v_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err mp4a_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err edts_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err udta_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err dref_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err stsd_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err stts_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err ctts_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err stsh_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err elst_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err stsc_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err stsz_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err stco_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err stss_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err stdp_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err sdtp_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err co64_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err esds_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err minf_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err tkhd_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err tref_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err mdia_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err defa_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err uuid_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err void_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err stsf_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err pdin_Read(GF_Box *s, GF_BitStream *bs);
+
+
+GF_Box *hinf_New();
+GF_Box *trpy_New();
+GF_Box *totl_New();
+GF_Box *nump_New();
+GF_Box *npck_New();
+GF_Box *tpyl_New();
+GF_Box *tpay_New();
+GF_Box *maxr_New();
+GF_Box *dmed_New();
+GF_Box *dimm_New();
+GF_Box *drep_New();
+GF_Box *tmin_New();
+GF_Box *tmax_New();
+GF_Box *pmax_New();
+GF_Box *dmax_New();
+GF_Box *payt_New();
+GF_Box *name_New();
+GF_Box *rely_New();
+GF_Box *snro_New();
+GF_Box *tims_New();
+GF_Box *tsro_New();
+GF_Box *ghnt_New();
+GF_Box *hnti_New();
+GF_Box *sdp_New();
+GF_Box *rtpo_New();
+
+void hinf_del(GF_Box *s);
+void trpy_del(GF_Box *s);
+void totl_del(GF_Box *s);
+void nump_del(GF_Box *s);
+void npck_del(GF_Box *s);
+void tpyl_del(GF_Box *s);
+void tpay_del(GF_Box *s);
+void maxr_del(GF_Box *s);
+void dmed_del(GF_Box *s);
+void dimm_del(GF_Box *s);
+void drep_del(GF_Box *s);
+void tmin_del(GF_Box *s);
+void tmax_del(GF_Box *s);
+void pmax_del(GF_Box *s);
+void dmax_del(GF_Box *s);
+void payt_del(GF_Box *s);
+void name_del(GF_Box *s);
+void rely_del(GF_Box *s);
+void snro_del(GF_Box *s);
+void tims_del(GF_Box *s);
+void tsro_del(GF_Box *s);
+void ghnt_del(GF_Box *s);
+void hnti_del(GF_Box *a);
+void sdp_del(GF_Box *a);
+void rtpo_del(GF_Box *s);
+
+GF_Err hinf_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err trpy_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err totl_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err nump_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err npck_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err tpyl_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err tpay_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err maxr_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err dmed_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err dimm_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err drep_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err tmin_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err tmax_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err pmax_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err dmax_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err payt_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err name_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err rely_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err snro_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err tims_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err tsro_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err ghnt_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err hnti_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err sdp_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err rtpo_Read(GF_Box *s, GF_BitStream *bs);
+
+GF_Err hinf_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err trpy_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err totl_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err nump_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err npck_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err tpyl_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err tpay_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err maxr_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err dmed_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err dimm_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err drep_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err tmin_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err tmax_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err pmax_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err dmax_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err payt_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err name_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err rely_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err snro_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err tims_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err tsro_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err ghnt_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err hnti_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err sdp_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err rtpo_Write(GF_Box *s, GF_BitStream *bs);
+
+GF_Err hinf_Size(GF_Box *s);
+GF_Err trpy_Size(GF_Box *s);
+GF_Err totl_Size(GF_Box *s);
+GF_Err nump_Size(GF_Box *s);
+GF_Err npck_Size(GF_Box *s);
+GF_Err tpyl_Size(GF_Box *s);
+GF_Err tpay_Size(GF_Box *s);
+GF_Err maxr_Size(GF_Box *s);
+GF_Err dmed_Size(GF_Box *s);
+GF_Err dimm_Size(GF_Box *s);
+GF_Err drep_Size(GF_Box *s);
+GF_Err tmin_Size(GF_Box *s);
+GF_Err tmax_Size(GF_Box *s);
+GF_Err pmax_Size(GF_Box *s);
+GF_Err dmax_Size(GF_Box *s);
+GF_Err payt_Size(GF_Box *s);
+GF_Err name_Size(GF_Box *s);
+GF_Err rely_Size(GF_Box *s);
+GF_Err snro_Size(GF_Box *s);
+GF_Err tims_Size(GF_Box *s);
+GF_Err tsro_Size(GF_Box *s);
+GF_Err ghnt_Size(GF_Box *s);
+GF_Err hnti_Size(GF_Box *s);
+GF_Err sdp_Size(GF_Box *s);
+GF_Err rtpo_Size(GF_Box *s);
+
+
+GF_Box *ftyp_New();
+void ftyp_del(GF_Box *s);
+GF_Err ftyp_Read(GF_Box *s,GF_BitStream *bs);
+GF_Err ftyp_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err ftyp_Size(GF_Box *s);
+
+GF_Box *padb_New();
+void padb_del(GF_Box *s);
+GF_Err padb_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err padb_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err padb_Size(GF_Box *s);
+
+GF_Box *gppa_New(u32 type);
+GF_Box *gppv_New(u32 type);
+GF_Box *gppc_New(u32 type);
+void gppa_del(GF_Box *s);
+void gppv_del(GF_Box *s);
+void gppc_del(GF_Box *s);
+GF_Err gppa_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err gppv_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err gppc_Read(GF_Box *s, GF_BitStream *bs);
+#ifndef GPAC_READ_ONLY
+GF_Err gppa_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err gppv_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err gppc_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err gppa_Size(GF_Box *s);
+GF_Err gppv_Size(GF_Box *s);
+GF_Err gppc_Size(GF_Box *s);
+#endif
+
+
+#ifndef	GPAC_ISOM_NO_FRAGMENTS
+GF_Box *mvex_New();
+GF_Box *trex_New();
+GF_Box *moof_New();
+GF_Box *mfhd_New();
+GF_Box *traf_New();
+GF_Box *tfhd_New();
+GF_Box *trun_New();
+
+void mvex_del(GF_Box *s);
+void trex_del(GF_Box *s);
+void moof_del(GF_Box *s);
+void mfhd_del(GF_Box *s);
+void traf_del(GF_Box *s);
+void tfhd_del(GF_Box *s);
+void trun_del(GF_Box *s);
+
+GF_Err mvex_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err trex_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err moof_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err mfhd_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err traf_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err tfhd_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err trun_Read(GF_Box *s, GF_BitStream *bs);
+
+GF_Err mvex_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err trex_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err moof_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err mfhd_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err traf_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err tfhd_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err trun_Write(GF_Box *s, GF_BitStream *bs);
+
+GF_Err mvex_Size(GF_Box *s);
+GF_Err trex_Size(GF_Box *s);
+GF_Err moof_Size(GF_Box *s);
+GF_Err mfhd_Size(GF_Box *s);
+GF_Err traf_Size(GF_Box *s);
+GF_Err tfhd_Size(GF_Box *s);
+GF_Err trun_Size(GF_Box *s);
+
+
+GF_Box *mehd_New();
+void mehd_del(GF_Box *s);
+GF_Err mehd_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err mehd_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err mehd_Size(GF_Box *s);
+
+#endif 
+
+/*avc ext*/
+GF_Box *avcc_New();
+void avcc_del(GF_Box *s);
+GF_Err avcc_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err avcc_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err avcc_Size(GF_Box *s);
+
+GF_Box *avc1_New();
+
+GF_Box *m4ds_New();
+void m4ds_del(GF_Box *s);
+GF_Err m4ds_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err m4ds_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err m4ds_Size(GF_Box *s);
+
+GF_Box *btrt_New();
+void btrt_del(GF_Box *s);
+GF_Err btrt_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err btrt_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err btrt_Size(GF_Box *s);
+
+
+/*3GPP streaming text*/
+GF_Box *ftab_New();
+GF_Box *tx3g_New();
+GF_Box *styl_New();
+GF_Box *hlit_New();
+GF_Box *hclr_New();
+GF_Box *krok_New();
+GF_Box *dlay_New();
+GF_Box *href_New();
+GF_Box *tbox_New();
+GF_Box *blnk_New();
+GF_Box *twrp_New();
+
+void ftab_del(GF_Box *s);
+void tx3g_del(GF_Box *s);
+void styl_del(GF_Box *s);
+void hlit_del(GF_Box *s);
+void hclr_del(GF_Box *s);
+void krok_del(GF_Box *s);
+void dlay_del(GF_Box *s);
+void href_del(GF_Box *s);
+void tbox_del(GF_Box *s);
+void blnk_del(GF_Box *s);
+void twrp_del(GF_Box *s);
+
+GF_Err ftab_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err tx3g_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err styl_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err hlit_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err hclr_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err krok_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err dlay_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err href_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err tbox_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err blnk_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err twrp_Read(GF_Box *s, GF_BitStream *bs);
+
+#ifndef GPAC_READ_ONLY
+GF_Err ftab_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err tx3g_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err styl_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err hlit_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err hclr_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err krok_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err dlay_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err href_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err tbox_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err blnk_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err twrp_Write(GF_Box *s, GF_BitStream *bs);
+
+GF_Err ftab_Size(GF_Box *s);
+GF_Err tx3g_Size(GF_Box *s);
+GF_Err styl_Size(GF_Box *s);
+GF_Err hlit_Size(GF_Box *s);
+GF_Err hclr_Size(GF_Box *s);
+GF_Err krok_Size(GF_Box *s);
+GF_Err dlay_Size(GF_Box *s);
+GF_Err href_Size(GF_Box *s);
+GF_Err tbox_Size(GF_Box *s);
+GF_Err blnk_Size(GF_Box *s);
+GF_Err twrp_Size(GF_Box *s);
+#endif
+
+
+/* MPEG-21 functions */
+GF_Box *meta_New();
+GF_Box *xml_New();
+GF_Box *bxml_New();
+GF_Box *iloc_New();
+GF_Box *pitm_New();
+GF_Box *ipro_New();
+GF_Box *infe_New();
+GF_Box *iinf_New();
+GF_Box *sinf_New();
+GF_Box *frma_New();
+GF_Box *schm_New();
+GF_Box *schi_New();
+GF_Box *enca_New();
+GF_Box *encv_New();
+GF_Box *encs_New();
+
+void meta_del(GF_Box *s);
+void xml_del(GF_Box *s);
+void bxml_del(GF_Box *s);
+void iloc_del(GF_Box *s);
+void pitm_del(GF_Box *s);
+void ipro_del(GF_Box *s);
+void infe_del(GF_Box *s);
+void iinf_del(GF_Box *s);
+void sinf_del(GF_Box *s);
+void frma_del(GF_Box *s);
+void schm_del(GF_Box *s);
+void schi_del(GF_Box *s);
+
+GF_Err meta_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err xml_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err bxml_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err iloc_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err pitm_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err ipro_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err infe_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err iinf_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err sinf_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err frma_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err schm_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err schi_Read(GF_Box *s, GF_BitStream *bs);
+
+#ifndef GPAC_READ_ONLY
+GF_Err meta_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err xml_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err bxml_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err iloc_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err pitm_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err ipro_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err infe_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err iinf_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err sinf_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err frma_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err schm_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err schi_Write(GF_Box *s, GF_BitStream *bs);
+
+GF_Err meta_Size(GF_Box *s);
+GF_Err xml_Size(GF_Box *s);
+GF_Err bxml_Size(GF_Box *s);
+GF_Err iloc_Size(GF_Box *s);
+GF_Err pitm_Size(GF_Box *s);
+GF_Err ipro_Size(GF_Box *s);
+GF_Err infe_Size(GF_Box *s);
+GF_Err iinf_Size(GF_Box *s);
+GF_Err sinf_Size(GF_Box *s);
+GF_Err frma_Size(GF_Box *s);
+GF_Err schm_Size(GF_Box *s);
+GF_Err schi_Size(GF_Box *s);
+#endif
+
+/* end of MPEG-21 functions */
+
+
+/** ISMACryp functions **/
+GF_Box *iKMS_New();
+GF_Box *iSFM_New();
+void iKMS_del(GF_Box *s);
+void iSFM_del(GF_Box *s);
+GF_Err iKMS_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err iSFM_Read(GF_Box *s, GF_BitStream *bs);
+#ifndef GPAC_READ_ONLY
+GF_Err iKMS_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err iSFM_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err iKMS_Size(GF_Box *s);
+GF_Err iSFM_Size(GF_Box *s);
+#endif
+
+/* Apple extensions */
+void ilst_del(GF_Box *s);
+void ListItem_del(GF_Box *s);
+void data_del(GF_Box *s);
+GF_Err ilst_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err ListItem_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err data_Read(GF_Box *s, GF_BitStream *bs);
+GF_Box *ilst_New();
+GF_Box *ListItem_New(u32 type);
+GF_Box *data_New();
+#ifndef GPAC_READ_ONLY
+GF_Err ilst_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err ListItem_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err data_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err ilst_Size(GF_Box *s);
+GF_Err ListItem_Size(GF_Box *s);
+GF_Err data_Size(GF_Box *s);
+#endif
+
+
+GF_Err gb_box_array_dump(GF_List *list, FILE * trace);
+GF_Err reftype_dump(GF_Box *a, FILE * trace);
+GF_Err free_dump(GF_Box *a, FILE * trace);
+GF_Err mdat_dump(GF_Box *a, FILE * trace);
+GF_Err moov_dump(GF_Box *a, FILE * trace);
+GF_Err mvhd_dump(GF_Box *a, FILE * trace);
+GF_Err mdhd_dump(GF_Box *a, FILE * trace);
+GF_Err vmhd_dump(GF_Box *a, FILE * trace);
+GF_Err smhd_dump(GF_Box *a, FILE * trace);
+GF_Err hmhd_dump(GF_Box *a, FILE * trace);
+GF_Err nmhd_dump(GF_Box *a, FILE * trace);
+GF_Err stbl_dump(GF_Box *a, FILE * trace);
+GF_Err dinf_dump(GF_Box *a, FILE * trace);
+GF_Err url_dump(GF_Box *a, FILE * trace);
+GF_Err urn_dump(GF_Box *a, FILE * trace);
+GF_Err cprt_dump(GF_Box *a, FILE * trace);
+GF_Err hdlr_dump(GF_Box *a, FILE * trace);
+GF_Err iods_dump(GF_Box *a, FILE * trace);
+GF_Err trak_dump(GF_Box *a, FILE * trace);
+GF_Err mp4s_dump(GF_Box *a, FILE * trace);
+GF_Err mp4v_dump(GF_Box *a, FILE * trace);
+GF_Err mp4a_dump(GF_Box *a, FILE * trace);
+GF_Err edts_dump(GF_Box *a, FILE * trace);
+GF_Err udta_dump(GF_Box *a, FILE * trace);
+GF_Err dref_dump(GF_Box *a, FILE * trace);
+GF_Err stsd_dump(GF_Box *a, FILE * trace);
+GF_Err stts_dump(GF_Box *a, FILE * trace);
+GF_Err ctts_dump(GF_Box *a, FILE * trace);
+GF_Err stsh_dump(GF_Box *a, FILE * trace);
+GF_Err elst_dump(GF_Box *a, FILE * trace);
+GF_Err stsc_dump(GF_Box *a, FILE * trace);
+GF_Err stsz_dump(GF_Box *a, FILE * trace);
+GF_Err stco_dump(GF_Box *a, FILE * trace);
+GF_Err stss_dump(GF_Box *a, FILE * trace);
+GF_Err stdp_dump(GF_Box *a, FILE * trace);
+GF_Err sdtp_dump(GF_Box *a, FILE * trace);
+GF_Err co64_dump(GF_Box *a, FILE * trace);
+GF_Err esds_dump(GF_Box *a, FILE * trace);
+GF_Err minf_dump(GF_Box *a, FILE * trace);
+GF_Err tkhd_dump(GF_Box *a, FILE * trace);
+GF_Err tref_dump(GF_Box *a, FILE * trace);
+GF_Err mdia_dump(GF_Box *a, FILE * trace);
+GF_Err defa_dump(GF_Box *a, FILE * trace);
+GF_Err void_dump(GF_Box *a, FILE * trace);
+GF_Err ftyp_dump(GF_Box *a, FILE * trace);
+GF_Err padb_dump(GF_Box *a, FILE * trace);
+GF_Err stsf_dump(GF_Box *a, FILE * trace);
+GF_Err gnrm_dump(GF_Box *a, FILE * trace);
+GF_Err gnrv_dump(GF_Box *a, FILE * trace);
+GF_Err gnra_dump(GF_Box *a, FILE * trace);
+GF_Err gppa_dump(GF_Box *a, FILE * trace);
+GF_Err gppv_dump(GF_Box *a, FILE * trace);
+GF_Err gppc_dump(GF_Box *a, FILE * trace);
+GF_Err chpl_dump(GF_Box *a, FILE * trace);
+GF_Err dpin_dump(GF_Box *a, FILE * trace);
+
+GF_Err hinf_dump(GF_Box *a, FILE * trace);
+GF_Err trpy_dump(GF_Box *a, FILE * trace);
+GF_Err totl_dump(GF_Box *a, FILE * trace);
+GF_Err nump_dump(GF_Box *a, FILE * trace);
+GF_Err npck_dump(GF_Box *a, FILE * trace);
+GF_Err tpyl_dump(GF_Box *a, FILE * trace);
+GF_Err tpay_dump(GF_Box *a, FILE * trace);
+GF_Err maxr_dump(GF_Box *a, FILE * trace);
+GF_Err dmed_dump(GF_Box *a, FILE * trace);
+GF_Err dimm_dump(GF_Box *a, FILE * trace);
+GF_Err drep_dump(GF_Box *a, FILE * trace);
+GF_Err tmin_dump(GF_Box *a, FILE * trace);
+GF_Err tmax_dump(GF_Box *a, FILE * trace);
+GF_Err pmax_dump(GF_Box *a, FILE * trace);
+GF_Err dmax_dump(GF_Box *a, FILE * trace);
+GF_Err payt_dump(GF_Box *a, FILE * trace);
+GF_Err name_dump(GF_Box *a, FILE * trace);
+GF_Err rely_dump(GF_Box *a, FILE * trace);
+GF_Err snro_dump(GF_Box *a, FILE * trace);
+GF_Err tims_dump(GF_Box *a, FILE * trace);
+GF_Err tsro_dump(GF_Box *a, FILE * trace);
+GF_Err ghnt_dump(GF_Box *a, FILE * trace);
+GF_Err hnti_dump(GF_Box *a, FILE * trace);
+GF_Err sdp_dump(GF_Box *a, FILE * trace);
+GF_Err rtpo_dump(GF_Box *a, FILE * trace);
+
+
+
+#ifndef	GPAC_ISOM_NO_FRAGMENTS
+GF_Err mvex_dump(GF_Box *a, FILE * trace);
+GF_Err mehd_dump(GF_Box *a, FILE * trace);
+GF_Err trex_dump(GF_Box *a, FILE * trace);
+GF_Err moof_dump(GF_Box *a, FILE * trace);
+GF_Err mfhd_dump(GF_Box *a, FILE * trace);
+GF_Err traf_dump(GF_Box *a, FILE * trace);
+GF_Err tfhd_dump(GF_Box *a, FILE * trace);
+GF_Err trun_dump(GF_Box *a, FILE * trace);
+#endif
+
+GF_Err avcc_dump(GF_Box *a, FILE * trace);
+GF_Err avc1_dump(GF_Box *a, FILE * trace);
+GF_Err m4ds_dump(GF_Box *a, FILE * trace);
+GF_Err btrt_dump(GF_Box *a, FILE * trace);
+
+GF_Err ftab_dump(GF_Box *a, FILE * trace);
+GF_Err tx3g_dump(GF_Box *a, FILE * trace);
+GF_Err styl_dump(GF_Box *a, FILE * trace);
+GF_Err hlit_dump(GF_Box *a, FILE * trace);
+GF_Err hclr_dump(GF_Box *a, FILE * trace);
+GF_Err krok_dump(GF_Box *a, FILE * trace);
+GF_Err dlay_dump(GF_Box *a, FILE * trace);
+GF_Err href_dump(GF_Box *a, FILE * trace);
+GF_Err tbox_dump(GF_Box *a, FILE * trace);
+GF_Err blnk_dump(GF_Box *a, FILE * trace);
+GF_Err twrp_dump(GF_Box *a, FILE * trace);
+
+/* ISMACryp dump */
+GF_Err iKMS_dump(GF_Box *a, FILE * trace);
+GF_Err iSFM_dump(GF_Box *a, FILE * trace);
+
+/*MPEG-21 extensions dump*/
+GF_Err meta_dump(GF_Box *a, FILE * trace);
+GF_Err xml_dump(GF_Box *a, FILE * trace);
+GF_Err bxml_dump(GF_Box *a, FILE * trace);
+GF_Err iloc_dump(GF_Box *a, FILE * trace);
+GF_Err pitm_dump(GF_Box *a, FILE * trace);
+GF_Err ipro_dump(GF_Box *a, FILE * trace);
+GF_Err infe_dump(GF_Box *a, FILE * trace);
+GF_Err iinf_dump(GF_Box *a, FILE * trace);
+GF_Err sinf_dump(GF_Box *a, FILE * trace);
+GF_Err frma_dump(GF_Box *a, FILE * trace);
+GF_Err schm_dump(GF_Box *a, FILE * trace);
+GF_Err schi_dump(GF_Box *a, FILE * trace);
+
+/*Apple extensions*/
+GF_Err ilst_dump(GF_Box *a, FILE * trace);
+GF_Err ListItem_dump(GF_Box *a, FILE * trace);
+GF_Err data_dump(GF_Box *a, FILE * trace);
+
+/*Apple extensions*/
+GF_MetaBox *gf_isom_apple_get_meta_extensions(GF_ISOFile *mov);
+
+#ifndef GPAC_READ_ONLY
+GF_MetaBox *gf_isom_apple_create_meta_extensions(GF_ISOFile *mov);
+#endif //GPAC_READ_ONLY
+
+/*OMA extensions*/
+GF_Box *ohdr_New();
+void ohdr_del(GF_Box *s);
+GF_Err ohdr_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err ohdr_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err ohdr_Size(GF_Box *s);
+GF_Err ohdr_dump(GF_Box *a, FILE * trace);
+GF_Box *grpi_New();
+void grpi_del(GF_Box *s);
+GF_Err grpi_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err grpi_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err grpi_Size(GF_Box *s);
+GF_Err grpi_dump(GF_Box *a, FILE * trace);
+GF_Box *mdri_New();
+void mdri_del(GF_Box *s);
+GF_Err mdri_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err mdri_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err mdri_Size(GF_Box *s);
+GF_Err mdri_dump(GF_Box *a, FILE * trace);
+GF_Box *odtt_New();
+void odtt_del(GF_Box *s);
+GF_Err odtt_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err odtt_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err odtt_Size(GF_Box *s);
+GF_Err odtt_dump(GF_Box *a, FILE * trace);
+GF_Box *odrb_New();
+void odrb_del(GF_Box *s);
+GF_Err odrb_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err odrb_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err odrb_Size(GF_Box *s);
+GF_Err odrb_dump(GF_Box *a, FILE * trace);
+GF_Box *odkm_New();
+void odkm_del(GF_Box *s);
+GF_Err odkm_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err odkm_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err odkm_Size(GF_Box *s);
+GF_Err odkm_dump(GF_Box *a, FILE * trace);
+
+
+GF_Box *pasp_New();
+void pasp_del(GF_Box *s);
+GF_Err pasp_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err pasp_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err pasp_Size(GF_Box *s);
+GF_Err pasp_dump(GF_Box *a, FILE * trace);
+
+GF_Box *metx_New(u32 type);
+void metx_del(GF_Box *s);
+GF_Err metx_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err metx_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err metx_Size(GF_Box *s);
+GF_Err metx_dump(GF_Box *a, FILE * trace);
+
+
+
+GF_Box *tsel_New();
+void tsel_del(GF_Box *s);
+GF_Err tsel_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err tsel_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err tsel_Size(GF_Box *s);
+GF_Err tsel_dump(GF_Box *a, FILE * trace);
+
+
+GF_Box *dimC_New();
+void dimC_del(GF_Box *s);
+GF_Err dimC_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err dimC_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err dimC_Size(GF_Box *s);
+GF_Err dimC_dump(GF_Box *a, FILE * trace);
+
+GF_Box *dims_New();
+void dims_del(GF_Box *s);
+GF_Err dims_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err dims_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err dims_Size(GF_Box *s);
+GF_Err dims_dump(GF_Box *a, FILE * trace);
+
+GF_Box *diST_New();
+void diST_del(GF_Box *s);
+GF_Err diST_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err diST_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err diST_Size(GF_Box *s);
+GF_Err diST_dump(GF_Box *a, FILE * trace);
+
+
+GF_Box *ac3_New();
+void ac3_del(GF_Box *s);
+GF_Err ac3_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err ac3_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err ac3_Size(GF_Box *s);
+GF_Err ac3_dump(GF_Box *a, FILE * trace);
+
+GF_Box *dac3_New();
+void dac3_del(GF_Box *s);
+GF_Err dac3_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err dac3_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err dac3_Size(GF_Box *s);
+GF_Err dac3_dump(GF_Box *a, FILE * trace);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //_GF_ISOMEDIA_DEV_H_
+
diff --git a/tstools/DtsEdit/src/gpac/internal/laser_dev.h b/tstools/DtsEdit/src/gpac/internal/laser_dev.h
new file mode 100644
index 0000000..e31180f
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/internal/laser_dev.h
@@ -0,0 +1,337 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean le Feuvre
+ *				Copyright (c) 2005-200X ENST
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / LASeR codec sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+#ifndef _GF_LASER_DEV_H_
+#define _GF_LASER_DEV_H_
+
+#include <gpac/laser.h>
+
+/*per_stream config support*/
+typedef struct 
+{
+	GF_LASERConfig cfg;
+	u16 ESID;
+} LASeRStreamInfo;
+
+typedef struct
+{
+	/*colors can be encoded on up to 16 bits per comp*/
+	u16 r, g, b;
+} LSRCol;
+
+struct __tag_laser_codec
+{
+	GF_BitStream *bs;
+	GF_SceneGraph *sg;
+	GF_Err last_error;
+
+	/*all attached streams*/
+	GF_List *streamInfo;
+
+	LASeRStreamInfo *info;
+	Fixed res_factor/*2^-coord_res*/;
+	/*duplicated from config*/
+	u8 scale_bits;
+	u8 coord_bits;
+	u16 time_resolution;
+	u16 color_scale;
+
+	LSRCol *col_table;
+	u32 nb_cols;
+	/*computed dynamically*/
+	u32 colorIndexBits;
+	GF_List *font_table;
+	u32 fontIndexBits;
+
+	u32 privateData_id_index, privateTag_index;
+
+	/*decoder only*/
+	Double (*GetSceneTime)(void *cbk);
+	void *cbk;
+
+	/*sameElement coding*/
+	SVG_Element *prev_g;
+	SVG_Element *prev_line;
+	SVG_Element *prev_path;
+	SVG_Element *prev_polygon;
+	SVG_Element *prev_rect;
+	SVG_Element *prev_text;
+	SVG_Element *prev_use;
+	GF_Node *current_root;
+
+	/*0: normal playback, store script content
+	  1: memory decoding of scene, decompress script into commands
+	*/
+	Bool memory_dec;
+
+	GF_List *defered_hrefs;
+	GF_List *defered_anims;
+	GF_List *defered_listeners;
+
+	char *cache_dir, *service_name;
+	GF_List *unresolved_commands;
+};
+
+s32 gf_lsr_anim_type_from_attribute(u32 tag);
+s32 gf_lsr_anim_type_to_attribute(u32 tag);
+s32 gf_lsr_rare_type_from_attribute(u32 tag);
+s32 gf_lsr_rare_type_to_attribute(u32 tag);
+u32 gf_lsr_same_rare(SVGAllAttributes *elt_atts, SVGAllAttributes *base_atts);
+
+
+/*transform*/
+#define RARE_TRANSFORM				47
+
+enum
+{
+	LSR_EVT_abort = 0,
+	LSR_EVT_accessKey = 1,
+	LSR_EVT_activate = 2,
+	LSR_EVT_activatedEvent = 3,
+	LSR_EVT_beginEvent = 4,
+	LSR_EVT_click = 5,
+	LSR_EVT_deactivatedEvent = 6,
+	LSR_EVT_endEvent = 7,
+	LSR_EVT_error = 8,
+	LSR_EVT_executionTime = 9,
+	LSR_EVT_focusin = 10,
+	LSR_EVT_focusout = 11,
+	LSR_EVT_keydown = 12,
+	LSR_EVT_keyup = 13,
+	LSR_EVT_load = 14,
+	LSR_EVT_longAccessKey = 15,
+	LSR_EVT_mousedown = 16,
+	LSR_EVT_mousemove = 17,
+	LSR_EVT_mouseout = 18,
+	LSR_EVT_mouseover = 19,
+	LSR_EVT_mouseup = 20,
+	LSR_EVT_pause = 21,
+	LSR_EVT_pausedEvent = 22,
+	LSR_EVT_play = 23,
+	LSR_EVT_repeatEvent = 24,
+	LSR_EVT_repeatKey = 25,
+	LSR_EVT_resize = 26,
+	LSR_EVT_resumedEvent = 27,
+	LSR_EVT_scroll = 28,
+	LSR_EVT_shortAccessKey = 29,
+	LSR_EVT_textinput = 30,
+	LSR_EVT_unload = 31,
+	LSR_EVT_zoom = 32
+};	
+
+u32 dom_to_lsr_key(u32 dom_k);
+
+
+#define LSR_UPDATE_TYPE_ROTATE			76
+#define LSR_UPDATE_TYPE_SCALE			79
+#define LSR_UPDATE_TYPE_SVG_HEIGHT		94
+#define LSR_UPDATE_TYPE_SVG_WIDTH		95
+#define LSR_UPDATE_TYPE_TEXT_CONTENT	107
+#define LSR_UPDATE_TYPE_TRANSFORM		108
+#define LSR_UPDATE_TYPE_TRANSLATION		110
+
+
+/*LASeR commands code*/
+enum
+{
+	LSR_UPDATE_ADD = 0,
+	LSR_UPDATE_CLEAN,
+	LSR_UPDATE_DELETE,
+	LSR_UPDATE_INSERT,
+	LSR_UPDATE_NEW_SCENE,
+	LSR_UPDATE_REFRESH_SCENE,
+	LSR_UPDATE_REPLACE,
+	LSR_UPDATE_RESTORE,
+	LSR_UPDATE_SAVE,
+	LSR_UPDATE_SEND_EVENT,
+	LSR_UPDATE_EXTEND,
+	LSR_UPDATE_TEXT_CONTENT
+};
+
+/*Code point Path code*/
+enum
+{
+	LSR_PATH_COM_C = 0,
+	LSR_PATH_COM_H,
+	LSR_PATH_COM_L,
+	LSR_PATH_COM_M, 
+	LSR_PATH_COM_Q, 
+	LSR_PATH_COM_S, 
+	LSR_PATH_COM_T, 
+	LSR_PATH_COM_V, 
+	LSR_PATH_COM_Z, 
+	LSR_PATH_COM_c, 
+	LSR_PATH_COM_h, 
+	LSR_PATH_COM_l, 
+	LSR_PATH_COM_m, 
+	LSR_PATH_COM_q, 
+	LSR_PATH_COM_s, 
+	LSR_PATH_COM_t,
+	LSR_PATH_COM_v,
+	LSR_PATH_COM_z
+};
+
+
+
+
+enum
+{
+	LSR_SCENE_CONTENT_MODEL_a = 0,
+	LSR_SCENE_CONTENT_MODEL_animate,
+	LSR_SCENE_CONTENT_MODEL_animateColor,
+	LSR_SCENE_CONTENT_MODEL_animateMotion,
+	LSR_SCENE_CONTENT_MODEL_animateTransform,
+	LSR_SCENE_CONTENT_MODEL_audio,
+	LSR_SCENE_CONTENT_MODEL_circle,
+	LSR_SCENE_CONTENT_MODEL_defs,
+	LSR_SCENE_CONTENT_MODEL_desc,
+	LSR_SCENE_CONTENT_MODEL_ellipse,
+	LSR_SCENE_CONTENT_MODEL_foreignObject,
+	LSR_SCENE_CONTENT_MODEL_g,
+	LSR_SCENE_CONTENT_MODEL_image,
+	LSR_SCENE_CONTENT_MODEL_line,
+	LSR_SCENE_CONTENT_MODEL_linearGradient,
+	LSR_SCENE_CONTENT_MODEL_metadata,
+	LSR_SCENE_CONTENT_MODEL_mpath,
+	LSR_SCENE_CONTENT_MODEL_path,
+	LSR_SCENE_CONTENT_MODEL_polygon,
+	LSR_SCENE_CONTENT_MODEL_polyline,
+	LSR_SCENE_CONTENT_MODEL_radialGradient,
+	LSR_SCENE_CONTENT_MODEL_rect,
+	LSR_SCENE_CONTENT_MODEL_sameg,
+	LSR_SCENE_CONTENT_MODEL_sameline,
+	LSR_SCENE_CONTENT_MODEL_samepath,
+	LSR_SCENE_CONTENT_MODEL_samepathfill,
+	LSR_SCENE_CONTENT_MODEL_samepolygon,
+	LSR_SCENE_CONTENT_MODEL_samepolygonfill,
+	LSR_SCENE_CONTENT_MODEL_samepolygonstroke,
+	LSR_SCENE_CONTENT_MODEL_samepolyline,
+	LSR_SCENE_CONTENT_MODEL_samepolylinefill,
+	LSR_SCENE_CONTENT_MODEL_samepolylinestroke,
+	LSR_SCENE_CONTENT_MODEL_samerect,
+	LSR_SCENE_CONTENT_MODEL_samerectfill,
+	LSR_SCENE_CONTENT_MODEL_sametext,
+	LSR_SCENE_CONTENT_MODEL_sametextfill,
+	LSR_SCENE_CONTENT_MODEL_sameuse,
+	LSR_SCENE_CONTENT_MODEL_script,
+	LSR_SCENE_CONTENT_MODEL_set,
+	LSR_SCENE_CONTENT_MODEL_stop,
+	LSR_SCENE_CONTENT_MODEL_switch,
+	LSR_SCENE_CONTENT_MODEL_text,
+	LSR_SCENE_CONTENT_MODEL_title,
+	LSR_SCENE_CONTENT_MODEL_tspan,
+	LSR_SCENE_CONTENT_MODEL_use,
+	LSR_SCENE_CONTENT_MODEL_video,
+	LSR_SCENE_CONTENT_MODEL_listener,
+	LSR_SCENE_CONTENT_MODEL_conditional,
+	LSR_SCENE_CONTENT_MODEL_cursorManager,
+	LSR_SCENE_CONTENT_MODEL_element_any,
+	LSR_SCENE_CONTENT_MODEL_privateContainer,
+	LSR_SCENE_CONTENT_MODEL_rectClip,
+	LSR_SCENE_CONTENT_MODEL_selector,
+	LSR_SCENE_CONTENT_MODEL_simpleLayout,
+	LSR_SCENE_CONTENT_MODEL_textContent,
+	LSR_SCENE_CONTENT_MODEL_extension,
+};
+
+enum
+{
+	LSR_UPDATE_CONTENT_MODEL_a = 0,
+	LSR_UPDATE_CONTENT_MODEL_animate,
+	LSR_UPDATE_CONTENT_MODEL_animateColor,
+	LSR_UPDATE_CONTENT_MODEL_animateMotion,
+	LSR_UPDATE_CONTENT_MODEL_animateTransform,
+	LSR_UPDATE_CONTENT_MODEL_audio,
+	LSR_UPDATE_CONTENT_MODEL_circle,
+	LSR_UPDATE_CONTENT_MODEL_defs,
+	LSR_UPDATE_CONTENT_MODEL_desc,
+	LSR_UPDATE_CONTENT_MODEL_ellipse,
+	LSR_UPDATE_CONTENT_MODEL_foreignObject,
+	LSR_UPDATE_CONTENT_MODEL_g,
+	LSR_UPDATE_CONTENT_MODEL_image,
+	LSR_UPDATE_CONTENT_MODEL_line,
+	LSR_UPDATE_CONTENT_MODEL_linearGradient,
+	LSR_UPDATE_CONTENT_MODEL_metadata,
+	LSR_UPDATE_CONTENT_MODEL_mpath,
+	LSR_UPDATE_CONTENT_MODEL_path,
+	LSR_UPDATE_CONTENT_MODEL_polygon,
+	LSR_UPDATE_CONTENT_MODEL_polyline,
+	LSR_UPDATE_CONTENT_MODEL_radialGradient,
+	LSR_UPDATE_CONTENT_MODEL_rect,
+	LSR_UPDATE_CONTENT_MODEL_script,
+	LSR_UPDATE_CONTENT_MODEL_set,
+	LSR_UPDATE_CONTENT_MODEL_stop,
+	LSR_UPDATE_CONTENT_MODEL_svg,
+	LSR_UPDATE_CONTENT_MODEL_switch,
+	LSR_UPDATE_CONTENT_MODEL_text,
+	LSR_UPDATE_CONTENT_MODEL_title,
+	LSR_UPDATE_CONTENT_MODEL_tspan,
+	LSR_UPDATE_CONTENT_MODEL_use,
+	LSR_UPDATE_CONTENT_MODEL_video,
+	LSR_UPDATE_CONTENT_MODEL_listener,
+};
+
+enum
+{
+	LSR_UPDATE_CONTENT_MODEL2_conditional = 0,
+	LSR_UPDATE_CONTENT_MODEL2_cursorManager,
+	LSR_UPDATE_CONTENT_MODEL2_extend,
+	LSR_UPDATE_CONTENT_MODEL2_private,
+	LSR_UPDATE_CONTENT_MODEL2_rectClip,
+	LSR_UPDATE_CONTENT_MODEL2_selector,
+	LSR_UPDATE_CONTENT_MODEL2_simpleLayout,
+};
+
+/*just to remember them, not implemented yet*/
+enum
+{
+	LSR_SVG12_EXT_animation = 0,
+	LSR_SVG12_EXT_discard,
+	LSR_SVG12_EXT_font,
+	LSR_SVG12_EXT_font_face,
+	LSR_SVG12_EXT_font_face_src,
+	LSR_SVG12_EXT_font_face_uri,
+	LSR_SVG12_EXT_glyph,
+	LSR_SVG12_EXT_handler,
+	LSR_SVG12_EXT_hkern,
+	LSR_SVG12_EXT_missingGlyph,
+	LSR_SVG12_EXT_prefetch,
+	LSR_SVG12_EXT_solidColor,
+	LSR_SVG12_EXT_tBreak,
+	LSR_SVG12_EXT_textArea,
+};
+
+/*just to remember them, not implemented yet*/
+enum
+{
+	LSR_AMD1_EXT_animateScroll = 0,
+	LSR_AMD1_EXT_setScroll,
+	LSR_AMD1_EXT_streamSource,
+	LSR_AMD1_EXT_updateSource,
+};
+
+#endif
+
diff --git a/tstools/DtsEdit/src/gpac/internal/media_dev.h b/tstools/DtsEdit/src/gpac/internal/media_dev.h
new file mode 100644
index 0000000..c7cc5bc
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/internal/media_dev.h
@@ -0,0 +1,148 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Media Tools sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+#ifndef _GF_MEDIA_DEV_H_
+#define _GF_MEDIA_DEV_H_
+
+#include <gpac/media_tools.h>
+
+GF_Err gf_import_message(GF_MediaImporter *import, GF_Err e, char *format, ...);
+
+/*returns 0 if not a start code, or size of start code (3 or 4 bytes). If start code, bitstream
+is positionned AFTER start code*/
+u32 AVC_IsStartCode(GF_BitStream *bs);
+/*returns size of chunk between current and next startcode (excluding startcode sizes), 0 if no more startcodes (eos)*/
+u32 AVC_NextStartCode(GF_BitStream *bs);
+/*returns NAL unit type - bitstream must be sync'ed!!*/
+u8 AVC_NALUType(GF_BitStream *bs);
+/*slice NALU*/
+Bool AVC_NALUIsSlice(u8 type);
+
+
+typedef struct
+{
+    s32 profile_idc;
+    s32 level_idc;
+    s32 prof_compat;
+    s32 log2_max_frame_num;
+    u32 poc_type, poc_cycle_length;
+    s32 log2_max_poc_lsb;
+    s32 delta_pic_order_always_zero_flag;
+	s32 offset_for_non_ref_pic, offset_for_top_to_bottom_field;
+	Bool frame_mbs_only_flag;
+
+    s16 offset_for_ref_frame[256];
+
+    s32 timing_info_present_flag;
+    u32 num_units_in_tick;
+    u32 time_scale;
+    s32 fixed_frame_rate_flag;
+
+	u32 width, height;
+	u32 par_num, par_den;
+	/*used to discard repeated SPSs - 0: not parsed, 1 parsed, 2 sent*/
+	u32 status;
+} AVC_SPS;
+
+typedef struct 
+{
+    s32 sps_id;
+    s32 pic_order_present;      /* pic_order_present_flag*/
+    s32 redundant_pic_cnt_present; /* redundant_pic_cnt_present_flag */
+    int slice_group_count;      /* num_slice_groups_minus1 + 1*/
+	/*used to discard repeated SPSs - 0: not parsed, 1 parsed, 2 sent*/
+	u32 status;
+} AVC_PPS;
+
+typedef struct
+{
+	u8 nal_ref_idc, nal_unit_type, field_pic_flag, bottom_field_flag;
+	u32 frame_num, idr_pic_id, poc_lsb, slice_type;
+	s32 delta_poc_bottom;
+	s32 delta_poc[2];
+	s32 redundant_pic_cnt;
+
+	s32 poc;
+	u32 poc_msb, poc_msb_prev, poc_lsb_prev, frame_num_prev;
+	s32 frame_num_offset, frame_num_offset_prev;
+
+	AVC_SPS *sps;
+	AVC_PPS *pps;
+} AVCSliceInfo;
+
+
+typedef struct 
+{
+	u32 frame_cnt;
+	u8 exact_match_flag;
+	u8 broken_link_flag;
+	u8 changing_slice_group_idc;
+	u8 valid;
+} AVCSeiRecoveryPoint;
+
+
+typedef struct 
+{
+	AVCSeiRecoveryPoint recovery_point;
+	/*to be eventually completed by other sei*/
+
+} AVCSei;
+
+typedef struct
+{
+	AVC_SPS sps[32];
+	AVC_PPS pps[255];
+
+	AVCSliceInfo s_info;
+	AVCSei sei;
+} AVCState;
+
+/*return sps ID or -1 if error*/
+s32 AVC_ReadSeqInfo(GF_BitStream *bs, AVCState *avc, u32 *vui_flag_pos);
+/*return pps ID or -1 if error*/
+s32 AVC_ReadPictParamSet(GF_BitStream *bs, AVCState *avc);
+/*is slice a RAP*/
+Bool AVC_SliceIsIDR(AVCState *avc);
+/*parses NALU, updates avc state and returns:
+	1 if NALU part of new frame
+	0 if NALU part of prev frame
+	-1 if bitstream error
+*/
+s32 AVC_ParseNALU(GF_BitStream *bs, u32 nal_hdr, AVCState *avc);
+/*remove SEI messages not allowed in MP4*/
+u32 AVC_ReformatSEI_NALU(char *buffer, u32 nal_size, AVCState *avc);
+
+GF_Err AVC_ChangePAR(GF_AVCConfig *avcc, s32 ar_n, s32 ar_d);
+
+
+typedef struct
+{
+	u8 rate_idx;
+	u8 pck_size;
+} QCPRateTable;
+
+
+#endif		/*_GF_MEDIA_DEV_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/internal/mesh.h b/tstools/DtsEdit/src/gpac/internal/mesh.h
new file mode 100644
index 0000000..05bca60
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/internal/mesh.h
@@ -0,0 +1,285 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Scene Compositor sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+#ifndef _GF_MESH_H_
+#define _GF_MESH_H_
+
+#include <gpac/scenegraph_vrml.h>
+#include <gpac/path2d.h>
+
+/*by default we store each color on 32 bit rather than 4 floats (128 bits)*/
+
+//#define MESH_USE_SFCOLOR
+
+#ifdef MESH_USE_SFCOLOR
+#define MESH_MAKE_COL(_argb) _argb
+#define MESH_GET_COLOR(_argb, _vertex) _argb = (_vertex).color;
+#else
+#define MESH_MAKE_COL(_argb) GF_COL_ARGB(FIX2INT(255*(_argb.alpha)), FIX2INT(255*(_argb.blue)), FIX2INT(255*(_argb.green)), FIX2INT(255*(_argb.red)))
+#define MESH_GET_COLOR(_argb, _vertex) { _argb.alpha = INT2FIX(GF_COL_A((_vertex).color))/255; _argb.red = INT2FIX(GF_COL_R((_vertex).color))/255; _argb.green = INT2FIX(GF_COL_G((_vertex).color))/255; _argb.blue = INT2FIX(GF_COL_B((_vertex).color))/255; }
+#endif
+
+/*by default we store normals as signed bytes rather than floats*/
+
+//#define MESH_USE_FIXED_NORMAL
+
+#ifdef MESH_USE_FIXED_NORMAL
+#define MESH_SET_NORMAL(_vertex, _nor) _vertex.normal = _nor;
+#define MESH_GET_NORMAL(_nor, _vertex) _nor = _vertex.normal;
+#define MESH_NORMAL_UNIT	FIX_ONE
+#else
+
+typedef struct
+{
+	s8 x, y, z;
+	s8 __dummy;
+} SFVec3f_bytes;
+
+#define MESH_NORMAL_UNIT	1
+
+#ifdef GPAC_FIXED_POINT
+#define MESH_SET_NORMAL(_vertex, _nor) { SFVec3f_bytes __nor; __nor.x = (s8) FIX2INT(_nor.x*100); __nor.y = (s8) FIX2INT(_nor.y*100); __nor.z = (s8) FIX2INT(_nor.z*100); __nor.__dummy=0; _vertex.normal = __nor; }
+#define MESH_GET_NORMAL(_nor, _vertex) { (_nor).x = INT2FIX(_vertex.normal.x); (_nor).y = INT2FIX(_vertex.normal.y); (_nor).z = INT2FIX(_vertex.normal.z); gf_vec_norm(&(_nor)); }
+#else
+#define MESH_SET_NORMAL(_vertex, _nor) { SFVec3f_bytes __nor; __nor.x = (s8) (_nor.x*100); __nor.y = (s8) (_nor.y*100); __nor.z = (s8) (_nor.z*100); __nor.__dummy=0; _vertex.normal = __nor; }
+#define MESH_GET_NORMAL(_nor, _vertex) { (_nor).x = _vertex.normal.x; (_nor).y = _vertex.normal.y; (_nor).z = _vertex.normal.z; gf_vec_norm(&(_nor)); }
+#endif
+
+#endif
+
+typedef struct
+{
+	/*position*/
+	SFVec3f pos;	
+	/*texture coordinates*/
+	SFVec2f texcoords;
+	/*normal*/
+#ifdef MESH_USE_FIXED_NORMAL
+	SFVec3f normal;
+#else
+	SFVec3f_bytes normal;
+#endif
+	/*color if used by mesh object*/
+#ifdef MESH_USE_SFCOLOR
+	SFColorRGBA color;
+#else
+	u32 color;
+#endif
+} GF_Vertex;
+
+/*mesh type used*/
+enum
+{
+	/*default: triangles described by indices (nb triangles = nb indices / 3) */
+	MESH_TRIANGLES = 0,
+	/*point set: indices is meaningless*/
+	MESH_POINTSET,
+	/*line set: lines described by indices (nb lines = nb indices / 2) */
+	MESH_LINESET,
+};
+
+/*mesh flags*/
+enum
+{
+	/*vertex.color is used*/
+	MESH_HAS_COLOR = 1, 
+	/*mesh is 2D: normal should be ignored and a global normal set to 0 0 1*/
+	MESH_IS_2D = 1<<1, 
+	/*mesh has no texture coords - disable texturing*/
+	MESH_NO_TEXTURE = 1<<2, 
+	/*mesh faces are clockwise*/
+	MESH_IS_CW = 1<<3, 
+	/*mesh is solid (back face culling + 2 side lighting)*/
+	MESH_IS_SOLID = 1<<4, 
+	/*mesh has smoothed normals*/
+	MESH_IS_SMOOTHED = 1<<5, 
+	/*vertex.color is used with alpha channel*/
+	MESH_HAS_ALPHA = 1<<6, 
+};
+
+/*indexes as used in glDrawElements - note that integer type is not allowed with oglES*/
+#ifdef GPAC_USE_OGL_ES
+#define IDX_TYPE	u16
+#else
+#define IDX_TYPE	u32
+#endif
+
+/*mesh object used by all 2D/3D primitives. */
+typedef struct __gf_mesh
+{
+	/*vertex list*/
+	u32 v_count, v_alloc;
+	GF_Vertex *vertices;
+	/*triangle indexes*/
+	u32 i_count, i_alloc;
+	IDX_TYPE *indices;
+
+	/*one of the above type*/
+	u32 mesh_type;
+
+	/*one of the above flags*/
+	u32 flags;
+
+	/*bounds info: bounding box and bounding sphere radius*/
+	GF_BBox bounds;
+
+	/*aabb tree of the mesh if any*/
+	struct __AABBNode *aabb_root;
+	/*triangle indexes used in AABB tree - order may be different than the one in mesh->indices*/
+	IDX_TYPE *aabb_indices;
+//	u32 aabb_nb_index;
+} GF_Mesh;
+
+GF_Mesh *new_mesh();
+void mesh_free(GF_Mesh *mesh);
+/*reset mesh*/
+void mesh_reset(GF_Mesh *mesh);
+/*recompute mesh bounds*/
+void mesh_update_bounds(GF_Mesh *mesh);
+/*adds new vertex*/
+void mesh_set_vertex_vx(GF_Mesh *mesh, GF_Vertex *vx);
+/*adds new vertex (exported for tesselator only)*/
+void mesh_set_vertex(GF_Mesh *mesh, Fixed x, Fixed y, Fixed z, Fixed nx, Fixed ny, Fixed nz, Fixed u, Fixed v);
+/*adds an index (exported for tesselator only)*/
+void mesh_set_index(GF_Mesh *mesh, u32 idx);
+/*adds an point & associated color, normal set to NULL*/
+void mesh_set_point(GF_Mesh *mesh, Fixed x, Fixed y, Fixed z, SFColorRGBA col);
+/*adds an index (exported for tesselator only)*/
+void mesh_set_triangle(GF_Mesh *mesh, u32 id1, u32 id2, u32 id3);
+/*make dest mesh the clone of orig*/
+void mesh_clone(GF_Mesh *dest, GF_Mesh *orig);
+/*recompute all normals*/
+void mesh_recompute_normals(GF_Mesh *mesh);
+/*generate texture coordinate - ONLY LOCAL MODES SUPPORTED FOR NOW*/
+void mesh_generate_tex_coords(GF_Mesh *mesh, GF_Node *__texCoords);
+
+/*inserts a box (lines only) of size 1.0 1.0 1.0*/
+void mesh_new_unit_bbox(GF_Mesh *mesh);
+
+/*insert base primitives - low res indicates less subdivision steps for circles (cone, cylinder, ellipse, sphere)*/
+void mesh_new_rectangle(GF_Mesh *mesh, SFVec2f size);
+void mesh_new_ellipse(GF_Mesh *mesh, Fixed a_dia, Fixed b_dia, Bool low_res);
+void mesh_new_box(GF_Mesh *mesh, SFVec3f size);
+void mesh_new_cylinder(GF_Mesh *mesh, Fixed height, Fixed radius, Bool bottom, Bool side, Bool top, Bool low_res);
+void mesh_new_cone(GF_Mesh *mesh, Fixed height, Fixed radius, Bool bottom, Bool side, Bool low_res);
+void mesh_new_sphere(GF_Mesh *mesh, Fixed radius, Bool low_res);
+/*inserts ILS/ILS2D and IFS2D outline when not filled*/
+void mesh_new_ils(GF_Mesh *mesh, GF_Node *__coord, MFInt32 *coordIndex, GF_Node *__color, MFInt32 *colorIndex, Bool colorPerVertex, Bool do_close);
+/*inserts IFS2D*/
+void mesh_new_ifs2d(GF_Mesh *mesh, GF_Node *ifs2d);
+/*inserts IFS*/
+void mesh_new_ifs(GF_Mesh *mesh, GF_Node *ifs);
+/*inserts PS/PS2D*/
+void mesh_new_ps(GF_Mesh *mesh, GF_Node *__coord, GF_Node *__color);
+/*inserts ElevationGrid*/
+void mesh_new_elevation_grid(GF_Mesh *mesh, GF_Node *eg);
+/*inserts Extrusion*/
+void mesh_new_extrusion(GF_Mesh *mesh, GF_Node *ext);
+/*builds mesh from path, performing tesselation if desired*/
+void mesh_from_path(GF_Mesh *mesh, GF_Path *path);
+/*builds mesh for outline of the given path*/
+void mesh_get_outline(GF_Mesh *mesh, GF_Path *path);
+/*constructs an extrusion from given path - mesh is reseted, txcoords computed from path bounds
+@thespine: spine line
+@creaseAngle: creaseAngle for normal smoothing, 0 for no smoothing
+begin_cap, end_cap: indicates whether start/end faces shall be added
+@spine_ori: orientation at spine points
+@spine_scale: scale at spine points
+@tx_along_spine: if set, texture coords are generated so that the texture is mapped on the side, 
+otherwise the same txcoords are used all along the extrusion spine
+*/
+void mesh_extrude_path(GF_Mesh *mesh, GF_Path *path, MFVec3f *thespine, Fixed creaseAngle, Bool begin_cap, Bool end_cap, MFRotation *spine_ori, MFVec2f *spine_scale, Bool tx_along_spine);
+/*special extension of the above: APPENDS an extrusion from given path - mesh is NOT reseted, txcoords are computed based on min_cx, min_cy, width_cx, width_cy*/
+void mesh_extrude_path_ext(GF_Mesh *mesh, GF_Path *path, MFVec3f *thespine, Fixed creaseAngle, Fixed min_cx, Fixed min_cy, Fixed width_cx, Fixed width_cy, Bool begin_cap, Bool end_cap, MFRotation *spine_ori, MFVec2f *spine_scale, Bool tx_along_spine);
+
+/*returns 1 if intersection and set outPoint to closest intersection, 0 otherwise*/
+Bool gf_mesh_intersect_ray(GF_Mesh *mesh, GF_Ray *r, SFVec3f *outPoint, SFVec3f *outNormal, SFVec2f *outTexCoords);
+/*returns 1 if any face is less than min_dist from pos, with collision point on closest face (towards pos)*/
+Bool gf_mesh_closest_face(GF_Mesh *mesh, SFVec3f pos, Fixed min_dist, SFVec3f *outPoint);
+
+
+
+
+/*AABB tree node (exported for bounds drawing)*/
+typedef struct __AABBNode
+{
+	/*bbox*/
+	SFVec3f min, max;
+	/*sorted indices in mesh indices list*/
+	IDX_TYPE *indices;
+	/*nb triangles*/
+	u32 nb_idx;
+	/*children nodes, NULL if leaf*/
+	struct __AABBNode *pos, *neg;
+} AABBNode;
+
+/*tree construction modes*/
+enum
+{
+	/*AABB tree is not used*/
+	AABB_NONE, 
+	/*longest box axis is used to divide an AABB node*/
+	AABB_LONGEST, 
+	/*keep tree well-balanced*/
+	AABB_BALANCED,
+	/*best axis is use: test largest, then middle, then smallest axis*/
+	AABB_BEST_AXIS, 
+	/*use variance to pick axis*/
+	AABB_SPLATTER,
+	/*fifty/fifty point split*/
+	AABB_FIFTY,
+};
+
+void gf_mesh_build_aabbtree(GF_Mesh *mesh);
+
+
+/*
+ *		tesselation functions
+ */
+
+/*appends given face (and tesselate if needed) to the mesh. Only vertices are used in the face
+indices are ignored. 
+partially implemented on ogl-ES*/
+void TesselateFaceMesh(GF_Mesh *mesh, GF_Mesh *face);
+
+#ifndef GPAC_USE_OGL_ES
+/*converts 2D path into a polygon - these are only partially implemented when using oglES
+for_outline:
+	 0, regular odd/even windining rule with texCoords
+	 1, zero-non-zero windining rule without texCoords
+	 2, zero-non-zero windining rule with texCoords
+*/
+void TesselatePath(GF_Mesh *mesh, GF_Path *path, u32 outline_style);
+
+/*appends given face (and tesselate if needed) to the mesh. Only vertices are used in the face
+indices are ignored. 
+Same as TesselateFaceMesh + faces info to determine where are the polygons in the face - used by extruder only
+*/
+void TesselateFaceMeshComplex(GF_Mesh *dest, GF_Mesh *orig, u32 nbFaces, u32 *ptsPerFaces);
+
+#endif
+
+#endif		/*_GF_MESH_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/internal/odf_dev.h b/tstools/DtsEdit/src/gpac/internal/odf_dev.h
new file mode 100644
index 0000000..b07ae98
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/internal/odf_dev.h
@@ -0,0 +1,364 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / MPEG-4 ObjectDescriptor sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+#ifndef _GF_OD_DEV_H_
+#define _GF_OD_DEV_H_
+
+#include <gpac/mpeg4_odf.h>
+
+/*read-write OD formatted strings*/
+GF_Err gf_odf_read_url_string(GF_BitStream *bs, char **string, u32 *readBytes);
+GF_Err gf_odf_write_url_string(GF_BitStream *bs, char *string);
+u32 gf_odf_size_url_string(char *string);
+
+/*descriptors base functions*/
+GF_Descriptor *gf_odf_create_descriptor(u8 tag);
+GF_Err gf_odf_delete_descriptor(GF_Descriptor *desc);
+GF_Err gf_odf_parse_descriptor(GF_BitStream *bs, GF_Descriptor **desc, u32 *size);
+GF_Err gf_odf_read_descriptor(GF_BitStream *bs, GF_Descriptor *desc, u32 DescSize);
+GF_Err gf_odf_write_base_descriptor(GF_BitStream *bs, u8 tag, u32 size);
+GF_Err gf_odf_write_descriptor(GF_BitStream *bs, GF_Descriptor *desc);
+GF_Err gf_odf_size_descriptor(GF_Descriptor *desc, u32 *outSize);
+GF_Err gf_odf_delete_descriptor_list(GF_List *descList);
+GF_Err gf_odf_write_descriptor_list(GF_BitStream *bs, GF_List *descList);
+GF_Err gf_odf_write_descriptor_list_filter(GF_BitStream *bs, GF_List *descList, u8 tag_only);
+GF_Err gf_odf_size_descriptor_list(GF_List *descList, u32 *outSize);
+
+/*handle lazy bitstreams where SizeOfInstance is always encoded on 4 bytes*/
+s32 gf_odf_size_field_size(u32 size_desc);
+
+GF_Err DumpDescList(GF_List *list, FILE *trace, u32 indent, const char *ListName, Bool XMTDump, Bool no_skip_empty);
+
+/*IPMPX tools*/
+u32 gf_ipmpx_array_size(GF_BitStream *bs, u32 *array_size);
+void gf_ipmpx_write_array(GF_BitStream *bs, char *data, u32 data_len);
+
+/*QoS qualifiers base functions*/
+GF_Err gf_odf_parse_qos_qual(GF_BitStream *bs, GF_QoS_Default **qos_qual, u32 *qos_size);
+void gf_odf_delete_qos_qual(GF_QoS_Default *qos);
+GF_Err gf_odf_size_qos_qual(GF_QoS_Default *qos);
+GF_Err gf_odf_write_qos_qual(GF_BitStream *bs, GF_QoS_Default *qos);
+
+GF_Descriptor *gf_odf_new_iod();
+GF_Descriptor *gf_odf_new_esd();
+GF_Descriptor *gf_odf_new_dcd();
+GF_Descriptor *gf_odf_new_slc(u8 predef);
+GF_Descriptor *gf_odf_new_cc();
+GF_Descriptor *gf_odf_new_cc_date();
+GF_Descriptor *gf_odf_new_cc_name();
+GF_Descriptor *gf_odf_new_ci();
+GF_Descriptor *gf_odf_new_default();
+GF_Descriptor *gf_odf_new_esd_inc();
+GF_Descriptor *gf_odf_new_esd_ref();
+GF_Descriptor *gf_odf_new_exp_text();
+GF_Descriptor *gf_odf_new_pl_ext();
+GF_Descriptor *gf_odf_new_ipi_ptr();
+GF_Descriptor *gf_odf_new_ipmp();
+GF_Descriptor *gf_odf_new_ipmp_ptr();
+GF_Descriptor *gf_odf_new_kw();
+GF_Descriptor *gf_odf_new_lang();
+GF_Descriptor *gf_odf_new_isom_iod();
+GF_Descriptor *gf_odf_new_isom_od();
+GF_Descriptor *gf_odf_new_od();
+GF_Descriptor *gf_odf_new_oci_date();
+GF_Descriptor *gf_odf_new_oci_name();
+GF_Descriptor *gf_odf_new_pl_idx();
+GF_Descriptor *gf_odf_new_qos();
+GF_Descriptor *gf_odf_new_rating();
+GF_Descriptor *gf_odf_new_reg();
+GF_Descriptor *gf_odf_new_short_text();
+GF_Descriptor *gf_odf_new_smpte_camera();
+GF_Descriptor *gf_odf_new_sup_cid();
+GF_Descriptor *gf_odf_new_segment();
+GF_Descriptor *gf_odf_new_mediatime();
+GF_Descriptor *gf_odf_new_ipmp_tool_list();
+GF_Descriptor *gf_odf_new_ipmp_tool();
+GF_Descriptor *gf_odf_new_muxinfo();
+GF_Descriptor *gf_odf_New_ElemMask();
+GF_Descriptor *gf_odf_new_bifs_cfg();
+GF_Descriptor *gf_odf_new_ui_cfg();
+GF_Descriptor *gf_odf_new_laser_cfg();
+GF_Descriptor *gf_odf_new_auxvid();
+
+
+GF_Err gf_odf_del_iod(GF_InitialObjectDescriptor *iod);
+GF_Err gf_odf_del_esd(GF_ESD *esd);
+GF_Err gf_odf_del_dcd(GF_DecoderConfig *dcd);
+GF_Err gf_odf_del_slc(GF_SLConfig *sl);
+GF_Err gf_odf_del_cc(GF_CCDescriptor *ccd);
+GF_Err gf_odf_del_cc_date(GF_CC_Date *cdd);
+GF_Err gf_odf_del_cc_name(GF_CC_Name *cnd);
+GF_Err gf_odf_del_ci(GF_CIDesc *cid);
+GF_Err gf_odf_del_default(GF_DefaultDescriptor *dd);
+GF_Err gf_odf_del_esd_inc(GF_ES_ID_Inc *esd_inc);
+GF_Err gf_odf_del_esd_ref(GF_ES_ID_Ref *esd_ref);
+GF_Err gf_odf_del_exp_text(GF_ExpandedTextual *etd);
+GF_Err gf_odf_del_pl_ext(GF_PLExt *pld);
+GF_Err gf_odf_del_ipi_ptr(GF_IPIPtr *ipid);
+GF_Err gf_odf_del_ipmp(GF_IPMP_Descriptor *ipmp);
+GF_Err gf_odf_del_ipmp_ptr(GF_IPMPPtr *ipmpd);
+GF_Err gf_odf_del_kw(GF_KeyWord *kwd);
+GF_Err gf_odf_del_lang(GF_Language *ld);
+GF_Err gf_odf_del_isom_iod(GF_IsomInitialObjectDescriptor *iod);
+GF_Err gf_odf_del_isom_od(GF_IsomObjectDescriptor *od);
+GF_Err gf_odf_del_od(GF_ObjectDescriptor *od);
+GF_Err gf_odf_del_oci_date(GF_OCI_Data *ocd);
+GF_Err gf_odf_del_oci_name(GF_OCICreators *ocn);
+GF_Err gf_odf_del_pl_idx(GF_PL_IDX *plid);
+GF_Err gf_odf_del_qos(GF_QoS_Descriptor *qos);
+GF_Err gf_odf_del_rating(GF_Rating *rd);
+GF_Err gf_odf_del_reg(GF_Registration *reg);
+GF_Err gf_odf_del_short_text(GF_ShortTextual *std);
+GF_Err gf_odf_del_smpte_camera(GF_SMPTECamera *cpd);
+GF_Err gf_odf_del_sup_cid(GF_SCIDesc *scid);
+GF_Err gf_odf_del_segment(GF_Segment *sd);
+GF_Err gf_odf_del_mediatime(GF_MediaTime *mt);
+GF_Err gf_odf_del_ipmp_tool_list(GF_IPMP_ToolList *ipmptl);
+GF_Err gf_odf_del_ipmp_tool(GF_IPMP_Tool *ipmp);
+GF_Err gf_odf_del_muxinfo(GF_MuxInfo *mi);
+GF_Err gf_odf_del_bifs_cfg(GF_BIFSConfig *desc);
+GF_Err gf_odf_del_ui_cfg(GF_UIConfig *desc);
+GF_Err gf_odf_del_laser_cfg(GF_LASERConfig *desc);
+GF_Err gf_odf_del_auxvid(GF_AuxVideoDescriptor *ld);
+
+GF_Err gf_odf_read_iod(GF_BitStream *bs, GF_InitialObjectDescriptor *iod, u32 DescSize);
+GF_Err gf_odf_read_esd(GF_BitStream *bs, GF_ESD *esd, u32 DescSize);
+GF_Err gf_odf_read_dcd(GF_BitStream *bs, GF_DecoderConfig *dcd, u32 DescSize);
+GF_Err gf_odf_read_slc(GF_BitStream *bs, GF_SLConfig *sl, u32 DescSize);
+GF_Err gf_odf_read_cc(GF_BitStream *bs, GF_CCDescriptor *ccd, u32 DescSize);
+GF_Err gf_odf_read_cc_date(GF_BitStream *bs, GF_CC_Date *cdd, u32 DescSize);
+GF_Err gf_odf_read_cc_name(GF_BitStream *bs, GF_CC_Name *cnd, u32 DescSize);
+GF_Err gf_odf_read_ci(GF_BitStream *bs, GF_CIDesc *cid, u32 DescSize);
+GF_Err gf_odf_read_default(GF_BitStream *bs, GF_DefaultDescriptor *dd, u32 DescSize);
+GF_Err gf_odf_read_esd_inc(GF_BitStream *bs, GF_ES_ID_Inc *esd_inc, u32 DescSize);
+GF_Err gf_odf_read_esd_ref(GF_BitStream *bs, GF_ES_ID_Ref *esd_ref, u32 DescSize);
+GF_Err gf_odf_read_exp_text(GF_BitStream *bs, GF_ExpandedTextual *etd, u32 DescSize);
+GF_Err gf_odf_read_pl_ext(GF_BitStream *bs, GF_PLExt *pld, u32 DescSize);
+GF_Err gf_odf_read_ipi_ptr(GF_BitStream *bs, GF_IPIPtr *ipid, u32 DescSize);
+GF_Err gf_odf_read_ipmp(GF_BitStream *bs, GF_IPMP_Descriptor *ipmp, u32 DescSize);
+GF_Err gf_odf_read_ipmp_ptr(GF_BitStream *bs, GF_IPMPPtr *ipmpd, u32 DescSize);
+GF_Err gf_odf_read_kw(GF_BitStream *bs, GF_KeyWord *kwd, u32 DescSize);
+GF_Err gf_odf_read_lang(GF_BitStream *bs, GF_Language *ld, u32 DescSize);
+GF_Err gf_odf_read_isom_iod(GF_BitStream *bs, GF_IsomInitialObjectDescriptor *iod, u32 DescSize);
+GF_Err gf_odf_read_isom_od(GF_BitStream *bs, GF_IsomObjectDescriptor *od, u32 DescSize);
+GF_Err gf_odf_read_od(GF_BitStream *bs, GF_ObjectDescriptor *od, u32 DescSize);
+GF_Err gf_odf_read_oci_date(GF_BitStream *bs, GF_OCI_Data *ocd, u32 DescSize);
+GF_Err gf_odf_read_oci_name(GF_BitStream *bs, GF_OCICreators *ocn, u32 DescSize);
+GF_Err gf_odf_read_pl_idx(GF_BitStream *bs, GF_PL_IDX *plid, u32 DescSize);
+GF_Err gf_odf_read_qos(GF_BitStream *bs, GF_QoS_Descriptor *qos, u32 DescSize);
+GF_Err gf_odf_read_rating(GF_BitStream *bs, GF_Rating *rd, u32 DescSize);
+GF_Err gf_odf_read_reg(GF_BitStream *bs, GF_Registration *reg, u32 DescSize);
+GF_Err gf_odf_read_short_text(GF_BitStream *bs, GF_ShortTextual *std, u32 DescSize);
+GF_Err gf_odf_read_smpte_camera(GF_BitStream *bs, GF_SMPTECamera *cpd, u32 DescSize);
+GF_Err gf_odf_read_sup_cid(GF_BitStream *bs, GF_SCIDesc *scid, u32 DescSize);
+GF_Err gf_odf_read_segment(GF_BitStream *bs, GF_Segment *sd, u32 DescSize);
+GF_Err gf_odf_read_mediatime(GF_BitStream *bs, GF_MediaTime *mt, u32 DescSize);
+GF_Err gf_odf_read_muxinfo(GF_BitStream *bs, GF_MuxInfo *mi, u32 DescSize);
+GF_Err gf_odf_read_ipmp_tool_list(GF_BitStream *bs, GF_IPMP_ToolList *ipmptl, u32 DescSize);
+GF_Err gf_odf_read_ipmp_tool(GF_BitStream *bs, GF_IPMP_Tool *ipmp, u32 DescSize);
+GF_Err gf_odf_read_auxvid(GF_BitStream *bs, GF_AuxVideoDescriptor *ld, u32 DescSize);
+
+GF_Err gf_odf_size_iod(GF_InitialObjectDescriptor *iod, u32 *outSize);
+GF_Err gf_odf_size_esd(GF_ESD *esd, u32 *outSize);
+GF_Err gf_odf_size_dcd(GF_DecoderConfig *dcd, u32 *outSize);
+GF_Err gf_odf_size_slc(GF_SLConfig *sl, u32 *outSize);
+GF_Err gf_odf_size_cc(GF_CCDescriptor *ccd, u32 *outSize);
+GF_Err gf_odf_size_cc_date(GF_CC_Date *cdd, u32 *outSize);
+GF_Err gf_odf_size_cc_name(GF_CC_Name *cnd, u32 *outSize);
+GF_Err gf_odf_size_ci(GF_CIDesc *cid, u32 *outSize);
+GF_Err gf_odf_size_default(GF_DefaultDescriptor *dd, u32 *outSize);
+GF_Err gf_odf_size_esd_inc(GF_ES_ID_Inc *esd_inc, u32 *outSize);
+GF_Err gf_odf_size_esd_ref(GF_ES_ID_Ref *esd_ref, u32 *outSize);
+GF_Err gf_odf_size_exp_text(GF_ExpandedTextual *etd, u32 *outSize);
+GF_Err gf_odf_size_pl_ext(GF_PLExt *pld, u32 *outSize);
+GF_Err gf_odf_size_ipi_ptr(GF_IPIPtr *ipid, u32 *outSize);
+GF_Err gf_odf_size_ipmp(GF_IPMP_Descriptor *ipmp, u32 *outSize);
+GF_Err gf_odf_size_ipmp_ptr(GF_IPMPPtr *ipmpd, u32 *outSize);
+GF_Err gf_odf_size_kw(GF_KeyWord *kwd, u32 *outSize);
+GF_Err gf_odf_size_lang(GF_Language *ld, u32 *outSize);
+GF_Err gf_odf_size_isom_iod(GF_IsomInitialObjectDescriptor *iod, u32 *outSize);
+GF_Err gf_odf_size_isom_od(GF_IsomObjectDescriptor *od, u32 *outSize);
+GF_Err gf_odf_size_od(GF_ObjectDescriptor *od, u32 *outSize);
+GF_Err gf_odf_size_oci_date(GF_OCI_Data *ocd, u32 *outSize);
+GF_Err gf_odf_size_oci_name(GF_OCICreators *ocn, u32 *outSize);
+GF_Err gf_odf_size_pl_idx(GF_PL_IDX *plid, u32 *outSize);
+GF_Err gf_odf_size_qos(GF_QoS_Descriptor *qos, u32 *outSize);
+GF_Err gf_odf_size_rating(GF_Rating *rd, u32 *outSize);
+GF_Err gf_odf_size_reg(GF_Registration *reg, u32 *outSize);
+GF_Err gf_odf_size_short_text(GF_ShortTextual *std, u32 *outSize);
+GF_Err gf_odf_size_smpte_camera(GF_SMPTECamera *cpd, u32 *outSize);
+GF_Err gf_odf_size_sup_cid(GF_SCIDesc *scid, u32 *outSize);
+GF_Err gf_odf_size_segment(GF_Segment *sd, u32 *outSize);
+GF_Err gf_odf_size_mediatime(GF_MediaTime *mt, u32 *outSize);
+GF_Err gf_odf_size_muxinfo(GF_MuxInfo *mi, u32 *outSize);
+GF_Err gf_odf_size_ipmp_tool_list(GF_IPMP_ToolList *ipmptl, u32 *outSize);
+GF_Err gf_odf_size_ipmp_tool(GF_IPMP_Tool *ipmp, u32 *outSize);
+GF_Err gf_odf_size_auxvid(GF_AuxVideoDescriptor *ld, u32 *outSize);
+
+GF_Err gf_odf_write_iod(GF_BitStream *bs, GF_InitialObjectDescriptor *iod);
+GF_Err gf_odf_write_esd(GF_BitStream *bs, GF_ESD *esd);
+GF_Err gf_odf_write_dcd(GF_BitStream *bs, GF_DecoderConfig *dcd);
+GF_Err gf_odf_write_slc(GF_BitStream *bs, GF_SLConfig *sl);
+GF_Err gf_odf_write_cc(GF_BitStream *bs, GF_CCDescriptor *ccd);
+GF_Err gf_odf_write_cc_date(GF_BitStream *bs, GF_CC_Date *cdd);
+GF_Err gf_odf_write_cc_name(GF_BitStream *bs, GF_CC_Name *cnd);
+GF_Err gf_odf_write_ci(GF_BitStream *bs, GF_CIDesc *cid);
+GF_Err gf_odf_write_default(GF_BitStream *bs, GF_DefaultDescriptor *dd);
+GF_Err gf_odf_write_esd_inc(GF_BitStream *bs, GF_ES_ID_Inc *esd_inc);
+GF_Err gf_odf_write_esd_ref(GF_BitStream *bs, GF_ES_ID_Ref *esd_ref);
+GF_Err gf_odf_write_exp_text(GF_BitStream *bs, GF_ExpandedTextual *etd);
+GF_Err gf_odf_write_pl_ext(GF_BitStream *bs, GF_PLExt *pld);
+GF_Err gf_odf_write_ipi_ptr(GF_BitStream *bs, GF_IPIPtr *ipid);
+GF_Err gf_odf_write_ipmp(GF_BitStream *bs, GF_IPMP_Descriptor *ipmp);
+GF_Err gf_odf_write_ipmp_ptr(GF_BitStream *bs, GF_IPMPPtr *ipmpd);
+GF_Err gf_odf_write_kw(GF_BitStream *bs, GF_KeyWord *kwd);
+GF_Err gf_odf_write_lang(GF_BitStream *bs, GF_Language *ld);
+GF_Err gf_odf_write_isom_iod(GF_BitStream *bs, GF_IsomInitialObjectDescriptor *iod);
+GF_Err gf_odf_write_isom_od(GF_BitStream *bs, GF_IsomObjectDescriptor *od);
+GF_Err gf_odf_write_od(GF_BitStream *bs, GF_ObjectDescriptor *od);
+GF_Err gf_odf_write_oci_date(GF_BitStream *bs, GF_OCI_Data *ocd);
+GF_Err gf_odf_write_oci_name(GF_BitStream *bs, GF_OCICreators *ocn);
+GF_Err gf_odf_write_pl_idx(GF_BitStream *bs, GF_PL_IDX *plid);
+GF_Err gf_odf_write_qos(GF_BitStream *bs, GF_QoS_Descriptor *qos);
+GF_Err gf_odf_write_rating(GF_BitStream *bs, GF_Rating *rd);
+GF_Err gf_odf_write_reg(GF_BitStream *bs, GF_Registration *reg);
+GF_Err gf_odf_write_short_text(GF_BitStream *bs, GF_ShortTextual *std);
+GF_Err gf_odf_write_smpte_camera(GF_BitStream *bs, GF_SMPTECamera *cpd);
+GF_Err gf_odf_write_sup_cid(GF_BitStream *bs, GF_SCIDesc *scid);
+GF_Err gf_odf_write_segment(GF_BitStream *bs, GF_Segment *sd);
+GF_Err gf_odf_write_mediatime(GF_BitStream *bs, GF_MediaTime *mt);
+GF_Err gf_odf_write_muxinfo(GF_BitStream *bs, GF_MuxInfo *mi);
+GF_Err gf_odf_write_ipmp_tool_list(GF_BitStream *bs, GF_IPMP_ToolList *ipmptl);
+GF_Err gf_odf_write_ipmp_tool(GF_BitStream *bs, GF_IPMP_Tool *ipmp);
+GF_Err gf_odf_write_auxvid(GF_BitStream *bs, GF_AuxVideoDescriptor *ld);
+
+GF_Descriptor *gf_odf_new_text_cfg();
+GF_Err gf_odf_del_text_cfg(GF_TextConfig *desc);
+GF_Descriptor *gf_odf_new_tx3g();
+GF_Err gf_odf_del_tx3g(GF_TextSampleDescriptor *sd);
+
+/*our commands base functions*/
+GF_ODCom *gf_odf_create_command(u8 tag);
+GF_Err gf_odf_delete_command(GF_ODCom *com);
+GF_Err gf_odf_parse_command(GF_BitStream *bs, GF_ODCom **com, u32 *com_size);
+GF_Err gf_odf_read_command(GF_BitStream *bs, GF_ODCom *com, u32 gf_odf_size_command);
+GF_Err gf_odf_size_command(GF_ODCom *com, u32 *outSize);
+GF_Err gf_odf_write_command(GF_BitStream *bs, GF_ODCom *com);
+
+GF_ODCom *gf_odf_new_od_remove();
+GF_ODCom *gf_odf_new_od_update();
+GF_ODCom *gf_odf_new_esd_update();
+GF_ODCom *gf_odf_new_esd_remove();
+GF_ODCom *gf_odf_new_ipmp_update();
+GF_ODCom *gf_odf_new_ipmp_remove();
+GF_ODCom *gf_odf_new_base_command();
+
+GF_Err gf_odf_del_od_remove(GF_ODRemove *ODRemove);
+GF_Err gf_odf_del_od_update(GF_ODUpdate *ODUpdate);
+GF_Err gf_odf_del_esd_update(GF_ESDUpdate *ESDUpdate);
+GF_Err gf_odf_del_esd_remove(GF_ESDRemove *ESDRemove);
+GF_Err gf_odf_del_ipmp_update(GF_IPMPUpdate *IPMPDUpdate);
+GF_Err gf_odf_del_ipmp_remove(GF_IPMPRemove *IPMPDRemove);
+GF_Err gf_odf_del_base_command(GF_BaseODCom *bcRemove);
+
+GF_Err gf_odf_read_od_remove(GF_BitStream *bs, GF_ODRemove *odRem, u32 gf_odf_size_command);
+GF_Err gf_odf_read_od_update(GF_BitStream *bs, GF_ODUpdate *odUp, u32 gf_odf_size_command);
+GF_Err gf_odf_read_esd_update(GF_BitStream *bs, GF_ESDUpdate *esdUp, u32 gf_odf_size_command);
+GF_Err gf_odf_read_esd_remove(GF_BitStream *bs, GF_ESDRemove *esdRem, u32 gf_odf_size_command);
+GF_Err gf_odf_read_ipmp_update(GF_BitStream *bs, GF_IPMPUpdate *ipmpUp, u32 gf_odf_size_command);
+GF_Err gf_odf_read_ipmp_remove(GF_BitStream *bs, GF_IPMPRemove *ipmpRem, u32 gf_odf_size_command);
+GF_Err gf_odf_read_base_command(GF_BitStream *bs, GF_BaseODCom *bcRem, u32 gf_odf_size_command);
+
+GF_Err gf_odf_size_od_remove(GF_ODRemove *odRem, u32 *outSize);
+GF_Err gf_odf_size_od_update(GF_ODUpdate *odUp, u32 *outSize);
+GF_Err gf_odf_size_esd_update(GF_ESDUpdate *esdUp, u32 *outSize);
+GF_Err gf_odf_size_esd_remove(GF_ESDRemove *esdRem, u32 *outSize);
+GF_Err gf_odf_size_ipmp_update(GF_IPMPUpdate *ipmpUp, u32 *outSize);
+GF_Err gf_odf_size_ipmp_remove(GF_IPMPRemove *ipmpRem, u32 *outSize);
+GF_Err gf_odf_size_base_command(GF_BaseODCom *bcRem, u32 *outSize);
+
+GF_Err gf_odf_write_od_remove(GF_BitStream *bs, GF_ODRemove *odRem);
+GF_Err gf_odf_write_od_update(GF_BitStream *bs, GF_ODUpdate *odUp);
+GF_Err gf_odf_write_esd_update(GF_BitStream *bs, GF_ESDUpdate *esdUp);
+GF_Err gf_odf_write_esd_remove(GF_BitStream *bs, GF_ESDRemove *esdRem);
+GF_Err gf_odf_write_ipmp_update(GF_BitStream *bs, GF_IPMPUpdate *ipmpUp);
+GF_Err gf_odf_write_ipmp_remove(GF_BitStream *bs, GF_IPMPRemove *ipmpRem);
+GF_Err gf_odf_write_base_command(GF_BitStream *bs, GF_BaseODCom *bcRem);
+
+
+
+/*dumping*/
+GF_Err gf_odf_dump_iod(GF_InitialObjectDescriptor *iod, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_esd(GF_ESD *esd, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_dcd(GF_DecoderConfig *dcd, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_slc(GF_SLConfig *sl, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_cc(GF_CCDescriptor *ccd, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_cc_date(GF_CC_Date *cdd, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_cc_name(GF_CC_Name *cnd, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_ci(GF_CIDesc *cid, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_default(GF_DefaultDescriptor *dd, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_esd_inc(GF_ES_ID_Inc *esd_inc, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_esd_ref(GF_ES_ID_Ref *esd_ref, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_exp_text(GF_ExpandedTextual *etd, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_pl_ext(GF_PLExt *pld, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_ipi_ptr(GF_IPIPtr *ipid, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_ipmp(GF_IPMP_Descriptor *ipmp, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_ipmp_ptr(GF_IPMPPtr *ipmpd, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_kw(GF_KeyWord *kwd, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_lang(GF_Language *ld, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_isom_iod(GF_IsomInitialObjectDescriptor *iod, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_isom_od(GF_IsomObjectDescriptor *od, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_od(GF_ObjectDescriptor *od, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_oci_date(GF_OCI_Data *ocd, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_oci_name(GF_OCICreators *ocn, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_pl_idx(GF_PL_IDX *plid, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_qos(GF_QoS_Descriptor *qos, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_rating(GF_Rating *rd, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_reg(GF_Registration *reg, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_short_text(GF_ShortTextual *std, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_smpte_camera(GF_SMPTECamera *cpd, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_sup_cid(GF_SCIDesc *scid, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_segment(GF_Segment *sd, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_mediatime(GF_MediaTime *mt, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_muxinfo(GF_MuxInfo *mi, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_bifs_cfg(GF_BIFSConfig *dsi, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_laser_cfg(GF_LASERConfig *dsi, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_ui_cfg(GF_UIConfig *dsi, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_txtcfg(GF_TextConfig *desc, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_ipmp_tool_list(GF_IPMP_ToolList *tl, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_ipmp_tool(GF_IPMP_Tool*t, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_aux_vid(GF_AuxVideoDescriptor *ld, FILE *trace, u32 indent, Bool XMTDump);
+
+
+GF_Err gf_odf_dump_od_update(GF_ODUpdate *com, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_od_remove(GF_ODRemove *com, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_esd_update(GF_ESDUpdate *com, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_esd_remove(GF_ESDRemove *com, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_ipmp_update(GF_IPMPUpdate *com, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_ipmp_remove(GF_IPMPRemove *com, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_base_command(GF_BaseODCom *com, FILE *trace, u32 indent, Bool XMTDump);
+
+#endif	/*_GF_OD_DEV_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/internal/ogg.h b/tstools/DtsEdit/src/gpac/internal/ogg.h
new file mode 100644
index 0000000..e5b0f1e
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/internal/ogg.h
@@ -0,0 +1,209 @@
+/********************************************************************
+ *                                                                  *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
+ *                                                                  *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2002             *
+ * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ *                                                                  *
+ ********************************************************************
+
+ function: code raw [Vorbis] packets into framed OggSquish stream and
+           decode Ogg streams back into raw packets
+
+ note: The CRC code is directly derived from public domain code by
+ Ross Williams (ross@guest.adelaide.edu.au).  See docs/framing.html
+ for details.
+
+ ********************************************************************/
+
+
+#ifndef _GF_OGG_H_
+#define _GF_OGG_H_
+
+/*DON'T CLASH WITH OFFICIAL OGG IF ALREADY INCLUDED*/
+#ifndef _OGG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/tools.h>
+
+typedef struct {
+  s32 endbyte;
+  s32  endbit;
+
+  unsigned char *buffer;
+  unsigned char *ptr;
+  s32 storage;
+} oggpack_buffer;
+
+/* ogg_page is used to encapsulate the data in one Ogg bitstream page *****/
+
+typedef struct {
+  unsigned char *header;
+  s32 header_len;
+  unsigned char *body;
+  s32 body_len;
+} ogg_page;
+
+/* ogg_stream_state contains the current encode/decode state of a logical
+   Ogg bitstream **********************************************************/
+
+typedef struct {
+  unsigned char   *body_data;    /* bytes from packet bodies */
+  s32    body_storage;          /* storage elements allocated */
+  s32    body_fill;             /* elements stored; fill mark */
+  s32    body_returned;         /* elements of fill returned */
+
+
+  s32     *lacing_vals;      /* The values that will go to the segment table */
+  s64 *granule_vals; /* granulepos values for headers. Not compact
+				this way, but it is simple coupled to the
+				lacing fifo */
+  s32    lacing_storage;
+  s32    lacing_fill;
+  s32    lacing_packet;
+  s32    lacing_returned;
+
+  unsigned char    header[282];      /* working space for header encode */
+  s32              header_fill;
+
+  s32     e_o_s;          /* set when we have buffered the last packet in the
+                             logical bitstream */
+  s32     b_o_s;          /* set after we've written the initial page
+                             of a logical bitstream */
+  s32    serialno;
+  s32    pageno;
+  s64  packetno;      /* sequence number for decode; the framing
+                             knows where there's a hole in the data,
+                             but we need coupling so that the codec
+                             (which is in a seperate abstraction
+                             layer) also knows about the gap */
+  s64   granulepos;
+
+} ogg_stream_state;
+
+/* ogg_packet is used to encapsulate the data and metadata belonging
+   to a single raw Ogg/Vorbis packet *************************************/
+
+typedef struct {
+  unsigned char *packet;
+  s32  bytes;
+  s32  b_o_s;
+  s32  e_o_s;
+
+  s64  granulepos;
+  
+  s64  packetno;     /* sequence number for decode; the framing
+				knows where there's a hole in the data,
+				but we need coupling so that the codec
+				(which is in a seperate abstraction
+				layer) also knows about the gap */
+} ogg_packet;
+
+typedef struct {
+  unsigned char *data;
+  s32 storage;
+  s32 fill;
+  s32 returned;
+
+  s32 unsynced;
+  s32 headerbytes;
+  s32 bodybytes;
+} ogg_sync_state;
+
+
+
+/* Ogg BITSTREAM PRIMITIVES: bitstream ************************/
+
+void oggpack_writeinit(oggpack_buffer *b);
+void oggpack_writetrunc(oggpack_buffer *b,s32 bits);
+void oggpack_writealign(oggpack_buffer *b);
+void oggpack_writecopy(oggpack_buffer *b,void *source,s32 bits);
+void oggpack_reset(oggpack_buffer *b);
+void oggpack_writeclear(oggpack_buffer *b);
+void oggpack_readinit(oggpack_buffer *b,unsigned char *buf,s32 bytes);
+void oggpack_write(oggpack_buffer *b,u32 value,s32 bits);
+s32 oggpack_look(oggpack_buffer *b,s32 bits);
+s32 oggpack_look1(oggpack_buffer *b);
+void oggpack_adv(oggpack_buffer *b,s32 bits);
+void oggpack_adv1(oggpack_buffer *b);
+s32 oggpack_read(oggpack_buffer *b,s32 bits);
+s32 oggpack_read1(oggpack_buffer *b);
+s32 oggpack_bytes(oggpack_buffer *b);
+s32 oggpack_bits(oggpack_buffer *b);
+unsigned char *oggpack_get_buffer(oggpack_buffer *b);
+
+void oggpackB_writeinit(oggpack_buffer *b);
+void oggpackB_writetrunc(oggpack_buffer *b,s32 bits);
+void oggpackB_writealign(oggpack_buffer *b);
+void oggpackB_writecopy(oggpack_buffer *b,void *source,s32 bits);
+void oggpackB_reset(oggpack_buffer *b);
+void oggpackB_writeclear(oggpack_buffer *b);
+void oggpackB_readinit(oggpack_buffer *b,unsigned char *buf,s32 bytes);
+void oggpackB_write(oggpack_buffer *b,u32 value,s32 bits);
+s32 oggpackB_look(oggpack_buffer *b,s32 bits);
+s32 oggpackB_look1(oggpack_buffer *b);
+void oggpackB_adv(oggpack_buffer *b,s32 bits);
+void oggpackB_adv1(oggpack_buffer *b);
+s32 oggpackB_read(oggpack_buffer *b,s32 bits);
+s32 oggpackB_read1(oggpack_buffer *b);
+s32 oggpackB_bytes(oggpack_buffer *b);
+s32 oggpackB_bits(oggpack_buffer *b);
+unsigned char *oggpackB_get_buffer(oggpack_buffer *b);
+
+/* Ogg BITSTREAM PRIMITIVES: encoding **************************/
+
+s32 ogg_stream_packetin(ogg_stream_state *os, ogg_packet *op);
+s32 ogg_stream_pageout(ogg_stream_state *os, ogg_page *og);
+s32 ogg_stream_flush(ogg_stream_state *os, ogg_page *og);
+
+/* Ogg BITSTREAM PRIMITIVES: decoding **************************/
+
+s32 ogg_sync_init(ogg_sync_state *oy);
+s32 ogg_sync_clear(ogg_sync_state *oy);
+s32 ogg_sync_reset(ogg_sync_state *oy);
+s32 ogg_sync_destroy(ogg_sync_state *oy);
+
+char *ogg_sync_buffer(ogg_sync_state *oy, s32 size);
+s32 ogg_sync_wrote(ogg_sync_state *oy, s32 bytes);
+s32 ogg_sync_pageseek(ogg_sync_state *oy,ogg_page *og);
+s32 ogg_sync_pageout(ogg_sync_state *oy, ogg_page *og);
+s32 ogg_stream_pagein(ogg_stream_state *os, ogg_page *og);
+s32 ogg_stream_packetout(ogg_stream_state *os,ogg_packet *op);
+s32 ogg_stream_packetpeek(ogg_stream_state *os,ogg_packet *op);
+
+/* Ogg BITSTREAM PRIMITIVES: general ***************************/
+
+s32 ogg_stream_init(ogg_stream_state *os,s32 serialno);
+s32 ogg_stream_clear(ogg_stream_state *os);
+s32 ogg_stream_reset(ogg_stream_state *os);
+s32 ogg_stream_reset_serialno(ogg_stream_state *os,s32 serialno);
+s32 ogg_stream_destroy(ogg_stream_state *os);
+s32 ogg_stream_eos(ogg_stream_state *os);
+void ogg_page_checksum_set(ogg_page *og);
+s32 ogg_page_version(ogg_page *og);
+s32 ogg_page_continued(ogg_page *og);
+s32 ogg_page_bos(ogg_page *og);
+s32 ogg_page_eos(ogg_page *og);
+s64 ogg_page_granulepos(ogg_page *og);
+s32 ogg_page_serialno(ogg_page *og);
+s32 ogg_page_pageno(ogg_page *og);
+s32 ogg_page_packets(ogg_page *og);
+
+void ogg_packet_clear(ogg_packet *op);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif	/*_OGG_H*/
+
+#endif	/*_GF_OGG_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/internal/scenegraph_dev.h b/tstools/DtsEdit/src/gpac/internal/scenegraph_dev.h
new file mode 100644
index 0000000..ba0507b
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/internal/scenegraph_dev.h
@@ -0,0 +1,1047 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005
+ *					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. 
+ *
+ */
+
+
+
+#ifndef _GF_SCENEGRAPH_DEV_H_
+#define _GF_SCENEGRAPH_DEV_H_
+
+/*defined this macro to enable cyclic render*/
+#define GF_CYCLIC_TRAVERSE_ON
+
+/*defined this macro to enable scene replacement from inside (through conditional)*/
+//#define GF_SELF_REPLACE_ENABLE
+
+/*for vrml base types, ROUTEs and PROTOs*/
+#include <gpac/scenegraph_vrml.h>
+
+#include <gpac/scenegraph_svg.h>
+
+#ifdef GPAC_HAS_SPIDERMONKEY
+
+/*WIN32 and WinCE config (no configure script)*/
+#if defined(WIN32) || defined(_WIN32_WCE) || defined(__SYMBIAN32__)
+#ifndef XP_PC
+#define XP_PC
+#endif
+#ifndef XP_WIN
+#define XP_WIN
+#endif
+/*WINCE specific config*/
+#if defined(_WIN32_WCE)
+#include <windows.h>
+#define XP_WINCE
+#endif
+#endif
+
+/*other platforms should be setup through configure*/
+
+#endif
+
+
+void gf_node_setup(GF_Node *p, u32 tag);
+
+typedef struct _parent_list
+{
+	struct _parent_list *next;
+	GF_Node *node;
+} GF_ParentList;
+
+
+/*internal flag reserved for NodeID*/
+#define GF_NODE_IS_DEF			0x80000000	// 1<<31
+/*internal flag reserved for activate/deactivate*/
+#define GF_NODE_IS_DEACTIVATED	0x40000000	// 1<<30
+/*internal flag reserved for node with scripting bindings*/
+#define GF_NODE_HAS_BINDING		0x20000000	// 1<<29
+
+#ifdef GF_CYCLIC_TRAVERSE_ON
+#define GF_NODE_IN_TRAVERSE		0x10000000	//	1<<28
+#define GF_NODE_INTERNAL_FLAGS	0xF0000000
+#else
+#define GF_NODE_INTERNAL_FLAGS	0xE0000000
+#endif
+
+struct _node_interactive_ext
+{
+	/*routes on eventOut, ISed routes, ... for VRML-based scene graphs
+	THIS IS DYNAMICALLY CREATED*/
+	GF_List *routes;
+
+#ifdef GPAC_HAS_SPIDERMONKEY
+	/*JS bindings if any - THIS IS DYNAMICALLY CREATED
+	This speeds up field modif notification (script bindings are listed here)*/
+	GF_List *bindings;
+#endif
+
+#ifndef GPAC_DISABLE_SVG
+	/*event listeners - THIS IS DYNAMICALLY CREATED*/
+	GF_DOMEventTarget *dom_evt;
+
+	/* SVG animations are registered in the target node  - THIS IS DYNAMICALLY CREATED*/
+	GF_List *animations;
+#endif
+
+};
+
+typedef struct _nodepriv
+{
+	/*node type*/
+	u16 tag;
+	/*number of instances of this node in the graph*/
+	u16 num_instances;
+	/*node flags*/
+	u32 flags;
+	/*scenegraph holding the node*/
+	struct __tag_scene_graph *scenegraph;
+
+	/*user defined callback function */
+	void (*UserCallback)(struct _base_node *node, void *render_stack, Bool node_destroy);
+	/*user defined stack*/
+	void *UserPrivate;
+
+	/*list of all parent nodes (needed to invalidate parent tree)*/
+	GF_ParentList *parents;
+	
+	/*holder for all interactive stuff - THIS IS DYNAMICALLY CREATED*/
+	struct _node_interactive_ext *interact;
+} NodePriv;
+
+
+typedef struct __tag_node_id
+{
+	struct __tag_node_id *next;
+	GF_Node *node;
+
+	/*node ID*/
+	u32 NodeID;
+	/*node def name*/
+	char *NodeName;
+} NodeIDedItem;
+
+typedef struct
+{
+	char *name;
+	char *qname;
+	u32 xmlns_id;
+} GF_XMLNS;
+
+struct __tag_scene_graph 
+{
+	/*used to discriminate between node and scenegraph*/
+	u64 __reserved_null;
+
+	/*all DEF nodes (explicit)*/
+	NodeIDedItem *id_node, *id_node_last;
+
+	/*all routes available*/
+	GF_List *Routes;
+
+	/*all routes available*/
+	GF_List *exported_nodes;
+
+	/*when a proto is instanciated it creates its own scene graph. BIFS/VRML specify that the namespace is the same 
+	(eg cannot reuse a NodeID or route name/ID), but this could be done differently by some other stds
+	if NULL this is the main scenegraph*/
+	struct _proto_instance *pOwningProto;
+
+	/*all first-level protos of the graph (the only ones that can be instanciated in this graph)*/
+	GF_List *protos;
+	/*all first-level protos of the graph not currently registered - memory handling of graph only*/
+	GF_List *unregistered_protos;
+
+	/*pointer to the root node*/
+	GF_Node *RootNode;
+
+	/*routes to be activated (cascade model). This is used at the top-level graph only (eg
+	proto routes use that too, ecept ISed fields). It is the app responsability to 
+	correctly connect or browse scene graphs connected through Inline*/
+	GF_List *routes_to_activate;
+
+	/*since events may trigger deletion of objects we use a 2 step delete*/
+	GF_List *routes_to_destroy;
+
+	u32 simulation_tick;
+
+	/*user private data*/
+	void *userpriv;
+
+	/*callback routines*/
+	/*node callback*/
+	void (*NodeCallback)(void *user_priv, u32 type, GF_Node *node, void *ctxdata);
+	/*real scene time callback*/
+	Double (*GetSceneTime)(void *userpriv);
+
+	GF_SceneGraph *(*GetExternProtoLib)(void *userpriv, MFURL *lib_url);
+
+	/*parent scene if any*/
+	struct __tag_scene_graph *parent_scene;
+
+	/*size info and pixel metrics - this is not used internally, however it helps when rendering
+	and decoding modules don't know each-other (as in MPEG4)*/
+	u32 width, height;
+	Bool usePixelMetrics;
+
+	Bool modified;
+
+	/*application interface for javascript*/
+	gf_sg_script_action script_action;
+	void *script_action_cbck;
+
+	/*script loader*/
+	void (*script_load)(GF_Node *node);
+	/*callback to JS upon node modif*/
+	void (*on_node_modified)(struct __tag_scene_graph *sg, GF_Node *node, GF_FieldInfo *info, GF_Node *script);
+
+	u32 max_defined_route_id;
+
+	/*namespaces list. This list is used while parsing/dumping the tree to store the hierarchy of xmlns attributes in subtrees.
+	It is a stack of GF_XMLNS structures pushed/popped at each element*/
+	GF_List *ns;
+
+#ifdef GF_SELF_REPLACE_ENABLE
+	/*to detect replace scene from within conditionals*/
+	Bool graph_has_been_reset;
+#endif
+	/*global qp used in BIFS coding*/
+	GF_Node *global_qp;
+
+	/*use stack as used in the dom_fire_event - this is only valid during an event fire, and may be NULL*/
+	GF_List *use_stack;
+
+	/*temp storage for name conversions*/
+	char szNameBuffer[100];
+
+#ifndef GPAC_DISABLE_SVG
+	GF_DOMEventTarget dom_evt;
+	u32 nb_evts_focus;
+	u32 nb_evts_mouse;
+	u32 nb_evts_key;
+	u32 nb_evts_ui;
+	u32 nb_evts_text;
+	u32 nb_evts_smil;
+	u32 nb_evts_mutation;
+	u32 nb_evts_laser;
+	u32 nb_evts_mae;
+	u32 nb_evts_svg;
+	u32 dom_evt_filter;
+
+	GF_List *xlink_hrefs;
+	GF_List *smil_timed_elements;
+	GF_List *modified_smil_timed_elements;
+	Bool update_smil_timing;
+
+	/*listeners to add*/
+	GF_List *listeners_to_add;
+
+#ifdef GPAC_HAS_SPIDERMONKEY
+	struct __tag_svg_script_ctx *svg_js;
+#endif
+
+#endif
+
+#ifdef GPAC_HAS_SPIDERMONKEY
+	GF_List *scripts;
+	/*
+			Note about reference counter
+
+	  A DOM document (<=> scenegraph) may be created through javascript, and the JS object having created the 
+	  document may be destroyed while the document is still in use. Moreover with XMLHttpRequest, the
+	  "associated" doc is re-created at each request, but the script may still refer to the original document.
+	  Since the document doesn't have a fixed owner, a reference counter is use and the scenegraph is kept alive 
+	  until the last object using it is destroyed.
+
+	If this counter is set to 0 when creating DOM Elements/..., this means the scenegraph is hold by an external
+	entity (typically the player), and cannot be destroyed from the scripting engine
+	*/
+	u32 reference_count;
+	/*DOM nodes*/
+	GF_List *objects;
+	/*DOM document*/
+	struct JSObject *document;
+
+	Bool dcci_doc;
+#endif
+};
+
+void gf_sg_parent_setup(GF_Node *pNode);
+void gf_sg_parent_reset(GF_Node *pNode);
+
+void *gf_node_get_name_address(GF_Node*node);
+
+void gf_node_changed_internal(GF_Node *node, GF_FieldInfo *field, Bool notify_scripts);
+
+struct _route
+{
+	u8 is_setup;
+	/*set to true for proto IS fields*/
+	u8 IS_route;
+
+	u32 ID;
+	char *name;
+
+	GF_Node *FromNode;
+	GF_FieldInfo FromField;
+
+	GF_Node *ToNode;
+	GF_FieldInfo ToField;
+
+	/*scope of this route*/
+	GF_SceneGraph *graph;
+	u32 lastActivateTime;
+};
+
+void gf_sg_route_unqueue(GF_SceneGraph *sg, GF_Route *r);
+/*returns TRUE if route modified destination node*/
+Bool gf_sg_route_activate(GF_Route *r);
+void gf_sg_route_queue(GF_SceneGraph *pSG, GF_Route *r);
+
+void gf_sg_destroy_routes(GF_SceneGraph *sg);
+
+void gf_sg_route_setup(GF_Route *r);
+
+
+/*MPEG4 def*/
+GF_Node *gf_sg_mpeg4_node_new(u32 NodeTag);
+u32 gf_sg_mpeg4_node_get_child_ndt(GF_Node *node);
+GF_Err gf_sg_mpeg4_node_get_field_index(GF_Node *node, u32 inField, u8 code_mode, u32 *fieldIndex);
+GF_Err gf_sg_mpeg4_node_get_field(GF_Node *node, GF_FieldInfo *field);
+u32 gf_sg_mpeg4_node_get_field_count(GF_Node *node, u8 code_mode);
+void gf_sg_mpeg4_node_del(GF_Node *node);
+const char *gf_sg_mpeg4_node_get_class_name(u32 NodeTag);
+Bool gf_sg_mpeg4_node_get_aq_info(GF_Node *node, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits);
+s32 gf_sg_mpeg4_node_get_field_index_by_name(GF_Node *node, char *name);
+
+/*X3D def*/
+GF_Node *gf_sg_x3d_node_new(u32 NodeTag);
+GF_Err gf_sg_x3d_node_get_field(GF_Node *node, GF_FieldInfo *field);
+u32 gf_sg_x3d_node_get_field_count(GF_Node *node);
+void gf_sg_x3d_node_del(GF_Node *node);
+const char *gf_sg_x3d_node_get_class_name(u32 NodeTag);
+s32 gf_sg_x3d_node_get_field_index_by_name(GF_Node *node, char *name);
+
+Bool gf_x3d_get_node_type(u32 NDT_Tag, u32 NodeTag);
+
+void gf_sg_mfint32_del(MFInt32 par);
+void gf_sg_mffloat_del(MFFloat par);
+void gf_sg_mfdouble_del(MFDouble par);
+void gf_sg_mfbool_del(MFBool par);
+void gf_sg_mfcolor_del(MFColor par);
+void gf_sg_mfcolor_rgba_del(MFColorRGBA par);
+void gf_sg_mfrotation_del(MFRotation par);
+void gf_sg_mfstring_del(MFString par);
+void gf_sg_mftime_del(MFTime par);
+void gf_sg_mfvec2f_del(MFVec2f par);
+void gf_sg_mfvec3f_del(MFVec3f par);
+void gf_sg_mfvec4f_del(MFVec4f par);
+void gf_sg_mfvec2d_del(MFVec2d par);
+void gf_sg_mfvec3d_del(MFVec3d par);
+void gf_sg_sfimage_del(SFImage im);
+void gf_sg_sfstring_del(SFString par);
+void gf_sg_mfscript_del(MFScript sc);
+void gf_sg_sfcommand_del(SFCommandBuffer cb);
+void gf_sg_sfurl_del(SFURL url);
+
+Bool gf_sg_vrml_node_init(GF_Node *node);
+Bool gf_sg_vrml_node_changed(GF_Node *node, GF_FieldInfo *field);
+
+
+/*specialized node unregister for Memory Commands - checks if the node(s) used in the command have been destroyed
+during the reset. If so don't attempt to unregister the node*/
+GF_Err gf_node_try_destroy(GF_SceneGraph *sg, GF_Node *pNode, GF_Node *parentNode);
+
+
+#ifndef GPAC_DISABLE_SVG
+
+
+/* reset functions for SVG types */
+void gf_svg_reset_path(SVG_PathData path);
+void gf_svg_reset_iri(GF_SceneGraph *sg, XMLRI*iri);
+/* delete functions for SVG types */
+void gf_svg_delete_paint		(GF_SceneGraph *sg, SVG_Paint *paint);
+void gf_smil_delete_times		(GF_List *l);
+void gf_svg_delete_points		(GF_List *l);
+void gf_svg_delete_coordinates	(GF_List *l);
+/*for keyTimes, keyPoints and keySplines*/
+void gf_smil_delete_key_types	(GF_List *l);
+
+u32 gf_node_get_attribute_count(GF_Node *node);
+GF_Err gf_node_get_attribute_info(GF_Node *node, GF_FieldInfo *info) ;
+
+
+/*SMIL anim tools*/
+
+typedef struct __xlink_attrip_ptrs {
+	XMLRI *href;
+	SVG_ContentType *type;
+	SVG_String *title;
+	XMLRI *arcrole; 
+	XMLRI *role;
+	SVG_String *show;
+	SVG_String *actuate;
+} XLinkAttributesPointers;
+
+typedef struct __smil_time_attrip_ptrs {
+	SMIL_Times *begin, *end;
+	SVG_Clock *clipBegin, *clipEnd;
+	SMIL_Duration *dur;
+	SMIL_RepeatCount *repeatCount;
+	SMIL_Duration *repeatDur;
+	SMIL_Restart *restart;
+	SMIL_Fill *fill;
+	SMIL_Duration *max;
+	SMIL_Duration *min;
+	struct _smil_timing_rti *runtime; /* contains values for runtime handling of the SMIL timing */
+} SMILTimingAttributesPointers;
+
+typedef struct __smil_sync_attrip_ptrs {
+	SMIL_SyncBehavior *syncBehavior, *syncBehaviorDefault;
+	SMIL_SyncTolerance *syncTolerance, *syncToleranceDefault;
+	SVG_Boolean *syncMaster;
+	XMLRI *syncReference;
+} SMILSyncAttributesPointers;
+
+typedef struct __smil_anim_attrip_ptrs {
+	SMIL_AttributeName *attributeName; 
+	SMIL_AttributeType *attributeType;
+	SMIL_AnimateValue *to, *by, *from;
+	SMIL_AnimateValues *values;
+	SMIL_CalcMode *calcMode;
+	SMIL_Accumulate *accumulate;
+	SMIL_Additive *additive;
+	SMIL_KeySplines *keySplines;
+	SMIL_KeyTimes *keyTimes;
+	SVG_TransformType *type;
+	SVG_Boolean *lsr_enabled;
+
+	SMIL_KeyPoints *keyPoints;
+	SVG_String *origin;
+	SVG_Rotate *rotate;
+	SVG_PathData *path;
+} SMILAnimationAttributesPointers;
+
+
+typedef struct {
+	GF_DOM_BASE_NODE
+
+	/*shortcuts for xlink, anim, timing attributes*/
+	XLinkAttributesPointers *xlinkp;
+	SMILAnimationAttributesPointers *animp;
+	SMILTimingAttributesPointers *timingp;
+} SVGTimedAnimBaseElement;
+
+GF_Err gf_node_animation_add(GF_Node *node, void *animation);
+GF_Err gf_node_animation_del(GF_Node *node);
+u32 gf_node_animation_count(GF_Node *node);
+void *gf_node_animation_get(GF_Node *node, u32 i);
+Bool gf_svg_is_inherit(GF_FieldInfo *a);
+Bool gf_svg_is_current_color(GF_FieldInfo *a);
+
+void gf_svg_reset_animate_values(SMIL_AnimateValues anim_values, GF_SceneGraph *sg);
+void gf_svg_reset_animate_value(SMIL_AnimateValue anim_value, GF_SceneGraph *sg);
+
+Bool gf_svg_is_timing_tag(u32 tag);
+Bool gf_svg_is_animation_tag(u32 tag);
+u32 gf_svg_get_modification_flags(SVG_Element *n, GF_FieldInfo *info);
+
+Bool gf_svg_resolve_smil_times(GF_Node *anim, void *event_base_element, GF_List *smil_times, Bool is_end, const char *node_name);
+
+
+/* SMIL Timing structures */
+/* status of an SMIL timed element */ 
+enum {
+	SMIL_STATUS_WAITING_TO_BEGIN = 0,
+	SMIL_STATUS_ACTIVE,
+	SMIL_STATUS_POST_ACTIVE,
+	SMIL_STATUS_FROZEN,
+	SMIL_STATUS_DONE
+};
+
+typedef struct {
+	u32 activation_cycle;
+	u32 nb_iterations;
+
+	/* for the case where min > simple duration*/
+	Bool min_active;
+
+	/* negative values mean indefinite */
+	Double begin, 
+		   end,
+		   simple_duration, 
+		   active_duration,
+		   repeat_duration;
+
+} SMIL_Interval;
+
+struct _smil_timing_rti
+{
+	GF_Node *timed_elt;
+	SMILTimingAttributesPointers *timingp;
+
+	Double scene_time;
+	Fixed normalized_simple_time;
+	Bool force_reevaluation;
+
+	/* SMIL element life-cycle status */
+	u8 status;
+
+	SMIL_Interval *current_interval;
+	SMIL_Interval *next_interval;
+
+	/* Evaluation of animations is postponed untill tree traversal, so that inherit values can be computed
+	Other timed elements (audio, video, animation) are evaluated directly and do not require
+	scene tree traversal.*/
+	Bool postpone;
+
+	void (*evaluate)(struct _smil_timing_rti *rti, Fixed normalized_simple_time, u32 state);
+	u32 evaluate_status;
+
+#if 0
+	/* is called only when the timed element is active */
+	void (*activation)(struct _smil_timing_rti *rti, Fixed normalized_simple_time);
+
+	/* is called (possibly many times) when the timed element is frozen */
+	void (*freeze)(struct _smil_timing_rti *rti, Fixed normalized_simple_time);
+
+	/* is called (only once) when the timed element is restored */
+	void (*restore)(struct _smil_timing_rti *rti, Fixed normalized_simple_time);
+
+	/* is called only when the timed element is inactive and receives a fraction event, the second parameter is ignored */
+	void (*fraction_activation)(struct _smil_timing_rti *rti, Fixed normalized_simple_time);
+#endif
+	/* simulated normalized simple time */
+	Fixed fraction;
+
+	Bool paused;
+	Double media_duration;
+
+	/* shortcut when this rti corresponds to an animation */
+	struct _smil_anim_rti *rai;
+};
+
+void gf_smil_timing_init_runtime_info(GF_Node *timed_elt);
+void gf_smil_timing_delete_runtime_info(GF_Node *timed_elt, SMIL_Timing_RTI *rti);
+Fixed gf_smil_timing_get_normalized_simple_time(SMIL_Timing_RTI *rti, Double scene_time, Bool *force_end);
+/*returns 1 if an animation changed a value in the rendering tree */
+s32 gf_smil_timing_notify_time(SMIL_Timing_RTI *rti, Double scene_time);
+
+
+/* SMIL Animation Structures */
+/* This structure is used per animated attribute,
+   it contains:
+    - all the animations applying to the same attribute,
+    - the specified value before any inheritance has been applied nor any animation started 
+	    (as specified in the SVG document),
+    - the presentation value passed from one animation to the next one, at the same level in the tree
+	- a boolean indicating if the animated attribute is in fact a property
+   
+   and if the attribute is a property:
+	- a pointer to presentation value passed from the previous level in the tree
+	- a pointer to the value of the color property (for handling of 'currentColor'), from previous level in the tree
+	- the location of the attribute in the elt structure when it was created 
+	  (used for fast comparison of SVG properties when animating from/to/by/values/... inherited values)
+*/
+typedef struct {
+	GF_List *anims;
+	GF_FieldInfo specified_value;
+	GF_FieldInfo presentation_value;
+	Bool is_property;
+	GF_FieldInfo parent_presentation_value;
+	GF_FieldInfo current_color_value;
+	void *orig_dom_ptr;
+	/* flag set by any animation to inform other animations that there base value has changed */
+	Bool presentation_value_changed;
+	/* flag used for rendering */
+	u32 dirty_flags;
+	Bool dirty_parents;
+} SMIL_AttributeAnimations;
+
+/* This structure is per animation element, 
+   it holds the result of the animation and 
+   some info to make animation computation faster */
+typedef struct _smil_anim_rti {
+	SMIL_AttributeAnimations *owner;
+
+	Bool is_first_anim;
+
+	/* animation element */
+	GF_Node *anim_elt;
+	SMILAnimationAttributesPointers *animp;
+	SMILTimingAttributesPointers *timingp;
+	XLinkAttributesPointers *xlinkp;
+
+	/* in case of animateTransform without from or to, the underlying value is the identity transform */
+	GF_Matrix2D identity;
+	GF_FieldInfo default_transform_value;
+
+	/* result of the animation */
+	GF_FieldInfo interpolated_value;
+
+	/* last value of the animation, used in accumulation phase */
+	/* normally the far pointer in the last specified value is a pointer to a real attribute value,
+	   and there's no need to allocate a new value. Except if the last specified value is the last 
+	   point in a path (animateMotion) in which case we allocate a matrix as last spec value,
+	   which we need to delete (see animate-elem-202-t.svg). This is signaled if rai->path is not NULL*/
+	GF_FieldInfo last_specified_value;
+
+	/* temporary value needed when the type of 
+	   the key values is different from the target attribute type */
+	GF_FieldInfo tmp_value;
+
+	/* the number of values in animations should be constant (unless updated with LASeR commands) 
+	   we can store them to avoid computing them at each cycle */
+	u32 values_count;
+	u32 key_times_count;
+	u32 key_points_count;
+	u32 key_splines_count;
+
+
+	/* In change detection mode, we test previous animation parameters to determine 
+	   if a new evaluation of the animation will produce a different result. 
+	   The result of these test is stored in interpolated_value_changed */
+	Bool	change_detection_mode;
+	Bool	interpolated_value_changed;
+	s32		previous_key_index;
+	u32		previous_keytime_index;
+	Fixed	previous_coef;
+	s32		previous_iteration;
+	Bool	anim_done;
+
+	GF_Path *path;
+	u8 rotate;
+	GF_PathIterator *path_iterator;
+	Fixed length;
+
+} SMIL_Anim_RTI;
+
+void gf_smil_anim_init_node(GF_Node *node);
+void gf_smil_anim_init_discard(GF_Node *node);
+void gf_smil_anim_init_runtime_info(GF_Node *node);
+void gf_smil_anim_delete_runtime_info(SMIL_Anim_RTI *rai);
+void gf_smil_anim_delete_animations(GF_Node *e);
+void gf_smil_anim_remove_from_target(GF_Node *anim, GF_Node *target);
+
+void gf_sg_handle_dom_event(GF_Node *hdl, GF_DOM_Event *event, GF_Node *observer);
+void gf_smil_setup_events(GF_Node *node);
+
+void gf_smil_anim_reset_variables(SMIL_Anim_RTI *rai);
+void gf_smil_anim_set_anim_runtime_in_timing(GF_Node *n);
+
+void gf_smil_timing_pause(GF_Node *node);
+void gf_smil_timing_resume(GF_Node *node);
+
+#endif
+
+
+//
+//		MF Fields tools
+//	WARNING: MF / SF Nodes CANNOT USE THESE FUNCTIONS
+//
+
+//return the size (in bytes) of fixed fields (buffers are handled as a char ptr , 1 byte)
+u32 gf_sg_vrml_get_sf_size(u32 FieldType);
+
+
+/*BASE node (GF_Node) destructor*/
+void gf_node_free(GF_Node *node);
+
+/*node destructor dispatcher: redirects destruction for each graph type: VRML/MPEG4, X3D, SVG...)*/
+void gf_node_del(GF_Node *node);
+
+/*creates an undefined GF_Node - for parsing only*/
+GF_Node *gf_sg_new_base_node();
+
+/*returns field type from its name*/
+u32 gf_sg_field_type_by_name(char *fieldType);
+
+
+
+/*
+			Proto node
+
+*/
+
+/*field interface to codec. This is used to do the node decoding, index translation
+and all QP/BIFS Anim parsing. */
+struct _protofield
+{
+	u8 EventType;
+	u8 FieldType;
+	/*if UseName, otherwise fieldN*/
+	char *FieldName;
+
+	/*default field value*/
+	void *def_value;
+	
+	GF_Node *def_sfnode_value;
+	GF_ChildNodeItem *def_mfnode_value;
+
+	/*coding indexes*/
+	u32 IN_index, OUT_index, DEF_index, ALL_index;
+
+	/*Quantization*/
+	u32 QP_Type, hasMinMax;
+	void *qp_min_value, *qp_max_value;
+	/*this is for QP=13 only*/
+	u32 NumBits;
+
+	/*Animation*/
+	u32 Anim_Type;
+
+	void *userpriv;
+	void (*OnDelete)(void *ptr);
+};
+
+GF_ProtoFieldInterface *gf_sg_proto_new_field_interface(u32 FieldType);
+
+/*set QP and anim info for a proto field (BIFS allows for that in proto coding)*/
+GF_Err gf_bifs_proto_field_set_aq_info(GF_ProtoFieldInterface *field, u32 QP_Type, u32 hasMinMax, u32 QPSFType, void *qp_min_value, void *qp_max_value, u32 QP13_NumBits);
+
+/*proto field instance. since it is useless to duplicate all coding info, names and the like
+we seperate proto declaration and proto instanciation*/
+typedef struct 
+{
+	u8 EventType;
+	u8 FieldType;
+	u8 has_been_accessed;
+	void *field_pointer;
+} GF_ProtoField;
+
+
+struct _proto
+{
+	/*1 - Prototype interface*/
+	u32 ID;
+	char *Name;
+	GF_List *proto_fields;
+
+	/*pointer to parent scene graph*/
+	struct __tag_scene_graph *parent_graph;
+	/*pointer to proto scene graph*/
+	struct __tag_scene_graph *sub_graph;
+
+	/*2 - proto implementation as declared in the bitstream*/
+	GF_List *node_code;
+
+	/*num fields*/
+	u32 NumIn, NumOut, NumDef, NumDyn;
+
+	void *userpriv;
+	void (*OnDelete)(void *ptr);
+
+	/*URL of extern proto lib (if none, URL is empty)*/
+	MFURL ExternProto;
+
+	/*list of instances*/
+	GF_List *instances;
+};
+
+/*proto field API*/
+u32 gf_sg_proto_get_num_fields(GF_Node *node, u8 code_mode);
+GF_Err gf_sg_proto_get_field(GF_Proto *proto, GF_Node *node, GF_FieldInfo *field);
+
+
+typedef struct _proto_instance
+{
+	/*this is a node*/
+	BASE_NODE
+
+	/*Prototype interface for coding and field addressing*/
+	GF_Proto *proto_interface;
+
+	/*proto implementation at run-time (aka the state of the nodes may differ accross
+	different instances of the proto)*/
+	GF_List *fields;
+
+	/*a proto doesn't have one root SFnode but a collection of nodes for implementation*/
+	GF_List *node_code;
+
+	/*node for proto rendering, first of all declared nodes*/
+	GF_Node *RenderingNode;
+
+	/*in case the PROTO is destroyed*/
+	char *proto_name;
+
+	/*scripts are loaded once all IS routes are activated and node code is loaded*/
+	GF_List *scripts_to_load;
+
+	Bool is_loaded;
+} GF_ProtoInstance;
+
+/*destroy proto*/
+void gf_sg_proto_del_instance(GF_ProtoInstance *inst);
+GF_Err gf_sg_proto_get_field_index(GF_ProtoInstance *proto, u32 index, u32 code_mode, u32 *all_index);
+Bool gf_sg_proto_get_aq_info(GF_Node *Node, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits);
+GF_Err gf_sg_proto_get_field_ind_static(GF_Node *Node, u32 inField, u8 IndexMode, u32 *allField);
+GF_Node *gf_sg_proto_create_node(GF_SceneGraph *scene, GF_Proto *proto, GF_ProtoInstance *from_inst);
+void gf_sg_proto_instanciate(GF_ProtoInstance *proto_node);
+
+/*get tag of first node in proto code - used for validation only*/
+u32 gf_sg_proto_get_root_tag(GF_Proto *proto);
+
+
+/*to call when a proto field has been modified (at creation or through commands, modifications through events 
+are handled internally).
+node can be the proto instance or a node from the proto code
+this will call NodeChanged if needed, forward to proto/node or trigger any route if needed*/
+void gf_sg_proto_propagate_event(GF_Node *node, u32 fieldIndex, GF_Node *from_node);
+
+s32 gf_sg_proto_get_field_index_by_name(GF_Proto *proto, GF_Node *node, char *name);
+
+GF_Node *gf_vrml_node_clone(GF_SceneGraph *inScene, GF_Node *orig, GF_Node *cloned_parent, char *inst_id_suffix);
+
+
+/*
+		Script node
+*/
+
+typedef struct 
+{
+	//extra script fields
+	GF_List *fields;
+
+	//BIFS coding stuff
+	u32 numIn, numDef, numOut;
+
+#ifdef GPAC_HAS_SPIDERMONKEY
+	struct JSContext *js_ctx;
+	struct JSObject *js_obj;
+	struct JSObject *js_browser;
+	/*all attached objects (eg, not created by the script) are stored here so that we don't
+	allocate them again and again when getting properties. Garbage collection is performed (if needed)
+	on these objects after each eventIn execution*/
+	GF_List *js_cache;
+	struct JSObject *event;
+#endif
+
+	void (*JS_PreDestroy)(GF_Node *node);
+	void (*JS_EventIn)(GF_Node *node, GF_FieldInfo *in_field);
+
+	Bool is_loaded;
+} GF_ScriptPriv;
+
+/*setup script stack*/
+void gf_sg_script_init(GF_Node *node);
+/*get script field*/
+GF_Err gf_sg_script_get_field(GF_Node *node, GF_FieldInfo *info);
+/*get effective field count per event mode*/
+u32 gf_sg_script_get_num_fields(GF_Node *node, u8 IndexMode);
+/*translate field index from inMode to ALL mode*/
+GF_Err gf_sg_script_get_field_index(GF_Node *Node, u32 inField, u8 IndexMode, u32 *allField);
+/*create dynamic fields in the clone*/
+GF_Err gf_sg_script_prepare_clone(GF_Node *dest, GF_Node *orig);
+
+struct _scriptfield
+{
+	u32 eventType;
+	u32 fieldType;
+	char *name;
+
+	s32 IN_index, OUT_index, DEF_index;
+	u32 ALL_index;
+
+	//real field
+	void *pField;
+
+	Double last_route_time;
+	Bool activate_event_out;
+};
+
+
+#ifdef GPAC_HAS_SPIDERMONKEY
+
+
+#include <gpac/download.h>
+#include <gpac/network.h>
+
+
+#define JS_SETUP_CLASS(the_class, cname, flag, getp, setp, fin)	\
+	memset(&the_class, 0, sizeof(the_class));	\
+	the_class.name = cname;	\
+	the_class.flags = flag;	\
+	the_class.addProperty = JS_PropertyStub;	\
+	the_class.delProperty = JS_PropertyStub;	\
+	the_class.getProperty = getp;	\
+	the_class.setProperty = setp;	\
+	the_class.enumerate = JS_EnumerateStub;	\
+	the_class.resolve = JS_ResolveStub;		\
+	the_class.convert = JS_ConvertStub;		\
+	the_class.finalize = fin;	\
+	the_class.hasInstance = js_has_instance;
+
+typedef struct
+{
+	GF_Node *node;
+	GF_DownloadSession *sess;
+} JSFileDownload;
+
+struct JSContext *gf_sg_ecmascript_new(GF_SceneGraph *sg);
+void gf_sg_ecmascript_del(struct JSContext *);
+
+void gf_sg_script_init_sm_api(GF_ScriptPriv *sc, GF_Node *script);
+
+typedef struct 
+{
+	GF_FieldInfo field;
+	GF_Node *owner;
+	struct JSObject *obj;
+
+	/*JS list for MFFields or NULL*/
+	struct JSObject *js_list;
+
+	/*when creating SFnode from inside the script, the node is stored here untill attached to an object*/
+	GF_Node *temp_node;
+	/*when creating MFnode from inside the script, the node list is stored here untill attached to an object*/
+	GF_ChildNodeItem *temp_list;
+	/*when not owned by a node*/
+	void *field_ptr;
+	
+	/*cpontext in which the field was created*/
+	struct JSContext *js_ctx;
+} GF_JSField;
+
+#ifndef GPAC_DISABLE_SVG
+void JSScript_LoadSVG(GF_Node *node);
+
+typedef struct __tag_svg_script_ctx 
+{
+	Bool (*script_execute)(struct __tag_scene_graph *sg, char *utf8_script, GF_DOM_Event *event);
+	Bool (*handler_execute)(GF_Node *n, GF_DOM_Event *event, GF_Node *observer);
+	u32 nb_scripts;
+	/*global script context for the scene*/
+	struct JSContext *js_ctx;
+	/*global object*/
+	struct JSObject *global;
+	/*global event object - used to update the associated DOMEvent (JS private stack) when dispatching events*/
+	struct JSObject *event;
+} GF_SVGJS;
+
+#endif	/*GPAC_DISABLE_SVG*/
+
+/*initialize DOM Core (subset) + xmlHTTPRequest API. The global object MUST have private data storage
+and its private data MUST be a scenegraph. This scenegraph is only used to create new documents
+and setup the callback pointers*/
+void dom_js_load(GF_SceneGraph *scene, struct JSContext *c, struct JSObject *global);
+/*unloads the DOM core support (to be called upon destruction only, once the JSContext has been destroyed
+to releases all resources used by DOM JS)*/
+void dom_js_unload();
+
+/*defines a new global object "document" of type Document*/
+void dom_js_define_document(struct JSContext *c, struct JSObject *global, GF_SceneGraph *doc);
+/*defines a new global object "evt" of type Event*/
+struct JSObject *dom_js_define_event(struct JSContext *c, struct JSObject *global);
+
+struct JSObject *gf_dom_new_event(struct JSContext *c);
+
+struct JSObject *dom_js_get_node_proto(struct JSContext *c);
+struct JSObject *dom_js_get_element_proto(struct JSContext *c);
+struct JSObject *dom_js_get_document_proto(struct JSContext *c);
+struct JSObject *dom_js_get_event_proto(struct JSContext *c);
+
+void dom_set_class_selector(struct JSContext *c, /*struct JSClass*/void *(*get_element_class)(GF_Node *n), /*struct JSClass*/void *(*get_document_class)(GF_SceneGraph *n) );
+
+enum
+{
+	GF_DOM_EXC_INDEX_SIZE_ERR = 1,
+	GF_DOM_EXC_DOMSTRING_SIZE_ERR = 2,
+	GF_DOM_EXC_HIERARCHY_REQUEST_ERR = 3,
+	GF_DOM_EXC_WRONG_DOCUMENT_ERR = 4,
+	GF_DOM_EXC_INVALID_CHARACTER_ERR = 5,
+	GF_DOM_EXC_NO_DATA_ALLOWED_ERR = 6,
+	GF_DOM_EXC_NO_MODIFICATION_ALLOWED_ERR = 7,
+	GF_DOM_EXC_NOT_FOUND_ERR = 8,
+	GF_DOM_EXC_NOT_SUPPORTED_ERR = 9,
+	GF_DOM_EXC_INUSE_ATTRIBUTE_ERR = 10,
+	GF_DOM_EXC_INVALID_STATE_ERR = 11,
+	GF_DOM_EXC_SYNTAX_ERR = 12,
+	GF_DOM_EXC_INVALID_MODIFICATION_ERR = 13,
+	GF_DOM_EXC_NAMESPACE_ERR = 14,
+	GF_DOM_EXC_INVALID_ACCESS_ERR = 15,
+	GF_DOM_EXC_VALIDATION_ERR = 16,
+	GF_DOM_EXC_TYPE_MISMATCH_ERR = 17,
+};
+
+int dom_throw_exception(struct JSContext *c, u32 code);
+
+void gf_sg_handle_dom_event_for_vrml(GF_Node *hdl, GF_DOM_Event *event, GF_Node *observer);
+
+void gf_sg_load_script_extensions(GF_SceneGraph *sg, struct JSContext *c, struct JSObject *obj, Bool unload);
+
+#endif	/*GPAC_HAS_SPIDERMONKEY*/
+
+GF_Err gf_sg_reload_xml_doc(const char *src, GF_SceneGraph *scene);
+
+SVG_Element *gf_svg_create_node(u32 tag);
+Bool gf_svg_node_init(GF_Node *node);
+void gf_svg_node_del(GF_Node *node);
+Bool gf_svg_node_changed(GF_Node *node, GF_FieldInfo *field);
+const char *gf_xml_get_element_name(GF_Node *node);
+
+SVGAttribute *gf_node_create_attribute_from_datatype(u32 data_type, u32 attribute_tag);
+
+GF_Err gf_node_get_attribute_by_name(GF_Node *node, char *name, u32 xmlns_code, Bool create_if_not_found, Bool set_default, GF_FieldInfo *field);
+void *gf_svg_get_property_pointer_from_tag(SVGPropertiesPointers *output_property_context, u32 prop_tag);
+void *gf_svg_get_property_pointer(SVG_Element *elt, void *input_attribute,
+								   SVGPropertiesPointers *output_property_context);
+
+Bool gf_svg_is_property(GF_Node *node, GF_FieldInfo *target_attribute);
+
+/*exported for LASeR paring*/
+u32 svg_parse_point(SVG_Point *p, char *value_string);
+
+/*activates node. This is used by LASeR:activate and whenever a node is inserted in the scene
+through DOM*/
+GF_Err gf_node_activate(GF_Node *node);
+/*deactivates node. This is used by LASeR:deactivate and whenever a node is removed from the scene
+through DOM*/
+GF_Err gf_node_deactivate(GF_Node *node);
+
+/*post a listener to be added - this is only used by LASeR:activate and DOM.addEventListener. This 
+is to ensure that when a node is processing an event creating a new listener on this node, this listener
+will not be triggered*/
+void gf_dom_listener_post_add(GF_Node *obs, GF_Node *listener);
+/*process all pending add_listener request*/
+void gf_dom_listener_process_add(GF_SceneGraph *sg);
+
+
+void gf_node_delete_attributes(GF_Node *node);
+
+
+typedef GF_DOMNode XBL_Element;
+const char *gf_xbl_get_element_name(u32 tag);
+u32 gf_xbl_get_element_tag(const char *element_name);
+XBL_Element *gf_xbl_create_node(u32 ElementTag);
+u32 gf_xbl_get_attribute_tag(u32 element_tag, const char *attribute_name);
+GF_DOMAttribute *gf_xbl_create_attribute(GF_DOMNode *elt, u32 tag);
+
+
+GF_Node *gf_xml_node_clone(GF_SceneGraph *inScene, GF_Node *orig, GF_Node *cloned_parent, char *inst_id, Bool deep);
+
+GF_Err gf_dom_listener_del(GF_Node *listener, GF_DOMEventTarget *target);
+
+GF_DOMHandler *gf_dom_listener_build_ex(GF_Node *node, u32 event_type, u32 event_parameter, GF_Node *handler, GF_Node **out_listener);
+
+
+#endif	/*_GF_SCENEGRAPH_DEV_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/internal/swf_dev.h b/tstools/DtsEdit/src/gpac/internal/swf_dev.h
new file mode 100644
index 0000000..798ac3e
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/internal/swf_dev.h
@@ -0,0 +1,361 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Scene Management sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _GF_SWF_DEV_H_
+#define _GF_SWF_DEV_H_
+
+#include <gpac/scene_manager.h>
+#include <gpac/color.h>
+
+#define SWF_TWIP_SCALE				(1/20.0f)
+
+
+typedef struct SWFReader SWFReader;
+typedef struct SWFSound SWFSound;
+typedef struct SWFText SWFText;
+typedef struct SWFEditText SWFEditText;
+typedef struct SWF_Button SWF_Button;
+typedef struct SWFShape SWFShape;
+typedef struct SWFFont SWFFont;
+typedef struct SWFAction SWFAction;
+
+enum
+{
+	SWF_PLACE ,
+	SWF_REPLACE,
+	SWF_MOVE,
+};
+
+
+struct SWFReader
+{
+	GF_SceneLoader *load;
+	FILE *input;
+
+	char *localPath;
+	/*file header*/
+	u32 length;
+	char *mem;
+	u32 frame_rate;
+	u32 frame_count;
+	Fixed width, height;
+	Bool has_interact, no_as;
+
+	/*copy of the swf import flags*/	
+	u32 flags;
+
+	/*bit reader*/
+	GF_BitStream *bs;
+	GF_Err ioerr;	
+	
+	u32 current_frame;
+
+	/*current tag*/
+	u32 tag, size;
+
+	GF_List *display_list;
+	u32 max_depth;
+
+	/*defined fonts*/
+	GF_List *fonts;
+
+	/*define sounds*/
+	GF_List *sounds;
+
+	/*the one and only sound stream for current timeline*/
+	SWFSound *sound_stream;
+
+	/*when creating sprites: 
+		1- all BIFS AUs in sprites are random access
+		2- depth is ignored in Sprites
+	*/
+	u32 current_sprite_id;
+
+	/*the parser can decide to remove nearly aligned pppoints in lineTo sequences*/
+	/*flatten limit - 0 means no flattening*/
+	Fixed flat_limit;
+	/*number of points removed*/
+	u32 flatten_points;
+
+	u8 *jpeg_hdr;
+	u32 jpeg_hdr_size;
+
+
+	/*callback functions for translator*/
+	GF_Err (*set_backcol)(SWFReader *read, u32 xrgb);
+	GF_Err (*show_frame)(SWFReader *read);
+
+	/*checks if display list is large enough - returns 1 if yes, 0 otherwise (and allocate space)*/
+	Bool (*allocate_depth)(SWFReader *read, u32 depth); 
+	GF_Err (*place_obj)(SWFReader *read, u32 depth, u32 ID, u32 prev_id, u32 type, GF_Matrix2D *mat, GF_ColorMatrix *cmat, GF_Matrix2D *prev_mat, GF_ColorMatrix *prev_cmat);
+	GF_Err (*remove_obj)(SWFReader *read, u32 depth, u32 ID);
+
+	GF_Err (*define_shape)(SWFReader *read, SWFShape *shape, SWFFont *parent_font, Bool last_sub_shape);
+	GF_Err (*define_sprite)(SWFReader *read, u32 nb_frames);
+	GF_Err (*define_text)(SWFReader *read, SWFText *text);
+	GF_Err (*define_edit_text)(SWFReader *read, SWFEditText *text);
+	/*@button is NULL to signal end of button declaration, non-null otherwise. "action" callback will be 
+	called inbetween*/
+	GF_Err (*define_button)(SWFReader *read, SWF_Button *button);
+
+	GF_Err (*setup_image)(SWFReader *read, u32 ID, char *fileName);
+	/*called whenever a sound is found. For soundstreams, called twice, once on the header (declaration), 
+	and one on the first soundstream block for offset signaling*/
+	GF_Err (*setup_sound)(SWFReader *read, SWFSound *snd, Bool soundstream_first_block);
+	GF_Err (*start_sound)(SWFReader *read, SWFSound *snd, Bool stop);
+	/*performs an action, returns 0 if action not supported*/
+	Bool (*action)(SWFReader *read, SWFAction *act);
+
+	void (*finalize)(SWFReader *read);
+
+
+	/* <BIFS conversion state> */
+
+	/*all simple appearances (no texture)*/
+	GF_List *apps;
+
+	GF_List *buttons;
+
+	/*current BIFS stream*/
+	GF_StreamContext *bifs_es;
+	GF_AUContext *bifs_au;
+
+	GF_StreamContext *bifs_dict_es;
+	GF_AUContext *bifs_dict_au;
+
+	/*for sound insert*/
+	GF_Node *root;
+
+	/*current OD AU*/
+	GF_StreamContext *od_es;
+	GF_AUContext *od_au;
+
+	GF_Node *cur_shape;
+	u16 prev_od_id, prev_es_id;
+
+	u32 wait_frame;
+	SWF_Button *btn;
+	GF_List *btn_over, *btn_not_over, *btn_active, *btn_not_active;
+
+	/* </BIFS conversion state> */
+};
+
+
+void swf_report(SWFReader *read, GF_Err e, char *format, ...);
+SWFFont *swf_find_font(SWFReader *read, u32 fontID);
+GF_Err swf_parse_sprite(SWFReader *read);
+
+
+GF_Err swf_to_bifs_init(SWFReader *read);
+
+
+
+typedef struct
+{
+	Fixed x, y;
+	Fixed w, h;
+} SWFRec;
+
+typedef struct
+{
+	/*0: not defined, otherwise index of shape*/
+	u32 nbType;
+	/*0: moveTo, 1: lineTo, 2: quad curveTo*/
+	u32 *types;
+	SFVec2f *pts;
+	u32 nbPts;
+	/*used by SWF->BIFS for IndexedCurveSet*/
+	u32 *idx;
+} SWFPath;
+
+typedef struct
+{
+	u32 type;
+	u32 solid_col;
+	u32 nbGrad;
+	u32 *grad_col;
+	u8 *grad_ratio;
+	GF_Matrix2D mat;
+	u32 img_id;
+	Fixed width;
+
+	SWFPath *path;
+} SWFShapeRec;
+
+struct SWFShape 
+{
+	GF_List *fill_left, *fill_right, *lines;
+	u32 ID;
+	SWFRec rc;
+};
+
+/*SWF font object*/
+struct SWFFont
+{
+	u32 fontID;
+	u32 nbGlyphs;
+	GF_List *glyphs;
+
+	/*the following may all be overridden by a DefineFontInfo*/
+
+	/*index -> glyph code*/
+	u16 *glyph_codes;
+	/*index -> glyph advance*/
+	s16 *glyph_adv;
+
+	/*font flags (SWF 3.0)*/
+	Bool has_layout;
+	Bool has_shiftJIS;
+	Bool is_unicode, is_ansi;
+	Bool is_bold, is_italic;
+	s16 ascent, descent, leading;
+
+	/*font familly*/
+	char *fontName;
+};
+
+/*chunk of text with the same aspect (font, col)*/
+typedef struct
+{
+	u32 fontID;
+	u32 col;
+	/*font size*/
+	u32 fontSize;
+	/*origin point in local metrics*/
+	Fixed orig_x, orig_y;
+
+	u32 nbGlyphs;
+	u32 *indexes;
+	Fixed *dx;
+} SWFGlyphRec;
+
+struct SWFText
+{
+	u32 ID;
+	GF_Matrix2D mat;
+	GF_List *text;
+};
+
+struct SWFEditText 
+{
+	u32 ID;
+	char *init_value;
+	SWFRec bounds;
+	Bool word_wrap, multiline, password, read_only, auto_size, no_select, html, outlines, has_layout, border;
+	u32 color;
+	Fixed max_length, font_height;
+	u32 fontID;
+
+	u32 align;
+	Fixed left, right, indent, leading;
+};
+
+
+enum
+{
+	SWF_SND_UNCOMP = 0,
+	SWF_SND_ADPCM,
+	SWF_SND_MP3
+};
+
+struct SWFSound
+{
+	u32 ID;
+	u8 format;
+	/*0: 5.5k - 1: 11k - 2: 22k - 3: 44k*/
+	u8 sound_rate;
+	u8 bits_per_sample;
+	Bool stereo;
+	u16 sample_count;
+	u32 frame_delay_ms;
+
+	/*IO*/
+	FILE *output;
+	char *szFileName;
+
+	/*set when sound is setup (OD inserted)*/
+	Bool is_setup;
+};
+
+typedef struct 
+{
+	/*interaction states*/
+	Bool hitTest, down, over, up;
+	u32 character_id;
+	u16 depth;
+	GF_Matrix2D mx;
+	GF_ColorMatrix cmx;
+	Bool skip;
+} SWF_ButtonRecord;
+
+
+struct SWF_Button 
+{
+	u32 count;
+	SWF_ButtonRecord buttons[40];
+	u32 ID;
+};
+
+/*AS codes.*/
+enum
+{
+	GF_SWF_AS3_GOTO_FRAME,
+	GF_SWF_AS3_GET_URL,
+	GF_SWF_AS3_NEXT_FRAME,
+	GF_SWF_AS3_PREV_FRAME,
+	GF_SWF_AS3_PLAY,
+	GF_SWF_AS3_STOP,
+	GF_SWF_AS3_TOGGLE_QUALITY,
+	GF_SWF_AS3_STOP_SOUNDS,
+	GF_SWF_AS3_WAIT_FOR_FRAME,
+	GF_SWF_AS3_SET_TARGET,
+	GF_SWF_AS3_GOTO_LABEL,
+};
+
+enum
+{
+	GF_SWF_COND_IDLE_TO_OVERDOWN = 1,
+	GF_SWF_COND_OUTDOWN_TO_IDLE = 1<<1,
+	GF_SWF_COND_OUTDOWN_TO_OVERDOWN = 1<<2,
+	GF_SWF_COND_OVERDOWN_TO_OUTDOWN = 1<<3,
+	GF_SWF_COND_OVERDOWN_TO_OUTUP = 1<<4,
+	GF_SWF_COND_OVERUP_TO_OVERDOWN = 1<<5,
+	GF_SWF_COND_OVERUP_TO_IDLE = 1<<6,
+	GF_SWF_COND_IDLE_TO_OVERUP = 1<<7,
+	GF_SWF_COND_OVERDOWN_TO_IDLE = 1<<8,
+};
+
+struct SWFAction
+{
+	u32 type;
+	u32 frame_number;
+	u32 button_mask, button_key;
+	/*target (geturl/set_target), label (goto_frame)*/
+	char *target;
+	char *url;
+};
+
+
+
+#endif /*_GF_SWF_DEV_H_*/
diff --git a/tstools/DtsEdit/src/gpac/internal/terminal_dev.h b/tstools/DtsEdit/src/gpac/internal/terminal_dev.h
new file mode 100644
index 0000000..a199064
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/internal/terminal_dev.h
@@ -0,0 +1,844 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Stream Management sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _GF_TERMINAL_DEV_H_
+#define _GF_TERMINAL_DEV_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#include <gpac/terminal.h>
+#include <gpac/mpeg4_odf.h>
+
+#include <gpac/modules/service.h>
+#include <gpac/modules/codec.h>
+#include <gpac/modules/ipmp.h>
+#include <gpac/mediaobject.h>
+#include <gpac/thread.h>
+
+typedef struct _inline_scene GF_InlineScene;
+typedef struct _media_manager GF_MediaManager;
+typedef struct _object_clock GF_Clock;
+typedef struct _es_channel GF_Channel;
+typedef struct _generic_codec GF_Codec;
+typedef struct _composition_memory GF_CompositionMemory;
+
+
+struct _net_service
+{
+	/*the module handling this service - must be declared first to typecast with GF_DownlaodSession upon deletion*/
+	GF_InputService *ifce;
+
+	/*the terminal*/
+	struct _tag_terminal *term;
+	/*service url*/
+	char *url;
+	/*od_manager owning service, NULL for services created for remote channels*/
+	struct _od_manager *owner;
+	/*number of attached remote channels ODM (ESD URLs)*/
+	u32 nb_ch_users;
+	/*number of attached remote ODM (OD URLs)*/
+	u32 nb_odm_users;
+	
+	/*clock objects. Kept at service level since ESID namespace is the service one*/
+	GF_List *Clocks;
+	/*all downloaders objects used in this service*/
+	GF_List *dnloads;
+	/*cache asscoiated with service, if any*/
+	GF_StreamingCache *cache;
+};
+
+
+/*opens service - performs URL concatenation if parent service specified*/
+GF_ClientService *gf_term_service_new(GF_Terminal *term, GF_ObjectManager *owner, const char *url, const char *parent_url, GF_Err *ret_code);
+/*destroy service*/
+void gf_term_service_del(GF_ClientService *nets);
+
+/*access to the module interfaces - cf net_api.h GF_InputService for details*/
+GF_Err gf_term_service_command(GF_ClientService *ns, GF_NetworkCommand *com);
+Bool gf_term_service_can_handle_url(GF_ClientService *ns, char *url);
+
+GF_Err gf_term_channel_get_sl_packet(GF_ClientService *ns, LPNETCHANNEL channel, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr, Bool *is_compressed, GF_Err *out_reception_status, Bool *is_new_data);
+GF_Err gf_term_channel_release_sl_packet(GF_ClientService *ns, LPNETCHANNEL channel);
+
+/*cache open/close*/
+GF_Err gf_term_service_cache_load(GF_ClientService *ns);
+GF_Err gf_term_service_cache_close(GF_ClientService *ns, Bool no_save);
+
+/*forwards all clocks of the given amount of time. Can only be used when terminal is in paused mode
+this is mainly designed for movie dumping in MP4Client*/
+GF_Err gf_term_step_clocks(GF_Terminal * term, u32 ms_diff);
+
+void gf_term_sample_clocks(GF_Terminal *term);
+
+/*
+		Inline scene stuff
+*/
+struct _inline_scene
+{
+	/*root OD of the subscene, ALWAYS namespace of the parent scene*/
+	struct _od_manager *root_od;
+	/*scene codec: top level decoder decoding/generating the scene - can be BIFS, VRML parser, etc*/
+	struct _generic_codec *scene_codec;
+	/*OD codec - specific to MPEG-4, only present at the inline level (media ressources are always scoped here)*/
+	struct _generic_codec *od_codec;
+
+	/*struct _od_managers used, namespace of this scene. The chain does not have the root_od
+	it only contains OD sent through OD UPDATE in the OD stream(s) attached 
+	to this scene. Remote ODs are not added, only there parents are*/
+	GF_List *ODlist;
+	/*list of MOs (links between OD and nodes)*/
+	GF_List *media_objects;
+	/*list of externproto libraries*/
+	GF_List *extern_protos;
+	/*list of nodes using this inline*/
+	GF_List *inline_nodes;
+	/*list of extra scene graphs (text streams, generic OSDs, ...)*/
+	GF_List *extra_scenes;
+	/*inline scene graph*/
+	GF_SceneGraph *graph;
+	/*graph state - if not attached, no traversing of inline
+	0: not attached
+	1: attached
+	2: temp graph attached. The temp graph is generated when waiting for the first scene AU to be processed
+	*/
+	u32 graph_attached;
+	/*togles inline restart - needed because the restart may be triggered from inside the scene or from
+	parent scene, hence 2 render passes must be used
+	special value 2 means scene URL changes (for anchor navigation*/
+	u32 needs_restart;
+	/*duration of inline scene*/
+	u64 duration;
+	/*if not 0, all objects in the scene will run on this clock. Needed in GPAC when clock references do not
+	respect object graph (eg IOD depending on external stream for clock)*/
+	u16 force_sub_clock_id;
+	/*world info node or title node*/
+	void *world_info;
+
+	Bool is_dynamic_scene;
+	/*clock for dynamic scene - current assumption is that all selected streams are synchronized in the dyn scene*/
+	GF_Clock *dyn_ck;
+	/*URLs of current video, audio and subs (we can't store objects since they may be destroyed when seeking)*/
+	SFURL visual_url, audio_url, text_url;
+	/*set to 1 when single time-line presentation with ONE OD AU is detected - the goal is to prevent
+	OD shutdown/startup when seeking. This will also remove unneeded net traffic for AddChannel/RemoveChannel
+	like RTSP TEARDOWN/SETUP*/
+	Bool static_media_ressources;
+
+	/*current simulation time of the compositor*/
+	Double simulation_time;
+
+	/*current IRI fragment if any*/
+	char *fragment_uri;
+
+	/*secondary resource scene*/
+	Bool secondary_resource;
+
+	char *redirect_xml_base;
+};
+
+GF_InlineScene *gf_inline_new(GF_InlineScene *parentScene);
+void gf_inline_del(GF_InlineScene *is);
+struct _od_manager *gf_inline_find_odm(GF_InlineScene *is, u16 OD_ID);
+void gf_inline_disconnect(GF_InlineScene *is, Bool for_shutdown);
+void gf_inline_remove_object(GF_InlineScene *is, GF_ObjectManager *odm, Bool for_shutdown);
+/*browse all (media) channels and send buffering info to the app*/
+void gf_inline_buffering_info(GF_InlineScene *is);
+void gf_inline_attach_to_compositor(GF_InlineScene *is);
+struct _mediaobj *gf_inline_get_media_object(GF_InlineScene *is, MFURL *url, u32 obj_type_hint, Bool lock_timelines);
+struct _mediaobj *gf_inline_get_media_object_ex(GF_InlineScene *is, MFURL *url, u32 obj_type_hint, Bool lock_timelines, struct _mediaobj *sync_ref, Bool always_load_new, GF_Node *node_ptr);
+void gf_inline_setup_object(GF_InlineScene *is, GF_ObjectManager *odm);
+/*restarts inline scene - care has to be taken not to remove the scene while it is traversed*/
+void gf_inline_restart(GF_InlineScene *is);
+/*updates scene duration based on settings*/
+void gf_inline_set_duration(GF_InlineScene *is);
+/*locate media object by ODID (non dynamic ODs) or URL (dynamic ODs)*/
+struct _mediaobj *gf_inline_find_object(GF_InlineScene *is, u16 ODID, char *url);
+/*returns scene time in sec - exact meaning of time depends on standard used*/
+Double gf_inline_get_time(void *_is);
+/*returns true if the given node DEF name is the url target view (eg blabla#myview)*/
+Bool gf_inline_default_scene_viewpoint(GF_Node *node);
+/*register extra scene graph for on-screen display*/
+void gf_inline_register_extra_graph(GF_InlineScene *is, GF_SceneGraph *extra_scene, Bool do_remove);
+/*forces scene size info (without changing pixel metrics) - this may be needed by modules using extra graphs (like timedtext)*/
+void gf_inline_force_scene_size(GF_InlineScene *is, u32 width, u32 height);
+/*regenerate a scene graph based on available objects - can only be called for dynamic OD streams*/
+void gf_inline_regenerate(GF_InlineScene *is);
+/*selects given ODM for dynamic scenes*/
+void gf_inline_select_object(GF_InlineScene *is, GF_ObjectManager *odm);
+/*restarts dynamic scene from given time: scene graph is not reseted, objects are just restarted
+instead of closed and reopened. If a media control is present on inline, from_time is overriden by MC range*/
+void gf_inline_restart_dynamic(GF_InlineScene *is, u64 from_time);
+/*owner inline node has been modified*/
+void gf_inline_on_modified(GF_Node *node);
+/*returns scene graph associated with an externProto lib - exported for VRML/X3D loaded*/
+GF_SceneGraph *gf_inline_get_proto_lib(void *_is, MFURL *lib_url);
+/*exported for compositor: handles filtering of "self" parameter indicating anchor only acts on container inline scene
+not root one. Returns 1 if handled (cf user.h, navigate event)*/
+Bool gf_inline_process_anchor(GF_Node *caller, GF_Event *evt);
+/*extern proto fetcher*/
+GF_SceneGraph *gf_inline_get_proto_lib(void *SceneCallback, MFURL *lib_url);
+void gf_inline_force_scene_size_video(GF_InlineScene *is, GF_MediaObject *mo);
+void gf_inline_sample_time(GF_InlineScene *is);
+/*compares object URL with another URL - ONLY USE THIS WITH DYNAMIC ODs*/
+Bool gf_mo_is_same_url(GF_MediaObject *obj, MFURL *inline_url);
+
+void gf_mo_update_caps(GF_MediaObject *mo);
+
+
+const char *gf_inline_get_fragment_uri(GF_Node *node);
+void gf_inline_set_fragment_uri(GF_Node *node, const char *uri);
+
+enum
+{
+	/*threading up to decoder*/
+	GF_TERM_THREAD_FREE,
+	/*single thread for all decoders*/
+	GF_TERM_THREAD_SINGLE,
+	/*all media (image, video, audio) decoders are threaded*/
+	GF_TERM_THREAD_MULTI,
+};
+
+enum
+{
+	GF_TERM_RUNNING= 1,
+	GF_TERM_DEAD = 1<<1,
+	GF_TERM_SINGLE_THREAD = 1<<2,
+	GF_TERM_MULTI_THREAD = 1<<3,
+	GF_TERM_SYSDEC_RESYNC = 1<<4,
+	GF_TERM_SINGLE_CLOCK = 1<<5,
+	GF_TERM_DRAW_FRAME = 1<<6
+};
+
+
+
+struct _tag_terminal
+{
+	u32 flags;
+
+	/*callback to user application*/	
+	GF_User *user;
+	/*scene compositor*/
+	struct __tag_compositor *compositor;
+	/*file downloader*/
+	GF_DownloadManager *downloader;
+	/*top level scene*/
+	GF_InlineScene *root_scene;
+
+	/*Media manager*/
+	GF_List *codecs;
+	/*mutex for decoder access*/
+	GF_Mutex *mm_mx;
+	/*decoding thread*/
+	GF_Thread *mm_thread;
+	/*last codec used in mm loop*/
+	u32 last_codec;
+	/*thread priority*/
+	s32 priority;
+	u32 cumulated_priority;
+	/*frame duration*/
+	u32 frame_duration;
+
+	/*net services*/
+	GF_List *net_services;
+	/*net services to be destroyed*/
+	GF_List *net_services_to_remove;
+	/*channels waiting for service CONNECT ack to be setup*/
+	GF_List *channels_pending;
+	/*media objects pending for stop/play*/
+	GF_List *media_queue;
+	/*network lock*/
+	GF_Mutex *net_mx;
+	/*all X3D key/mouse/string sensors*/
+	GF_List *x3d_sensors;
+	/*all input stream decoders*/
+	GF_List *input_streams;
+	
+	/*options (cf config doc)*/
+	Bool enable_cache;
+	/*data timeout for network buffering in ms - if no data is received within this timeout
+	the initial buffering aborts. */
+	u32 net_data_timeout;
+
+	u32 play_state;
+
+	u32 reload_state;
+	char *reload_url;
+
+	/*special list used by nodes needing a call to RenderNode but not in the traverese scene graph (VRML/MPEG-4 protos only). 
+	For these nodes, the traverse effect passed will be NULL. This is only used by InputSensor node at the moment*/
+	GF_List *nodes_pending;
+
+	/*root node of the user prefs*/
+	GF_SceneGraph *dcci_doc;
+
+	GF_List *extensions;
+	GF_List *unthreaded_extensions;
+};
+
+
+
+GF_Err gf_term_init_scheduler(GF_Terminal *term, u32 threading_mode);
+void gf_term_stop_scheduler(GF_Terminal *term);
+void gf_term_add_codec(GF_Terminal *term, GF_Codec *codec);
+void gf_term_remove_codec(GF_Terminal *term, GF_Codec *codec);
+void gf_term_start_codec(GF_Codec *codec);
+void gf_term_stop_codec(GF_Codec *codec);
+void gf_term_set_threading(GF_Terminal *term, u32 mode);
+void gf_term_set_priority(GF_Terminal *term, s32 Priority);
+
+
+/*error report function*/
+void gf_term_message(GF_Terminal *app, const char *service, const char *message, GF_Err error);
+/*creates service for given OD / URL*/
+void gf_term_connect_object(GF_Terminal *app, GF_ObjectManager *odm, char *serviceURL, char *parent_url);
+/*creates service for given channel / URL*/
+GF_Err gf_term_connect_remote_channel(GF_Terminal *app, GF_Channel *ch, char *URL);
+
+/*called by media manager to perform service maintenance:
+servive shutdown: this is needed because service handler may be asynchronous
+object Play: this is needed to properly handle multiplexed sources (all channels must be connected before play)
+service restart
+*/
+void gf_term_handle_services(GF_Terminal *app);
+/*close service and queue for delete*/
+void gf_term_close_services(GF_Terminal *app, GF_ClientService *service);
+
+/*locks net manager*/
+void gf_term_lock_net(GF_Terminal *app, Bool LockIt);
+
+
+/*locks scene compositor*/
+void gf_term_lock_compositor(GF_Terminal *app, Bool LockIt);
+/*get scene compositor time - FIXME this is not flexible enough for SMIL/Multiple time containers*/
+u32 gf_term_get_time(GF_Terminal *term);
+/*forces scene composition*/
+void gf_term_invalidate_compositor(GF_Terminal *term);
+
+/*callbacks for scene graph library so that all related ESM nodes are properly instanciated*/
+void gf_term_node_callback(void *_is, u32 type, GF_Node *node, void *param);
+
+/*add/rem node requiring a call to render without being present in traversed graph (VRML/MPEG-4 protos). 
+For these nodes, the traverse effect passed will be NULL.*/
+void gf_term_queue_node_traverse(GF_Terminal *term, GF_Node *node);
+void gf_term_unqueue_node_traverse(GF_Terminal *term, GF_Node *node);
+
+
+
+/*clock*/
+struct _object_clock 
+{
+	u16 clockID;	
+	GF_Terminal *term;
+	GF_Mutex *mx;
+	/*no_time_ctrl : set if ANY stream running on this clock has no time control capabilities - this avoids applying
+	mediaControl and others that would break stream dependencies*/
+	Bool use_ocr, clock_init, has_seen_eos, no_time_ctrl;
+	u32 init_time, StartTime, PauseTime, Paused;
+	/*the number of streams buffering on this clock*/
+	u32 Buffering;
+	/*associated media control if any*/
+	struct _media_control *mc;
+	/*for MC only (no FlexTime)*/
+	Fixed speed;
+	u32 discontinuity_time;
+	s32 drift;
+};
+
+/*destroys clock*/
+void gf_clock_del(GF_Clock *ck);
+/*finds a clock by ID or by ES_ID*/
+GF_Clock *gf_clock_find(GF_List *Clocks, u16 clockID, u16 ES_ID);
+/*attach clock returns a new clock or the clock this stream (ES_ID) depends on (OCR_ES_ID)
+hasOCR indicates whether the stream being attached carries object clock references
+@clocks: list of clocks in ES namespace (service)
+@is: inline scene to solve clock dependencies
+*/
+GF_Clock *gf_clock_attach(GF_List *clocks, GF_InlineScene *is, u16 OCR_ES_ID, u16 ES_ID, s32 hasOCR);
+/*reset clock (only called by channel owning clock)*/
+void gf_clock_reset(GF_Clock *ck);
+/*stops clock (only called for scene clock)*/
+void gf_clock_stop(GF_Clock *ck);
+/*return clock time in ms*/
+u32 gf_clock_time(GF_Clock *ck);
+/*return ellapsed time in ms since start of the clock*/
+u32 gf_clock_ellapse_time(GF_Clock *ck);
+/*sets clock time - FIXME: drift updates for OCRs*/
+void gf_clock_set_time(GF_Clock *ck, u32 TS);
+/*return clock time in ms without drift adjustment - used by audio objects only*/
+u32 gf_clock_real_time(GF_Clock *ck);
+/*pause the clock*/
+void gf_clock_pause(GF_Clock *ck);
+/*resume the clock*/
+void gf_clock_resume(GF_Clock *ck);
+/*returns true if clock started*/
+Bool gf_clock_is_started(GF_Clock *ck);
+/*toggles buffering on (clock is paused at the first stream buffering) */
+void gf_clock_buffer_on(GF_Clock *ck);
+/*toggles buffering off (clock is paused at the last stream restarting) */
+void gf_clock_buffer_off(GF_Clock *ck);
+/*set clock speed scaling factor*/
+void gf_clock_set_speed(GF_Clock *ck, Fixed speed);
+/*set clock drift - used to resync audio*/
+void gf_clock_adjust_drift(GF_Clock *ck, s32 ms_drift);
+
+enum
+{
+	/*channel is setup and waits for connection request*/
+	GF_ESM_ES_SETUP = 0,
+	/*waiting for server reply*/
+	GF_ESM_ES_WAIT_FOR_ACK,
+	/*connection OK*/
+	GF_ESM_ES_CONNECTED,
+	/*data exchange on this service/channel*/
+	GF_ESM_ES_RUNNING,
+	/*deconnection OK - a download channel can automatically disconnect when download is done*/
+	GF_ESM_ES_DISCONNECTED,
+	/*service/channel is not (no longer) available/found and should be removed*/
+	GF_ESM_ES_UNAVAILABLE
+};
+
+/*data channel (elementary stream)*/
+struct _es_channel 
+{
+	/*security check on channel*/
+	u32 chan_id;
+	/*service this channel belongs to*/
+	GF_ClientService *service;
+	/*stream descriptor*/
+	GF_ESD *esd;
+	/*parent OD for this stream*/
+	struct _od_manager *odm;
+	u32 es_state;
+	Bool is_pulling;
+	u32 media_padding_bytes;
+	/*IO mutex*/
+	GF_Mutex *mx;
+	u32 AU_Count;
+	/*decoding buffers for push mode*/
+	struct _decoding_buffer * AU_buffer_first, * AU_buffer_last;
+	/*static decoding buffer for pull mode*/
+	struct _decoding_buffer * AU_buffer_pull;
+	/*channel buffer flag*/
+	Bool BufferOn;
+	/*min level to trigger buffering on, max to trigger it off. */
+	u32 MinBuffer, MaxBuffer;
+	/*amount of buffered media - this is the DTS of the last received AU minus the onject clock time, to make sure
+	we always have MaxBuffer ms ready for composition when resuming the clock*/
+	s32 BufferTime;
+	/*last received AU time - if exceeding a certain time and buffering is on, buffering is turned off.
+	This is needed for streams with very short duration (less than buffer time) and stream with only one AU (BIFS/OD)*/
+	u32 last_au_time;
+	/*Current reassemnbling buffer - currently packets are NOT reordered, only AUs are*/
+	char *buffer;
+	u32 len, allocSize;
+	/*only for last packet of an AU*/
+	u8 padingBits;
+	Bool IsEndOfStream;
+	/*	SL reassembler	*/
+	/*current AU TSs*/
+	u32 DTS, CTS;
+	/*AU and Packet seq num info*/
+	u32 au_sn, pck_sn;
+	u32 max_au_sn, max_pck_sn;
+	/*the AU length indicated in the SL Header. */
+	u32 AULength;
+	/*state indicator: 0 OK, 1: not tuned in, 2: has error and needs RAP*/
+	u32 stream_state;
+	/*the AU in reception is RAP*/
+	Bool IsRap;
+	/*signal that next AU is an AU start*/
+	Bool NextIsAUStart;
+	/*if codec resilient, packet drops are not considered as fatal for AU reconstruction (eg no wait for RAP)*/
+	Bool codec_resilient;
+	/*when starting a channel, the first AU is ALWAYS fetched when buffering - this forces
+	BIFS and OD to be decoded and first frame render, in order to detect media objects that would also need
+	buffering - note this doesn't affect the clock, it is still paused if buffering*/
+	Bool first_au_fetched;
+
+	/* used in Carousel, to skip packets until the end of AU */ 
+	Bool skip_carousel_au;
+	
+	/* TimeStamp to Media Time mapping*/
+	/*TS (in TSResolution) corresponding to the SeedTime of the decoder. Delivered by net, otherwise 0*/
+	u64 seed_ts;
+	/*media time offset corresponding to SeedTS. This is needed when the channel doesn't own the clock*/
+	u32 ts_offset;
+	/*scaling factors to remap to timestamps in milliseconds*/
+	u64 ts_res;
+	Double ocr_scale;
+	/*clock driving this stream - currently only CTS is supported (no OCR)*/
+	struct _object_clock *clock;
+	/*flag for clock init. Only a channel owning the clock will set this flag on clock init*/
+	Bool IsClockInit;
+
+	/*duration of last received AU if any, 0 if not known (most of the time)*/
+	u32 au_duration;
+	/*A channel with this flag set considers each incoming packet as a complete AU and assigns timestamps 
+	upon reception matching the reception time, then dispatching it into the decoding buffer (only tested
+	with audi video). This flag is turned on by setting esd->slconfig->predefined to 'SLPredef_SkipSL' */
+	Bool skip_sl;
+
+	/*indicates that decoding can be called directly when receiving a complete AU on this channel
+	This is used by systems streams in non-seekable (eg broadcast/multicast, MPEG-2 TS multiplexes) to 
+	make sure resources are setup as fast as possible. If the AU is too early, it will be kept in the 
+	decoding buffer*/
+	Bool dispatch_after_db;
+
+	/*indicates that decoding is called directly when receiving a packet on this channel
+	This is used to bypass SL defragmenting and decoding buffer for EIT internal streams*/
+	Bool bypass_sl_and_db;
+
+	GF_IPMPTool *ipmp_tool;
+	Bool is_protected;
+
+	/*TSs as received from network - these are used for cache storage*/
+	u64 net_dts, net_cts;
+};
+
+/*creates a new channel for this stream*/
+GF_Channel *gf_es_new(GF_ESD *esd);
+/*destroys channel*/
+void gf_es_del(GF_Channel *ch);
+/*(un)locks channel*/
+void gf_es_lock(GF_Channel *ch, u32 LockIt);
+/*setup channel for reception of data*/
+GF_Err gf_es_start(GF_Channel *ch);
+/*stop channel from receiving data*/
+GF_Err gf_es_stop(GF_Channel *ch);
+/*handles reception of an SL PDU*/
+void gf_es_receive_sl_packet(GF_ClientService *serv, GF_Channel *ch, char *StreamBuf, u32 StreamLength, GF_SLHeader *header, GF_Err reception_status);
+/*signals end of stream on the channel*/
+void gf_es_on_eos(GF_Channel *ch);
+/*fetches first AU available for decoding on this channel*/
+struct _decoding_buffer *gf_es_get_au(GF_Channel *ch);
+/*drops first AU on this channel*/
+void gf_es_drop_au(GF_Channel *ch);
+/*performs final setup upon connection confirm*/
+void gf_es_on_connect(GF_Channel *ch);
+/*reconfigure SL for this channel*/
+void gf_es_reconfig_sl(GF_Channel *ch, GF_SLConfig *slc);
+/*hack for streaming: whenever a time map (media time <-> TS time) event is received on the channel reset decoding buffer
+this is needed because all server tested resend packets on already running channel*/
+void gf_es_map_time(GF_Channel *ch, Bool reset);
+/*dummy channels are used by scene decoders which don't use ESM but load directly the scene graph themselves
+these channels are ALWAYS pulling ones, and this function will init the channel clock if needed*/
+void gf_es_init_dummy(GF_Channel *ch);
+/*setup DRM info*/
+void gf_es_config_drm(GF_Channel *ch, GF_NetComDRMConfig *isma_cryp);
+
+/*
+		decoder stuff
+*/
+enum
+{
+	/*stop: the decoder is not playing*/
+	GF_ESM_CODEC_STOP	=	0,
+	/*stop: the decoder is playing*/
+	GF_ESM_CODEC_PLAY	=	1,
+	/*End Of Stream: when the base layer signals it's done, this triggers media-specific
+	handling of the CB. 
+	For video, the output is kept alive, For audio, the output is reseted (don't want audio loop ;)*/
+	GF_ESM_CODEC_EOS	=	2,
+	/*pause: the decoder is stoped but the CB is kept intact
+	THIS IS NOT USED AS A CODEC STATUS, but only for signaling that the CB shouldn't 
+	be reseted - the real status of a "paused" decoder is STOP*/
+	GF_ESM_CODEC_PAUSE	=	3,
+	/*Buffer: transition state: the decoder runs (fetch data/decode) but the clock
+	is not running (no composition). This is used for rebuffering channels (rtp...)*/
+	GF_ESM_CODEC_BUFFER =	4
+};
+
+enum
+{
+	GF_ESM_CODEC_HAS_UPSTREAM = 1,
+	/*the codec uses the interface from another codec (only used by private scene streams to handle
+	any intern sprite/animation streams)*/
+	GF_ESM_CODEC_IS_USE = 1<<1,
+	/*set for OD codec when static (ressources are declared in OD stream esd a la ISMA*/
+	GF_ESM_CODEC_IS_STATIC_OD = 1<<2,
+};
+
+struct _generic_codec 
+{
+	/*codec type (streamType from base layer)*/
+	u32 type;
+	u32 flags;
+	/*current decoder interface */
+	GF_BaseDecoder *decio;
+	/*composition memory for media streams*/
+	struct _composition_memory *CB;
+	/*input media channles*/
+	GF_List *inChannels;
+	/*a pointer to the OD that owns the decoder.*/
+	struct _od_manager *odm;
+	u32 Status;
+	Bool Muted;
+	struct _object_clock *ck;
+	/*priority of this media object. This is ALWAYS the base layer priority
+	PriorityBoost is set when the CB is under critical limit (for now only audio uses the feature)
+	and results in a bigger time slice for the codec. Only on/off value for now*/
+	u32 Priority, PriorityBoost;
+	/*last processed DTS - sanity check for scalability*/
+	u32 last_unit_dts;
+	/*last processed CTS on base layer - seeking detection*/
+	u32 last_unit_cts;
+	/*in case the codec performs temporal re-ordering itself*/
+	Bool is_reordering;
+	u32 prev_au_size;
+	u32 bytes_per_sec;
+	Double fps;
+
+	/*statistics*/
+	u32 last_stat_start, cur_bit_size;
+	u32 avg_bit_rate, max_bit_rate;
+	u32 total_dec_time, nb_dec_frames, max_dec_time;
+	/*number of droped frames*/
+	u32 nb_droped;
+
+	/*for CTS reconstruction (channels not using SL): we cannot just update timing at each frame, not precise enough 
+	since we use ms and not microsec TSs*/
+	u32 cur_audio_bytes, cur_video_frames;
+};
+
+GF_Codec *gf_codec_new(GF_ObjectManager *odm, GF_ESD *base_layer, s32 PL, GF_Err *e);
+void gf_codec_del(GF_Codec *codec);
+GF_Err gf_codec_add_channel(GF_Codec *codec, GF_Channel *ch);
+/*returns TRUE if stream was present, false otherwise*/
+Bool gf_codec_remove_channel(GF_Codec *codec, GF_Channel *ch);
+GF_Err gf_codec_process(GF_Codec *codec, u32 TimeAvailable);
+GF_Err gf_codec_get_capability(GF_Codec *codec, GF_CodecCapability *cap);
+GF_Err gf_codec_set_capability(GF_Codec *codec, GF_CodecCapability cap);
+void gf_codec_set_status(GF_Codec *codec, u32 Status);
+/*returns a new codec using an existing loaded decoder - only used by private scene to handle != timelines, for 
+instance when loading a BT with an animation stream*/
+GF_Codec *gf_codec_use_codec(GF_Codec *codec, GF_ObjectManager *odm);
+
+/*OD manager*/
+
+enum
+{
+	/*flag set if object cannot be time-controloed*/
+	GF_ODM_NO_TIME_CTRL = (1<<1),
+	/*flag set if subscene uses parent scene timeline*/
+	GF_ODM_INHERIT_TIMELINE = (1<<2),
+	/*flag set if object has been redirected*/
+	GF_ODM_REMOTE_OD = (1<<3),
+	/*flag set if object has profile indications*/
+	GF_ODM_HAS_PROFILES = (1<<4),
+	/*flag set if object governs profile of inline subscenes*/
+	GF_ODM_INLINE_PROFILES = (1<<5),
+	/*flag set if object declared by network service, not from OD stream*/
+	GF_ODM_NOT_IN_OD_STREAM = (1<<6),
+
+	/*dynamic flags*/
+	
+	/*flag set if associated subscene must be regenerated*/
+	GF_ODM_REGENERATE_SCENE = (1<<10),
+};
+
+enum
+{
+	GF_ODM_STATE_STOP,
+	GF_ODM_STATE_PLAY,
+	GF_ODM_STATE_IN_SETUP,
+	GF_ODM_STATE_BLOCKED,
+};
+
+struct _od_manager
+{
+	/*pointer to terminal*/
+	struct _tag_terminal *term;
+	/*the service used by this ODM. If the service private data is this ODM, then the service was created for this ODM*/
+	GF_ClientService *net_service;
+	/*parent scene or NULL for root scene*/
+	struct _inline_scene *parentscene;
+	/*channels associated with this object (media channels, OCR, IPMP, OCI, etc)*/
+	GF_List *channels;
+	/*sub scene for inline/animation or NULL */
+	struct _inline_scene *subscene;
+	/*object codec (media or BIFS for AnimationStream) attached if any*/
+	struct _generic_codec *codec;
+	/*OCI codec attached if any*/
+	struct _generic_codec *oci_codec;
+	/*OCR codec attached if any*/
+	struct _generic_codec *ocr_codec;
+
+	/*MPEG-4 object descriptor*/
+	GF_ObjectDescriptor *OD;
+
+	/*exclusive access is required since rendering and media management don't always take place in the same thread*/
+	GF_Mutex *mx;
+
+	u32 flags;
+
+	/*PLs*/
+	u8 Audio_PL, Graphics_PL, OD_PL, Scene_PL, Visual_PL;
+	
+	/*interface with scene rendering*/
+	struct _mediaobj *mo;
+	
+	/*number of channels with connection not yet acknowledge*/
+	u32 pending_channels;
+	u32 state;
+	/* during playback: timing as evaluated by the composition memory or the scene codec */
+	u32 current_time;
+	/*full object duration 0 if unknown*/
+	u64 duration;
+	/*
+	upon start: media start time as requested by scene compositor (eg not media control)
+	set to -1 upon stop to postpone stop request
+	*/
+	u64 media_start_time, media_stop_time;
+
+	/*the one and only media control currently attached to this object*/
+	struct _media_control *media_ctrl;
+	/*the list of media control controling the object*/
+	GF_List *mc_stack;
+	/*the media sensor(s) attached to this object*/
+	GF_List *ms_stack;
+};
+
+
+GF_ObjectManager *gf_odm_new();
+void gf_odm_del(GF_ObjectManager *ODMan);
+void gf_odm_lock(GF_ObjectManager *odm, u32 LockIt);
+
+/*setup service entry point*/
+void gf_odm_setup_entry_point(GF_ObjectManager *odm, const char *sub_url);
+/*setup OD*/
+void gf_odm_setup_object(GF_ObjectManager *odm, GF_ClientService *parent_serv);
+/*disctonnect OD and removes it if desired (otherwise only STOP is propagated)*/
+void gf_odm_disconnect(GF_ObjectManager *odman, Bool do_remove);
+/*setup an ESD*/
+GF_Err gf_odm_setup_es(GF_ObjectManager *odm, GF_ESD *esd, GF_ClientService *service, GF_MediaObject *sync_ref);
+/*removes an ESD (this destroys associated channel if any)*/
+void gf_odm_remove_es(GF_ObjectManager *odm, u16 ES_ID);
+/*set stream duration - updates object duration accordingly*/
+void gf_odm_set_duration(GF_ObjectManager *odm, GF_Channel *, u64 stream_duration);
+/*signals end of stream on channels*/
+void gf_odm_on_eos(GF_ObjectManager *odm, GF_Channel *);
+/*start Object streams and queue object for network PLAY*/
+void gf_odm_start(GF_ObjectManager *odm);
+/*stop OD streams*/
+void gf_odm_stop(GF_ObjectManager *odm, Bool force_close);
+/*send PLAY request to network - needed to properly handle multiplexed inputs 
+ONLY called by service handler (media manager thread)*/
+void gf_odm_play(GF_ObjectManager *odm);
+
+/*returns 1 if this is a segment switch, 0 otherwise - takes care of object restart if segment switch*/
+Bool gf_odm_check_segment_switch(GF_ObjectManager *odm);
+/*pause object (mediaControl use only)*/
+void gf_odm_pause(GF_ObjectManager *odm);
+/*resume object (mediaControl use only)*/
+void gf_odm_resume(GF_ObjectManager *odm);
+/*set object speed*/
+void gf_odm_set_speed(GF_ObjectManager *odm, Fixed speed);
+/*returns the clock of the media stream (video, audio or bifs), NULL otherwise */
+struct _object_clock *gf_odm_get_media_clock(GF_ObjectManager *odm);
+/*adds segment descriptors targeted by the URL to the list and sort them - the input list must be empty*/
+void gf_odm_init_segments(GF_ObjectManager *odm, GF_List *list, MFURL *url);
+/*returns true if this OD depends on the given clock*/
+Bool gf_odm_shares_clock(GF_ObjectManager *odm, struct _object_clock *ock);
+
+GF_Segment *gf_odm_find_segment(GF_ObjectManager *odm, char *descName);
+/*locks ODM with destruction check - returns 0 if object manager is not attached to object*/
+Bool gf_odm_lock_mo(struct _mediaobj *mo);
+
+
+/*GF_MediaObject: link between real object manager and scene. although there is a one-to-one mapping between a 
+MediaObject and an ObjectManager, we have to keep them seperated in order to handle OD remove commands which destroy
+ObjectManagers. */
+struct _mediaobj
+{
+	/*type is as defined in constants.h # GF_MEDIA_OBJECT_* */
+	u32 type;
+	/*one of the above flags*/
+	u32 flags;
+
+
+	/* private to ESM*/
+
+	/*media object manager - private to the sync engine*/
+	struct _od_manager *odm;
+	/*OD ID of the object*/
+	u32 OD_ID;
+	/*OD URL for object not using MPEG4 OD urls*/
+	MFURL URLs;
+	/*session join*/
+	u32 num_open;
+	/*shared object restart handling*/
+	u32 num_to_restart, num_restart;
+	Fixed speed;
+
+	/*shared object info: if 0 a new frame will be checked, otherwise current is returned*/
+	u32 nb_fetch;
+	/*frame presentation time*/
+	u32 timestamp;
+	/*data frame size*/
+	u32 framesize;
+	/*pointer to data frame */
+	char *frame;
+	/*nodes currently registered with the media object - used to dispatch MediaAccessEvents*/
+	GF_List *nodes;
+	/*pointer to the node responsible for the creation of this media object
+	ONLY used for scene media type (animationStreams) 
+	Reset upon creation of the decoder.
+	*/
+	void *node_ptr;
+};
+
+GF_MediaObject *gf_mo_new();
+
+
+/*used for delayed channel setup*/
+typedef struct 
+{
+	struct _generic_codec *dec;
+	struct _es_channel *ch;	
+} GF_ChannelSetup;
+
+/*post-poned channel connect*/
+GF_Err gf_odm_post_es_setup(struct _es_channel *ch, struct _generic_codec *dec, GF_Err err);
+
+/*
+	special entry point: specify directly a service interface for service input
+*/
+void gf_term_attach_service(GF_Terminal *term, GF_InputService *service_hdl);
+
+/*media access events */
+void gf_term_service_media_event(GF_ObjectManager *odm, u32 event_type);
+
+u32 URL_GetODID(MFURL *url);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif	/*_GF_TERMINAL_DEV_H_*/
+
+
diff --git a/tstools/DtsEdit/src/gpac/internal/vobsub.h b/tstools/DtsEdit/src/gpac/internal/vobsub.h
new file mode 100644
index 0000000..6d95a3c
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/internal/vobsub.h
@@ -0,0 +1,82 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) by  Falco (Ivan Vecera) 2006
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Media Tools sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+#ifndef _GF_VOBSUB_H_
+#define _GF_VOBSUB_H_
+
+#include <gpac/tools.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define VOBSUBIDXVER 7
+
+typedef struct _tag_vobsub_pos
+{
+	u64  filepos;
+	u64  start;
+	u64  stop;
+} vobsub_pos;
+
+typedef struct _tag_vobsub_lang
+{
+	u32      id;
+	char    *name;
+	GF_List *subpos;
+} vobsub_lang;
+
+typedef struct _tag_vobsub_file
+{
+	u32         width;
+	u32         height;
+	u8          palette[16][4];
+	u32         num_langs;
+	vobsub_lang langs[32];
+} vobsub_file;
+
+GFINLINE static void vobsub_trim_ext(char *filename)
+{
+	char *pos = strchr(filename, '.');
+
+	if (pos != NULL) {
+		if (!stricmp(pos, ".idx") || !stricmp(pos, ".sub")) {
+			*pos = '\0';
+		}
+	}
+}
+
+s32    vobsub_lang_name(u16 id);
+char  *vobsub_lang_id(char *name);
+GF_Err vobsub_read_idx(FILE *file, vobsub_file *vobsub, int *version);
+void   vobsub_free(vobsub_file *vobsub);
+GF_Err vobsub_get_subpic_duration(char *data, u32 psize, u32 dsize, u32 *duration);
+GF_Err vobsub_packetize_subpicture(FILE *fsub, u64 pts, char *data, u32 dataSize);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _GF_VOBSUB_H_ */
diff --git a/tstools/DtsEdit/src/gpac/ismacryp.h b/tstools/DtsEdit/src/gpac/ismacryp.h
new file mode 100644
index 0000000..1f2c34f
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/ismacryp.h
@@ -0,0 +1,116 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Authoring Tools sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _GF_ISMACRYP_H_
+#define _GF_ISMACRYP_H_
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/isomedia.h>
+
+enum
+{
+	/*no selective encryption*/
+	GF_ISMACRYP_SELENC_NONE = 0,
+	/*only encrypts RAP samples*/
+	GF_ISMACRYP_SELENC_RAP = 1,
+	/*only encrypts non-RAP samples*/
+	GF_ISMACRYP_SELENC_NON_RAP = 2,
+	/*selective encryption of random samples*/
+	GF_ISMACRYP_SELENC_RAND = 3,
+	/*selective encryption of a random sample in given range*/
+	GF_ISMACRYP_SELENC_RAND_RANGE = 4,
+	/*selective encryption of first sample in given range*/
+	GF_ISMACRYP_SELENC_RANGE = 5,
+	/*encryption of all samples but the preview range*/
+	GF_ISMACRYP_SELENC_PREVIEW = 6,
+};
+
+typedef struct
+{
+	/*0: ISMACryp - 1: OMA DRM*/
+	u32 enc_type;
+	u32 trackID;
+	unsigned char key[16];
+	unsigned char salt[16];
+
+	/*the rest is only used for encryption*/
+	char KMS_URI[5000];
+	char Scheme_URI[5000];
+	/*selecive encryption type*/
+	u32 sel_enc_type;
+	u32 sel_enc_range;
+	/*IPMP signaling: 0: none, 1: IPMP, 2: IPMPX
+	when IPMP signaling is enabled, the OD stream will be updated with
+	IPMP Update commands*/
+	u32 ipmp_type;
+	/*if not set and IPMP enabled, defaults to TrackID*/
+	u32 ipmp_desc_id;
+
+	/*OMA extensions*/
+	/*0: none, 1: AES CBC, 2: AES CTR*/
+	u8 encryption;
+	char TextualHeaders[5000];
+	u32 TextualHeadersLen;
+	char TransactionID[17];
+
+} GF_TrackCryptInfo;
+
+/*encrypts track - logs, progress: info callbacks, NULL for stdout*/
+GF_Err gf_ismacryp_encrypt_track(GF_ISOFile *mp4, GF_TrackCryptInfo *tci, void (*progress)(void *cbk, u32 done, u32 total), void *cbk);
+
+/*decrypts track - logs, progress: info callbacks, NULL for stdout*/
+GF_Err gf_ismacryp_decrypt_track(GF_ISOFile *mp4, GF_TrackCryptInfo *tci, void (*progress)(void *cbk, u32 done, u32 total), void *cbk);
+
+/*decrypt a file 
+@drm_file: location of DRM data (cf MP4Box doc).
+@LogMsg: redirection for message or NULL for stdout
+*/
+GF_Err gf_ismacryp_decrypt_file(GF_ISOFile *mp4file, const char *drm_file);
+
+/*Crypt a the file 
+@drm_file: location of DRM data.
+@LogMsg: redirection for message or NULL for stdout
+*/
+GF_Err gf_ismacryp_crypt_file(GF_ISOFile *mp4file, const char *drm_file);
+
+/*loads key and salt from a LOCAL gpac-DRM file (cf MP4Box doc)*/
+GF_Err gf_ismacryp_gpac_get_info(u32 stream_id, char *drm_file, char *key, char *salt);
+
+/*loads key and salt for MPEG4IP protected files*/
+Bool gf_ismacryp_mpeg4ip_get_info(char *kms_uri, char *key, char *salt);
+
+/*computes file hash. If file is ISO-based, computre hash according to OMA (P)DCF (without MutableDRMInformation box)*/
+GF_Err gf_media_get_file_hash(const char *file, u8 hash[20]);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif	/*_GF_ISMACRYP_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/iso639.h b/tstools/DtsEdit/src/gpac/iso639.h
new file mode 100644
index 0000000..16d4632
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/iso639.h
@@ -0,0 +1,523 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC 
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _GF_ISO_639_H
+#define _GF_ISO_639_H
+
+
+/*ISO 639 code names 
+	- first string is readable english name of the language
+	- second string is 3-char code of language as per ISO/IEC 639-2
+	- third string is 2-char code of language as per ISO/IEC 639-1, and may be empty 
+*/
+static const char *GF_ISO639_Lang[] = 
+{
+	"Abkhazian","abk", "ab",
+	"Achinese","ace", "",
+	"Acoli","ach", "",
+	"Adangme","ada", "",
+	"Adygei","ady", "",
+	"Adyghe","ady", "",
+	"Afar","aar", "aa",
+	"Afrihili","afh", "",
+	"Afrikaans","afr", "af",
+	"Afro-Asiatic (Other)","afa", "",
+	"Akan","aka", "",
+	"Akkadian","akk", "",
+	"Albanian","alb/sqi", "sq",
+	"Aleut","ale", "",
+	"Algonquian languages","alg", "",
+	"Altaic (Other)","tut", "",
+	"Amharic","amh", "am",
+	"Apache languages","apa", "",
+	"Arabic","ara", "ar",
+	"Aragonese","arg", "",
+	"Aramaic","arc", "",
+	"Arapaho","arp", "",
+	"Araucanian","arn", "",
+	"Arawak","arw", "",
+	"Armenian","arm/hye", "hy",
+	"Artificial (Other)","art", "",
+	"Assamese","ast", "as",
+	"Athapascan languages","ath", "",
+	"Australian languages","aus", "",
+	"Austronesian (Other)","map", "",
+	"Avaric","ava", "",
+	"Avestan","ave", "",
+	"Awadhi","awa", "",
+	"Aymara","aym", "ay",
+	"Azerbaijani","aze", "az",
+	"Bable","ast", "",
+	"Balinese","ban", "",
+	"Baltic (Other)","bat", "",
+	"Baluchi","bal", "",
+	"Bambara","bam", "",
+	"Bamileke languages","bai", "",
+	"Banda","bad", "",
+	"Bantu (Other)","bnt", "",
+	"Basa","bas", "",
+	"Bashkir","bak", "ba",
+	"Basque","baq/eus", "eu",
+	"Batak (Indonesia)","btk", "",
+	"Beja","bej", "",
+	"Belarusian","bel", "be",
+	"Bemba","bem", "",
+	"Bengali","ben", "bn",
+	"Berber (Other)","ber", "",
+	"Bhojpuri","bho", "",
+	"Bihari","bih", "bh",
+	"Bikol","bik", "",
+	"Bini","bin", "",
+	"Bislama","bis", "bi",
+	"Bokmål, Norwegian","nob", "",
+	"Bosnian","bos", "",
+	"Braj","bra", "",
+	"Breton","bre", "br",
+	"Buginese","bug", "",
+	"Bulgarian","bul", "bg",
+	"Buriat","bua", "",
+	"Burmese","bur/mya", "my",
+	"Caddo","cad", "",
+	"Carib","car", "",
+	"Castilian","spa", "",
+	"Catalan","cat", "ca",
+	"Caucasian (Other)","cau", "",
+	"Cebuano","ceb", "",
+	"Celtic (Other)","cel", "",
+	"Central American Indian (Other)","cai", "",
+	"Chagatai","chg", "",
+	"Chamic languages","cmc", "",
+	"Chamorro","cha", "",
+	"Chechen","che", "",
+	"Cherokee","chr" , "",
+	"Chewa","nya", "",
+	"Cheyenne","chy", "",
+	"Chibcha","chb", "",
+	"Chichewa","nya", "",
+	"Chinese","chi/zho", "zh",
+	"Chinook jargon","chn", "",
+	"Chipewyan","chp", "",
+	"Choctaw","cho", "",
+	"Chuang","zha", "",
+	"Church Slavic (Slavonic)","chu", "",
+	"Chuukese","chk", "",
+	"Chuvash","chv", "",
+	"Coptic","cop", "",
+	"Cornish","cor", "",
+	"Corsican","cos", "co",
+	"Cree","cre" , "",
+	"Creek","mus" , "",
+	"Creoles and pidgins(Other)","crp", "",
+	"Creoles and pidgins, English-based (Other)","cpe", "",
+	"Creoles and pidgins, French-based (Other)","cpf", "",
+	"Creoles and pidgins, Portuguese-based (Other)","cpp", "",
+	"Crimean Tatar","crh", "",
+	"Crimean Turkish","crh", "",
+	"Croatian","scr/hrv", "hr",
+	"Cushitic (Other)","cus", "",
+	"Czech","cze/ces", "cs",
+	"Dakota","dak", "",
+	"Danish","dan", "da",
+	"Dargwa","dar", "",
+	"Dayak","day", "",
+	"Delaware","del", "",
+	"Dinka","din", "",
+	"Divehi","div" , "",
+	"Dogri","doi", "",
+	"Dogrib","dgr" , "",
+	"Dravidian (Other)","dra", "",
+	"Duala","dua", "",
+	"Dutch","dut/nld", "nl",
+	"Dutch, Middle (ca. 1050-1350)","dum", "",
+	"Dyula","dyu", "",
+	"Dzongkha","dzo", "dz",
+	"Efik","efi", "",
+	"Egyptian (Ancient)","egy", "",
+	"Ekajuk","eka", "",
+	"Elamite","elx", "",
+	"English","eng", "en",
+	"English, Middle (1100-1500)","enm", "",
+	"English, Old (ca.450-1100)","ang", "",
+	"Erzya","myv", "",
+	"Esperanto","epo", "eo",
+	"Estonian","est", "et",
+	"Ewe","ewe", "",
+	"Ewondo","ewo", "",
+	"Fang","fan", "",
+	"Fanti","fat" , "",
+	"Faroese","fao", "fo",
+	"Fijian","fij", "fj",
+	"Finnish","fin", "fi",
+	"Finno-Ugrian (Other)","fiu", "",
+	"Fon","fon", "",
+	"French","fre/fra", "fr",
+	"French, Middle (ca.1400-1600)","frm", "",
+	"French, Old (842-ca.1400)","fro", "",
+	"Frisian","fry", "fy",
+	"Friulian","fur" , "",
+	"Fulah","ful", "",
+	"Ga","gaa", "",
+	"Gaelic","gla", "",
+	"Gallegan","glg", "gl",
+	"Ganda","lug", "",
+	"Gayo","gay", "",
+	"Gbaya","gba" , "",
+	"Geez","gez", "",
+	"Georgian","geo/kat", "ka",
+	"German","ger/deu", "de",
+	"German, Low","nds" , "",
+	"German, Middle High (ca.1050-1500)","gmh", "",
+	"German, Old High (ca.750-1050)","goh", "",
+	"Germanic (Other)","gem", "",
+	"Gikuyu","kik", "",
+	"Gilbertese","gil", "",
+	"Gondi","gon", "",
+	"Gorontalo","gor", "",
+	"Gothic","got", "",
+	"Grebo","grb", "",
+	"Greek, Ancient (to 1453)","grc", "",
+	"Greek, Modern (1453-)","gre/ell", "el",
+	"Guarani","grn", "gn",
+	"Gujarati","guj", "gu",
+	"Gwich´in","gwi", "",
+	"Haida","hai", "",
+	"Haitian","hat", "",
+	"Haitian Creole","hat", "",
+	"Hausa","hau", "ha",
+	"Hawaiian","haw", "",
+	"Hebrew","heb", "he",
+	"Herero","her", "",
+	"Hiligaynon","hil", "",
+	"Himachali","him", "",
+	"Hindi","hin", "hi",
+	"Hiri Motu","hmo", "",
+	"Hittite","hit", "",
+	"Hmong","hmn", "",
+	"Hungarian","hun", "hu",
+	"Hupa","hup", "",
+	"Iban","iba", "",
+	"Icelandic","ice/isl", "is",
+	"Ido","ido", "",
+	"Igbo","ibo" , "",
+	"Ijo","ijo", "",
+	"Iloko","ilo", "",
+	"Inari Sami","smn", "",
+	"Indic (Other)","inc", "",
+	"Indo-European (Other)","ine", "",
+	"Indonesian","ind", "id",
+	"Ingush","inh", "",
+	"Interlingua (International Auxiliary Language Association)","ina", "ia",
+	"Interlingue","ile", "",
+	"Inuktitut","iku", "iu",
+	"Inupiaq","ipk", "ik",
+	"Iranian (Other)","ira", "",
+	"Irish","gle", "ga",
+	"Irish, Middle (900-1200)","mga", "",
+	"Irish, Old (to 900)","sga", "",
+	"Iroquoian languages","iro", "",
+	"Italian","ita", "it",
+	"Japanese","jpn", "ja",
+	"Javanese","jav", "jv",
+	"Judeo-Arabic","jrb", "",
+	"Judeo-Persian","jpr", "",
+	"Kabardian","kbd", "",
+	"Kabyle","kab", "",
+	"Kachin","kac", "",
+	"Kalaallisut","kal", "kl",
+	"Kalmyk","xal", "",
+	"Kamba","kam", "",
+	"Kannada","kan", "kn",
+	"Kanuri","kau", "",
+	"Karachay-Balkar","krc", "",
+	"Kara-Kalpak","kaa", "",
+	"Karen","kar", "",
+	"Kashmiri","kas", "ks",
+	"Kashubian","csb", "",
+	"Kawi","kaw", "",
+	"Kazakh","kaz", "kk",
+	"Khasi","kha", "",
+	"Khmer","khm", "km",
+	"Khoisan (Other)","khi", "",
+	"Khotanese","kho", "",
+	"Kikuyu","kik", "",
+	"Kimbundu","kmb", "",
+	"Kinyarwanda","kin", "rw",
+	"Kirghiz","kir", "ky",
+	"Komi","kom", "",
+	"Kongo","kon" , "",
+	"Konkani","kok" , "",
+	"Korean","kor", "ko",
+	"Kosraean","kos" , "",
+	"Kpelle","kpe" , "",
+	"Kru","kro" , "",
+	"Kuanyama","kua", "",
+	"Kumyk","kum" , "",
+	"Kurdish","kur", "ku",
+	"Kurukh","kru" , "",
+	"Kutenai","kut", "",
+	"Kwanyama","kua", "",
+	"Ladino","lad" , "",
+	"Lahnda","lah" , "",
+	"Lamba","lam" , "",
+	"Lao","lao", "lo",
+	"Latin","lat", "la",
+	"Latvian","lav", "lv",
+	"Letzeburgesch","ltz", "",
+	"Lezghian (lezLimburgan - limLimburger - limlimburgish)","lim", "",
+	"Lingala","lin", "ln",
+	"Lithuanian","lit", "lt",
+	"Low German","nds", "",
+	"Low Saxon","nds", "",
+	"Lozi","loz" , "",
+	"Luba-Katanga","lub" , "",
+	"Luba-Lulua","lua" , "",
+	"Luiseno","lui", "",
+	"Lule Sami","smj", "",
+	"Lunda","lun" , "",
+	"Luo (Kenya and Tanzania)","luo", "",
+	"Luxembourgish","ltz", "",
+	"Lushai","lus" , "",
+	"Macedonian","mac/mkd", "mk",
+	"Madurese","mad" , "",
+	"Magahi","mag" , "",
+	"Maithili","mai", "",
+	"Makasar","mak", "",
+	"Malagasy","mlg", "mg",
+	"Malay","may/msa", "ms",
+	"Malayalam","mal", "",
+	"Maltese","mlt", "ml",
+	"Manchu","mnc", "",
+	"Mandar","mdr", "",
+	"Mandingo","man", "",
+	"Manipuri","mni" , "",
+	"Manobo languages","mno" , "",
+	"Manx","glv", "",
+	"Maori","mao/mri", "mi",
+	"Marathi","mar", "mr",
+	"Mari","chm" , "",
+	"Marshallese","mah", "",
+	"Marwari","mwr" , "",
+	"Masai","mas" , "",
+	"Mayan languages","myn" , "",
+	"Mende","men" , "",
+	"Micmac","mic" , "",
+	"Minangkabau","min" , "",
+	"Miscellaneous languages","mis" , "",
+	"Mohawk","moh" , "",
+	"Moksha","mdf", "",
+	"Moldavian","mol", "mo",
+	"Mon-Khmer (Other)","mkh" , "",
+	"Mongo","lol" , "",
+	"Mongolian","mon", "mn",
+	"Mossi","mos" , "",
+	"Multiple languages","mul" , "",
+	"Munda languages","mun" , "",
+	"Nahuatl","nah" , "",
+	"Nauru","nau", "na",
+	"Navaho","nav", "",
+	"Navajo","nav", "",
+	"Ndebele, North","nde", "",
+	"Ndebele, South","nbl", "",
+	"Ndonga, ndoNeapolitan","nap", "",
+	"Nepali","nep", "ne",
+	"Newari","new" , "",
+	"Nias","nia" , "",
+	"Niger-Kordofanian (Other)","nic", "",
+	"Nilo-Saharan (Other)","ssa" , "",
+	"Niuean","niu" , "",
+	"Nogai","nog", "",
+	"Norse, Old","non", "",
+	"North American Indian (Other)","nai" , "",
+	"Northern Sami","sme", "",
+	"North Ndebele","nde", "",
+	"Norwegian","nor", "no",
+	"Norwegian Bokmål","nob", "",
+	"Norwegian Nynorsk","nno", "",
+	"Nubian languages","nub" , "",
+	"Nyamwezi","nym" , "",
+	"Nyanja","nya", "",
+	"Nyankole","nyn", "",
+	"Nynorsk, Norwegian","nno" , "",
+	"Nyoro","nyo" , "",
+	"Nzima","nzi" , "",
+	"Occitan (post 1500)","oci", "oc",
+	"Ojibwa","oji" , "",
+	"Old Bulgarian","chu", "",
+	"Old Church Slavonic","chu", "",
+	"Old Slavonic","chu", "",
+	"Oriya","ori", "or",
+	"Oromo","orm", "om",
+	"Osage","osa", "",
+	"Ossetian - Ossetic","oss", "",
+	"Otomian languages","oto", "",
+	"Pahlavi","pal" , "",
+	"Palauan","pau", "",
+	"Pali","pli", "",
+	"Pampanga","pam", "",
+	"Pangasinan","pag", "",
+	"Panjabi","pan", "pa",
+	"Papiamento","pap" , "",
+	"Papuan (Other)","paa" , "",
+	"Persian","per/fas", "fa",
+	"Persian, Old (ca.600-400)","peo" , "",
+	"Philippine (Other)","phi" , "",
+	"Phoenician","phn" , "",
+	"Pohnpeian","pon" , "",
+	"Polish","pol", "pl",
+	"Portuguese","por", "pt",
+	"Prakrit languages","pra", "",
+	"Provençal","oci", "",
+	"Provençal, Old (to 1500)","pro" , "",
+	"Pushto","pus", "ps",
+	"Quechua","que", "qu",
+	"Raeto-Romance","roh", "rm",
+	"Rajasthani","raj", "",
+	"Rapanui","rap", "",
+	"Rarotongan","rar", "",
+	"Romance (Other)","roa", "",
+	"Romanian","rum/ron", "ro",
+	"Romany","rom" , "",
+	"Rundi","run", "rn",
+	"Russian","rus", "ru",
+	"Salishan languages","sal" , "",
+	"Samaritan Aramaic","sam" , "",
+	"Sami languages (Other)","smi" , "",
+	"Samoan","smo", "sm",
+	"Sandawe","sad" , "",
+	"Sango","sag", "sg",
+	"Sanskrit","san", "sa",
+	"Santali","sat", "",
+	"Sardinian","srd", "",
+	"Sasak","sas" , "",
+	"Saxon, Low","nds", "",
+	"Scots","sco", "",
+	"Scottish Gaelic","gla"  , "",
+	"Selkup","sel" , "",
+	"Semitic (Other)","sem" , "",
+	"Serbian","srp", "sr",
+	"Serbo-Croatian", "scr", "sh",
+	"Serer","srr" , "",
+	"Shan","shn" , "",
+	"Shona","sna", "sn",
+	"Sichuan Yi","iii", "",
+	"Sidamo","sid" , "",
+	"Sign languages","sgn" , "",
+	"Siksika","bla" , "",
+	"Sindhi","snd", "sd",
+	"Sinhalese","sin", "si",
+	"Sino-Tibetan (Other)","sit", "",
+	"Siouan languages","sio", "",
+	"Skolt Sami","sms" , "",
+	"Slave (Athapascan)","den" , "",
+	"Slavic (Other)","sla" , "",
+	"Slovak","slo", "sk",
+	"Slovenian","slv", "sl",
+	"Sogdian","sog" , "",
+	"Somali","som", "so",
+	"Songhai","son" , "",
+	"Soninke","snk" , "",
+	"Sorbian languages","wen" , "",
+	"Sotho, Northern","nso" , "",
+	"Sotho, Southern","sot", "st",
+	"South American Indian (Other)","sai" , "",
+	"Southern Sami","sma", "",
+	"South Ndebele","nbl", "",
+	"Spanish","spa", "es",
+	"Sukuma","suk", "",
+	"Sumerian","sux" , "",
+	"Sundanese","sun", "su",
+	"Susu","sus" , "",
+	"Swahili","swa", "sw",
+	"Swati","ssw", "ss",
+	"Swedish","swe", "sv",
+	"Syriac","syr", "",
+	"Tagalog","tgl", "tl",
+	"Tahitian","tah", "",
+	"Tai (Other)","tai" , "",
+	"Tajik","tgk", "tg",
+	"Tamashek","tmh" , "",
+	"Tamil","tam", "ta",
+	"Tatar","tat", "tt",
+	"Telugu","tel", "te",
+	"Tereno","ter" , "",
+	"Tetum","tet" , "",
+	"Thai","tha", "th",
+	"Tibetan","tib", "bo",
+	"Tigre","tig" , "",
+	"Tigrinya","tir", "ti",
+	"Timne","tem" , "",
+	"Tiv","tiv" , "",
+	"Tlingit","tli" , "",
+	"Tok Pisin","tpi" , "",
+	"Tokelau","tkl" , "",
+	"Tonga (Nyasa)","tog" , "to",
+	"Tonga (Tonga Islands)","ton", "",
+	"Tsimshian","tsi" , "",
+	"Tsonga","tso", "ts",
+	"Tswana","tsn", "tn",
+	"Tumbuka","tum" , "",
+	"Tupi languages","tup", "",
+	"Turkish","tur", "tr",
+	"Turkish, Ottoman (1500-1928)","ota" , "",
+	"Turkmen","tuk", "tk",
+	"Tuvalu","tvl", "",
+	"Tuvinian","tyv" , "",
+	"Twi","twi", "tw",
+	"Udmurt (udmUgaritic)","uga" , "",
+	"Uighur","uig", "ug",
+	"Ukrainian","ukr", "uk",
+	"Umbundu","umb" , "",
+	"Undetermined","und", "",
+	"Urdu","urd", "ur",
+	"Uzbek","uzb", "uz",
+	"Vai","vai", "",
+	"Venda","ven" , "",
+	"Vietnamese","vie", "vi",
+	"Volapük","vol", "vo",
+	"Votic","vot", "",
+	"Wakashan languages","wak" , "",
+	"Walamo","wal" , "",
+	"Walloon","wln", "",
+	"Waray","war", "",
+	"Washo","was" , "",
+	"Welsh","wel", "cy",
+	"Wolof","wol", "wo",
+	"Xhosa","xho", "xh",
+	"Yakut","sah" , "",
+	"Yao","yao" , "",
+	"Yapese","yap", "",
+	"Yiddish","yid", "yi",
+	"Yoruba","yor", "yo",
+	"Yupik languages","ypk" , "",
+	"Zande","znd" , "",
+	"Zapotec","zap" , "",
+	"Zenaga","zen" , "",
+	"Zhuang","zha", "za",
+	"Zulu","zul", "zu",
+	"Zuni","zun", "",
+	NULL
+};
+
+
+#endif
diff --git a/tstools/DtsEdit/src/gpac/isomedia.h b/tstools/DtsEdit/src/gpac/isomedia.h
new file mode 100644
index 0000000..bcd329f
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/isomedia.h
@@ -0,0 +1,1852 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					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. 
+ *
+ */
+
+
+
+#ifndef _GF_ISOMEDIA_H_
+#define _GF_ISOMEDIA_H_
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#include <gpac/mpeg4_odf.h>
+
+
+/*the isomedia file*/
+typedef struct __tag_isom GF_ISOFile;
+
+/*media sample object*/
+typedef struct
+{
+	/*data size*/
+	u32 dataLength;
+	/*data with padding if requested*/
+	char *data;
+	/*decoding time*/
+	u64 DTS;
+	/*relative offset for composition if needed*/
+	u32 CTS_Offset;
+	/*Random Access Point flag:
+	 0: not random access
+	 1: regular RAP, 
+	 2: sample is a redundant RAP. If set when adding the sample, this will create a sample dependency entry
+	*/
+	u8 IsRAP;
+} GF_ISOSample;
+
+
+/*creates a new empty sample*/
+GF_ISOSample *gf_isom_sample_new();
+
+/*delete a sample. NOTE:the buffer content will be destroyed by default.
+if you wish to keep the buffer, set dataLength to 0 in the sample 
+before deleting it
+the pointer is set to NULL after deletion*/
+void gf_isom_sample_del(GF_ISOSample **samp);
+
+
+
+/********************************************************************
+				FILE FORMAT CONSTANTS
+********************************************************************/
+
+/*Modes for file opening
+		NOTE 1: All the READ function in this API can be used in EDIT/WRITE mode. 
+However, some unexpected errors or values may happen in that case, depending
+on how much modifications you made (timing, track with 0 samples, ...)
+		On the other hand, none of the EDIT/WRITE functions will work in 
+READ mode.
+		NOTE 2: The output structure of a edited file will sometimes be different 
+from the original file, but the media-data and meta-data will be identical.
+The only change happens in the file media-data container(s) during edition
+		NOTE 3: when editing the file, you MUST set the final name of the modified file
+to something different. This API doesn't allow file overwriting.
+*/
+enum 
+{
+	/*Opens file for dumping: same as read-only but keeps all movie fragments info untouched*/
+	GF_ISOM_OPEN_READ_DUMP = 0,
+	/*Opens a file in READ ONLY mode*/
+	GF_ISOM_OPEN_READ,
+	/*Opens a file in WRITE ONLY mode. Media Data is captured on the fly. In this mode, 
+	the editing functions are disabled.*/
+	GF_ISOM_OPEN_WRITE,
+	/*Opens an existing file in EDIT mode*/
+	GF_ISOM_OPEN_EDIT,
+	/*Creates a new file in EDIT mode*/
+	GF_ISOM_WRITE_EDIT
+};
+
+/*Movie Options for file writing*/
+enum
+{
+	/*FLAT: the MediaData (MPEG4 ESs) is stored at the begining of the file*/
+	GF_ISOM_STORE_FLAT = 1,
+	/*STREAMABLE: the MetaData (File Info) is stored at the begining of the file 
+	for fast access during download*/
+	GF_ISOM_STORE_STREAMABLE,
+	/*INTERLEAVED: Same as STREAMABLE, plus the media data is mixed by chunk  of fixed duration*/
+	GF_ISOM_STORE_INTERLEAVED,
+	/*INTERLEAVED +DRIFT: Same as INTERLEAVED, and adds time drift control to avoid creating too long chunks*/
+	GF_ISOM_STORE_DRIFT_INTERLEAVED,
+	/*tightly interleaves samples based on their DTS, therefore allowing better placement of samples in the file.
+	This is used for both http interleaving and Hinting optimizations*/
+	GF_ISOM_STORE_TIGHT
+
+};
+
+/*Some track may depend on other tracks for several reasons. They reference these tracks 
+through the following Reference Types*/
+enum
+{
+	/*ref type for the OD track dependencies*/
+	GF_ISOM_REF_OD			= GF_4CC( 'm', 'p', 'o', 'd' ),
+	/*ref type for stream dependencies*/
+	GF_ISOM_REF_DECODE = GF_4CC( 'd', 'p', 'n', 'd' ),
+	/*ref type for OCR (Object Clock Reference) dependencies*/
+	GF_ISOM_REF_OCR				= GF_4CC( 's', 'y', 'n', 'c' ),
+	/*ref type for IPI (Intellectual Property Information) dependencies*/
+	GF_ISOM_REF_IPI				= GF_4CC( 'i', 'p', 'i', 'r' ),
+	/*ref type for timed Meta Data tracks*/
+	GF_ISOM_REF_META		= GF_4CC( 'c', 'd', 's', 'c' ),
+	/*ref type for Hint tracks*/
+	GF_ISOM_REF_HINT		= GF_4CC( 'h', 'i', 'n', 't' ),
+	/*ref type for QT Chapter tracks*/
+	GF_ISOM_REF_CHAP		= GF_4CC( 'c', 'h', 'a', 'p' )
+};
+
+/*Track Edition flag*/
+enum {
+	/*empty segment in the track (no media for this segment)*/
+	GF_ISOM_EDIT_EMPTY		=	0x00,
+	/*dwelled segment in the track (one media sample for this segment)*/
+	GF_ISOM_EDIT_DWELL		=	0x01,
+	/*normal segment in the track*/
+	GF_ISOM_EDIT_NORMAL		=	0x02
+};
+
+/*Generic Media Types (YOU HAVE TO USE ONE OF THESE TYPES FOR COMPLIANT ISO MEDIA FILES)*/
+enum
+{
+	/*base media types*/
+	GF_ISOM_MEDIA_VISUAL	= GF_4CC( 'v', 'i', 'd', 'e' ),
+	GF_ISOM_MEDIA_AUDIO		= GF_4CC( 's', 'o', 'u', 'n' ),
+	GF_ISOM_MEDIA_HINT		= GF_4CC( 'h', 'i', 'n', 't' ),
+	GF_ISOM_MEDIA_META		= GF_4CC( 'm', 'e', 't', 'a' ),
+	GF_ISOM_MEDIA_TEXT		= GF_4CC( 't', 'e', 'x', 't' ),
+	GF_ISOM_MEDIA_SUBPIC	= GF_4CC( 's', 'u', 'b', 'p' ),
+
+	/*MPEG-4 media types*/
+	GF_ISOM_MEDIA_OD		= GF_4CC( 'o', 'd', 's', 'm' ),
+	GF_ISOM_MEDIA_OCR		= GF_4CC( 'c', 'r', 's', 'm' ),
+	GF_ISOM_MEDIA_SCENE		= GF_4CC( 's', 'd', 's', 'm' ),
+	GF_ISOM_MEDIA_MPEG7		= GF_4CC( 'm', '7', 's', 'm' ),
+	GF_ISOM_MEDIA_OCI		= GF_4CC( 'o', 'c', 's', 'm' ),
+	GF_ISOM_MEDIA_IPMP		= GF_4CC( 'i', 'p', 's', 'm' ),
+	GF_ISOM_MEDIA_MPEGJ		= GF_4CC( 'm', 'j', 's', 'm' ),
+	/*GPAC-defined, for any track using MPEG-4 systems signaling but with undefined streaml types*/
+	GF_ISOM_MEDIA_ESM		= GF_4CC( 'g', 'e', 's', 'm' ),
+
+	/*DIMS media type (same as scene but with a different mediaInfo)*/
+	GF_ISOM_MEDIA_DIMS		= GF_4CC( 'd', 'i', 'm', 's' ),
+
+	GF_ISOM_MEDIA_FLASH		= GF_4CC( 'f', 'l', 's', 'h' )
+};
+
+/* Encryption Scheme Type in the SchemeTypeInfoBox */
+enum 
+{
+	GF_ISOM_ISMACRYP_SCHEME	= GF_4CC( 'i', 'A', 'E', 'C' )
+};
+
+/*specific media sub-types - you shall make sure the media sub type is what you expect*/
+enum
+{
+	/*reserved, internal use in the lib. Indicates the track complies to MPEG-4 system
+	specification, and the usual OD framework tools may be used*/
+	GF_ISOM_SUBTYPE_MPEG4		= GF_4CC( 'M', 'P', 'E', 'G' ),
+	
+	/*reserved, internal use in the lib. Indicates the track is of GF_ISOM_SUBTYPE_MPEG4
+	but it is encrypted.*/
+	GF_ISOM_SUBTYPE_MPEG4_CRYP	= GF_4CC( 'E', 'N', 'C', 'M' ),
+
+	/*AVC/H264 media type - not listed as an MPEG-4 type, ALTHOUGH this library automatically remaps
+	GF_AVCConfig to MPEG-4 ESD*/
+	GF_ISOM_SUBTYPE_AVC_H264		= GF_4CC( 'a', 'v', 'c', '1' ),
+
+	/*3GPP(2) extension subtypes*/
+	GF_ISOM_SUBTYPE_3GP_H263		= GF_4CC( 's', '2', '6', '3' ),
+	GF_ISOM_SUBTYPE_3GP_AMR		= GF_4CC( 's', 'a', 'm', 'r' ),
+	GF_ISOM_SUBTYPE_3GP_AMR_WB	= GF_4CC( 's', 'a', 'w', 'b' ),
+	GF_ISOM_SUBTYPE_3GP_EVRC		= GF_4CC( 's', 'e', 'v', 'c' ),
+	GF_ISOM_SUBTYPE_3GP_QCELP	= GF_4CC( 's', 'q', 'c', 'p' ),
+	GF_ISOM_SUBTYPE_3GP_SMV		= GF_4CC( 's', 's', 'm', 'v' ),
+
+	/*3GPP DIMS*/
+	GF_ISOM_SUBTYPE_3GP_DIMS	= GF_4CC( 'd', 'i', 'm', 's' ),
+
+	GF_ISOM_SUBTYPE_AC3			= GF_4CC( 'a', 'c', '-', '3' ),
+};
+
+
+
+
+/*direction for sample search (including SyncSamples search)
+Function using search allways specify the desired time in composition (presentation) time
+
+		(Sample N-1)	DesiredTime		(Sample N)
+
+FORWARD: will give the next sample given the desired time (eg, N)
+BACKWARD: will give the previous sample given the desired time (eg, N-1)
+SYNCFORWARD: will search from the desired point in time for a sync sample if any
+		If no sync info, behaves as FORWARD
+SYNCBACKWARD: will search till the desired point in time for a sync sample if any
+		If no sync info, behaves as BACKWARD
+SYNCSHADOW: use the sync shadow information to retrieve the sample.
+		If no SyncShadow info, behave as SYNCBACKWARD
+*/
+enum
+{
+	GF_ISOM_SEARCH_FORWARD		=	1,
+	GF_ISOM_SEARCH_BACKWARD		=	2,
+	GF_ISOM_SEARCH_SYNC_FORWARD	=	3,
+	GF_ISOM_SEARCH_SYNC_BACKWARD	=	4,
+	GF_ISOM_SEARCH_SYNC_SHADOW		=	5
+};
+
+/*Predefined File Brand codes (MPEG-4 and JPEG2000)*/
+enum
+{
+	/*file complying to the generic ISO Media File (base specification ISO/IEC 14496-12)
+	this is the default brand when creating a new movie*/
+	GF_ISOM_BRAND_ISOM = GF_4CC( 'i', 's', 'o', 'm' ),
+	/*file complying to the generic ISO Media File (base specification ISO/IEC 14496-12) + Meta extensions*/
+	GF_ISOM_BRAND_ISO2 =  GF_4CC( 'i', 's', 'o', '2' ),
+	/*file complying to ISO/IEC 14496-1 2001 edition. A .mp4 file without a brand
+	is equivalent to a file compatible with this brand*/
+	GF_ISOM_BRAND_MP41 = GF_4CC( 'm', 'p', '4', '1' ),
+	/*file complying to ISO/IEC 14496-14 (MP4 spec)*/
+	GF_ISOM_BRAND_MP42 = GF_4CC( 'm', 'p', '4', '2' ),
+	/*file complying to ISO/IEC 15444-3 (JPEG2000) without profile restriction*/
+	GF_ISOM_BRAND_MJP2 = GF_4CC( 'm', 'j', 'p', '2' ),
+	/*file complying to ISO/IEC 15444-3 (JPEG2000) with simple profile restriction*/
+	GF_ISOM_BRAND_MJ2S = GF_4CC( 'm', 'j', '2', 's' ),
+	/*old versions of 3GPP spec (without timed text)*/
+	GF_ISOM_BRAND_3GP4 = GF_4CC('3', 'g', 'p', '4'),
+	GF_ISOM_BRAND_3GP5 = GF_4CC('3', 'g', 'p', '5'),
+	/*final version of 3GPP file spec*/
+	GF_ISOM_BRAND_3GP6 = GF_4CC('3', 'g', 'p', '6'),
+	/*generci 3GPP file (several audio tracks, etc..)*/
+	GF_ISOM_BRAND_3GG6 = GF_4CC('3', 'g', 'g', '6'),
+	/*3GPP2 file spec*/
+	GF_ISOM_BRAND_3G2A = GF_4CC('3', 'g', '2', 'a'),
+	/*AVC file spec*/
+	GF_ISOM_BRAND_AVC1 = GF_4CC('a', 'v', 'c', '1'),
+	/* file complying to ISO/IEC 21000-9:2005 (MPEG-21 spec)*/
+	GF_ISOM_BRAND_MP21 = GF_4CC('m', 'p', '2', '1'),
+};
+
+
+/*MPEG-4 ProfileAndLevel codes*/
+enum
+{
+	GF_ISOM_PL_AUDIO,
+	GF_ISOM_PL_VISUAL,
+	GF_ISOM_PL_GRAPHICS,
+	GF_ISOM_PL_SCENE,
+	GF_ISOM_PL_OD,
+	GF_ISOM_PL_MPEGJ,
+	/*not a profile, just set/unset inlineFlag*/
+	GF_ISOM_PL_INLINE,
+};
+
+
+/********************************************************************
+				GENERAL API FUNCTIONS
+********************************************************************/
+
+/*get the last fatal error that occured in the file
+ANY FUNCTION OF THIS API WON'T BE PROCESSED IF THE FILE HAS AN ERROR
+Note: some function may return an error while the movie has no error
+the last error is a FatalError, and is not always set if a bad 
+param is specified...*/
+GF_Err gf_isom_last_error(GF_ISOFile *the_file);
+
+/*returns 1 if target file is an IsoMedia file, 0 otherwise*/
+Bool gf_isom_probe_file(const char *fileName);
+
+/*Opens an isoMedia File.
+tmp_dir: for the 2 edit modes only, specifies a location for temp file. If NULL, the librairy will use the default
+OS temporary file management schemes.*/
+GF_ISOFile *gf_isom_open(const char *fileName, u32 OpenMode, const char *tmp_dir);
+
+/*close the file, write it if new/edited*/
+GF_Err gf_isom_close(GF_ISOFile *the_file);
+
+/*delete the movie without saving it.*/
+void gf_isom_delete(GF_ISOFile *the_file);
+
+/*Get the mode of an open file*/
+u8 gf_isom_get_mode(GF_ISOFile *the_file);
+
+Bool gf_isom_is_JPEG2000(GF_ISOFile *mov);
+
+/********************************************************************
+				STREAMING API FUNCTIONS
+********************************************************************/
+/*open a movie that can be uncomplete in READ_ONLY mode
+to use for http streaming & co
+
+NOTE: you must buffer the data to a local file, this mode DOES NOT handle 
+http/ftp/... streaming
+
+BytesMissing is the predicted number of bytes missing for the file to be loaded
+Note that if the file is not optimized for streaming, this number is not accurate
+If the movie is successfully loaded (the_file non-NULL), BytesMissing is zero
+*/
+GF_Err gf_isom_open_progressive(const char *fileName, GF_ISOFile **the_file, u64 *BytesMissing);
+
+/*If requesting a sample fails with error GF_ISOM_INCOMPLETE_FILE, use this function
+to get the number of bytes missing to retrieve the sample*/
+u64 gf_isom_get_missing_bytes(GF_ISOFile *the_file, u32 trackNumber);
+
+
+/*Fragmented movie extensions*/
+
+/*return 0 if movie isn't fragmented, 1 otherwise*/
+u32 gf_isom_is_fragmented(GF_ISOFile *the_file);
+/*return 0 if track isn't fragmented, 1 otherwise*/
+u32 gf_isom_is_track_fragmented(GF_ISOFile *the_file, u32 TrackID);
+
+/*a file being downloaded may be a fragmented file. In this case only partial info 
+is available once the file is successfully open (gf_isom_open_progressive), and since there is 
+no information wrt number fragments (which could actually be generated on the fly 
+at the sender side), you must call this function on regular bases in order to
+load newly downloaded fragments. Note this may result in Track/Movie duration changes
+and SampleCount change too ...*/
+GF_Err gf_isom_refresh_fragmented(GF_ISOFile *the_file, u64 *MissingBytes);
+
+/*check if file has movie info, eg has tracks & dynamic media. Some files may just use
+the base IsoMedia structure without "moov" container*/
+Bool gf_isom_has_movie(GF_ISOFile *file);
+
+/********************************************************************
+				READING API FUNCTIONS
+********************************************************************/
+
+/*return the number of tracks in the movie, or -1 if error*/
+u32 gf_isom_get_track_count(GF_ISOFile *the_file);
+
+/*return the timescale of the movie, 0 if error*/
+u32 gf_isom_get_timescale(GF_ISOFile *the_file);
+
+/*return the duration of the movie, 0 if error*/
+u64 gf_isom_get_duration(GF_ISOFile *the_file);
+
+/*return the creation info of the movie*/
+GF_Err gf_isom_get_creation_time(GF_ISOFile *the_file, u64 *creationTime, u64 *modificationTime);
+
+/*return the trackID of track number n, or 0 if error*/
+u32 gf_isom_get_track_id(GF_ISOFile *the_file, u32 trackNumber);
+
+/*return the track number of the track of specified ID, or 0 if error*/
+u32 gf_isom_get_track_by_id(GF_ISOFile *the_file, u32 trackID);
+
+/*gets the enable flag of a track 0: NO, 1: yes, 2: error*/
+u8 gf_isom_is_track_enabled(GF_ISOFile *the_file, u32 trackNumber);
+
+/* determines if the track is encrypted 0: NO, 1: yes, 2: error*/
+u8 gf_isom_is_track_encrypted(GF_ISOFile *the_file, u32 trackNumber);
+
+/*get the track duration return 0 if bad param*/
+u64 gf_isom_get_track_duration(GF_ISOFile *the_file, u32 trackNumber);
+
+/*return the media type FOUR CHAR code type of the media*/
+u32 gf_isom_get_media_type(GF_ISOFile *the_file, u32 trackNumber);
+
+/*return the media type FOUR CHAR code type of the media*/
+u32 gf_isom_get_media_subtype(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
+
+/*return the media type FOUR CHAR code type of an MPEG4 media (eg, mp4a, mp4v, enca, encv, etc...)
+returns 0 if not MPEG-4 subtype*/
+u32 gf_isom_get_mpeg4_subtype(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
+
+/*Get the media (composition) time given the absolute time in the Movie
+mediaTime is set to 0 if the media is not playing at that time (empty time segment)*/
+GF_Err gf_isom_get_media_time(GF_ISOFile *the_file, u32 trackNumber, u32 movieTime, u64 *MediaTime);
+
+/*Get the number of "streams" stored in the media - a media can have several stream descriptions...*/
+u32 gf_isom_get_sample_description_count(GF_ISOFile *the_file, u32 trackNumber);
+
+/*Get the stream description index (eg, the ESD) for a given time IN MEDIA TIMESCALE
+return 0 if error or if empty*/
+u32 gf_isom_get_sample_description_index(GF_ISOFile *the_file, u32 trackNumber, u64 for_time);
+
+/*returns 1 if samples refering to the given stream description are present in the file
+0 otherwise*/
+Bool gf_isom_is_self_contained(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex);
+
+/*get the media duration (without edit) return 0 if no samples (URL streams)*/
+u64 gf_isom_get_media_duration(GF_ISOFile *the_file, u32 trackNumber);
+
+/*Get the timeScale of the media. */
+u32 gf_isom_get_media_timescale(GF_ISOFile *the_file, u32 trackNumber);
+
+/*return the maximum chunk duration of the track in milliseconds*/
+u32 gf_isom_get_max_chunk_duration(GF_ISOFile *the_file, u32 trackNumber);
+
+/*Get the HandlerDescription name. The outName must be:
+		 (outName != NULL && *outName == NULL)
+the handler name is the string version of the MediaTypes*/
+GF_Err gf_isom_get_handler_name(GF_ISOFile *the_file, u32 trackNumber, const char **outName);
+
+/*Check a DataReference of this track (index >= 1)
+A Data Reference allows to construct a file without integrating the media data*/
+GF_Err gf_isom_check_data_reference(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex);
+
+/*get the location of the data. If URL && URN are NULL, the data is in this file
+both strings are const: don't free them.*/
+GF_Err gf_isom_get_data_reference(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, const char **outURL, const char **outURN);
+
+/*Get the number of samples - return 0 if error*/
+u32 gf_isom_get_sample_count(GF_ISOFile *the_file, u32 trackNumber);
+
+/*Get constant sample size, or 0 if size not constant*/
+u32 gf_isom_get_constant_sample_size(GF_ISOFile *the_file, u32 trackNumber);
+/*returns total amount of media bytes in track*/
+u64 gf_isom_get_media_data_size(GF_ISOFile *the_file, u32 trackNumber);
+
+/*It may be desired to fetch samples with a bigger allocated buffer than their real size, in case the decoder
+reads more data than available. This sets the amount of extra bytes to allocate when reading samples from this track
+NOTE: the dataLength of the sample does NOT include padding*/
+GF_Err gf_isom_set_sample_padding(GF_ISOFile *the_file, u32 trackNumber, u32 padding_bytes);
+
+/*return a sample given its number, and set the StreamDescIndex of this sample
+this index allows to retrieve the stream description if needed (2 media in 1 track)
+return NULL if error*/
+GF_ISOSample *gf_isom_get_sample(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u32 *StreamDescriptionIndex);
+
+/*same as gf_isom_get_sample but doesn't fetch media data
+@StreamDescriptionIndex (optional): set to stream description index
+@data_offset (optional): set to sample start offset in file.
+	
+	  NOTE: when both StreamDescriptionIndex and data_offset are NULL, only DTS, CTS_Offset and RAP indications are 
+retrieved (faster)
+*/
+GF_ISOSample *gf_isom_get_sample_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u32 *StreamDescriptionIndex, u64 *data_offset);
+
+/*retrieves given sample DTS*/
+u64 gf_isom_get_sample_dts(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber);
+
+/*returns sample duration in media timeScale*/
+u32 gf_isom_get_sample_duration(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber);
+
+/*gets a sample given a desired decoding time IN MEDIA TIME SCALE
+and set the StreamDescIndex of this sample
+this index allows to retrieve the stream description if needed (2 media in 1 track)
+return GF_EOS if the desired time exceeds the media duration
+WARNING: the sample may not be sync even though the sync was requested (depends on the media and the editList)
+the SampleNum is optional. If non-NULL, will contain the sampleNumber*/
+GF_Err gf_isom_get_sample_for_media_time(GF_ISOFile *the_file, u32 trackNumber, u64 desiredTime, u32 *StreamDescriptionIndex, u8 SearchMode, GF_ISOSample **sample, u32 *SampleNum);
+
+/*retrieves given sample DTS*/
+u32 gf_isom_get_sample_from_dts(GF_ISOFile *the_file, u32 trackNumber, u64 dts);
+
+/*Track Edition functions*/
+
+/*return a sample given a desired time in the movie. MovieTime is IN MEDIA TIME SCALE , handles edit list.
+and set the StreamDescIndex of this sample
+this index allows to retrieve the stream description if needed (2 media in 1 track)
+sample must be set to NULL before calling. 
+
+result Sample is NULL if an error occured
+if no sample is playing, an empty sample is returned with no data and a DTS set to MovieTime when serching in sync modes
+if no sample is playing, the closest sample in the edit time-line is returned when serching in regular modes
+
+WARNING: the sample may not be sync even though the sync was requested (depends on the media and the editList)
+
+Note: this function will handle re-timestamping the sample according to the mapping  of the media time-line 
+on the track time-line. The sample TSs (DTS / CTS offset) are expressed in MEDIA TIME SCALE 
+(to match the media stream TS resolution as indicated in media header / SLConfig)
+
+sampleNumber is optional and gives the number of the sample in the media
+*/
+GF_Err gf_isom_get_sample_for_movie_time(GF_ISOFile *the_file, u32 trackNumber, u64 movieTime, u32 *StreamDescriptionIndex, u8 SearchMode, GF_ISOSample **sample, u32 *sampleNumber);
+
+/*get the number of edited segment*/
+u32 gf_isom_get_edit_segment_count(GF_ISOFile *the_file, u32 trackNumber);
+
+/*Get the desired segment information*/
+GF_Err gf_isom_get_edit_segment(GF_ISOFile *the_file, u32 trackNumber, u32 SegmentIndex, u64 *EditTime, u64 *SegmentDuration, u64 *MediaTime, u8 *EditMode);
+
+/*get the number of languages for the copyright*/
+u32 gf_isom_get_copyright_count(GF_ISOFile *the_file);
+/*get the copyright and its language code given the index*/
+GF_Err gf_isom_get_copyright(GF_ISOFile *the_file, u32 Index, const char **threeCharCodes, const char **notice);
+/*get the opaque watermark info if any - returns GF_NOT_SUPPORTED if not present*/
+GF_Err gf_isom_get_watermark(GF_ISOFile *the_file, bin128 UUID, u8** data, u32* length);
+
+/*get the number of chapter for movie or track if trackNumber !=0*/
+u32 gf_isom_get_chapter_count(GF_ISOFile *the_file, u32 trackNumber);
+/*get the given movie or track (trackNumber!=0) chapter time and name - index is 1-based
+@chapter_time: retrives start time in milliseconds - may be NULL.
+@name: retrieves chapter name - may be NULL - SHALL NOT be destroyed by user
+*/
+GF_Err gf_isom_get_chapter(GF_ISOFile *the_file, u32 trackNumber, u32 Index, u64 *chapter_time, const char **name);
+
+/*
+return 0 if the media has no sync point info (eg, all samples are RAPs)
+return 1 if the media has sync points (eg some samples are RAPs)
+return 2 if the media has empty sync point info (eg no samples are RAPs). This will likely only happen 
+			in scalable context
+*/
+u8 gf_isom_has_sync_points(GF_ISOFile *the_file, u32 trackNumber);
+
+/*returns number of sync points*/
+u32 gf_isom_get_sync_point_count(GF_ISOFile *the_file, u32 trackNumber);
+
+/*returns 1 if one sample of the track is found to have a composition time offset (DTS<CTS)*/
+Bool gf_isom_has_time_offset(GF_ISOFile *the_file, u32 trackNumber);
+
+/*returns 1 if the track has sync shadow samples*/
+Bool gf_isom_has_sync_shadows(GF_ISOFile *the_file, u32 trackNumber);
+
+/*returns 1 if the track has sample dep indications*/
+Bool gf_isom_has_sample_dependency(GF_ISOFile *the_file, u32 trackNumber);
+
+/*rough estimation of file size, only works for completely self-contained files and without fragmentation
+for the current time*/
+u64 gf_isom_estimate_size(GF_ISOFile *the_file);
+
+u32 gf_isom_get_next_alternate_group_id(GF_ISOFile *movie);
+
+
+/*
+		MPEG-4 Systems extensions
+*/
+
+/*check if files has root OD/IOD or not*/
+Bool gf_isom_has_root_od(GF_ISOFile *the_file);
+
+/*return the root Object descriptor of the movie (can be NULL, OD or IOD, you have to check its tag)
+YOU HAVE TO DELETE THE DESCRIPTOR
+*/
+GF_Descriptor *gf_isom_get_root_od(GF_ISOFile *the_file);
+
+/*check the presence of a track in IOD. 0: NO, 1: YES, 2: ERROR*/
+u8 gf_isom_is_track_in_root_od(GF_ISOFile *the_file, u32 trackNumber);
+
+/*Get the GF_ESD given the StreamDescriptionIndex - YOU HAVE TO DELETE THE DESCRIPTOR*/
+GF_ESD *gf_isom_get_esd(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex);
+
+/*Get the decoderConfigDescriptor given the StreamDescriptionIndex - YOU HAVE TO DELETE THE DESCRIPTOR*/
+GF_DecoderConfig *gf_isom_get_decoder_config(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex);
+
+/*sets default TrackID (or ES_ID) for clock references. If trackNumber is 0, default sync track ID is reseted
+and will be reassigned at next ESD fetch*/
+void gf_isom_set_default_sync_track(GF_ISOFile *file, u32 trackNumber);
+
+/*Return the number of track references of a track for a given ReferenceType - return -1 if error*/
+s32 gf_isom_get_reference_count(GF_ISOFile *the_file, u32 trackNumber, u32 referenceType);
+
+/*Return the referenced track number for a track and a given ReferenceType and Index
+return -1 if error, 0 if the reference is a NULL one, or the trackNumber
+*/
+GF_Err gf_isom_get_reference(GF_ISOFile *the_file, u32 trackNumber, u32 referenceType, u32 referenceIndex, u32 *refTrack);
+
+u8 gf_isom_get_pl_indication(GF_ISOFile *the_file, u8 PL_Code);
+
+/*locates the first ObjectDescriptor using the given track by inspecting any OD tracks*/
+u32 gf_isom_find_od_for_track(GF_ISOFile *file, u32 track);
+
+/*returns file name*/
+const char *gf_isom_get_filename(GF_ISOFile *the_file);
+
+/*
+		Update of the Reading API for IsoMedia Version 2
+*/
+
+/*retrieves the brand of the file. The brand is introduced in V2 to differenciate
+MP4, MJPEG2000 and QT while indicating compatibilities
+the brand is one of the above defined code, or any other registered brand
+
+minorVersion is an optional parameter (can be set to NULL) , 
+		"informative integer for the minor version of the major brand"
+AlternateBrandsCount is an optional parameter (can be set to NULL) , 
+	giving the number of compatible brands. 
+
+	The function will set brand to 0 if no brand indication is found in the file
+*/
+GF_Err gf_isom_get_brand_info(GF_ISOFile *the_file, u32 *brand, u32 *minorVersion, u32 *AlternateBrandsCount);
+
+/*gets an alternate brand indication. BrandIndex is 1-based
+Note that the Major brand should always be indicated in the alternate brands*/
+GF_Err gf_isom_get_alternate_brand(GF_ISOFile *the_file, u32 BrandIndex, u32 *brand);
+
+/*get the number of padding bits at the end of a given sample if any*/
+GF_Err gf_isom_get_sample_padding_bits(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u8 *NbBits);
+/*indicates whether the track samples use padding bits or not*/
+Bool gf_isom_has_padding_bits(GF_ISOFile *the_file, u32 trackNumber);
+
+/*returns width and height of the given visual sample desc - error if not a visual track*/
+GF_Err gf_isom_get_visual_info(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, u32 *Width, u32 *Height);
+
+/*returns samplerate, channels and bps of the given audio track - error if not a audio track*/
+GF_Err gf_isom_get_audio_info(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, u32 *SampleRate, u32 *Channels, u8 *bitsPerSample);
+
+/*returns track visual info - all coord values are expressed as 16.16 fixed point floats*/
+GF_Err gf_isom_get_track_layout_info(GF_ISOFile *the_file, u32 trackNumber, u32 *width, u32 *height, s32 *translation_x, s32 *translation_y, s16 *layer);
+
+/*returns width and height of the given visual sample desc - error if not a visual track*/
+GF_Err gf_isom_get_pixel_aspect_ratio(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, u32 *hSpacing, u32 *vSpacing);
+
+/*
+	User Data Manipulation (cf write API too)
+*/
+
+/* Gets the number of UserDataItems with the same ID / UUID in the desired track or 
+in the movie if trackNumber is set to 0*/
+u32 gf_isom_get_user_data_count(GF_ISOFile *the_file, u32 trackNumber, u32 UserDataType, bin128 UUID);
+/* Gets the UserData for the specified item from the track or the movie if trackNumber is set to 0
+data is allocated by the function and is yours to free
+you musty pass (userData != NULL && *userData=NULL)*/
+GF_Err gf_isom_get_user_data(GF_ISOFile *the_file, u32 trackNumber, u32 UserDataType, bin128 UUID, u32 UserDataIndex, char **userData, u32 *userDataSize);
+
+
+/*gets 3char media language code - @three_char_code must be at least 4 char long*/
+GF_Err gf_isom_get_media_language(GF_ISOFile *the_file, u32 trackNumber, char *three_char_code);
+
+/*Unknown sample description*/
+typedef struct
+{
+	/*codec tag is the containing box's tag, 0 if UUID is used*/
+	u32 codec_tag;
+	/*entry UUID if no tag is used*/
+	bin128 UUID;
+
+	u16 version;
+	u16 revision;
+	u32 vendor_code;
+
+	/*video codecs only*/
+	u32 temporal_quality;
+	u32 spacial_quality;
+	u16 width, height;
+	u32 h_res, v_res;
+	u16 depth;
+	u16 color_table_index;
+	char compressor_name[33];
+
+	/*audio codecs only*/
+	u32 samplerate;
+	u16 nb_channels;
+	u16 bits_per_sample;
+
+	/*if present*/
+	char *extension_buf;
+	u32 extension_buf_size;
+} GF_GenericSampleDescription;
+
+/*returns wrapper for unknown entries - you must delete it yourself*/
+GF_GenericSampleDescription *gf_isom_get_generic_sample_description(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex);
+
+/*retrieves default values for a track fragment. Each variable is optional and 
+if set will contain the default value for this track samples*/
+GF_Err gf_isom_get_fragment_defaults(GF_ISOFile *the_file, u32 trackNumber, 
+							 u32 *defaultDuration, u32 *defaultSize, u32 *defaultDescriptionIndex,
+							 u32 *defaultRandomAccess, u8 *defaultPadding, u16 *defaultDegradationPriority);
+
+
+/*non standard extensions used for video packets in order to keep AU structure in the file format 
+(no normative tables for that). Info is NOT written to disk.
+*/
+/*get number of fragments for a sample */
+u32 gf_isom_get_sample_fragment_count(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber);
+/*get sample fragment size*/
+u16 gf_isom_get_sample_fragment_size(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u32 FragmentIndex);
+
+/*returns 1 if file is single AV (max one audio, one video, one text and basic od/bifs)*/
+Bool gf_isom_is_single_av(GF_ISOFile *file);
+
+/*guess which std this file refers to. return value:
+	GF_ISOM_BRAND_ISOM: unrecognized std
+	GF_ISOM_BRAND_3GP5: 3GP file (max 1 audio, 1 video) without text track
+	GF_ISOM_BRAND_3GP6: 3GP file (max 1 audio, 1 video) with text track
+	GF_ISOM_BRAND_3GG6: 3GP file multitrack file
+	GF_ISOM_BRAND_3G2A: 3GP2 file
+	GF_ISOM_BRAND_AVC1: AVC file
+	FCC("ISMA"): ISMA file (may overlap with 3GP)
+	GF_ISOM_BRAND_MP42: any generic MP4 file (eg with BIFS/OD/MPEG-4 systems stuff)
+
+  for files without movie, returns the file meta handler type
+*/
+u32 gf_isom_guess_specification(GF_ISOFile *file);
+
+
+#ifndef GPAC_READ_ONLY
+
+
+/********************************************************************
+				EDITING/WRITING API FUNCTIONS
+********************************************************************/
+
+/*set the timescale of the movie*/
+GF_Err gf_isom_set_timescale(GF_ISOFile *the_file, u32 timeScale);
+
+/*creates a new Track. If trackID = 0, the trackID is chosen by the API
+returns the track number or 0 if error*/
+u32 gf_isom_new_track(GF_ISOFile *the_file, u32 trackID, u32 MediaType, u32 TimeScale);
+
+/*removes the desired track - internal cross dependancies will be updated.
+WARNING: any OD streams with references to this track through  ODUpdate, ESDUpdate, ESDRemove commands
+will be rewritten*/
+GF_Err gf_isom_remove_track(GF_ISOFile *the_file, u32 trackNumber);
+
+/*sets the enable flag of a track*/
+GF_Err gf_isom_set_track_enabled(GF_ISOFile *the_file, u32 trackNumber, u8 enableTrack);
+
+/*changes the trackID - all track references present in the file are updated
+returns error if trackID is already in used in the file*/
+GF_Err gf_isom_set_track_id(GF_ISOFile *the_file, u32 trackNumber, u32 trackID);
+
+/*Add samples to a track. Use streamDescriptionIndex to specify the desired stream (if several)*/
+GF_Err gf_isom_add_sample(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, GF_ISOSample *sample);
+
+/*Add sync shadow sample to a track. 
+- There must be a regular sample with the same DTS. 
+- Sync Shadow samples MUST be RAP
+- Currently, adding sync shadow must be done in order (no sample insertion)
+*/
+GF_Err gf_isom_add_sample_shadow(GF_ISOFile *the_file, u32 trackNumber, GF_ISOSample *sample);
+
+/*add data to current sample in the track. Use this function for media with
+fragmented options such as MPEG-4 video packets. This will update the data size.
+CANNOT be used with OD media type*/
+GF_Err gf_isom_append_sample_data(GF_ISOFile *the_file, u32 trackNumber, char *data, u32 data_size);
+
+/*Add sample references to a track. The dataOffset is the offset of the data in the referenced file
+you MUST have created a StreamDescription with URL or URN specifying your referenced file
+Use streamDescriptionIndex to specify the desired stream (if several)*/
+GF_Err gf_isom_add_sample_reference(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, GF_ISOSample *sample, u64 dataOffset);
+
+/*set the duration of the last media sample. If not set, the duration of the last sample is the
+duration of the previous one if any, or media TimeScale (default value).*/
+GF_Err gf_isom_set_last_sample_duration(GF_ISOFile *the_file, u32 trackNumber, u32 duration);
+
+/*sets a track reference*/
+GF_Err gf_isom_set_track_reference(GF_ISOFile *the_file, u32 trackNumber, u32 referenceType, u32 ReferencedTrackID);
+
+/*removes a track reference*/
+GF_Err gf_isom_remove_track_reference(GF_ISOFile *the_file, u32 trackNumber, u32 referenceType, u32 ReferenceIndex);
+
+/*sets track handler name. name is either NULL (reset), a UTF-8 formatted string or a UTF8 file 
+resource in the form "file://path/to/file_utf8" */
+GF_Err gf_isom_set_handler_name(GF_ISOFile *the_file, u32 trackNumber, const char *nameUTF8);
+
+/*Update the sample size table - this is needed when using @gf_isom_append_sample_data in case the resulting samples
+are of same sizes (typically in 3GP speech tracks)*/
+GF_Err gf_isom_refresh_size_info(GF_ISOFile *file, u32 trackNumber);
+
+/*Update Sample functions*/
+
+/*update a given sample of the media.
+@data_only: if set, only the sample data is updated, not other info*/
+GF_Err gf_isom_update_sample(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, GF_ISOSample *sample, Bool data_only);
+
+/*update a sample reference in the media. Note that the sample MUST exists,
+that sample->data MUST be NULL and sample->dataLength must be NON NULL;*/
+GF_Err gf_isom_update_sample_reference(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, GF_ISOSample *sample, u64 data_offset);
+
+/*Remove a given sample*/
+GF_Err gf_isom_remove_sample(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber);
+
+/*changes media time scale*/
+GF_Err gf_isom_set_media_timescale(GF_ISOFile *the_file, u32 trackNumber, u32 new_timescale);
+
+/*set the save file name of the (edited) movie. 
+If the movie is edited, the default fileName is avp_#openName)
+NOTE: you cannot save an edited file under the same name (overwrite not allowed)
+If the movie is created (WRITE mode), the default filename is #openName*/
+GF_Err gf_isom_set_final_name(GF_ISOFile *the_file, char *filename);
+
+
+/*set the storage mode of a file (FLAT, STREAMABLE, INTERLEAVED)*/
+GF_Err gf_isom_set_storage_mode(GF_ISOFile *the_file, u8 storageMode);
+u8 gf_isom_get_storage_mode(GF_ISOFile *the_file);
+
+/*set the interleaving time of media data (INTERLEAVED mode only)
+InterleaveTime is in MovieTimeScale*/
+GF_Err gf_isom_set_interleave_time(GF_ISOFile *the_file, u32 InterleaveTime);
+u32 gf_isom_get_interleave_time(GF_ISOFile *the_file);
+
+/*set the copyright in one language.*/
+GF_Err gf_isom_set_copyright(GF_ISOFile *the_file, const char *threeCharCode, char *notice);
+
+/*deletes copyright (1-based indexes)*/
+GF_Err gf_isom_remove_copyright(GF_ISOFile *the_file, u32 index);
+
+
+GF_Err gf_isom_set_alternate_group_id(GF_ISOFile *movie, u32 trackNumber, u32 groupId);
+
+/*add chapter info:
+if trackNumber is 0, the chapter info is added to the movie, otherwise to the track
+@timestamp: chapter start time in milliseconds. Chapters are added in order to the file. If a chapter with same timestamp
+	is found, its name is updated but no entry is created.
+@name: chapter name. If NULL, defaults to 'Chapter N'
+*/
+GF_Err gf_isom_add_chapter(GF_ISOFile *the_file, u32 trackNumber, u64 timestamp, char *name);
+
+/*deletes copyright (1-based index, index 0 for all)*/
+GF_Err gf_isom_remove_chapter(GF_ISOFile *the_file, u32 trackNumber, u32 index);
+
+/*set watermark info for movie*/
+GF_Err gf_isom_set_watermark(GF_ISOFile *the_file, bin128 UUID, u8* data, u32 length);
+
+/*Track Edition functions - used to change the normal playback of the media if desired
+NOTE: IT IS THE USER RESPONSABILITY TO CREATE A CONSISTENT TIMELINE FOR THE TRACK
+This API provides the basic hooks and some basic consistency checking
+but can not check the desired functionality of the track edits
+*/
+
+/*update or insert a new edit segment in the track time line. Edits are used to modify
+the media normal timing. EditTime and EditDuration are expressed in Movie TimeScale
+If a segment with EditTime already exists, IT IS ERASED
+if there is a segment before this new one, its duration is adjust to match EditTime of
+the new segment
+WARNING: The first segment always have an EditTime of 0. You should insert an empty or dwelled segment first.*/
+GF_Err gf_isom_set_edit_segment(GF_ISOFile *the_file, u32 trackNumber, u64 EditTime, u64 EditDuration, u64 MediaTime, u8 EditMode);
+
+/*same as above except only modifies duartion type and mediaType*/
+GF_Err gf_isom_modify_edit_segment(GF_ISOFile *the_file, u32 trackNumber, u32 seg_index, u64 EditDuration, u64 MediaTime, u8 EditMode);
+/*same as above except only appends new segment*/
+GF_Err gf_isom_append_edit_segment(GF_ISOFile *the_file, u32 trackNumber, u64 EditDuration, u64 MediaTime, u8 EditMode);
+
+/*remove the edit segments for the whole track*/
+GF_Err gf_isom_remove_edit_segments(GF_ISOFile *the_file, u32 trackNumber);
+
+/*remove the given edit segment (1-based index). If this is not the last segment, the next segment duration
+is updated to maintain a continous timeline*/
+GF_Err gf_isom_remove_edit_segment(GF_ISOFile *the_file, u32 trackNumber, u32 seg_index);
+
+/*
+				User Data Manipulation
+
+		You can add specific typed data to either a track or the movie: the UserData
+	The type must be formated as a FourCC if you have a registered 4CC type
+	but the usual is to set a UUID (128 bit ID for box type) which never conflict
+	with existing structures in the format
+		To manipulate a UUID user data set the UserDataType to 0 and specify a valid UUID.
+Otherwise the UUID parameter is ignored
+		Several items with the same ID or UUID can be added (this allows you to store any
+	kind/number of private information under a unique ID / UUID)
+*/
+/*Add a user data item in the desired track or in the movie if TrackNumber is 0*/
+GF_Err gf_isom_add_user_data(GF_ISOFile *the_file, u32 trackNumber, u32 UserDataType, bin128 UUID, char *data, u32 DataLength);
+
+/*remove all user data items from the desired track or from the movie if TrackNumber is 0*/
+GF_Err gf_isom_remove_user_data(GF_ISOFile *the_file, u32 trackNumber, u32 UserDataType, bin128 UUID);
+
+/*remove a user data item from the desired track or from the movie if TrackNumber is 0
+use the UDAT read functions to get the item index*/
+GF_Err gf_isom_remove_user_data_item(GF_ISOFile *the_file, u32 trackNumber, u32 UserDataType, bin128 UUID, u32 UserDataIndex);
+
+/*remove track, moov (trackNumber=0) or file-level (trackNumber=0xFFFFFFFF) UUID box of matching type*/
+GF_Err gf_isom_remove_uuid(GF_ISOFile *movie, u32 trackNumber, bin128 UUID);
+/*adds track, moov (trackNumber=0) or file-level (trackNumber=0xFFFFFFFF) UUID box of given type*/
+GF_Err gf_isom_add_uuid(GF_ISOFile *movie, u32 trackNumber, bin128 UUID, char *data, u32 data_size);
+
+/*
+		Update of the Writing API for IsoMedia Version 2
+*/	
+
+/*use a compact track version for sample size. This is not usually recommended 
+except for speech codecs where the track has a lot of small samples
+compaction is done automatically while writing based on the track's sample sizes*/
+GF_Err gf_isom_use_compact_size(GF_ISOFile *the_file, u32 trackNumber, u8 CompactionOn);
+
+/*sets the brand of the movie*/
+GF_Err gf_isom_set_brand_info(GF_ISOFile *the_file, u32 MajorBrand, u32 MinorVersion);
+
+/*adds or remove an alternate brand for the movie*/
+GF_Err gf_isom_modify_alternate_brand(GF_ISOFile *the_file, u32 Brand, u8 AddIt);
+
+/*removes all alternate brands except major brand*/
+GF_Err gf_isom_reset_alt_brands(GF_ISOFile *movie);
+
+/*set the number of padding bits at the end of a given sample if needed
+if the function is never called the padding bit info is ignored
+this MUST be called on an existin sample*/
+GF_Err gf_isom_set_sample_padding_bits(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u8 NbBits);
+
+
+/*since v2 you must specify w/h of video tracks for authoring tools (no decode the video cfg / first sample)*/
+GF_Err gf_isom_set_visual_info(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, u32 Width, u32 Height);
+
+/*mainly used for 3GPP text since most ISO-based formats ignore these (except MJ2K) 
+all coord values are expressed as 16.16 fixed point floats*/
+GF_Err gf_isom_set_track_layout_info(GF_ISOFile *the_file, u32 trackNumber, u32 width, u32 height, s32 translation_x, s32 translation_y, s16 layer);
+
+GF_Err gf_isom_set_pixel_aspect_ratio(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, u32 hSpacing, u32 vSpacing);
+
+/*set SR & nbChans for audio description*/
+GF_Err gf_isom_set_audio_info(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, u32 sampleRate, u32 nbChannels, u8 bitsPerSample);
+
+/*non standard extensions: set/remove a fragment of a sample - this is used for video packets
+in order to keep AU structure in the file format (no normative tables for that). Info is NOT written to disk*/
+GF_Err gf_isom_add_sample_fragment(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u16 FragmentSize);
+GF_Err gf_isom_remove_sample_fragment(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber);
+/*remove all sample fragment info for this track*/
+GF_Err gf_isom_remove_sample_fragments(GF_ISOFile *the_file, u32 trackNumber);
+
+/*set CTS unpack mode (used for B-frames & like): in unpack mode, each sample uses one entry in CTTS tables
+unpack=0: set unpack on - !!creates a CTTS table if none found!!
+unpack=1: set unpack off and repacks all table info
+*/
+GF_Err gf_isom_set_cts_packing(GF_ISOFile *the_file, u32 trackNumber, Bool unpack);
+/*modify CTS offset of a given sample (used for B-frames) - MUST be called in unpack mode only*/
+GF_Err gf_isom_modify_cts_offset(GF_ISOFile *the_file, u32 trackNumber, u32 sample_number, u32 offset);
+/*remove CTS offset table (used for B-frames)*/
+GF_Err gf_isom_remove_cts_info(GF_ISOFile *the_file, u32 trackNumber);
+
+/*set 3char code media language*/
+GF_Err gf_isom_set_media_language(GF_ISOFile *the_file, u32 trackNumber, char *three_char_code);
+
+/*removes given stream description*/
+GF_Err gf_isom_remove_sample_description(GF_ISOFile *the_file, u32 trackNumber, u32 streamDescIndex);
+
+/*
+	some authoring extensions
+*/
+/*sets name for authoring - if name is NULL reset authoring name*/
+GF_Err gf_isom_set_track_name(GF_ISOFile *the_file, u32 trackNumber, char *name);
+/*gets authoring name*/
+const char *gf_isom_get_track_name(GF_ISOFile *the_file, u32 trackNumber);
+
+/*
+			MPEG-4 Extensions
+*/
+
+/*set a profile and level indication for the movie iod (created if needed)
+if the flag is ProfileLevel is 0 this means the movie doesn't require
+the specific codec (equivalent to 0xFF value in MPEG profiles)*/
+GF_Err gf_isom_set_pl_indication(GF_ISOFile *the_file, u8 PL_Code, u8 ProfileLevel);
+
+/*set the rootOD ID of the movie if you need it. By default, movies are created without root ODs*/
+GF_Err gf_isom_set_root_od_id(GF_ISOFile *the_file, u32 OD_ID);
+
+/*set the rootOD URL of the movie if you need it (only needed to create empty file pointing 
+to external ressource)*/
+GF_Err gf_isom_set_root_od_url(GF_ISOFile *the_file, char *url_string);
+
+/*remove the root OD*/
+GF_Err gf_isom_remove_root_od(GF_ISOFile *the_file);
+
+/*Add a system descriptor to the OD of the movie*/
+GF_Err gf_isom_add_desc_to_root_od(GF_ISOFile *the_file, GF_Descriptor *theDesc);
+
+/*add a track to the root OD*/
+GF_Err gf_isom_add_track_to_root_od(GF_ISOFile *the_file, u32 trackNumber);
+
+/*remove a track to the root OD*/
+GF_Err gf_isom_remove_track_from_root_od(GF_ISOFile *the_file, u32 trackNumber);
+
+/*Create a new StreamDescription (GF_ESD) in the file. The URL and URN are used to 
+describe external media, this will creat a data reference for the media*/
+GF_Err gf_isom_new_mpeg4_description(GF_ISOFile *the_file, u32 trackNumber, GF_ESD *esd, char *URLname, char *URNname, u32 *outDescriptionIndex);
+
+/*use carefully. Very usefull when you made a lot of changes (IPMP, IPI, OCI, ...)
+THIS WILL REPLACE THE WHOLE DESCRIPTOR ...*/
+GF_Err gf_isom_change_mpeg4_description(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, GF_ESD *newESD);
+
+/*Add a system descriptor to the ESD of a stream - you have to delete the descriptor*/
+GF_Err gf_isom_add_desc_to_description(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, GF_Descriptor *theDesc);
+
+
+/*Default extensions*/
+
+/*Create a new unknown StreamDescription in the file. The URL and URN are used to 
+describe external media, this will creat a data reference for the media
+use this to store media not currently supported by the ISO media format
+*/
+GF_Err gf_isom_new_generic_sample_description(GF_ISOFile *the_file, u32 trackNumber, char *URLname, char *URNname, GF_GenericSampleDescription *udesc, u32 *outDescriptionIndex);
+
+/*change the data field of an unknown sample description*/
+GF_Err gf_isom_change_generic_sample_description(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, GF_GenericSampleDescription *udesc);
+
+/*
+special shortcut for stream description cloning from a given input file (this avoids inspecting for media type)
+@the_file, @trackNumber: destination file and track
+@orig_file, @orig_track, @orig_desc_index: orginal file, track and sample description
+@URLname, @URNname, @outDescriptionIndex: same usage as with gf_isom_new_mpeg4_description
+*/
+GF_Err gf_isom_clone_sample_description(GF_ISOFile *the_file, u32 trackNumber, GF_ISOFile *orig_file, u32 orig_track, u32 orig_desc_index, char *URLname, char *URNname, u32 *outDescriptionIndex);
+
+/*special shortcut: clones a track (everything except media data and sample info (DTS? CTS, RAPs, etc...) 
+also clones sampleDescriptions
+@keep_data_ref: if set, external data references are kept, otherwise they are removed (track media data will be self-contained)
+@dest_track: track number of cloned track*/
+GF_Err gf_isom_clone_track(GF_ISOFile *orig_file, u32 orig_track, GF_ISOFile *dest_file, Bool keep_data_ref, u32 *dest_track);
+/*special shortcut: clones IOD PLs from orig to dest if any*/
+GF_Err gf_isom_clone_pl_indications(GF_ISOFile *orig, GF_ISOFile *dest);
+/*clones root OD from input to output file, without copying root OD track references*/
+GF_Err gf_isom_clone_root_od(GF_ISOFile *input, GF_ISOFile *output);
+
+/*returns true if same set of sample description in both tracks - this does include self-contained checking
+and reserved flags. The specific media cfg (DSI & co) is not analysed, only
+a brutal memory comparaison is done*/
+Bool gf_isom_is_same_sample_description(GF_ISOFile *f1, u32 tk1, GF_ISOFile *f2, u32 tk2);
+
+GF_Err gf_isom_set_JPEG2000(GF_ISOFile *mov, Bool set_on);
+
+/*
+			Movie Fragments Writing API
+		Movie Fragments is a feature of ISO media files for fragmentation
+	of a presentation meta-data and interleaving with its media data.
+	This enables faster http fast start for big movies, and also reduces the risk
+	of data loss in case of a recording crash, because meta data and media data
+	can be written to disk at regular times
+		This API provides simple function calls to setup such a movie and write it
+	The process implies:
+		1- creating a movie in the usual way (track, stream descriptions, (IOD setup
+	copyright, ...)
+		2- possibly add some samples in the regular fashion
+		3- setup track fragments for all track that will be written in a fragmented way
+	(note that you can create/write a track that has no fragmentation at all)
+		4- finalize the movie for fragmentation (this will flush all meta-data and 
+	any media-data added to disk, ensuring all vital information for the presentation
+	is stored on file and not lost in case of crash/poweroff)
+	
+	  then 5-6 as often as desired
+		5- start a new movie fragment
+		6- add samples to each setup track
+
+
+  IMPORTANT NOTES:
+		* Movie Fragments can only be used in GF_ISOM_OPEN_WRITE mode (capturing)
+  and no editing functionalities can be used
+		* the fragmented movie API uses TrackID and not TrackNumber 
+*/
+
+/*
+setup a track for fragmentation by specifying some default values for 
+storage efficiency
+*TrackID: track identifier
+*DefaultStreamDescriptionIndex: the default description used by samples in this track
+*DefaultSampleDuration: default duration of samples in this track
+*DefaultSampleSize: default size of samples in this track (0 if unknown)
+*DefaultSampleIsSync: default key-flag (RAP) of samples in this track
+*DefaultSamplePadding: default padding bits for samples in this track
+*DefaultDegradationPriority: default degradation priority for samples in this track
+
+*/
+GF_Err gf_isom_setup_track_fragment(GF_ISOFile *the_file, u32 TrackID, 
+							 u32 DefaultStreamDescriptionIndex,
+							 u32 DefaultSampleDuration,
+							 u32 DefaultSampleSize,
+							 u8 DefaultSampleIsSync,
+							 u8 DefaultSamplePadding,
+							 u16 DefaultDegradationPriority);
+
+/*flushes data to disk and prepare movie fragmentation*/
+GF_Err gf_isom_finalize_for_fragment(GF_ISOFile *the_file);
+
+/*starts a new movie fragment*/
+GF_Err gf_isom_start_fragment(GF_ISOFile *the_file);
+
+
+enum
+{
+	/*indicates that the track fragment has no samples but still has a duration
+	(silence-detection in audio codecs, ...). 
+	param: indicates duration*/
+	GF_ISOM_TRAF_EMPTY,
+	/*I-Frame detection: this can reduce file size by detecting I-frames and
+	optimizing sample flags (padding, priority, ..)
+	param: on/off (0/1)*/
+	GF_ISOM_TRAF_RANDOM_ACCESS,
+	/*activate data cache on track fragment. This is usefull when writing interleaved
+	media from a live source (typically audio-video), and greatly reduces file size
+	param: Number of samples (> 1) to cache before disk flushing. You shouldn't try 
+	to cache too many samples since this will load your memory. base that on FPS/SR*/
+	GF_ISOM_TRAF_DATA_CACHE
+};
+
+/*set options. Options can be set at the begining of each new fragment only, and for the
+lifetime of the fragment*/
+GF_Err gf_isom_set_fragment_option(GF_ISOFile *the_file, u32 TrackID, u32 Code, u32 param);
+
+
+/*adds a sample to a fragmented track
+
+*TrackID: destination track
+*sample: sample to add
+*StreamDescriptionIndex: stream description for this sample. If 0, the default one 
+is used
+*Duration: sample duration.
+Note: because of the interleaved nature of the meta/media data, the sample duration
+MUST be provided (in case of regular tracks, this was computed internally by the lib)
+*PaddingBits: padding bits for the sample, or 0
+*DegradationPriority for the sample, or 0
+
+*/
+
+GF_Err gf_isom_fragment_add_sample(GF_ISOFile *the_file, u32 TrackID, GF_ISOSample *sample, 
+								 u32 StreamDescriptionIndex, 
+								 u32 Duration,
+								 u8 PaddingBits, u16 DegradationPriority);
+
+/*appends data into last sample of track for video fragments/other media
+CANNOT be used with OD tracks*/
+GF_Err gf_isom_fragment_append_data(GF_ISOFile *the_file, u32 TrackID, char *data, u32 data_size, u8 PaddingBits);
+
+
+
+/******************************************************************
+		GENERIC Publishing API
+******************************************************************/
+
+/*Removes all sync shadow entries for a given track. The shadow samples are NOT removed; they must be removed
+by the user app*/
+GF_Err gf_isom_remove_sync_shadows(GF_ISOFile *the_file, u32 trackNumber);
+
+/*Use this function to do the shadowing if you use shadowing.
+the sample to be shadowed MUST be a non-sync sample (ignored if not)
+the sample shadowing must be a Sync sample (error if not)*/
+GF_Err gf_isom_set_sync_shadow(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u32 syncSample);
+
+/*set the GroupID of a track (only used for optimized interleaving). By setting GroupIDs
+you can specify the storage order for media data of a group of streams. This is usefull
+for BIFS presentation so that static resources of the scene can be downloaded before BIFS*/
+GF_Err gf_isom_set_track_group(GF_ISOFile *the_file, u32 trackNumber, u32 GroupID);
+
+/*set the priority of a track within a Group (used for optimized interleaving and hinting). 
+This allows tracks to be stored before other within a same group, for instance the 
+hint track data can be stored just before the media data, reducing disk seeking
+for a same time, within a group of tracks, the track with the lowest inversePriority will 
+be written first*/
+GF_Err gf_isom_set_track_priority_in_group(GF_ISOFile *the_file, u32 trackNumber, u32 InversePriority);
+
+/*set the max SamplesPerChunk (for file optimization, mainly in FLAT and STREAMABLE modes)*/
+GF_Err gf_isom_set_max_samples_per_chunk(GF_ISOFile *the_file, u32 trackNumber, u32 maxSamplesPerChunk);
+
+/*associate a given SL config with a given ESD while extracting the OD information
+all the SL params must be fixed by the calling app!
+The SLConfig is stored by the API for further use. A NULL pointer will result
+in using the default SLConfig (predefined = 2) remapped to predefined = 0
+This is usefull while reading the IOD / OD stream of an MP4 file. Note however that
+only full AUs are extracted, therefore the calling application must SL-packetize the streams*/
+GF_Err gf_isom_set_extraction_slc(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, GF_SLConfig *slConfig);
+
+GF_Err gf_isom_get_extraction_slc(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, GF_SLConfig **slConfig);
+
+u32 gf_isom_get_track_group(GF_ISOFile *the_file, u32 trackNumber);
+u32 gf_isom_get_track_priority_in_group(GF_ISOFile *the_file, u32 trackNumber);
+
+/*stores movie config (storage mode, interleave time, track groupIDs, priorities and names) in UDTA(kept on disk)
+if @remove_all is set, removes all stored info, otherwise recompute all stored info*/
+GF_Err gf_isom_store_movie_config(GF_ISOFile *the_file, Bool remove_all);
+/*restores movie config (storage mode, interleave time, track groupIDs, priorities and names) if found*/
+GF_Err gf_isom_load_movie_config(GF_ISOFile *the_file);
+
+/*setup interleaving for storage (shortcut for storeage mode + interleave_time)*/
+GF_Err gf_isom_make_interleave(GF_ISOFile *mp4file, Double TimeInSec);
+
+
+/******************************************************************
+		GENERIC HINTING WRITING API
+******************************************************************/
+
+/*supported hint formats - ONLY RTP now*/
+enum
+{
+	GF_ISOM_HINT_RTP = GF_4CC('r', 't', 'p', ' '),
+};
+
+
+/*Setup the resources based on the hint format
+This function MUST be called after creating a new hint track and before
+any other calls on this track*/
+GF_Err gf_isom_setup_hint_track(GF_ISOFile *the_file, u32 trackNumber, u32 HintType);
+
+/*Create a HintDescription for the HintTrack
+the rely flag indicates whether a reliable transport protocol is desired/required
+for data transport
+	0: not desired (UDP/IP). NB: most RTP streaming servers only support UDP/IP for data
+	1: preferable (TCP/IP if possible or UDP/IP)
+	2: required (TCP/IP only)
+The HintDescriptionIndex is set, to be used when creating a HINT sample
+*/
+GF_Err gf_isom_new_hint_description(GF_ISOFile *the_file, u32 trackNumber, s32 HintTrackVersion, s32 LastCompatibleVersion, u8 Rely, u32 *HintDescriptionIndex);
+
+/*Starts a new sample for the hint track. A sample is just a collection of packets
+the transmissionTime is indicated in the media timeScale of the hint track*/
+GF_Err gf_isom_begin_hint_sample(GF_ISOFile *the_file, u32 trackNumber, u32 HintDescriptionIndex, u32 TransmissionTime);
+
+/*stores the hint sample in the file once all your packets for this sample are done
+set IsRandomAccessPoint if you want to indicate that this is a random access point 
+in the stream*/
+GF_Err gf_isom_end_hint_sample(GF_ISOFile *the_file, u32 trackNumber, u8 IsRandomAccessPoint);
+
+
+/******************************************************************
+		PacketHandling functions
+		Data can be added at the end or at the beginning of the current packet
+		by setting AtBegin to 1 the data will be added at the begining
+		This allows constructing the packet payload before any meta-data
+******************************************************************/
+
+/*adds a blank chunk of data in the sample that is skipped while streaming*/
+GF_Err gf_isom_hint_blank_data(GF_ISOFile *the_file, u32 trackNumber, u8 AtBegin);
+
+/*adds a chunk of data in the packet that is directly copied while streaming
+NOTE: dataLength MUST BE <= 14 bytes, and you should only use this function
+to add small blocks of data (encrypted parts, specific headers, ...)*/
+GF_Err gf_isom_hint_direct_data(GF_ISOFile *the_file, u32 trackNumber, char *data, u32 dataLength, u8 AtBegin);
+
+/*adds a reference to some sample data in the packet
+SourceTrackID: the ID of the track where the referenced sample is
+SampleNumber: the sample number containing the data to be added
+DataLength: the length of bytes to copy in the packet
+offsetInSample: the offset in bytes in the sample at which to begin copying data
+
+extra_data: only used when the sample is actually the sample that will contain this packet
+(usefull to store en encrypted version of a packet only available while streaming)
+	In this case, set SourceTrackID to the HintTrack ID and SampleNumber to 0
+	In this case, the DataOffset MUST BE NULL and length will indicate the extra_data size
+
+Note that if you want to reference a previous HintSample in the hintTrack, you will 
+have to parse the sample yourself ...
+*/
+GF_Err gf_isom_hint_sample_data(GF_ISOFile *the_file, u32 trackNumber, u32 SourceTrackID, u32 SampleNumber, u16 DataLength, u32 offsetInSample, char *extra_data, u8 AtBegin);
+
+
+/*adds a reference to some stream description data in the packet (headers, ...)
+SourceTrackID: the ID of the track where the referenced sample is
+StreamDescriptionIndex: the index of the stream description in the desired track
+DataLength: the length of bytes to copy in the packet
+offsetInDescription: the offset in bytes in the description at which to begin copying data
+
+Since it is far from being obvious what this offset is, we recommend not using this 
+function. The ISO Media Format specification is currently being updated to solve
+this issue*/
+GF_Err gf_isom_hint_sample_description_data(GF_ISOFile *the_file, u32 trackNumber, u32 SourceTrackID, u32 StreamDescriptionIndex, u16 DataLength, u32 offsetInDescription, u8 AtBegin);
+
+
+/******************************************************************
+		RTP SPECIFIC WRITING API
+******************************************************************/
+
+/*Creates a new RTP packet in the HintSample. If a previous packet was created, 
+it is stored in the hint sample and a new packet is created.
+- relativeTime: RTP time offset of this packet in the HintSample if any - in hint track 
+time scale. Used for data smoothing by servers.
+- PackingBit: the 'P' bit of the RTP packet header
+- eXtensionBit: the'X' bit of the RTP packet header
+- MarkerBit: the 'M' bit of the RTP packet header
+- PayloadType: the payload type, on 7 bits, format 0x0XXXXXXX
+- B_frame: indicates if this is a B-frame packet. Can be skipped by a server
+- IsRepeatedPacket: indicates if this is a duplicate packet of a previous one.
+Can be skipped by a server
+- SequenceNumber: the RTP base sequence number of the packet. Because of support for repeated
+packets, you have to set the sequence number yourself.*/
+GF_Err gf_isom_rtp_packet_begin(GF_ISOFile *the_file, u32 trackNumber, s32 relativeTime, u8 PackingBit, u8 eXtensionBit, u8 MarkerBit, u8 PayloadType, u8 B_frame, u8 IsRepeatedPacket, u16 SequenceNumber);
+
+/*set the flags of the RTP packet*/
+GF_Err gf_isom_rtp_packet_set_flags(GF_ISOFile *the_file, u32 trackNumber, u8 PackingBit, u8 eXtensionBit, u8 MarkerBit, u8 disposable_packet, u8 IsRepeatedPacket);
+
+/*set the time offset of this packet. This enables packets to be placed in the hint track 
+in decoding order, but have their presentation time-stamp in the transmitted 
+packet in a different order. Typically used for MPEG video with B-frames
+*/
+GF_Err gf_isom_rtp_packet_set_offset(GF_ISOFile *the_file, u32 trackNumber, s32 timeOffset);
+
+								   
+/*set some specific info in the HintDescription for RTP*/
+
+/*sets the RTP TimeScale that the server use to send packets
+some RTP payloads may need a specific timeScale that is not the timeScale in the file format
+the default timeScale choosen by the API is the MediaTimeScale of the hint track*/
+GF_Err gf_isom_rtp_set_timescale(GF_ISOFile *the_file, u32 trackNumber, u32 HintDescriptionIndex, u32 TimeScale);
+/*sets the RTP TimeOffset that the server will add to the packets
+if not set, the server adds a random offset*/
+GF_Err gf_isom_rtp_set_time_offset(GF_ISOFile *the_file, u32 trackNumber, u32 HintDescriptionIndex, u32 TimeOffset);
+/*sets the RTP SequenceNumber Offset that the server will add to the packets
+if not set, the server adds a random offset*/
+GF_Err gf_isom_rtp_set_time_sequence_offset(GF_ISOFile *the_file, u32 trackNumber, u32 HintDescriptionIndex, u32 SequenceNumberOffset);
+
+
+
+/******************************************************************
+		SDP SPECIFIC WRITING API
+******************************************************************/
+/*add an SDP line to the SDP container at the track level (media-specific SDP info)
+NOTE: the \r\n end of line for SDP is automatically inserted*/
+GF_Err gf_isom_sdp_add_track_line(GF_ISOFile *the_file, u32 trackNumber, const char *text);
+/*remove all SDP info at the track level*/
+GF_Err gf_isom_sdp_clean_track(GF_ISOFile *the_file, u32 trackNumber);
+
+/*add an SDP line to the SDP container at the movie level (presentation SDP info)
+NOTE: the \r\n end of line for SDP is automatically inserted*/
+GF_Err gf_isom_sdp_add_line(GF_ISOFile *the_file, const char *text);
+/*remove all SDP info at the movie level*/
+GF_Err gf_isom_sdp_clean(GF_ISOFile *the_file);
+
+#endif	/*GPAC_READ_ONLY*/
+
+/*Get SDP info at the movie level*/
+GF_Err gf_isom_sdp_get(GF_ISOFile *the_file, const char **sdp, u32 *length);
+/*Get SDP info at the track level*/
+GF_Err gf_isom_sdp_track_get(GF_ISOFile *the_file, u32 trackNumber, const char **sdp, u32 *length);
+
+u32 gf_isom_get_payt_count(GF_ISOFile *the_file, u32 trackNumber);
+const char *gf_isom_get_payt_info(GF_ISOFile *the_file, u32 trackNumber, u32 index, u32 *payID);
+
+/*dumps file structures into XML trace file */
+GF_Err gf_isom_dump(GF_ISOFile *file, FILE *trace);
+/*dumps RTP hint samples structure into XML trace file
+	@trackNumber, @SampleNum: hint track and hint sample number
+	@trace: output
+*/
+GF_Err gf_isom_dump_hint_sample(GF_ISOFile *the_file, u32 trackNumber, u32 SampleNum, FILE * trace);
+
+
+
+/*small hint reader - performs data caching*/
+
+/*resets hint reading parameters, returns an error if the hint type is not supported for reading
+packet sequence number is always reseted to 0
+@sample_start: indicates from where the packets should be read (regular 1-based sample number)
+@ts_offset: constant offset for timestamps, must be expressed in media timescale (which is the hint timescale).
+	usually 0 (no offset)
+@sn_offset: offset for packet sequence number (first packet will have a SN of 1 + sn_offset)
+	usually 0
+@ssrc: sync source identifier for RTP
+*/
+GF_Err gf_isom_reset_hint_reader(GF_ISOFile *the_file, u32 trackNumber, u32 sample_start, u32 ts_offset, u32 sn_offset, u32 ssrc);
+
+/*reads next hint packet. ALl packets are read in transmission (decoding) order
+returns an error if not supported, or GF_EOS when no more packets are available
+currently only RTP reader is supported
+@pck_data, @pck_size: output packet data (must be freed by caller) - contains all info to be sent 
+	on the wire, eg for RTP contains the RTP header and the data
+@disposable (optional): indicates that the packet can be droped when late (B-frames & co)
+@repeated (optional): indicates this is a repeated packet (same one has already been sent)
+@trans_ts (optional): indicates the transmission time of the packet, expressed in hint timescale, taking into account
+the ts_offset specified in gf_isom_reset_hint_reader. Depending on packets this may not be the same
+as the hint sample timestamp + ts_offset, some packets may need to be sent earlier (B-frames)
+@sample_num (optional): indicates hint sample number the packet belongs to
+*/
+GF_Err gf_isom_next_hint_packet(GF_ISOFile *the_file, u32 trackNumber, char **pck_data, u32 *pck_size, Bool *disposable, Bool *repeated, u32 *trans_ts, u32 *sample_num);
+
+
+/*
+				3GPP specific extensions
+	NOTE: MPEG-4 OD Framework cannot be used with 3GPP files.
+	Stream Descriptions are not GF_ESD, just generic config options as specified in this file
+*/
+
+/*Generic 3GP/3GP2 config record*/
+typedef struct 
+{
+	/*GF_4CC record type, one fo the above GF_ISOM_SUBTYPE_3GP_ * subtypes*/
+	u32 type;
+	/*4CC vendor name*/
+	u32 vendor;
+	/*codec version*/
+	u8 decoder_version;
+	/*number of sound frames per IsoMedia sample, >0 and <=15. The very last sample may contain less frames. */
+	u8 frames_per_sample;
+
+	/*H263 ONLY - Level and profile*/
+	u8 H263_level, H263_profile;
+
+	/*AMR(WB) ONLY - num of mode for the codec*/
+	u16 AMR_mode_set;
+	/*AMR(WB) ONLY - changes in codec mode per sample*/
+	u8 AMR_mode_change_period;
+} GF_3GPConfig;
+
+
+/*return the 3GP config for this tream description, NULL if not a 3GPP track*/
+GF_3GPConfig *gf_isom_3gp_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex);
+#ifndef GPAC_READ_ONLY
+/*create the track config*/
+GF_Err gf_isom_3gp_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_3GPConfig *config, char *URLname, char *URNname, u32 *outDescriptionIndex);
+/*update the track config - subtypes shall NOT differ*/
+GF_Err gf_isom_3gp_config_update(GF_ISOFile *the_file, u32 trackNumber, GF_3GPConfig *config, u32 DescriptionIndex);
+#endif	/*GPAC_READ_ONLY*/
+
+/*AVC/H264 extensions - GF_AVCConfig is defined in mpeg4_odf.h*/
+
+/*gets uncompressed AVC config - user is responsible for deleting it*/
+GF_AVCConfig *gf_isom_avc_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
+
+#ifndef GPAC_READ_ONLY
+/*creates new AVC config*/
+GF_Err gf_isom_avc_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_AVCConfig *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex);
+/*updates AVC config*/
+GF_Err gf_isom_avc_config_update(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_AVCConfig *cfg);
+#endif
+
+
+/*
+	3GP timed text handling
+
+	NOTE: currently only writing API is developped, the reading one is not used in MPEG-4 since
+	MPEG-4 maps 3GP timed text to MPEG-4 Streaming Text (part 17)
+*/
+
+/*set streamihng text reading mode: if do_convert is set, all text samples will be retrieved as TTUs
+and ESD will be emulated for text tracks.*/
+GF_Err gf_isom_text_set_streaming_mode(GF_ISOFile *the_file, Bool do_convert);
+
+/*exports text track to given format
+@dump_type: 0 for TTXT, 1 for srt, 2 for SVG
+*/
+GF_Err gf_isom_text_dump(GF_ISOFile *the_file, u32 track, FILE *dump, u32 dump_type);
+
+/*returns encoded TX3G box (text sample description for 3GPP text streams) as needed by RTP or other standards:
+	@sidx: 1-based stream description index
+	@sidx_offset: 
+		if 0, the sidx will NOT be written before the encoded TX3G
+		if not 0, the sidx will be written before the encoded TX3G, with the given offset. Offset sshould be at 
+		least 128 for most commmon usage of TX3G (RTP, MPEG-4 timed text, etc)
+
+*/
+GF_Err gf_isom_text_get_encoded_tx3g(GF_ISOFile *file, u32 track, u32 sidx, u32 sidx_offset, char **tx3g, u32 *tx3g_size);
+
+/*checks if this text description is already inserted
+@outDescIdx: set to 0 if not found, or descIndex
+@same_style, @same_box: indicates if default styles and box are used
+*/
+GF_Err gf_isom_text_has_similar_description(GF_ISOFile *the_file, u32 trackNumber, GF_TextSampleDescriptor *desc, u32 *outDescIdx, Bool *same_box, Bool *same_styles);
+
+/*text sample formatting*/
+typedef struct _3gpp_text_sample GF_TextSample;
+/*creates text sample handle*/
+GF_TextSample *gf_isom_new_text_sample();
+/*destroy text sample handle*/
+void gf_isom_delete_text_sample(GF_TextSample *tx_samp);
+
+#ifndef GPAC_READ_ONLY
+
+/*Create a new TextSampleDescription in the file. 
+The URL and URN are used to describe external media, this will create a data reference for the media
+GF_TextSampleDescriptor is defined in mpeg4_odf.h
+*/
+GF_Err gf_isom_new_text_description(GF_ISOFile *the_file, u32 trackNumber, GF_TextSampleDescriptor *desc, char *URLname, char *URNname, u32 *outDescriptionIndex);
+/*change the text sample description*/
+GF_Err gf_isom_update_text_description(GF_ISOFile *movie, u32 trackNumber, u32 descriptionIndex, GF_TextSampleDescriptor *desc);
+
+/*reset text sample content*/
+GF_Err gf_isom_text_reset(GF_TextSample * tx_samp);
+/*reset text sample styles but keep text*/
+GF_Err gf_isom_text_reset_styles(GF_TextSample * samp);
+
+/*sets UTF16 marker for text data. This MUST be called on an empty sample. If text data added later 
+on (cf below) is not formatted as UTF16 data(2 bytes char) the resulting text sample won't be compliant, 
+but this library WON'T WARN*/
+GF_Err gf_isom_text_set_utf16_marker(GF_TextSample * samp);
+/*append text to sample - text_len is the number of bytes to be written from text_data. This allows 
+handling UTF8 and UTF16 strings in a transparent manner*/
+GF_Err gf_isom_text_add_text(GF_TextSample * tx_samp, char *text_data, u32 text_len);
+/*append style modifyer to sample*/
+GF_Err gf_isom_text_add_style(GF_TextSample * tx_samp, GF_StyleRecord *rec);
+/*appends highlight modifier for the sample 
+	@start_char: first char highlighted, 
+	@end_char: first char not highlighted*/
+GF_Err gf_isom_text_add_highlight(GF_TextSample * samp, u16 start_char, u16 end_char);
+/*sets highlight color for the whole sample*/
+GF_Err gf_isom_text_set_highlight_color(GF_TextSample * samp, u8 r, u8 g, u8 b, u8 a);
+GF_Err gf_isom_text_set_highlight_color_argb(GF_TextSample * samp, u32 argb);
+/*appends a new karaoke sequence in the sample
+	@start_time: karaoke start time expressed in text stream timescale, but relative to the sample media time
+*/
+GF_Err gf_isom_text_add_karaoke(GF_TextSample * samp, u32 start_time);
+/*appends a new segment in the current karaoke sequence - you must build sequences in order to be compliant
+	@end_time: segment end time expressed in text stream timescale, but relative to the sample media time
+	@start_char: first char highlighted, 
+	@end_char: first char not highlighted
+*/
+GF_Err gf_isom_text_set_karaoke_segment(GF_TextSample * samp, u32 end_time, u16 start_char, u16 end_char);
+/*sets scroll delay for the whole sample (scrolling is enabled through GF_TextSampleDescriptor.DisplayFlags)
+	@scroll_delay: delay for scrolling expressed in text stream timescale
+*/
+GF_Err gf_isom_text_set_scroll_delay(GF_TextSample * samp, u32 scroll_delay);
+/*appends hyperlinking for the sample
+	@URL: ASCII url
+	@altString: ASCII hint (tooltip, ...) for end user
+	@start_char: first char hyperlinked, 
+	@end_char: first char not hyperlinked
+*/
+GF_Err gf_isom_text_add_hyperlink(GF_TextSample * samp, char *URL, char *altString, u16 start_char, u16 end_char);
+/*sets current text box (display pos&size within the text track window) for the sample*/
+GF_Err gf_isom_text_set_box(GF_TextSample * samp, s16 top, s16 left, s16 bottom, s16 right);
+/*appends blinking for the sample
+	@start_char: first char blinking, 
+	@end_char: first char not blinking
+*/
+GF_Err gf_isom_text_add_blink(GF_TextSample * samp, u16 start_char, u16 end_char);
+/*sets wrap flag for the sample - currently only 0 (no wrap) and 1 ("soft wrap") are allowed in 3GP*/
+GF_Err gf_isom_text_set_wrap(GF_TextSample * samp, u8 wrap_flags);
+
+/*formats sample as a regular GF_ISOSample. The resulting sample will always be marked as random access
+text sample content is kept untouched*/
+GF_ISOSample *gf_isom_text_to_sample(GF_TextSample * tx_samp);
+
+#endif	//GPAC_READ_ONLY
+
+/*****************************************************
+		ISMACryp Samples
+*****************************************************/
+/*flags for GF_ISMASample*/
+enum 
+{
+	/*signals the stream the sample belongs to uses selective encryption*/
+	GF_ISOM_ISMA_USE_SEL_ENC = 1,
+	/*signals the sample is encrypted*/
+	GF_ISOM_ISMA_IS_ENCRYPTED = 2,
+};
+
+typedef struct
+{
+	/*IV in ISMACryp is Byte Stream Offset*/
+	u64 IV;
+	u8 IV_length;/*repeated from sampleDesc for convenience*/
+	u8 *key_indicator;
+	u8 KI_length;/*repeated from sampleDesc for convenience*/
+	u32 dataLength;
+	char *data;
+	u32 flags;
+} GF_ISMASample;
+/**
+ * creates a new empty ISMA sample
+ */
+GF_ISMASample *gf_isom_ismacryp_new_sample();
+
+/*delete an ISMA sample. NOTE:the buffers content will be destroyed by default.
+if you wish to keep the buffer, set dataLength to 0 in the sample before deleting it*/
+void gf_isom_ismacryp_delete_sample(GF_ISMASample *samp);
+
+/*decodes ISMACryp sample based on all info in ISMACryp sample description*/
+GF_ISMASample *gf_isom_ismacryp_sample_from_data(char *data, u32 dataLength, Bool use_selective_encryption, u8 KI_length, u8 IV_length);
+/*rewrites samp content from s content*/
+GF_Err gf_isom_ismacryp_sample_to_sample(GF_ISMASample *s, GF_ISOSample *dest);
+
+/*decodes ISMACryp sample based on sample and its descrition index - returns NULL if not an ISMA sample 
+Note: input sample is NOT destroyed*/
+GF_ISMASample *gf_isom_get_ismacryp_sample(GF_ISOFile *the_file, u32 trackNumber, GF_ISOSample *samp, u32 sampleDescriptionIndex);
+
+/*returns whether the given media is a protected one or not - return scheme protection 4CC*/
+u32 gf_isom_is_media_encrypted(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex);
+
+/*returns whether the given media is a protected ISMACryp one or not*/
+Bool gf_isom_is_ismacryp_media(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex);
+
+/*returns whether the given media is a protected ISMACryp one or not*/
+Bool gf_isom_is_omadrm_media(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex);
+
+GF_Err gf_isom_get_omadrm_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *outOriginalFormat,
+							   u32 *outSchemeType, u32 *outSchemeVersion,
+							   const char **outContentID, const char **outRightsIssuerURL, const char **outTextualHeaders, u32 *outTextualHeadersLen, u64 *outPlaintextLength, u32 *outEncryptionType, Bool *outSelectiveEncryption, u32 *outIVLength, u32 *outKeyIndicationLength);
+/*retrieves ISMACryp info for the given track & SDI - all output parameters are optional - URIs SHALL NOT BE MODIFIED BY USER
+	@outOriginalFormat: retrieves orginal protected media format - usually GF_ISOM_SUBTYPE_MPEG4
+	@outSchemeType: retrieves 4CC of protection scheme (GF_ISOM_ISMACRYP_SCHEME = iAEC in ISMACryp 1.0)
+	outSchemeVersion: retrieves version of protection scheme (1 in ISMACryp 1.0)
+	outSchemeURI: retrieves URI location of scheme 
+	outKMS_URI: retrieves URI location of key management system - only valid with ISMACryp 1.0
+	outSelectiveEncryption: specifies whether sample-based encryption is used in media - only valid with ISMACryp 1.0
+	outIVLength: specifies length of Initial Vector - only valid with ISMACryp 1.0
+	outKeyIndicationLength: specifies length of key indicator - only valid with ISMACryp 1.0
+
+  outSelectiveEncryption, outIVLength and outKeyIndicationLength are usually not needed to decode an 
+  ISMA sample when using gf_isom_get_ismacryp_sample fct above
+*/
+GF_Err gf_isom_get_ismacryp_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *outOriginalFormat, u32 *outSchemeType, u32 *outSchemeVersion, const char **outSchemeURI, const char **outKMS_URI, Bool *outSelectiveEncryption, u32 *outIVLength, u32 *outKeyIndicationLength);
+
+
+#ifndef GPAC_READ_ONLY
+/*removes ISMACryp protection info (does not perform decryption :)*/
+GF_Err gf_isom_remove_ismacryp_protection(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex);
+
+/*creates ISMACryp protection info (does not perform encryption :)*/
+GF_Err gf_isom_set_ismacryp_protection(GF_ISOFile *the_file, u32 trackNumber, u32 desc_index, u32 scheme_type, 
+						   u32 scheme_version, char *scheme_uri, char *kms_URI,
+						   Bool selective_encryption, u32 KI_length, u32 IV_length);
+
+/*change scheme URI and/or KMS URI for crypted files. Other params cannot be changed once the media is crypted
+	@scheme_uri: new scheme URI, or NULL to keep previous
+	@kms_uri: new KMS URI, or NULL to keep previous
+*/
+GF_Err gf_isom_change_ismacryp_protection(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, char *scheme_uri, char *kms_uri);
+
+
+GF_Err gf_isom_set_oma_protection(GF_ISOFile *the_file, u32 trackNumber, u32 desc_index,
+						   char *contentID, char *kms_URI, u32 encryption_type, u64 plainTextLength, char *textual_headers, u32 textual_headers_len,
+						   Bool selective_encryption, u32 KI_length, u32 IV_length);
+
+#endif
+
+/*xml dumpers*/
+GF_Err gf_isom_dump_ismacryp_protection(GF_ISOFile *the_file, u32 trackNumber, FILE * trace);
+GF_Err gf_isom_dump_ismacryp_sample(GF_ISOFile *the_file, u32 trackNumber, u32 SampleNum, FILE *trace);
+
+
+/********************************************************************
+				GENERAL META API FUNCTIONS
+	
+	  Meta can be stored at several places in the file layout:
+		* root level (like moov, ftyp and co)
+		* moov level
+		* track level
+	Meta API uses the following parameters for all functions:
+	
+	 gf_isom_*_meta_*(GF_ISOFile *file, Bool root_meta, u32 track_num, ....) with:
+		@root_meta: if set, accesses file root meta
+		@track_num: if root_meta not set, specifies whether the target meta is at the
+			moov level (track_num=0) or at the track level.
+
+********************************************************************/
+
+/*gets meta type. Returned value: 0 if no meta found, or four char code of meta (eg, "mp21", "smil", ...)*/
+u32 gf_isom_get_meta_type(GF_ISOFile *file, Bool root_meta, u32 track_num);
+
+/*indicates if the meta has an XML container (note that XML data can also be included as items). 
+return value: 0 (no XML or error), 1 (XML text), 2 (BinaryXML, eg BiM) */
+u32 gf_isom_has_meta_xml(GF_ISOFile *file, Bool root_meta, u32 track_num);
+
+/*extracts XML (if any) from given meta
+	@outName: output file path and location for writing
+	@is_binary: indicates if XML is Bim or regular XML
+*/
+GF_Err gf_isom_extract_meta_xml(GF_ISOFile *file, Bool root_meta, u32 track_num, char *outName, Bool *is_binary);
+
+/*returns number of items described in this meta*/
+u32 gf_isom_get_meta_item_count(GF_ISOFile *file, Bool root_meta, u32 track_num);
+
+/*gets item info for the given item
+	@item_num: 1-based index of item to query
+	@itemID (optional): item ID in file
+	@is_self_reference: item is the file itself
+	@item_name (optional): item name
+	@item_mime_type (optional): item mime type
+	@item_encoding (optional): item content encoding type
+	@item_url, @item_urn (optional): url/urn of external resource containing this item data if any. 
+		When item is fully contained in file, these are set to NULL
+
+*/
+GF_Err gf_isom_get_meta_item_info(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_num, 
+							u32 *itemID, u32 *protection_idx, Bool *is_self_reference,
+							const char **item_name, const char **item_mime_type, const char **item_encoding,
+							const char **item_url, const char **item_urn);
+
+
+/*gets item idx from item ID*/
+u32 gf_isom_get_meta_item_by_id(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_ID);
+
+/*extracts item from given meta
+	@item_num: 1-based index of item to query
+*/
+GF_Err gf_isom_extract_meta_item(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_num, const char *dump_file_name);
+
+/*retirves primary item ID, 0 if none found (primary can also be stored through meta XML)*/
+u32 gf_isom_get_meta_primary_item_id(GF_ISOFile *file, Bool root_meta, u32 track_num);
+
+#ifndef GPAC_READ_ONLY
+
+/*sets meta type (four char int, eg "mp21", ... 
+	Creates a meta box if none found
+	if metaType is 0, REMOVES META 
+*/
+GF_Err gf_isom_set_meta_type(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 metaType);
+
+/*removes meta XML info if any*/
+GF_Err gf_isom_remove_meta_xml(GF_ISOFile *file, Bool root_meta, u32 track_num);
+
+/*set meta XML data from file - erase any previously (Binary)XML info*/
+GF_Err gf_isom_set_meta_xml(GF_ISOFile *file, Bool root_meta, u32 track_num, char *XMLFileName, Bool IsBinaryXML);
+
+/*adds item to meta:
+	@self_reference: indicates this item is the file itself
+	@resource_path: file to add - can be NULL when URL/URN is used
+	@item_name: item name - if NULL, use file name. CANNOT BE NULL if resource_path is not set
+	@mime_type: item mime type - if NULL, use "application/octet-stream"
+	@content_encoding: content encoding type - if NULL, none specified
+	@URL, @URN: if set, resource will be remote (same as stream descriptions)
+*/
+GF_Err gf_isom_add_meta_item(GF_ISOFile *file, Bool root_meta, u32 track_num, Bool self_reference, char *resource_path, const char *item_name, const char *mime_type, const char *content_encoding, const char *URL, const char *URN);
+
+/*removes item from meta*/
+GF_Err gf_isom_remove_meta_item(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_num);
+
+/*sets the given item as the primary one. You SHALL NOT use this if the meta has a valid XML data*/
+GF_Err gf_isom_set_meta_primary_item(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_num);
+
+#endif
+
+
+/********************************************************************
+				Timed Meta-Data extensions
+********************************************************************/
+
+GF_Err gf_isom_get_timed_meta_data_info(GF_ISOFile *file, u32 track, u32 sampleDescription, Bool *is_xml, const char **mime_or_namespace, const char **content_encoding, const char **schema_loc);
+
+#ifndef GPAC_READ_ONLY
+/*create a new timed metat data sample description for this track*/
+GF_Err gf_isom_timed_meta_data_config_new(GF_ISOFile *movie, u32 trackNumber, Bool is_xml, char *mime_or_namespace, char *content_encoding, char *schema_loc, char *URLname, char *URNname, u32 *outDescriptionIndex);
+#endif
+
+
+/********************************************************************
+				iTunes info tags
+********************************************************************/
+enum
+{
+	/*probe is only used ti check if iTunes info are present*/
+	GF_ISOM_ITUNE_PROBE = 0,
+	GF_ISOM_ITUNE_ALBUM	= GF_4CC( 0xA9, 'a', 'l', 'b' ),
+	GF_ISOM_ITUNE_ARTIST = GF_4CC( 0xA9, 'A', 'R', 'T' ),
+	GF_ISOM_ITUNE_COMMENT = GF_4CC( 0xA9, 'c', 'm', 't' ),
+	GF_ISOM_ITUNE_COMPILATION = GF_4CC( 'c', 'p', 'i', 'l' ),
+	GF_ISOM_ITUNE_COMPOSER = GF_4CC( 0xA9, 'c', 'o', 'm' ),
+	GF_ISOM_ITUNE_COVER_ART = GF_4CC( 'c', 'o', 'v', 'r' ),
+	GF_ISOM_ITUNE_CREATED = GF_4CC( 0xA9, 'd', 'a', 'y' ),
+	GF_ISOM_ITUNE_DISK = GF_4CC( 'd', 'i', 's', 'k' ),
+	GF_ISOM_ITUNE_TOOL = GF_4CC( 0xA9, 't', 'o', 'o' ),
+	GF_ISOM_ITUNE_GENRE = GF_4CC( 'g', 'n', 'r', 'e' ),
+	GF_ISOM_ITUNE_GROUP = GF_4CC( 0xA9, 'g', 'r', 'p' ),
+	GF_ISOM_ITUNE_ITUNES_DATA = GF_4CC( '-', '-', '-', '-' ),
+	GF_ISOM_ITUNE_NAME = GF_4CC( 0xA9, 'n', 'a', 'm' ),
+	GF_ISOM_ITUNE_TEMPO = GF_4CC( 't', 'm', 'p', 'o' ),
+	GF_ISOM_ITUNE_TRACK = GF_4CC( 0xA9, 't', 'r', 'k' ),
+	GF_ISOM_ITUNE_TRACKNUMBER = GF_4CC( 't', 'r', 'k', 'n' ),
+	GF_ISOM_ITUNE_WRITER = GF_4CC( 0xA9, 'w', 'r', 't' ),
+	GF_ISOM_ITUNE_ENCODER = GF_4CC( 0xA9, 'e', 'n', 'c' ),
+	GF_ISOM_ITUNE_ALBUM_ARTIST = GF_4CC( 'a', 'A', 'R', 'T' ),
+	GF_ISOM_ITUNE_GAPELESS = GF_4CC( 'p', 'g', 'a', 'p' ),
+};
+/*get the given tag info. 
+!! 'genre' may be coded by ID, the libisomedia doesn't translate the ID. In such a case, the result data is set to NULL 
+and the data_len to the genre ID
+returns GF_URL_ERROR if no tag is present in the file
+*/
+GF_Err gf_isom_apple_get_tag(GF_ISOFile *mov, u32 tag, const char **data, u32 *data_len);
+#ifndef GPAC_READ_ONLY
+/*set the given tag info. If data and data_len are 0, removes the given tag
+For 'genre', data may be NULL in which case the genre ID taken from the data_len parameter
+*/
+GF_Err gf_isom_apple_set_tag(GF_ISOFile *mov, u32 tag, const char *data, u32 data_len);
+
+/*sets compatibility tag on AVC tracks (needed by iPod to play files... hurray for standards)*/
+GF_Err gf_isom_set_ipod_compatible(GF_ISOFile *the_file, u32 trackNumber);
+#endif
+
+
+/*3GPP Alternate Group API - (c) 2007 ENST & ResonateMP4*/
+
+/*gets the number of switching groups declared in this track if any:
+trackNumber: track number
+alternateGroupID: alternate group id of track if speciifed, 0 otherwise
+nb_groups: number of switching groups defined for this track
+*/
+GF_Err gf_isom_get_track_switch_group_count(GF_ISOFile *movie, u32 trackNumber, u32 *alternateGroupID, u32 *nb_groups);
+
+/*returns the list of criteria (expressed as 4CC IDs, cf 3GPP TS 26.244)
+trackNumber: track number
+group_index: 1-based index of the group to inspect
+switchGroupID: ID of the switch group if any, 0 otherwise (alternate-only group)
+criteriaListSize: number of criteria items in returned list
+*/
+const u32 *gf_isom_get_track_switch_parameter(GF_ISOFile *movie, u32 trackNumber, u32 group_index, u32 *switchGroupID, u32 *criteriaListSize);
+
+#ifndef GPAC_READ_ONLY
+/*sets a new (switch) group for this track
+trackNumber: track
+trackRefGroup: number of a track belonging to the same alternate group. If 0, a new alternate group will be created for this track
+is_switch_group: if set, indicates that a switch group identifier shall be assigned to the created group. Otherwise, the criteria list is associated with the entire alternate group
+switchGroupID: SHALL NOT BE NULL
+	input: specifies the desired switchGroupID to use. If value is 0, next available switchGroupID in file is used.
+	output: indicates the switchGroupID used.
+criteriaList, criteriaListCount: criteria list and size. Criterias are expressed as 4CC IDs, cf 3GPP TS 26.244
+*/
+GF_Err gf_isom_set_track_switch_parameter(GF_ISOFile *movie, u32 trackNumber, u32 trackRefGroup, Bool is_switch_group, u32 *switchGroupID, u32 *criteriaList, u32 criteriaListCount);
+
+/*resets track switch group information for the track or for the entire alternate group this track belongs to if reset_all_group is set*/
+GF_Err gf_isom_reset_track_switch_parameter(GF_ISOFile *movie, u32 trackNumber, Bool reset_all_group);
+
+/*resets ALL track switch group information in the entire movie*/
+GF_Err gf_isom_reset_switch_parameters(GF_ISOFile *movie);
+
+#endif
+
+
+typedef struct
+{
+	u8 profile;
+	u8 level;
+	u8 pathComponents;
+	Bool fullRequestHost;
+	Bool streamType;
+	u8 containsRedundant;
+	const char *textEncoding;
+	const char *contentEncoding;
+	const char *content_script_types;
+} GF_DIMSDescription;
+
+GF_Err gf_isom_get_dims_description(GF_ISOFile *movie, u32 trackNumber, u32 descriptionIndex, GF_DIMSDescription *desc);
+#ifndef GPAC_READ_ONLY
+GF_Err gf_isom_new_dims_description(GF_ISOFile *movie, u32 trackNumber, GF_DIMSDescription *desc, char *URLname, char *URNname, u32 *outDescriptionIndex);
+GF_Err gf_isom_update_dims_description(GF_ISOFile *movie, u32 trackNumber, GF_DIMSDescription *desc, char *URLname, char *URNname, u32 DescriptionIndex);
+#endif
+
+
+
+
+/*AC3 config record*/
+typedef struct 
+{
+	u8 fscod;
+	u8 bsid;
+	u8 bsmod;
+	u8 acmod;
+	u8 lfon;
+	u8 brcode;
+} GF_AC3Config;
+
+#ifndef GPAC_READ_ONLY
+GF_Err gf_isom_ac3_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_AC3Config *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex);
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif	/*_GF_ISOMEDIA_H_*/
+
+
diff --git a/tstools/DtsEdit/src/gpac/laser.h b/tstools/DtsEdit/src/gpac/laser.h
new file mode 100644
index 0000000..4e05d63
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/laser.h
@@ -0,0 +1,88 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean le Feuvre
+ *				Copyright (c) 2005-200X ENST
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / BIFS codec sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _GF_LASER_H_
+#define _GF_LASER_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/nodes_svg.h>
+
+/*for LASeRConfig*/
+#include <gpac/mpeg4_odf.h>
+
+#ifndef GPAC_DISABLE_SVG
+
+typedef struct __tag_laser_codec GF_LASeRCodec;
+
+
+/*LASeR decoder constructor*/
+GF_LASeRCodec *gf_laser_decoder_new(GF_SceneGraph *scenegraph);
+void gf_laser_decoder_del(GF_LASeRCodec *codec);
+
+/*sets the scene time. Scene time is the real clock of the bifs stream in secs*/
+void gf_laser_decoder_set_clock(GF_LASeRCodec *codec, Double (*GetSceneTime)(void *st_cbk), void *st_cbk );
+
+/*setup a stream*/
+GF_Err gf_laser_decoder_configure_stream(GF_LASeRCodec *codec, u16 ESID, char *DecoderSpecificInfo, u32 DecoderSpecificInfoLength);
+/*removes a stream*/
+GF_Err gf_laser_decoder_remove_stream(GF_LASeRCodec *codec, u16 ESID);
+
+/*decode a laser AU and applies it to the graph (non-memory mode only)*/
+GF_Err gf_laser_decode_au(GF_LASeRCodec *codec, u16 ESID, char *data, u32 data_length);
+
+/*Memory laser decoding - fills the command list with the content of the AU - cf scenegraph_vrml.h for commands usage
+	@ESID: ID of input stream
+	@data, @data_length: BIFS AU
+	@com_list: target list for decoded commands
+*/
+GF_Err gf_laser_decode_command_list(GF_LASeRCodec *codec, u16 ESID, char *data, u32 data_length, GF_List *com_list);
+
+
+/*constructor - @graph: scene graph being encoded*/
+GF_LASeRCodec *gf_laser_encoder_new(GF_SceneGraph *graph);
+/*destructor*/
+void gf_laser_encoder_del(GF_LASeRCodec *codec);
+/*setup a destination stream*/
+GF_Err gf_laser_encoder_new_stream(GF_LASeRCodec *codec, u16 ESID, GF_LASERConfig *cfg);
+/*encodes a list of commands for the given stream in the output buffer - data is dynamically allocated for output*/
+GF_Err gf_laser_encode_au(GF_LASeRCodec *codec, u16 ESID, GF_List *command_list, Bool reset_encoding_context, char **out_data, u32 *out_data_length);
+/*returns encoded config desc*/
+GF_Err gf_laser_encoder_get_config(GF_LASeRCodec *codec, u16 ESID, char **out_data, u32 *out_data_length);
+
+/*Encodes current graph as a scene replace*/
+GF_Err gf_laser_encoder_get_rap(GF_LASeRCodec *codec, char **out_data, u32 *out_data_length);
+
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/tstools/DtsEdit/src/gpac/libgpac_static.lib b/tstools/DtsEdit/src/gpac/libgpac_static.lib
new file mode 100644
index 0000000..f9d9236
Binary files /dev/null and b/tstools/DtsEdit/src/gpac/libgpac_static.lib differ
diff --git a/tstools/DtsEdit/src/gpac/libgpac_static_msvcr.lib b/tstools/DtsEdit/src/gpac/libgpac_static_msvcr.lib
new file mode 100644
index 0000000..43711a3
Binary files /dev/null and b/tstools/DtsEdit/src/gpac/libgpac_static_msvcr.lib differ
diff --git a/tstools/DtsEdit/src/gpac/list.h b/tstools/DtsEdit/src/gpac/list.h
new file mode 100644
index 0000000..ca3239d
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/list.h
@@ -0,0 +1,168 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / common tools sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _GF_LIST_H_
+#define _GF_LIST_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!
+ *	\file <gpac/list.h>
+ *	\brief list functions.
+ */
+
+/*!
+ *	\addtogroup list_grp list
+ *	\ingroup utils_grp
+ *	\brief List object
+ *
+ *	This section documents the list object of the GPAC framework.
+ *	@{
+ */
+
+#include <gpac/tools.h>
+
+typedef struct _tag_array GF_List;
+
+/*!
+ *	\brief list constructor
+ *
+ *	Constructs a new list object
+ *	\return new list object
+ */
+GF_List *gf_list_new();
+/*!
+ *	\brief list destructor
+ *
+ *	Destructs a list object
+ *	\param ptr list object to destruct
+ *	\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
+ *
+ *	Returns number of items in the list
+ *	\param ptr target list object
+ *	\return number of items in the list
+ */
+u32 gf_list_count(GF_List *ptr);
+/*!
+ *	\brief add item
+ *
+ *	Adds an item at the end of the list
+ *	\param ptr target list object
+ *	\param item item to add
+ */
+GF_Err gf_list_add(GF_List *ptr, void* item);
+/*!
+ *	\brief inserts item
+ *
+ *	Insert an item in the list
+ *	\param ptr target list object
+ *	\param item item to add
+ *	\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
+ *
+ *	Removes an item from the list given its position
+ *	\param ptr target list object
+ *	\param position position of the item to remove. It is expressed between 0 and gf_list_count-1.
+ *	\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
+ *
+ *	Gets an item from the list given its position
+ *	\param ptr target list object
+ *	\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
+ *
+ *	Finds an item in the list
+ *	\param ptr target list object.
+ *	\param item the item to find.
+ *	\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
+ *
+ *	Deletes an item from the list
+ *	\param ptr target list object.
+ *	\param item the item to find.
+ *	\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
+ *
+ *	Resets the content of the list
+ *	\param ptr target list object.
+ *	\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
+ *
+ *	Gets last item o fthe list 
+ *	\param ptr target list object
+ */
+void *gf_list_last(GF_List *ptr);
+/*!
+ *	\brief removes last item
+ *
+ *	Removes the last item of the list
+ *	\param ptr target list object
+ *	\note It is the caller responsability to destroy the content of the list if needed
+ */
+GF_Err gf_list_rem_last(GF_List *ptr);
+
+
+/*!
+ *	\brief list enumerator
+ *
+ *	Retrieves given list item and increment current position
+ *	\param ptr target list object
+ *	\param pos target item position. The position is automatically incremented regardless of the return value
+ *	\note A typical enumeration will start with a value of 0 until NULL is returned.
+ */
+void *gf_list_enum(GF_List *ptr, u32 *pos);
+
+/*! @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif		/*_GF_LIST_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/math.h b/tstools/DtsEdit/src/gpac/math.h
new file mode 100644
index 0000000..27d4cd4
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/math.h
@@ -0,0 +1,1048 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / common tools sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _GF_MATH_H_
+#define _GF_MATH_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!
+ *	\file <gpac/math.h>
+ *	\brief math and trigo functions.
+ */
+
+#include <gpac/setup.h>
+	
+/*NOTE: there is a conflict on Win32 VC6 with C++ and gpac headers when including <math.h>*/
+#if !defined(__cplusplus) || defined(__SYMBIAN32__)
+#include <math.h>
+#endif
+
+/*!
+ \cond DUMMY_DOXY_SECTION
+*/
+
+#ifndef GPAC_FIXED_POINT
+/*note: 
+		to turn fp on, change to GPAC_FIXED_POINT
+		to turn fp off, change to GPAC_NO_FIXED_POINT
+	this is needed by configure+sed to modify this file directly
+*/
+#define GPAC_NO_FIXED_POINT
+#endif
+
+/*!
+ \endcond
+*/
+
+
+/*!
+ *\addtogroup math_grp math
+ *\ingroup utils_grp
+ *\brief Mathematics and Trigonometric functions
+ *
+ *This section documents the math and trigo functions used in the GPAC framework. GPAC can be compiled with
+ *fixed-point support, representing float values on a 16.16 signed integer, which implies a developer 
+ *must take care of float computations when using GPAC.\n
+ *A developper should not need to know in which mode the framework has been compiled as long as he uses
+ *the math functions of GPAC which work in both float and fixed-point mode.\n
+ *Using fixed-point version is decided at compilation time and cannot be changed. The feature is signaled
+ *through the following macros:
+ *- GPAC_FIXED_POINT: when defined, GPAC has been compiled in fixed-point mode
+ *- GPAC_NO_FIXED_POINT: when defined, GPAC has been compiled in regular (float) mode
+ *	@{
+ */
+
+
+/*****************************************************************************************
+			FIXED-POINT SUPPORT - HARDCODED FOR 16.16 representation
+	the software rasterizer also use a 16.16 representation even in non-fixed version
+******************************************************************************************/
+
+#ifdef GPAC_FIXED_POINT
+
+/*!
+ *Fixed 16.16 number
+ *\hideinitializer
+ \note This documentation has been generated for a fixed-point version of the GPAC framework.
+ */
+typedef s32 Fixed;
+#define FIX_ONE			0x10000L
+#define INT2FIX(v)		((Fixed)( ((s32) (v) ) << 16))
+#define FLT2FIX(v)		((Fixed) ((v) * FIX_ONE))
+#define FIX2INT(v)		((s32)(((v)+((FIX_ONE>>1)))>>16))
+#define FIX2FLT(v)		((Float)( ((Float)(v)) / ((Float) FIX_ONE)))
+#define FIX_EPSILON		2
+#define FIX_MAX			0x7FFFFFFF
+#define FIX_MIN			-FIX_MAX
+#define GF_PI2		102944
+#define GF_PI		205887
+#define GF_2PI		411774
+
+/*!\return 1/a, expressed as fixed number*/
+Fixed gf_invfix(Fixed a);
+/*!\return a*b, expressed as fixed number*/
+Fixed gf_mulfix(Fixed a, Fixed b);
+/*!\return a*b/c, expressed as fixed number*/
+Fixed gf_muldiv(Fixed a, Fixed b, Fixed c);
+/*!\return a/b, expressed as fixed number*/
+Fixed gf_divfix(Fixed a, Fixed b);
+/*!\return sqrt(a), expressed as fixed number*/
+Fixed gf_sqrt(Fixed x);
+/*!\return ceil(a), expressed as fixed number*/
+Fixed gf_ceil(Fixed a);
+/*!\return floor(a), expressed as fixed number*/
+Fixed gf_floor(Fixed a);
+/*!\return cos(a), expressed as fixed number*/
+Fixed gf_cos(Fixed angle);
+/*!\return sin(a), expressed as fixed number*/
+Fixed gf_sin(Fixed angle);
+/*!\return tan(a), expressed as fixed number*/
+Fixed gf_tan(Fixed angle);
+/*!\return acos(a), expressed as fixed number*/
+Fixed gf_acos(Fixed angle);
+/*!\return asin(a), expressed as fixed number*/
+Fixed gf_asin(Fixed angle);
+/*!\return atan(y, x), expressed as fixed number*/
+Fixed gf_atan2(Fixed y, Fixed x);
+
+#else
+
+
+/*!Fixed is 32bit float number
+ \note This documentation has been generated for a float version of the GPAC framework.
+*/
+typedef Float Fixed;
+#define FIX_ONE			1.0f
+#define INT2FIX(v)		((Float) (v))
+#define FLT2FIX(v)		((Float) (v))
+#define FIX2INT(v)		((s32)(v))
+#define FIX2FLT(v)		((Float) (v))
+#define FIX_EPSILON		GF_EPSILON_FLOAT
+#define FIX_MAX			GF_MAX_FLOAT
+#define FIX_MIN			-GF_MAX_FLOAT
+#define GF_PI2		1.5707963267949f
+#define GF_PI		3.1415926535898f
+#define GF_2PI		6.2831853071796f
+
+/*!\hideinitializer 1/_a, expressed as fixed number*/
+#define gf_invfix(_a)	(FIX_ONE/(_a))
+/*!\hideinitializer _a*_b, expressed as fixed number*/
+#define gf_mulfix(_a, _b)		((_a)*(_b))
+/*!\hideinitializer _a*_b/_c, expressed as fixed number*/
+#define gf_muldiv(_a, _b, _c)	((_c) ? (_a)*(_b)/(_c) : GF_MAX_FLOAT)
+/*!\hideinitializer _a/_b, expressed as fixed number*/
+#define gf_divfix(_a, _b)		((_b) ? (_a)/(_b) : GF_MAX_FLOAT)
+/*!\hideinitializer sqrt(_a), expressed as fixed number*/
+#define gf_sqrt(_a) ((Float) sqrt(_a))
+/*!\hideinitializer ceil(_a), expressed as fixed number*/
+#define gf_ceil(_a) ((Float) ceil(_a))
+/*!\hideinitializer floor(_a), expressed as fixed number*/
+#define gf_floor(_a) ((Float) floor(_a))
+/*!\hideinitializer cos(_a), expressed as fixed number*/
+#define gf_cos(_a) ((Float) cos(_a))
+/*!\hideinitializer sin(_a), expressed as fixed number*/
+#define gf_sin(_a) ((Float) sin(_a))
+/*!\hideinitializer tan(_a), expressed as fixed number*/
+#define gf_tan(_a) ((Float) tan(_a))
+/*!\hideinitializer atan2(_y,_x), expressed as fixed number*/
+#define gf_atan2(_y, _x) ((Float) atan2(_y, _x))
+/*!\hideinitializer acos(_a), expressed as fixed number*/
+#define gf_acos(_a) ((Float) acos(_a))
+/*!\hideinitializer asin(_a), expressed as fixed number*/
+#define gf_asin(_a) ((Float) asin(_a))
+
+#endif
+
+/*!\def FIX_ONE
+ \hideinitializer
+ Fixed unit value
+*/
+/*!\def INT2FIX(v)
+ \hideinitializer
+ Conversion from integer to fixed
+*/
+/*!\def FLT2FIX(v)
+ \hideinitializer
+ Conversion from float to fixed
+*/
+/*!\def FIX2INT(v)
+ \hideinitializer
+ Conversion from fixed to integer
+*/
+/*!\def FIX2FLT(v)
+ \hideinitializer
+ Conversion from fixed to float
+*/
+/*!\def FIX_EPSILON
+ \hideinitializer
+ Epsilon Fixed (positive value closest to 0)
+*/
+/*!\def FIX_MAX
+ \hideinitializer
+ Maximum Fixed (maximum representable fixed value)
+*/
+/*!\def FIX_MIN
+ \hideinitializer
+ Minimum Fixed (minimum representable fixed value)
+*/
+/*!\def GF_PI2
+ \hideinitializer
+ PI/2 expressed as Fixed
+*/
+/*!\def GF_PI
+ \hideinitializer
+ PI expressed as Fixed
+*/
+/*!\def GF_2PI
+ \hideinitializer
+ 2*PI expressed as Fixed
+*/
+
+Fixed gf_angle_diff(Fixed a, Fixed b);
+
+/*!
+ *	\brief Field bit-size 
+ *
+ *	Gets the number of bits needed to represent the value.
+ *	\param MaxVal Maximum value to be represented.
+ *	\return number of bits required to represent the value.
+ */
+u32 gf_get_bit_size(u32 MaxVal);
+
+/*!
+ *	\brief Get power of 2
+ *
+ *	Gets the closest power of 2 greater or equal to the value.
+ *	\param val value to be used.
+ *	\return requested power of 2.
+ */
+u32 gf_get_next_pow2(u32 val);
+
+/*!
+ *\addtogroup math2d_grp math2d
+ *\ingroup math_grp
+ *\brief 2D Mathematics functions
+ *
+ *This section documents mathematic tools for 2D geometry and color matrices operations
+ *	@{
+ */
+
+/*!\brief 2D point
+ *
+ *The 2D point object is used in all the GPAC framework for both point and vector representation.
+*/
+typedef struct __vec2f
+{
+	Fixed x;
+	Fixed y;
+} GF_Point2D;
+/*!
+ *\brief get 2D vector length
+ *
+ *Gets the length of a 2D vector
+ *\return length of the vector
+ */
+Fixed gf_v2d_len(GF_Point2D *vec);
+/*!
+ *\brief 2D vector from polar coordinates
+ *
+ *Constructs a 2D vector from its polar coordinates
+ *\param length the length of the vector
+ *\param angle the angle of the vector in radians
+ *\return the 2D vector
+ */
+GF_Point2D gf_v2d_from_polar(Fixed length, Fixed angle);
+
+/*!\brief rectangle 2D
+ *
+ *The 2D rectangle used in the GPAC project.
+ */
+typedef struct
+{
+	/*!the left coordinate of the rectangle*/
+	Fixed x;
+	/*!the top coordinate of the rectangle, regardless of the canvas orientation. In other words, y is always the 
+	greatest coordinate value, 	even if the rectangle is presented bottom-up. This insures proper rectangles testing*/
+	Fixed y;
+	/*!the width of the rectangle. Width must be greater than or equal to 0*/
+	Fixed width;
+	/*!the height of the rectangle. Height must be greater than or equal to 0*/
+	Fixed height;
+} GF_Rect;
+
+/*!
+ \brief rectangle union
+ *
+ *Gets the union of two rectangles.
+ *\param rc1 first rectangle of the union. Upon return, this rectangle will contain the result of the union
+ *\param rc2 second rectangle of the union
+*/
+void gf_rect_union(GF_Rect *rc1, GF_Rect *rc2);
+/*!
+ \brief centers a rectangle
+ *
+ *Builds a rectangle centered on the origin
+ *\param w width of the rectangle
+ *\param h height of the rectangle
+ *\return centered rectangle object
+*/
+GF_Rect gf_rect_center(Fixed w, Fixed h);
+/*!
+ \brief rectangle overlap test
+ *
+ *Tests if two rectangles overlap.
+ *\param rc1 first rectangle to test
+ *\param rc2 second rectangle to test
+ *\return 1 if rectangles overlap, 0 otherwise
+*/
+Bool gf_rect_overlaps(GF_Rect rc1, GF_Rect rc2);
+/*!
+ \brief rectangle identity test
+ *
+ *Tests if two rectangles are identical.
+ *\param rc1 first rectangle to test
+ *\param rc2 second rectangle to test
+ *\return 1 if rectangles are identical, 0 otherwise
+*/
+Bool gf_rect_equal(GF_Rect rc1, GF_Rect rc2);
+
+/*!
+ *\brief pixel-aligned rectangle
+ *
+ *Pixel-aligned rectangle used in the GPAC framework. This is usually needed for 2D drawing algorithms.
+ */
+typedef struct
+{
+	/*!the left coordinate of the rectangle*/
+	s32 x;
+	/*!the top coordinate of the rectangle, regardless of the canvas orientation. In other words, y is always the 
+	greatest coordinate value, even if the rectangle is presented bottom-up. This insures proper rectangles operations*/
+	s32 y;
+	/*!the width of the rectangle. Width must be greater than or equal to 0*/
+	s32 width;
+	/*!the height of the rectangle. Height must be greater than or equal to 0*/
+	s32 height;
+} GF_IRect;
+/*!
+ *\brief gets the pixelized version of a rectangle
+ *
+ *Returns the smallest pixel-aligned rectangle completely containing a rectangle
+ *\param r the rectangle to transform
+ *\return the pixel-aligned transformed rectangle
+*/
+GF_IRect gf_rect_pixelize(GF_Rect *r);
+
+
+/*!
+ *\brief 2D matrix
+ *
+ *The 2D affine matrix object usied in GPAC. The transformation of P(x,y) in P'(X, Y) is:
+ \code
+	X = m[0]*x + m[1]*y + m[2];
+	Y = m[3]*x + m[4]*y + m[5];
+ \endcode
+*/
+typedef struct
+{
+	Fixed m[6];
+} GF_Matrix2D;
+
+/*!\brief matrix initialization
+ *\hideinitializer
+ *
+ *Inits the matrix to the identity matrix
+*/
+#define gf_mx2d_init(_obj) { memset((_obj).m, 0, sizeof(Fixed)*6); (_obj).m[0] = (_obj).m[4] = FIX_ONE; }
+/*!\brief matrix copy
+ *\hideinitializer
+ *
+ *Copies the matrix _from to the matrix _obj
+*/
+#define gf_mx2d_copy(_obj, from) memcpy((_obj).m, (from).m, sizeof(Fixed)*6)
+/*!\brief matrix identity testing
+ *\hideinitializer
+ *
+ *This macro evaluates to 1 if the matrix _obj is the identity matrix, 0 otherwise
+*/
+#define gf_mx2d_is_identity(_obj) ((!(_obj).m[1] && !(_obj).m[2] && !(_obj).m[3] && !(_obj).m[5] && ((_obj).m[0]==FIX_ONE) && ((_obj).m[4]==FIX_ONE)) ? 1 : 0)
+
+/*!\brief 2D matrix multiplication
+ *
+ *Multiplies two 2D matrices from*_this
+ *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
+ *\param from transformation matrix to add
+*/
+void gf_mx2d_add_matrix(GF_Matrix2D *_this, GF_Matrix2D *from);
+
+/*!\brief 2D matrix pre-multiplication
+ *
+ *Multiplies two 2D matrices _this*from
+ *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
+ *\param from transformation matrix to add
+*/
+void gf_mx2d_pre_multiply(GF_Matrix2D *_this, GF_Matrix2D *from);
+
+/*!\brief matrix translating
+ *
+ *Translates a 2D matrix
+ *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
+ *\param cx horizontal translation
+ *\param cy vertical translation
+*/
+void gf_mx2d_add_translation(GF_Matrix2D *_this, Fixed cx, Fixed cy);
+/*!\brief matrix rotating
+ *
+ *Rotates a 2D matrix
+ *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
+ *\param cx horizontal rotation center coordinate
+ *\param cy vertical rotation center coordinate
+ *\param angle rotation angle in radians
+*/
+void gf_mx2d_add_rotation(GF_Matrix2D *_this, Fixed cx, Fixed cy, Fixed angle);
+/*!\brief matrix scaling
+ *
+ *Scales a 2D matrix
+ *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
+ *\param scale_x horizontal scaling factor
+ *\param scale_y vertical scaling factor
+*/
+void gf_mx2d_add_scale(GF_Matrix2D *_this, Fixed scale_x, Fixed scale_y);
+/*!\brief matrix uncentered scaling
+ *
+ *Scales a 2D matrix with a non-centered scale
+ *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
+ *\param scale_x horizontal scaling factor
+ *\param scale_y vertical scaling factor
+ *\param cx horizontal scaling center coordinate
+ *\param cy vertical scaling center coordinate
+ *\param angle scale orienttion angle in radians
+*/
+void gf_mx2d_add_scale_at(GF_Matrix2D *_this, Fixed scale_x, Fixed scale_y, Fixed cx, Fixed cy, Fixed angle);
+/*!\brief matrix skewing
+ *
+ *Skews a 2D matrix
+ *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
+ *\param skew_x horizontal skew factor
+ *\param skew_y vertical skew factor
+*/
+void gf_mx2d_add_skew(GF_Matrix2D *_this, Fixed skew_x, Fixed skew_y);
+/*!\brief matrix horizontal skewing
+ *
+ *Skews a 2D matrix horizontally by a given angle
+ *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
+ *\param angle horizontal skew angle in radians
+*/
+void gf_mx2d_add_skew_x(GF_Matrix2D *_this, Fixed angle);
+/*!\brief matrix vertical skewing
+ *
+ *Skews a 2D matrix vertically by a given angle
+ *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
+ *\param angle vertical skew angle in radians
+*/
+void gf_mx2d_add_skew_y(GF_Matrix2D *_this, Fixed angle);
+/*!\brief matrix inversing
+ *
+ *Inverses a 2D matrix 
+ *\param _this matrix being transformed. Once the function is called, _this contains the result matrix
+*/
+void gf_mx2d_inverse(GF_Matrix2D *_this);
+/*!\brief matrix coordinate transformation
+ *
+ *Applies a 2D matrix transformation to coordinates
+ *\param _this transformation matrix
+ *\param x pointer to horizontal coordinate. Once the function is called, x contains the transformed horizontal coordinate
+ *\param y pointer to vertical coordinate. Once the function is called, y contains the transformed vertical coordinate
+*/
+void gf_mx2d_apply_coords(GF_Matrix2D *_this, Fixed *x, Fixed *y);
+/*!\brief matrix point transformation
+ *
+ *Applies a 2D matrix transformation to a 2D point
+ *\param _this transformation matrix
+ *\param pt pointer to 2D point. Once the function is called, pt contains the transformed point
+*/
+void gf_mx2d_apply_point(GF_Matrix2D *_this, GF_Point2D *pt);
+/*!\brief matrix rectangle transformation
+ *
+ *Applies a 2D matrix transformation to a rectangle, giving the enclosing rectangle of the transformed one
+ *\param _this transformation matrix
+ *\param rc pointer to rectangle. Once the function is called, rc contains the transformed rectangle
+*/
+void gf_mx2d_apply_rect(GF_Matrix2D *_this, GF_Rect *rc);
+
+/*!\brief matrix decomposition
+ *
+ *Decomposes a 2D matrix M as M=Scale x Rotation x Translation if possible
+ *\param _this transformation matrix
+ *\param scale resulting scale part
+ *\param rotate resulting rotation part
+ *\param translate resulting translation part
+ *\return 0 if matrix cannot be decomposed, 1 otherwise
+*/
+Bool gf_mx2d_decompose(GF_Matrix2D *_this, GF_Point2D *scale, Fixed *rotate, GF_Point2D *translate);
+
+/*! @} */
+
+
+/*!
+ *\addtogroup math3d_grp math3d
+ *\ingroup math_grp
+ *\brief 3D Mathematics functions
+ *
+ *This section documents mathematic tools for 3D geometry operations
+ *	@{
+ */
+
+/*!\brief 3D point or vector
+ *
+ *The 3D point object is used in all the GPAC framework for both point and vector representation.
+*/
+typedef struct __vec3f
+{
+	Fixed x;
+	Fixed y;
+	Fixed z;
+} GF_Vec;
+
+/*base vector operations are MACROs for faster access*/
+/*!\hideinitializer macro evaluating to 1 if vectors are equal, 0 otherwise*/
+#define gf_vec_equal(v1, v2) (((v1).x == (v2).x) && ((v1).y == (v2).y) && ((v1).z == (v2).z))
+/*!\hideinitializer macro reversing a vector v = v*/
+#define gf_vec_rev(v) { (v).x = -(v).x; (v).y = -(v).y; (v).z = -(v).z; }
+/*!\hideinitializer macro performing the minus operation res = v1 - v2*/
+#define gf_vec_diff(res, v1, v2) { (res).x = (v1).x - (v2).x; (res).y = (v1).y - (v2).y; (res).z = (v1).z - (v2).z; }
+/*!\hideinitializer macro performing the add operation res = v1 + v2*/
+#define gf_vec_add(res, v1, v2) { (res).x = (v1).x + (v2).x; (res).y = (v1).y + (v2).y; (res).z = (v1).z + (v2).z; }
+
+/*!
+ *\brief get 3D vector length
+ *
+ *Gets the length of a 3D vector
+ *\return length of the vector
+ */
+Fixed gf_vec_len(GF_Vec v);
+/*!
+ *\brief get 3D vector square length
+ *
+ *Gets the square length of a 3D vector
+ *\return square length of the vector
+ */
+Fixed gf_vec_lensq(GF_Vec v);
+/*!
+ *\brief get 3D vector dot product
+ *
+ *Gets the dot product of two vectors
+ *\return dot product of the vectors
+ */
+Fixed gf_vec_dot(GF_Vec v1, GF_Vec v2);
+/*!
+ *\brief vector normalization
+ *
+ *Norms the vector, eg make its length equal to \ref FIX_ONE
+ *\param v vector to normalize
+ */
+void gf_vec_norm(GF_Vec *v);
+/*!
+ *\brief vector scaling
+ *
+ *Scales a vector by a given amount
+ *\param v vector to scale
+ *\param f scale factor
+ *\return scaled vector
+ */
+GF_Vec gf_vec_scale(GF_Vec v, Fixed f);
+/*!
+ *\brief vector cross product
+ *
+ *Gets the cross product of two vectors
+ *\param v1 first vector
+ *\param v2 second vector
+ *\return cross-product vector
+ */
+GF_Vec gf_vec_cross(GF_Vec v1, GF_Vec v2);
+
+/*!\brief 4D vector
+ *
+ *The 4D vector object is used in all the GPAC framework for 4 dimension vectors, VRML Rotations and quaternions representation.
+*/
+typedef struct __vec4f
+{
+	Fixed x;
+	Fixed y;
+	Fixed z;
+	Fixed q;
+} GF_Vec4;
+
+
+/*!\brief 3D matrix
+ *
+ *The 3D matrix object used in GPAC. The matrix is oriented like OpenGL matrices (column-major ordering), with 
+ the translation part at the end of the coefficients list.
+ \note Unless specified otherwise, the matrix object is always expected to represent an affine transformation.
+ */
+typedef struct
+{
+	Fixed m[16];
+} GF_Matrix;
+
+
+/*!\hideinitializer gets the len of a quaternion*/
+#define gf_quat_len(v) gf_sqrt(gf_mulfix((v).q,(v).q) + gf_mulfix((v).x,(v).x) + gf_mulfix((v).y,(v).y) + gf_mulfix((v).z,(v).z))
+/*!\hideinitializer normalizes a quaternion*/
+#define gf_quat_norm(v) { \
+	Fixed __mag = gf_quat_len(v);	\
+	(v).x = gf_divfix((v).x, __mag); (v).y = gf_divfix((v).y, __mag); (v).z = gf_divfix((v).z, __mag); (v).q = gf_divfix((v).q, __mag);	\
+	}	\
+
+/*!\brief quaternion to rotation
+ *
+ *Transforms a quaternion to a Rotation, expressed as a 4 dimension vector with x,y,z for axis and q for rotation angle
+ *\param quat the quaternion to transform
+ *\return the rotation value
+ */
+GF_Vec4 gf_quat_to_rotation(GF_Vec4 *quat);
+/*!\brief quaternion from rotation
+ *
+ *Transforms a Rotation to a quaternion
+ *\param rot the rotation to transform
+ *\return the quaternion value
+ */
+GF_Vec4 gf_quat_from_rotation(GF_Vec4 rot);
+/*!inverses a quaternion*/
+GF_Vec4 gf_quat_get_inv(GF_Vec4 *quat);
+/*!\brief quaternion multiplication
+ *
+ *Multiplies two quaternions
+ *\param q1 the first quaternion
+ *\param q2 the second quaternion
+ *\return the resulting quaternion
+ */
+GF_Vec4 gf_quat_multiply(GF_Vec4 *q1, GF_Vec4 *q2);
+/*!\brief quaternion vector rotating
+ *
+ *Rotates a vector with a quaternion 
+ *\param quat the quaternion modelizing the rotation
+ *\param vec the vector to rotate
+ *\return the resulting vector
+ */
+GF_Vec gf_quat_rotate(GF_Vec4 *quat, GF_Vec *vec);
+/*!\brief quaternion from axis and cos
+ *
+ *Constructs a quaternion from an axis and a cosinus value (shortcut to \ref gf_quat_from_rotation)
+ *\param axis the rotation axis
+ *\param cos_a the rotation cosinus value
+ *\return the resulting quaternion
+ */
+GF_Vec4 gf_quat_from_axis_cos(GF_Vec axis, Fixed cos_a);
+/*!\brief quaternion interpolation
+ *
+ *Interpolates two quaternions using spherical linear interpolation
+ *\param q1 the first quaternion
+ *\param q2 the second quaternion
+ *\param frac the fraction of the interpolation, between 0 and \ref FIX_ONE
+ *\return the interpolated quaternion
+ */
+GF_Vec4 gf_quat_slerp(GF_Vec4 q1, GF_Vec4 q2, Fixed frac);
+
+/*!\brief 3D Bounding Box
+ *
+ *The 3D Bounding Box is a 3D Axis-Aligned Bounding Box used to in various tools of the GPAC framework for bounds 
+ estimation of a 3D object. It features an axis-aligned box and a sphere bounding volume for fast intersection tests.
+ */
+typedef struct
+{
+	/*!minimum x, y, and z of the object*/
+	GF_Vec min_edge;
+	/*!maximum x, y, and z of the object*/
+	GF_Vec max_edge;
+
+	/*!center of the bounding box.\note this is computed from min_edge and max_edge*/
+	GF_Vec center;
+	/*!radius of the bounding sphere for this box.\note this is computed from min_edge and max_edge*/
+	Fixed radius;
+	/*!the bbox center and radius are valid*/
+	Bool is_set;
+} GF_BBox;
+/*!updates information of the bounding box based on the edge information*/
+void gf_bbox_refresh(GF_BBox *b);
+/*!builds a bounding box from a 2D rectangle*/
+void gf_bbox_from_rect(GF_BBox *box, GF_Rect *rc);
+/*!builds a rectangle from a 3D bounding box.\note The z dimension is lost and no projection is performed*/
+void gf_rect_from_bbox(GF_Rect *rc, GF_BBox *box);
+/*!\brief bounding box expansion
+ *
+ *Checks if a point is inside a bounding box and updates the bounding box to include it if not the case
+ *\param box the bounding box object
+ *\param pt the 3D point to check
+*/
+void gf_bbox_grow_point(GF_BBox *box, GF_Vec pt);
+/*!performs the union of two bounding boxes*/
+void gf_bbox_union(GF_BBox *b1, GF_BBox *b2);
+/*!checks if two bounding boxes are equal or not*/
+Bool gf_bbox_equal(GF_BBox *b1, GF_BBox *b2);
+/*!checks if a point is inside a bounding box or not*/
+Bool gf_bbox_point_inside(GF_BBox *box, GF_Vec *p);
+/*!\brief get box vertices
+ *
+ *Returns the 8 bounding box vertices given the minimum and maximum edge. Vertices are ordered to respect 
+ "p-vertex indexes", (vertex from a box closest to plane) and so that n-vertex (vertex from a box farthest from plane) 
+ is 7-p_vx_idx
+ *\param bmin minimum edge of the box
+ *\param bmax maximum edge of the box
+ *\param vecs list of 8 3D points used to store the vertices.
+*/
+void gf_bbox_get_vertices(GF_Vec bmin, GF_Vec bmax, GF_Vec *vecs);
+
+
+/*!\brief matrix initialization
+ *\hideinitializer
+ *
+ *Inits the matrix to the identity matrix
+*/
+#define gf_mx_init(_obj) { memset((_obj).m, 0, sizeof(Fixed)*16); (_obj).m[0] = (_obj).m[5] = (_obj).m[10] = (_obj).m[15] = FIX_ONE; }
+/*!\brief matrix copy
+ *\hideinitializer
+ *
+ *Copies the matrix _from to the matrix _obj
+*/
+#define gf_mx_copy(_obj, from) memcpy(&(_obj), &(from), sizeof(GF_Matrix));
+/*!\brief matrix constructor from 2D
+ *
+ *Initializes a 3D matrix from a 2D matrix.\note all z-related coefficients will be set to default.
+*/
+void gf_mx_from_mx2d(GF_Matrix *mx, GF_Matrix2D *mat2D);
+/*!\brief matrix identity testing
+ *
+ *Tests if two matrices are equal or not.
+ \return 1 if matrices are same, 0 otherwise
+*/
+Bool gf_mx_equal(GF_Matrix *mx1, GF_Matrix *mx2);
+/*!\brief matrix translation
+ *
+ *Translates a matrix 
+ *\param mx the matrix being transformed. Once the function is called, contains the result matrix
+ *\param tx horizontal translation
+ *\param ty vertical translation
+ *\param tz depth translation
+*/
+void gf_mx_add_translation(GF_Matrix *mx, Fixed tx, Fixed ty, Fixed tz);
+/*!\brief matrix scaling
+ *
+ *Scales a matrix 
+ *\param mx the matrix being transformed. Once the function is called, contains the result matrix
+ *\param sx horizontal translation scaling
+ *\param sy vertical translation scaling
+ *\param sz depth translation scaling
+*/
+void gf_mx_add_scale(GF_Matrix *mx, Fixed sx, Fixed sy, Fixed sz);
+/*!\brief matrix rotating
+ *
+ *Rotates a matrix 
+ *\param mx the matrix being transformed. Once the function is called, contains the result matrix
+ *\param angle rotation angle in radians
+ *\param x horizontal coordinate of rotation axis
+ *\param y vertical coordinate of rotation axis
+ *\param z depth coordinate of rotation axis
+*/
+void gf_mx_add_rotation(GF_Matrix *mx, Fixed angle, Fixed x, Fixed y, Fixed z);
+/*!\brief matrices multiplication 
+ *
+ *Multiplies a matrix with another one mx = mx*mul
+ *\param mx the matrix being transformed. Once the function is called, contains the result matrix
+ *\param mul the matrix to add
+*/
+void gf_mx_add_matrix(GF_Matrix *mx, GF_Matrix *mul);
+/*!\brief 2D matrix multiplication
+ *
+ *Adds a 2D affine matrix to a matrix
+ *\param mx the matrix 
+ *\param mat2D the matrix to premultiply
+ */
+void gf_mx_add_matrix_2d(GF_Matrix *mx, GF_Matrix2D *mat2D);
+
+/*!\brief affine matrix inversion
+ *
+ *Inverses an affine matrix.\warning Results are undefined if the matrix is not an affine one
+ *\param mx the matrix to inverse
+ */
+void gf_mx_inverse(GF_Matrix *mx);
+/*!\brief matrix point transformation
+ *
+ *Applies a 3D matrix transformation to a 3D point
+ *\param mx transformation matrix
+ *\param pt pointer to 3D point. Once the function is called, pt contains the transformed point
+*/
+void gf_mx_apply_vec(GF_Matrix *mx, GF_Vec *pt);
+/*!\brief matrix rectangle transformation
+ *
+ *Applies a 3D matrix transformation to a rectangle, giving the enclosing rectangle of the transformed one.\note all depth information are discarded.
+ *\param _this transformation matrix
+ *\param rc pointer to rectangle. Once the function is called, rc contains the transformed rectangle
+*/
+void gf_mx_apply_rect(GF_Matrix *_this, GF_Rect *rc);
+/*!\brief ortho matrix construction
+ *
+ *Creates an orthogonal projection matrix
+ *\param mx matrix to initialize
+ *\param left min horizontal coordinate of viewport
+ *\param right max horizontal coordinate of viewport
+ *\param bottom min vertical coordinate of viewport
+ *\param top max vertical coordinate of viewport
+ *\param z_near min depth coordinate of viewport
+ *\param z_far max depth coordinate of viewport
+*/
+void gf_mx_ortho(GF_Matrix *mx, Fixed left, Fixed right, Fixed bottom, Fixed top, Fixed z_near, Fixed z_far);
+/*!\brief perspective matrix construction
+ *
+ *Creates a perspective projection matrix
+ *\param mx matrix to initialize
+ *\param foc camera field of view angle in radian
+ *\param aspect_ratio viewport aspect ratio
+ *\param z_near min depth coordinate of viewport
+ *\param z_far max depth coordinate of viewport
+*/
+void gf_mx_perspective(GF_Matrix *mx, Fixed foc, Fixed aspect_ratio, Fixed z_near, Fixed z_far);
+/*!\brief creates look matrix
+ *
+ *Creates a transformation matrix looking at a given direction from a given point (camera matrix).
+ *\param mx matrix to initialize
+ *\param position position
+ *\param target look direction
+ *\param up_vector vector describing the up direction
+*/
+void gf_mx_lookat(GF_Matrix *mx, GF_Vec position, GF_Vec target, GF_Vec up_vector);
+/*!\brief matrix box transformation
+ *
+ *Applies a 3D matrix transformation to a bounding box, giving the enclosing box of the transformed one
+ *\param mx transformation matrix
+ *\param b pointer to bounding box. Once the function is called, contains the transformed bounding box
+*/
+void gf_mx_apply_bbox(GF_Matrix *mx, GF_BBox *b);
+/*!\brief matrix box sphere transformation
+ *
+ *Applies a 3D matrix transformation to a bounding box, computing only the enclosing sphere of the transformed one.
+ *\param mx transformation matrix
+ *\param b pointer to bounding box. Once the function is called, contains the transformed bounding sphere
+*/
+void gf_mx_apply_bbox_sphere(GF_Matrix *mx, GF_BBox *box);
+/*!\brief non-affine matrix multiplication
+ *
+ *Multiplies two non-affine matrices mx = mx*mul
+*/
+void gf_mx_add_matrix_4x4(GF_Matrix *mat, GF_Matrix *mul);
+/*!\brief non-affine matrix inversion
+ *
+ *Inverses a non-affine matrices
+ *\return 1 if inversion was done, 0 if inversion not possible.
+*/
+Bool gf_mx_inverse_4x4(GF_Matrix *mx);
+/*!\brief matrix 4D vector transformation
+ *
+ *Applies a 3D non-affine matrix transformation to a 4 dimension vector
+ *\param mx transformation matrix
+ *\param vec pointer to the vector. Once the function is called, contains the transformed vector
+*/
+void gf_mx_apply_vec_4x4(GF_Matrix *mx, GF_Vec4 *vec);
+/*!\brief matrix decomposition
+ *
+ *Decomposes a matrix into translation, scale, shear and rotate
+ *\param mx the matrix to decompose
+ *\param translate the decomposed translation part
+ *\param scale the decomposed scaling part
+ *\param rotate the decomposed rotation part, expressed as a Rotataion (axis + angle)
+ *\param shear the decomposed shear part
+ */
+void gf_mx_decompose(GF_Matrix *mx, GF_Vec *translate, GF_Vec *scale, GF_Vec4 *rotate, GF_Vec *shear);
+/*!\brief matrix vector rotation
+ *
+ *Rotates a vector with a given matrix, ignoring any translation.
+ *\param mx transformation matrix
+ *\param pt pointer to 3D vector. Once the function is called, pt contains the transformed vector
+ */
+void gf_mx_rotate_vector(GF_Matrix *mx, GF_Vec *pt);
+/*!\brief matrix initialization from vectors
+ *
+ *Inits a matrix to rotate the local axis in the given vectors
+ \param mx matrix to initialize
+ \param x_axis target normalized X axis
+ \param y_axis target normalized Y axis
+ \param z_axis target normalized Z axis
+*/
+void gf_mx_rotation_matrix_from_vectors(GF_Matrix *mx, GF_Vec x_axis, GF_Vec y_axis, GF_Vec z_axis);
+/*!\brief matrix to 2D matrix 
+ *
+ *Inits a 2D matrix by removing all depth info from a 3D matrix
+ *\param mx2d 2D matrix to initialize
+ *\param mx 3D matrix to use
+*/
+void gf_mx2d_from_mx(GF_Matrix2D *mx2d, GF_Matrix *mx);
+
+/*!\brief Plane object*/
+typedef struct
+{
+	/*!normal vector to the plane*/
+	GF_Vec normal;
+	/*!distance from origin of the plane*/
+	Fixed d;
+} GF_Plane;
+/*!\brief matrix plane transformation
+ *
+ *Transorms a plane by a given matrix
+ *\param mx the matrix to use
+ *\param plane pointer to 3D plane. Once the function is called, plane contains the transformed plane
+ */
+void gf_mx_apply_plane(GF_Matrix *mx, GF_Plane *plane);
+/*!\brief point to plane distance
+ *
+ *Gets the distance between a point and a plne
+ *\param plane the plane to use
+ *\param p pointer to ^point to check
+ *\return the distance between the place and the point
+ */
+Fixed gf_plane_get_distance(GF_Plane *plane, GF_Vec *p);
+/*!\brief closest point on a line
+ *
+ *Gets the closest point on a line from a given point in space
+ *\param line_pt a point of the line to test
+ *\param line_vec the normalized direction vector of the line
+ *\param pt the point to check
+ *\return the closest point on the line to the desired point
+ */
+GF_Vec gf_closest_point_to_line(GF_Vec line_pt, GF_Vec line_vec, GF_Vec pt);
+/*!\brief box p-vertex index
+ *
+ *Gets the p-vertex index for a given plane. The p-vertex index is the index of the closest vertex of a bounding box to the plane. The vertices of a box are always 
+ *ordered in GPAC? cf \ref gf_bbox_get_vertices
+ *\param p the plane to check
+ *\return the p-vertex index value, ranging from 0 to 7
+*/
+u32 gf_plane_get_p_vertex_idx(GF_Plane *p);
+/*!\brief plane line intersection
+ *
+ *Checks for the intersection of a plane and a line
+ *\param plane plane to test
+ *\param linepoint a point on the line to test
+ *\param linevec normalized direction vector of the line to test
+ *\param outPoint optional pointer to retrieve the intersection point, NULL otherwise
+ *\return 1 if line and plane intersect, 0 otherwise
+*/
+Bool gf_plane_intersect_line(GF_Plane *plane, GF_Vec *linepoint, GF_Vec *linevec, GF_Vec *outPoint);
+
+/*!Classification types for box/plane position used in \ref gf_bbox_plane_relation*/
+enum 
+{	
+	/*!box is in front of the plane*/
+	GF_BBOX_FRONT,
+	/*!box intersects the plane*/
+	GF_BBOX_INTER,
+	/*!box is back of the plane*/
+	GF_BBOX_BACK
+};
+/*!\brief box-plane relation
+ *
+ *Gets the spatial relation between a box and a plane
+ *\param box the box to check
+ *\param p the plane to check
+ *\return the relation type
+ */
+u32 gf_bbox_plane_relation(GF_BBox *box, GF_Plane *p);
+
+/*!\brief 3D Ray
+ *
+ *The 3D ray object is used in GPAC for all collision and mouse interaction tests
+*/
+typedef struct
+{
+	/*!origin point of the ray*/
+	GF_Vec orig;
+	/*!normalized direction vector of the ray*/
+	GF_Vec dir;
+} GF_Ray;
+
+/*!\brief ray constructor
+ *
+ *Constructs a ray object
+ *\param start starting point of the ray
+ *\param end end point of the ray, or any point on the ray
+ *\return the ray object
+*/
+GF_Ray gf_ray(GF_Vec start, GF_Vec end);
+/*!\brief matrix ray transformation
+ *
+ *Transforms a ray by a given transformation matrix
+ *\param mx the matrix to use
+ *\param r pointer to the ray. Once the function is called, contains the transformed ray
+*/
+void gf_mx_apply_ray(GF_Matrix *mx, GF_Ray *r);
+/*!\brief ray box intersection test
+ *
+ *Checks if a ray intersects a box or not
+ *\param ray the ray to check
+ *\param min_edge the minimum edge of the box to check
+ *\param max_edge the maximum edge of the box to check
+ *\param out_point optional location of a 3D point to store the intersection, NULL otherwise.
+ *\return retuns 1 if the ray intersects the box, 0 otherwise
+*/
+Bool gf_ray_hit_box(GF_Ray *ray, GF_Vec min_edge, GF_Vec max_edge, GF_Vec *out_point);
+/*!\brief ray sphere intersection test
+ *
+ *Checks if a ray intersects a box or not
+ *\param ray the ray to check
+ *\param center the center of the sphere to check. If NULL, the origin (0,0,0)is used
+ *\param radius the radius of the sphere to check
+ *\param out_point optional location of a 3D point to store the intersection, NULL otherwise
+ *\return retuns 1 if the ray intersects the sphere, 0 otherwise
+*/
+Bool gf_ray_hit_sphere(GF_Ray *ray, GF_Vec *center, Fixed radius, GF_Vec *out_point);
+/*!\brief ray triangle intersection test
+ *
+ *Checks if a ray intersects a triangle or not
+ *\param ray the ray to check
+ *\param v0 first vertex of the triangle
+ *\param v1 second vertex of the triangle
+ *\param v2 third vertex of the triangle
+ *\param dist optional location of a fixed number to store the intersection distance from ray origin if any, NULL otherwise
+ *\return retuns 1 if the ray intersects the triangle, 0 otherwise
+*/
+Bool gf_ray_hit_triangle(GF_Ray *ray, GF_Vec *v0, GF_Vec *v1, GF_Vec *v2, Fixed *dist);
+/*same as above and performs backface cull (solid meshes)*/
+/*!\brief ray triangle intersection test
+ *
+ *Checks if a ray intersects a triangle or not, performing backface culling. For parameters details, look at \ref gf_ray_hit_triangle_backcull
+ */
+Bool gf_ray_hit_triangle_backcull(GF_Ray *ray, GF_Vec *v0, GF_Vec *v1, GF_Vec *v2, Fixed *dist);
+
+/*! @} */
+
+/*! @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif		/*_GF_MATH_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/media_tools.h b/tstools/DtsEdit/src/gpac/media_tools.h
new file mode 100644
index 0000000..2842137
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/media_tools.h
@@ -0,0 +1,335 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Authoring Tools sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _GF_MEDIA_H_
+#define _GF_MEDIA_H_
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/isomedia.h>
+#include <gpac/avparse.h>
+
+/*			
+			track importers
+
+	All these can import a file into a dedicated track. If esd is NULL the track is blindly added 
+	otherwise it is added with the requested ESID if non-0, otherwise the new trackID is stored in ESID
+	if use_data_ref is set, data is only referenced in the file
+	if duration is not 0, only the first duration seconds are imported
+	NOTE: if an ESD is specified, its decoderSpecificInfo is also updated
+*/
+/*track importer flags*/
+enum
+{
+	/*references data rather than copy, whenever possible*/
+	GF_IMPORT_USE_DATAREF = 1,
+	/*for AVI video: imports at constant FPS (eg imports N-Vops due to encoder drops)*/
+	GF_IMPORT_NO_FRAME_DROP = 1<<1,
+	/*for CMP ASP only: forces treating the input as packed bitsream and discards all n-vops*/
+	GF_IMPORT_FORCE_PACKED = 1<<2,
+	/*for AAC audio: forces SBR mode with implicit signaling (backward compatible)*/
+	GF_IMPORT_SBR_IMPLICIT = 1<<3,
+	/*for AAC audio: forces SBR mode with explicit signaling (non-backward compatible). 
+	Will override GF_IMPORT_SBR_IMPLICIT flag when set*/
+	GF_IMPORT_SBR_EXPLICIT = 1<<4,
+	/*forces MPEG-4 import - some 3GP2 streams have both native IsoMedia sample description and MPEG-4 one possible*/
+	GF_IMPORT_FORCE_MPEG4 = 1<<5,
+	/*special flag for text import at run time (never set on probe), indicates to leave the text box empty
+	so that we dynamically adapt to display size*/
+	GF_IMPORT_SKIP_TXT_BOX = 1<<6,
+	/*indicates to keep unknown tracks from .MOV/.IsoMedia files*/
+	GF_IMPORT_KEEP_ALL_TRACKS = 1<<7,
+	/*uses compact size in .MOV/.IsoMedia files*/
+	GF_IMPORT_USE_COMPACT_SIZE = 1<<8,
+	
+	/*when set, only updates tracks info and return*/
+	GF_IMPORT_PROBE_ONLY	= 1<<20,
+	/*only set when probing, signals several frames per sample possible*/
+	GF_IMPORT_3GPP_AGGREGATION = 1<<21,
+	/*only set when probing, signals video FPS overridable*/
+	GF_IMPORT_OVERRIDE_FPS = 1<<22,
+	/*only set when probing, signals duration not usable*/
+	GF_IMPORT_NO_DURATION = 1<<23,
+	/*when set by user during import, will abort*/
+	GF_IMPORT_DO_ABORT = 1<<31
+};
+
+#define GF_IMPORT_MAX_TRACKS	100
+struct __track_video_info
+{
+	u32 width, height, par;
+	Double FPS;
+};
+struct __track_audio_info
+{
+	u32 sample_rate, nb_channels;
+};
+
+struct __track_import_info
+{
+	u32 track_num;
+	/*track type (GF_ISOM_MEDIA_****)*/
+	u32 type;
+	/*media type ('MPG1', 'MPG2', ISO 4CC, AVI 4CC)*/
+	u32 media_type;
+	/*possible import flags*/
+	u32 flags;
+	/*media format info*/
+	struct __track_video_info video_info;
+	struct __track_audio_info audio_info;
+
+	u32 lang;
+	/*for MPEG2 TS: program number*/
+	u16 prog_num;
+};
+
+struct __program_import_info
+{
+	u32 number;
+	char name[40];
+};
+
+/*track dumper*/
+typedef struct __track_import
+{
+	GF_ISOFile *dest;
+	/*media to import:
+		MP4/ISO media: trackID
+		AVI files: 
+			0: first video and first audio,
+			1: video track
+			2->any: audio track(s)
+		MPEG-PS files with N video streams: 
+			0: first video and first audio
+			1->N: video track
+			N+1->any: audio track
+	TrackNums can be obtain with probing
+	*/
+	u32 trackID;
+	/*media source - selects importer type based on extension*/
+	char *in_name;
+	/*import duration if any*/
+	u32 duration;
+	/*importer flags*/
+	u32 flags;
+	/*if non 0, force video FPS (CMP, AVI, OGG, H264) - also used by SUB import*/
+	Double video_fps;
+	/*optional ESD*/
+	GF_ESD *esd;
+	/*optional format indication for media source (used in IM1)*/
+	char *streamFormat;
+	/*frame per sample cumulation (3GP media only) - MAX 15, ignored in data ref*/
+	u32 frames_per_sample;
+	/*track ID of imported media in destination file*/
+	u32 final_trackID;
+	
+	/*for MP4 import only*/
+	GF_ISOFile *orig;
+
+	/*for text import*/
+	u32 fontSize;
+	char *fontName;
+
+	/*number of tracks after probing - may be set to 0, in which case no track 
+	selection can be performed. It may also be inaccurate if probing doesn't
+	detect all available tracks (cf ogg import)*/
+	u32 nb_tracks;
+	/*track info after probing (GF_IMPORT_PROBE_ONLY set).*/
+	struct __track_import_info tk_info[GF_IMPORT_MAX_TRACKS];
+
+	/*for MPEG-TS and similar: program names*/
+	u32 nb_progs;
+	struct __program_import_info pg_info[GF_IMPORT_MAX_TRACKS];
+
+	GF_Err last_error;
+} GF_MediaImporter;
+
+GF_Err gf_media_import(GF_MediaImporter *importer);
+
+enum
+{
+	/*track dumper types are formatted as flags for conveniency for 
+	authoring tools, but never used as a OR'ed set*/
+	/*native format (JPG, PNG, MP3, etc) if supported*/
+	GF_EXPORT_NATIVE = 1,
+	/*raw samples (including hint tracks for rtp)*/
+	GF_EXPORT_RAW_SAMPLES = (1<<1),
+	/*NHNT format (any MPEG-4 media)*/
+	GF_EXPORT_NHNT = (1<<2),
+	/*AVI (MPEG4 video and AVC tracks only)*/
+	GF_EXPORT_AVI = (1<<3),
+	/*MP4 (all except OD)*/
+	GF_EXPORT_MP4 = (1<<4),
+	/*AVI->RAW to dump video (trackID=1) or audio (trackID>=2)*/
+	GF_EXPORT_AVI_NATIVE = (1<<5),
+	/*NHML format (any media)*/
+	GF_EXPORT_NHML = (1<<6),
+	/*SAF format*/
+	GF_EXPORT_SAF = (1<<7),
+
+	/*following ones are real flags*/
+	/*
+	for MP4 extraction, indicates track should be added to dest file if any
+	for raw extraction, indicates data shall be appended at the end of output file if present
+	*/
+	GF_EXPORT_MERGE = (1<<10),
+	/*indicates QCP file format possible as well as native (EVRC and SMV audio only)*/
+	GF_EXPORT_USE_QCP = (1<<11),
+	/*indicates full NHML dump*/
+	GF_EXPORT_NHML_FULL = (1<<11),
+	/*ony probes extraction format*/
+	GF_EXPORT_PROBE_ONLY = (1<<30),
+	/*when set by user during export, will abort*/
+	GF_EXPORT_DO_ABORT = (1<<31),
+};
+
+/*track dumper*/
+typedef struct __track_exporter
+{
+	GF_ISOFile *file;
+	u32 trackID;
+	/*sample number to export for GF_EXPORT_RAW_SAMPLES only*/
+	u32 sample_num;
+	/*out name WITHOUT extension*/
+	char *out_name;
+	/*dump type*/
+	u32 flags;
+	/*non-IsoMedia file (AVI)*/
+	char *in_name;
+} GF_MediaExporter;
+
+/*if error returns same value as error signaled in message*/
+GF_Err gf_media_export(GF_MediaExporter *dump);
+
+
+
+/*
+	RTP IsoMedia file hinting
+*/
+typedef struct __tag_isom_hinter GF_RTPHinter;
+
+GF_RTPHinter *gf_hinter_track_new(GF_ISOFile *file, u32 TrackNum, 
+							u32 Path_MTU, u32 max_ptime, u32 default_rtp_rate, u32 hint_flags, u8 PayloadID, 
+							Bool copy_media, u32 InterleaveGroupID, u8 InterleaveGroupPriority, GF_Err *e);
+/*delete the track hinter*/
+void gf_hinter_track_del(GF_RTPHinter *tkHinter);
+/*hints all samples in the media track*/
+GF_Err gf_hinter_track_process(GF_RTPHinter *tkHint);
+/*returns media bandwidth in kbps*/
+u32 gf_hinter_track_get_bandwidth(GF_RTPHinter *tkHinter);
+/*retrieves hinter flags*/
+u32 gf_hinter_track_get_flags(GF_RTPHinter *tkHinter);
+/*retrieves rtp payload name 
+	@payloadName: static buffer for retrieval, minimum 30 bytes
+*/
+void gf_hinter_track_get_payload_name(GF_RTPHinter *tkHint, char *payloadName);
+
+/*finalizes hinting process for the track (setup flags, write SDP for RTP, ...)
+	@AddSystemInfo: if non-0, systems info are duplicated in the SDP (decoder cfg, PL IDs ..)
+*/
+GF_Err gf_hinter_track_finalize(GF_RTPHinter *tkHint, Bool AddSystemInfo);
+
+/*SDP IOD flag*/
+enum
+{
+	/*no IOD included*/
+	GF_SDP_IOD_NONE = 0,
+	/*base64 encoding of the regular MPEG-4 IOD*/
+	GF_SDP_IOD_REGULAR,
+	/*base64 encoding of IOD containing BIFS and OD tracks (one AU only) - this is used for ISMA 1.0 profiles
+	note that the "hinted" file will loose all systems info*/
+	GF_SDP_IOD_ISMA,
+	/*same as ISMA but removes all clock references from IOD*/
+	GF_SDP_IOD_ISMA_STRICT,
+};
+
+/*finalizes hinting process for the file (setup flags, write SDP for RTP, ...)
+	@IOD_Profile: see above
+	@bandwidth: total bandwidth in kbps of all hinted tracks, 0 means no bandwidth info at session level
+*/
+GF_Err gf_hinter_finalize(GF_ISOFile *file, u32 IOD_Profile, u32 bandwidth);
+
+
+/*returns TRUE if the encoded data fits in an ESD url - streamType is the systems stream type needed to
+signal data mime-type (OD, BIFS or any) */
+Bool gf_hinter_can_embbed_data(char *data, u32 data_size, u32 streamType);
+
+/*save file as fragmented movie*/
+GF_Err gf_media_fragment_file(GF_ISOFile *input, char *output_file, Double MaxFragmentDuration);
+
+/*adds chapter info contained in file - import_fps is optional (most formats don't use it), defaults to 25*/
+GF_Err gf_media_import_chapters(GF_ISOFile *file, char *chap_file, Double import_fps);
+
+
+/*make the file ISMA compliant: creates ISMA BIFS / OD tracks if needed, and update audio/video IDs
+the file should not contain more than one audio and one video track
+@keepImage: if set, generates system info if image is found - only used for image imports
+*/
+GF_Err gf_media_make_isma(GF_ISOFile *mp4file, Bool keepESIDs, Bool keepImage, Bool no_ocr);
+
+/*make the file 3GP compliant && sets profile
+*/
+GF_Err gf_media_make_3gpp(GF_ISOFile *mp4file);
+
+/*make the file playable on a PSP
+*/
+GF_Err gf_media_make_psp(GF_ISOFile *mp4file);
+
+/*creates (if needed) a GF_ESD for the given track - THIS IS RESERVED for local playback
+only, since the OTI used when emulated is not standard...*/
+GF_ESD *gf_media_map_esd(GF_ISOFile *mp4, u32 track);
+
+/*changes pixel aspect ratio for visual tracks if supported. Negative values remove any PAR info*/
+GF_Err gf_media_change_par(GF_ISOFile *file, u32 track, s32 ar_num, s32 ar_den);
+
+
+/*SAF Multiplexer object. The multiplexer supports concurencial (multi-threaded) access*/
+typedef struct __saf_muxer GF_SAFMuxer;
+/*SAF Multiplexer constructor*/
+GF_SAFMuxer *gf_saf_mux_new();
+/*SAF Multiplexer destructor*/
+void gf_saf_mux_del(GF_SAFMuxer *mux);
+/*adds a new stream in the SAF multiplex*/
+GF_Err gf_saf_mux_stream_add(GF_SAFMuxer *mux, u32 stream_id, u32 ts_res, u32 buffersize_db, u8 stream_type, u8 object_type, char *mime_type, char *dsi, u32 dsi_len, char *remote_url);
+/*removes a stream from the SAF multiplex*/
+GF_Err gf_saf_mux_stream_rem(GF_SAFMuxer *mux, u32 stream_id);
+/*adds an AU to the given stream. !!AU data will be freed by the multiplexer!! 
+AUs are not reinterleaved based on their CTS, in order to enable audio interleaving
+*/
+GF_Err gf_saf_mux_add_au(GF_SAFMuxer *mux, u32 stream_id, u32 CTS, char *data, u32 data_len, Bool is_rap);
+/*gets the content of the multiplexer for the given time.
+if force_end_of_session is set, this flushes the SAF Session - no more operations will be allowed on the muxer*/
+GF_Err gf_saf_mux_for_time(GF_SAFMuxer *mux, u32 time_ms, Bool force_end_of_session, char **out_data, u32 *out_size);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif	/*_GF_MEDIA_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/mediaobject.h b/tstools/DtsEdit/src/gpac/mediaobject.h
new file mode 100644
index 0000000..2dc23b0
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/mediaobject.h
@@ -0,0 +1,149 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Stream Management sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+
+#ifndef _GF_MEDIA_OBJECT_H_
+#define _GF_MEDIA_OBJECT_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/scenegraph_vrml.h>
+
+
+/*
+		Media Object
+
+  opaque handler for all natural media objects (audio, video, image) so that compositor and systems engine
+are not too tied up. 
+	NOTE: the media object location relies on the node parent graph (this is to deal with namespaces in OD framework)
+therefore it is the task of the media management app to setup clear links between the scene graph and its ressources
+(but this is not mandatory, cf URLs in VRML )
+
+	TODO - add interface for shape coding positioning in mediaObject and in the decoder API
+*/
+
+typedef struct _mediaobj GF_MediaObject;
+
+/*locate media object related to the given node - url designes the object to find - returns NULL if
+URL cannot be handled - note that until the mediaObject.isInit member is true, the media object is not valid
+(and could actually never be) */
+GF_MediaObject *gf_mo_register(GF_Node *node, MFURL *url, Bool lock_timelines);
+/*unregister the node from the media object*/
+void gf_mo_unregister(GF_Node *node, GF_MediaObject *mo);
+
+/*opens media object*/
+void gf_mo_play(GF_MediaObject *mo, Double clipBegin, Double clipEnd, Bool can_loop);
+/*stops media object - video memory is not reset, last frame is kept*/
+void gf_mo_stop(GF_MediaObject *mo);
+/*restarts media object - shall be used for all looping media instead of stop/play for mediaControl
+to restart appropriated objects*/
+void gf_mo_restart(GF_MediaObject *mo);
+
+void gf_mo_pause(GF_MediaObject *mo);
+void gf_mo_resume(GF_MediaObject *mo);
+
+/*
+	Note on mediaControl: mediaControl is the media management app responsability, therefore
+is hidden from the rendering app. Since MediaControl overrides default settings of the node (speed and loop)
+you must use the gf_mo_get_speed and gf_mo_get_loop in order to know whether the related field applies or not
+*/
+
+/*set speed of media - speed is not always applied, depending on media control settings.
+NOTE: audio pitching is the responsability of the rendering app*/
+void gf_mo_set_speed(GF_MediaObject *mo, Fixed speed);
+/*returns current speed of media - in_speed is the speed of the media as set in the node (MovieTexture, 
+AudioClip and AudioSource) - the return value is the real speed of the media as overloaded by mediaControl if any*/
+Fixed gf_mo_get_speed(GF_MediaObject *mo, Fixed in_speed);
+/*returns looping flag of media - in_loop is the looping flag of the media as set in the node (MovieTexture, 
+AudioClip) - the return value is the real loop flag of the media as overloaded by mediaControl if any*/
+Bool gf_mo_get_loop(GF_MediaObject *mo, Bool in_loop);
+/*returns media object duration*/
+Double gf_mo_get_duration(GF_MediaObject *mo);
+/*returns whether the object should be deactivated (stop) or not - this checks object status as well as 
+mediaControl status */
+Bool gf_mo_should_deactivate(GF_MediaObject *mo);
+/*checks whether the target object is changed - you MUST use this in order to detect url changes*/
+Bool gf_mo_url_changed(GF_MediaObject *mo, MFURL *url);
+
+
+/*fetch media data 
+
+*/
+char *gf_mo_fetch_data(GF_MediaObject *mo, Bool resync, Bool *eos, u32 *timestamp, u32 *size);
+
+/*release given amount of media data - nb_bytes is used for audio - if forceDrop is set, the unlocked frame will be 
+droped if all bytes are consumed, otherwise it will be droped based on object time - typically, video fetches with the resync
+flag set and release without forceDrop, while audio fetches without resync but forces buffer drop. If forceDrop is set to 2, 
+the frame will be stated as a discraded frame*/
+void gf_mo_release_data(GF_MediaObject *mo, u32 nb_bytes, s32 forceDrop);
+/*get media time*/
+void gf_mo_get_media_time(GF_MediaObject *mo, u32 *media_time, u32 *media_dur);
+/*get object clock*/
+void gf_mo_get_object_time(GF_MediaObject *mo, u32 *obj_time);
+/*returns mute flag of media - if muted the media shouldn't be displayed*/
+Bool gf_mo_is_muted(GF_MediaObject *mo);
+/*returns end of stream state*/
+Bool gf_mo_is_done(GF_MediaObject *mo);
+/*resyncs clock - only audio objects are allowed to use this*/
+void gf_mo_adjust_clock(GF_MediaObject *mo, s32 ms_drift);
+
+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_audio_info(GF_MediaObject *mo, u32 *sample_rate, u32 *bits_per_sample, u32 *num_channels, u32 *channel_config);
+
+/*checks if the service associated withthis object has an audio stream*/
+Bool gf_mo_has_audio(GF_MediaObject *mo);
+
+enum
+{
+	/*this is set to 0 by the OD manager whenever a change occur in the media (w/h change, SR change, etc) 
+	as a hint for the compositor*/
+	GF_MO_IS_INIT = (1<<1),
+	/*used by animation stream to remove TEXT from display upon delete and URL change*/
+	GF_MO_DISPLAY_REMOVE = (1<<2),
+};
+
+u32 gf_mo_get_flags(GF_MediaObject *mo);
+void gf_mo_set_flag(GF_MediaObject *mo, u32 flag, Bool set_on);
+
+/*loads a new resource as indicated in the xlink:href attribute of the node. If this points to a fragment
+of the current document, returns NULL. This will automatically trigger a play request on the resource*/
+GF_MediaObject *gf_mo_load_xlink_resource(GF_Node *node, Bool primary_resource, Double clipBegin, Double clipEnd);
+void gf_mo_unload_xlink_resource(GF_Node *node, GF_MediaObject *mo);
+/*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);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif	/*_GF_MEDIA_OBJECT_H_*/
+
+
diff --git a/tstools/DtsEdit/src/gpac/module.h b/tstools/DtsEdit/src/gpac/module.h
new file mode 100644
index 0000000..5d2bfd0
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/module.h
@@ -0,0 +1,235 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / common tools sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _GF_MODULE_H_
+#define _GF_MODULE_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!
+ *	\file <gpac/module.h>
+ *	\brief plugable module functions.
+ */
+
+/*!
+ *	\addtogroup mods_grp plugable modules
+ *	\ingroup utils_grp
+ *	\brief Plugable Module functions
+ *
+ *This section documents the plugable module functions of the GPAC framework.
+ *A module is a dynamic/shared library providing one or several interfaces to the GPAC framework.
+ *A module cannot provide several interfaces of the same type. Each module must export the following functions:
+ \code
+ *	Bool QueryInterface(u32 interface_type);
+ \endcode
+ *	This function is used to query supported interfaces. It returns non zero if the module handles this interface type, 0 otherwise.\n
+ \code
+ 	GF_BaseInterface *LoadInterface(u32 interface_type);
+ \endcode
+ *	This function is used to load an interface. It returns the interface object, NULL if error.\n
+ \code
+ 	void ShutdownInterface(GF_BaseInterface *interface);
+ \endcode
+ *This function is used to destroy an interface.\n\n
+ *Each interface must begin with the interface macro in order to be type-casted to the base interface structure.
+ \code
+	struct {
+		GF_DECL_MODULE_INTERFACE
+		extensions;
+	};
+ \endcode
+ *	@{
+ */
+
+#include <gpac/config_file.h>
+
+typedef struct __tag_mod_man GF_ModuleManager;
+
+/*!
+ *\brief common module interface
+ *\hideinitializer
+ *
+ *This is the module interface declaration macro. It must be placed first in an interface structure declaration.
+*/
+#define GF_DECL_MODULE_INTERFACE	\
+	u32 InterfaceType;				\
+	const char *module_name;		\
+	const char *author_name;		\
+	void *HPLUG;					\
+
+/*!
+ *\brief Base Interface
+ *
+ *This structure represent a base interface, e.g. the minimal interface declaration without functionalities. Each interface is
+ *type-casted to this structure and shall always be checked against its interface type. API Versioning is taken care of in the 
+ *interface type itsel, changing at each modification of the interface API
+ */
+typedef struct
+{
+	GF_DECL_MODULE_INTERFACE
+} GF_BaseInterface;
+
+/*!
+ *\brief module interface registration
+ *\hideinitializer
+ *
+ *This is the module interface registration macro. A module must call this macro whenever creating a new interface.
+ *- \e _ifce: interface being registered
+ *- \e _ifce_type: the four character code defining the interface type.
+ *- \e _ifce_name: a printable string giving the interface name (const char *).
+ *- \e _ifce_author: a printable string giving the author name (const char *).
+ *\n
+ *This is a sample GPAC codec interface declaration:
+ \code
+GF_BaseInterface *MyDecoderInterfaceLoad() {
+	GF_MediaDecoder *ifce;
+	GF_SAFEALLOC(ifce, GF_MediaDecoder);
+	GF_REGISTER_MODULE_INTERFACE(ifce, GF_MEDIA_DECODER_INTERFACE, "Sample Decoder", "The Author")
+	//follows any initialization private to the decoder
+	return (GF_BaseInterface *)ifce;
+}
+ \endcode
+*/
+#define GF_REGISTER_MODULE_INTERFACE(_ifce, _ifce_type, _ifce_name, _ifce_author) \
+	_ifce->InterfaceType = _ifce_type;	\
+	_ifce->module_name = _ifce_name ? _ifce_name : "unknown";	\
+	_ifce->author_name = _ifce_author ? _ifce_author : "gpac distribution";	\
+	
+/*!
+ *\brief module manager construtcor
+ *
+ *Constructs a module manager object.
+ *\param directory absolute path to the directory where the manager shall look for modules
+ *\param cfgFile GPAC configuration file handle. If this is NULL, the modules won't be able to share the configuration
+ *file with the rest of the GPAC framework.
+ *\return the module manager object
+*/
+GF_ModuleManager *gf_modules_new(const char *directory, GF_Config *cfgFile);
+/*!
+ *\brief module manager destructor
+ *
+ *Destroys the module manager
+ *\param pm the module manager
+ */
+void gf_modules_del(GF_ModuleManager *pm);
+/*!
+ *\brief refreshes modules
+ *
+ *Refreshes all modules in the manager directory and load unloaded ones
+ *\param pm the module manager
+ *\return the number of loaded modules
+ */
+u32 gf_modules_refresh(GF_ModuleManager *pm);
+
+/*!
+ *\brief get module count
+ *
+ *Gets the number of modules found in the manager directory
+ *\param pm the module manager
+ *\return the number of loaded modules
+ */
+u32 gf_modules_get_count(GF_ModuleManager *pm);
+
+/*!
+ *\brief get module file name
+ *
+ *Gets a module shared library file name based on its index
+ *\param pm the module manager
+ *\param index the 0-based index of the module to query
+ *\return the name of the shared library module
+ */
+const char *gf_modules_get_file_name(GF_ModuleManager *pm, u32 index);
+
+/*!
+ *\brief loads an interface
+ *
+ *Loads an interface in the desired module.
+ *\param pm the module manager
+ *\param index the 0-based index of the module to load the interface from
+ *\param InterfaceFamily type of the interface to load
+ *\return the interface object if found and loaded, NULL otherwise.
+ */
+GF_BaseInterface *gf_modules_load_interface(GF_ModuleManager *pm, u32 index, u32 InterfaceFamily);
+
+/*!
+ *\brief loads an interface by module name
+ *
+ *Loads an interface in the desired module
+ *\param pm the module manager
+ *\param mod_name the name of the module (shared library file) or of the interface as declared when registered.
+ *\param InterfaceFamily type of the interface to load
+ *\return the interface object if found and loaded, NULL otherwise.
+ */
+GF_BaseInterface *gf_modules_load_interface_by_name(GF_ModuleManager *pm, const char *mod_name, u32 InterfaceFamily);
+
+/*!
+ *\brief interface shutdown
+ *
+ *Closes an interface
+ *\param interface_obj the interface to close
+ */
+GF_Err gf_modules_close_interface(GF_BaseInterface *interface_obj);
+
+/*!
+ *\brief interface option query
+ *
+ *Gets an option from the config file associated with the module manager 
+ *\param interface_obj the interface object used
+ *\param secName the desired key parent section name
+ *\param keyName the desired key name
+ *\return the desired key value if found, NULL otherwise.
+ */
+const char *gf_modules_get_option(GF_BaseInterface *interface_obj, const char *secName, const char *keyName);
+/*!
+ *\brief interface option update
+ *
+ *Sets an option in the config file associated with the module manager 
+ *\param interface_obj the interface object used
+ *\param secName the desired key parent section name
+ *\param keyName the desired key name
+ *\param keyValue the desired key value
+ *\note this will also create both section and key if they are not found in the configuration file
+ */
+GF_Err gf_modules_set_option(GF_BaseInterface *interface_obj, const char *secName, const char *keyName, const char *keyValue);
+
+/*!
+ *\brief get config fiole
+ *
+ *Gets the configuration file for the module instance
+ *\param interface_obj the interface object used
+ *\return handle to the config file
+ */
+GF_Config *gf_modules_get_config(GF_BaseInterface *ifce);
+
+/*! @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif		/*_GF_MODULE_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/modules/audio_out.h b/tstools/DtsEdit/src/gpac/modules/audio_out.h
new file mode 100644
index 0000000..66c40b5
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/modules/audio_out.h
@@ -0,0 +1,133 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / modules interfaces
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+/*
+
+		Note on video driver: this is not a graphics driver, the only thing requested from this driver
+	is accessing video memory and performing stretch of YUV and RGB on the backbuffer (bitmap node)
+	the graphics driver is a different entity that performs 2D rasterization
+
+*/
+
+#ifndef _GF_MODULE_AUDIO_OUT_H_
+#define _GF_MODULE_AUDIO_OUT_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*include event system*/
+#include <gpac/module.h>
+
+
+/*
+	Audio hardware output module
+*/
+
+/*interface name and version for audio output*/
+#define GF_AUDIO_OUTPUT_INTERFACE		GF_4CC('G','A','O', 0x03)
+
+/*interface returned on query interface*/
+typedef struct _audiooutput
+{
+	/* interface declaration*/
+	GF_DECL_MODULE_INTERFACE
+
+	/*setup system 
+		Win32: os_handle is HWND
+
+	if num_buffer is set, the audio driver should work with num_buffers with a total amount of audio data
+	equal to total_duration ms
+	if not set the driver is free to decide what to do
+	*/
+	GF_Err (*Setup) (struct _audiooutput *aout, void *os_handle, u32 num_buffers, u32 total_duration);
+
+	/*shutdown system */
+	void (*Shutdown) (struct _audiooutput *aout);
+
+	/*query output frequency available - if the requested sampleRate is not available, the driver shall return the best 
+	possible sampleRate able to handle NbChannels and NbBitsPerSample - if it doesn't handle the NbChannels
+	the internal mixer will do it
+	*/
+	GF_Err (*QueryOutputSampleRate)(struct _audiooutput *aout, u32 *io_desired_samplerate, u32 *io_NbChannels, u32 *io_nbBitsPerSample);
+
+	/*set output config - if audio is not running, driver must start it
+	*SampleRate, *NbChannels, *nbBitsPerSample: 
+		input: desired value
+		output: final values
+	channel_cfg is the channels output cfg, eg set of flags as specified in constants.h
+	*/
+	GF_Err (*ConfigureOutput) (struct _audiooutput *aout, u32 *SampleRate, u32 *NbChannels, u32 *nbBitsPerSample, u32 channel_cfg);
+
+	/*returns total buffer size used in ms. This is needed to compute the min size of audio decoders output*/
+	u32 (*GetTotalBufferTime)(struct _audiooutput *aout);
+
+	/*returns audio delay in ms, eg time delay until written audio data is outputed by the sound card
+	This function is only called after ConfigureOuput*/ 
+	u32 (*GetAudioDelay)(struct _audiooutput *aout);
+
+	/*set output volume(between 0 and 100) */
+	void (*SetVolume) (struct _audiooutput *aout, u32 Volume);
+	/*set balance (between 0 and 100, 0=full left, 100=full right)*/
+	void (*SetPan) (struct _audiooutput *aout, u32 pan);
+	/*freezes soundcard flow - must not be NULL for self threaded
+		PlayType: 0: pause, 1: resume, 2: reset HW buffer and play.
+	*/
+	void (*Play) (struct _audiooutput *aout, u32 PlayType);
+	/*specifies whether the driver relies on the app to feed data or runs standalone*/
+	Bool SelfThreaded;
+
+	/*if not using private thread, this should perform sleep & fill of HW buffer
+		the audio render loop in this case is: while (run) {driver->WriteAudio(); if (reconf) Reconfig();}
+	the driver must therefore give back the hand to the renderer as often as possible - the usual way is:
+		gf_sleep untill hw data can be written
+		write HW data
+		return
+	*/
+	void (*WriteAudio)(struct _audiooutput *aout);
+
+	/*if using private thread the following MUST be provided*/
+	void (*SetPriority)(struct _audiooutput *aout, u32 priority);
+
+	/*your private data handler - should be allocated when creating the interface object*/
+	void *opaque;
+	
+	/*these are assigned by the audio renderer once module is loaded*/
+	
+	/*fills the buffer with audio data, returns effective bytes written - the rest is filled with 0*/
+	u32 (*FillBuffer) (void *audio_renderer, char *buffer, u32 buffer_size);
+	void *audio_renderer;
+
+} GF_AudioOutput;
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif	/*_GF_MODULE_AUDIO_OUT_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/modules/codec.h b/tstools/DtsEdit/src/gpac/modules/codec.h
new file mode 100644
index 0000000..df28e92
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/modules/codec.h
@@ -0,0 +1,231 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / modules interfaces
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+
+#ifndef _GF_MODULE_CODEC_H_
+#define _GF_MODULE_CODEC_H_
+
+
+#include <gpac/module.h>
+#include <gpac/mpeg4_odf.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*multimedia processing levels*/
+enum
+{
+	/*normal, full processing*/
+	GF_CODEC_LEVEL_NORMAL,
+	/*codec is late, should scale down processing*/
+	GF_CODEC_LEVEL_LATE,
+	/*codec is very late, should turn off post-processing, even drop*/
+	GF_CODEC_LEVEL_VERY_LATE,
+	/*input frames are already late before decoding*/
+	GF_CODEC_LEVEL_DROP,
+	/*this is a special level indicating that a seek is happening (decode but no dispatch)
+	it is set dynamically*/
+	GF_CODEC_LEVEL_SEEK
+};
+
+/*the structure for capabilities*/
+typedef struct 
+{
+	/*cap code cf below*/
+	u16 CapCode;
+	union {
+		u32 valueInt;
+		Float valueFloat;
+	} cap;
+} GF_CodecCapability;
+
+
+/*
+			all codecs capabilities
+*/
+
+enum
+{
+	/*size of a single composition unit */
+	GF_CODEC_OUTPUT_SIZE =	0x01,
+	/*resilency: if packets are lost within an AU, resilience means the AU won't be discarded and the codec
+	will try to decode */
+	GF_CODEC_RESILIENT,
+	/*critical level of composition memory - if below, media management for the object */
+	GF_CODEC_BUFFER_MIN,
+	/*maximum size in CU of composition memory */
+	GF_CODEC_BUFFER_MAX,
+	/*flags that all AUs should be discarded till next RAP (needed in case RAPs are not carried by the transport
+	protocol */
+	GF_CODEC_WAIT_RAP,
+	/*number of padding bytes needed - if the decoder needs padding input cannot be pulled and data is duplicated*/
+	GF_CODEC_PADDING_BYTES,
+	/*codecs can be threaded at will - by default a single thread is used for all decoders and priority is handled
+	by the app, but a codec can configure itself to run in a dedicated thread*/
+	GF_CODEC_WANTS_THREAD,
+
+	/*video width and height and horizontal pitch (in YV12 we assume half Y pitch for U and V planes) */
+	GF_CODEC_WIDTH,
+	GF_CODEC_HEIGHT,
+	GF_CODEC_STRIDE,
+	GF_CODEC_FPS,
+	/*Pixel Aspect Ratio, expressed as (par.num<<16) | par.den*/
+	GF_CODEC_PAR,
+	/*video color mode - color modes are defined in constants.h*/
+	GF_CODEC_PIXEL_FORMAT,
+	/*isgnal decoder performs frame re-ordering in temporal scalability*/
+	GF_CODEC_REORDER,
+	
+	/*Audio sample rate*/
+	GF_CODEC_SAMPLERATE,
+	/*Audio num channels*/
+	GF_CODEC_NB_CHAN,
+	/*Audio bps*/
+	GF_CODEC_BITS_PER_SAMPLE,
+	/*audio frame format*/
+	GF_CODEC_CHANNEL_CONFIG,
+	/*this is only used for audio in case transport mapping relies on sampleRate (RTP)
+	gets the CU duration in samplerate unit (type: int) */
+	GF_CODEC_CU_DURATION,
+
+	/*This is only called on scene decoders to signal that potential overlay scene should be 
+	showed (cap.valueINT=1) or hidden (cap.valueINT=0). Currently only used with SetCap*/
+	GF_CODEC_SHOW_SCENE,
+	/*This is only called on scene decoders, GetCap only. If the decoder may continue modifying the scene once the last AU is received,
+	it must set cap.valueINT to 1 (typically, text stream decoder will hold the scene for a given duration
+	after the last AU). Otherwise the decoder will be stoped and ask to remove any extra scene being displayed*/
+	GF_CODEC_MEDIA_NOT_OVER,
+};
+
+
+	/* Generic interface used by both media decoders and scene decoders
+@AttachStream:
+	Add a Stream to the codec. If DependsOnESID is NULL, the stream is a base layer
+	UpStream means that the decoder should send feedback on this channel. 
+	WARNING: Feedback format is not standardized by MPEG
+	the same API is used for both encoder and decoder (decSpecInfo is ignored
+	for an encoder) 
+@DetachStream:
+	Remove stream
+@GetCapabilities:
+	Get the desired capability given its code
+@SetCapabilities
+	Set the desired capability given its code if possible
+	if the codec does not support the request capability, return GF_NOT_SUPPORTED
+@CanHandleStream
+	Can module handle this codec? Return 0 if No and !0 otherwise
+	decoderSpecificInfo is provided for MPEG4 audio/visual where a bunch of codecs are defined 
+	with same objectType
+@GetDecoderName
+	returns codec name - only called once the stream is successfully attached
+@privateStack
+	user defined.
+*/
+
+#define GF_CODEC_BASE_INTERFACE(IFCE_NAME)		\
+	GF_DECL_MODULE_INTERFACE	\
+	GF_Err (*AttachStream)(IFCE_NAME, GF_ESD *esd);\
+	GF_Err (*DetachStream)(IFCE_NAME, u16 ES_ID);\
+	GF_Err (*GetCapabilities)(IFCE_NAME, GF_CodecCapability *capability);\
+	GF_Err (*SetCapabilities)(IFCE_NAME, GF_CodecCapability capability);\
+	Bool (*CanHandleStream)(IFCE_NAME, u32 StreamType, u32 ObjectType, char *decSpecInfo, u32 decSpecInfoSize, u32 PL);\
+	const char *(*GetName)(IFCE_NAME);\
+	void *privateStack;	\
+
+
+typedef struct _basedecoder
+{
+	GF_CODEC_BASE_INTERFACE(struct _basedecoder *)
+} GF_BaseDecoder;
+
+/*interface name and version for media decoder */
+#define GF_MEDIA_DECODER_INTERFACE		GF_4CC('G', 'M', 'D', 0x02)
+
+/*the media module interface. A media module MUST be implemented in synchronous mode as time 
+and resources management is done by the terminal*/
+typedef struct _mediadecoder
+{
+	GF_CODEC_BASE_INTERFACE(struct _basedecoder *)
+
+	/*Process the media data in inAU. 
+	@inBuffer, inBufferLength: encoded input data (complete framing of encoded data)
+	@ES_ID: stream this data belongs too (scalable object)
+	@outBuffer, outBufferLength: allocated data for decoding - if outBufferLength is not enough
+		you must set the size in outBufferLength and GF_BUFFER_TOO_SMALL 
+
+	@PaddingBits is the padding at the end of the buffer (some codecs need this info)
+	@mmlevel: speed indicator for the decoding - cf above for values*/
+	GF_Err (*ProcessData)(struct _mediadecoder *, 
+			char *inBuffer, u32 inBufferLength,
+			u16 ES_ID,
+			char *outBuffer, u32 *outBufferLength,
+			u8 PaddingBits, u32 mmlevel);
+} GF_MediaDecoder;
+
+
+
+typedef struct _inline_scene *LPINLINESCENE;
+
+/*interface name and version for scene decoder */
+#define GF_SCENE_DECODER_INTERFACE		GF_4CC('G', 'S', 'D', 0x02)
+
+typedef struct _scenedecoder
+{
+	GF_CODEC_BASE_INTERFACE(struct _basedecoder *)
+	
+	/*attaches scene to the decoder - a scene may be attached to several decoders of several types
+	(BIFS or others scene dec, ressource decoders (OD), etc. 
+	is: inline scene owning graph (and not just graph), defined in intern/terminal_dev.h. With inline scene
+	the complete terminal is exposed so there's pretty much everything doable in a scene decoder
+	@is_scene_root: set to true if this decoder is the root of the scene, false otherwise (either another decoder
+	or a re-entrant call, cf below)
+	This is called once upon creation of the decoder (several times if re-entrant)
+	*/
+	GF_Err (*AttachScene)(struct _scenedecoder *, LPINLINESCENE is, Bool is_scene_root);
+	/*releases scene. If the decoder manages nodes / resources in the scene, 
+	THESE MUST BE DESTROYED. May be NULL if decoder doesn't manage nodes but only create them (like BIFS, OD) and
+	doesn't have to be instructed the scene is about to be resumed
+	This is called each time the scene is about to be reseted (eg, seek and destroy)
+	*/
+	GF_Err (*ReleaseScene)(struct _scenedecoder *);
+	/*Process the scene data in inAU. 
+	@inBuffer, inBufferLength: encoded input data (complete framing of encoded data)
+	@ES_ID: stream this data belongs too (scalable object)
+	@AU_Time: specifies the current AU time. This is usually unused, however is needed for decoder
+	handling the scene graph without input data (cf below). In this case the buffer passed is always NULL and the AU
+	time caries the time of the scene (or of the stream object attached to the scene decoder, cf below)
+	@mmlevel: speed indicator for the decoding - cf above for values*/
+	GF_Err (*ProcessData)(struct _scenedecoder *, char *inBuffer, u32 inBufferLength,
+					u16 ES_ID, u32 AU_Time, u32 mmlevel);
+
+} GF_SceneDecoder;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/*_GF_MODULE_CODEC_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/modules/font.h b/tstools/DtsEdit/src/gpac/modules/font.h
new file mode 100644
index 0000000..f09899f
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/modules/font.h
@@ -0,0 +1,126 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / modules interfaces
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+#ifndef _GF_MODULE_FONT_H_
+#define _GF_MODULE_FONT_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/path2d.h>
+#include <gpac/module.h>
+#include <gpac/user.h>
+
+
+typedef struct _gf_glyph
+{
+	/*glyphs are stored as linked lists*/
+	struct _gf_glyph *next;
+	/*glyph ID as used in *_get_glyphs - this may not match the UTF name*/
+	u32 ID;
+	/*UTF-name of the glyph if any*/
+	u32 utf_name;
+	GF_Path *path;
+	/*width of the glyph - !! this can be more than the horizontal advance !! */
+	u32 width;
+	/*glyph horizontal advance in font EM size*/
+	s32 horiz_advance;
+	/*height of the glyph - !! this can be more than the vertical advance !! */
+	u32 height;
+	/*glyph vertical advance in font EM size*/
+	s32 vert_advance;
+} GF_Glyph;
+
+enum
+{
+	/*font styles*/
+	GF_FONT_ITALIC = 1,
+	GF_FONT_OBLIQUE = 1<<1,
+	/*font variant (smallcaps)*/
+	GF_FONT_SMALLCAPS = 1<<2,
+	/*font decoration*/
+	GF_FONT_UNDERLINED = 1<<3,
+	GF_FONT_STRIKEOUT = 1<<4,
+
+	/*all font weight modification are placed AFTER 1<<9*/
+	GF_FONT_WEIGHT_100 = 1<<10,
+	GF_FONT_WEIGHT_LIGHTER = 1<<11,
+	GF_FONT_WEIGHT_200 = 1<<12,
+	GF_FONT_WEIGHT_300 = 1<<13,
+	GF_FONT_WEIGHT_400 = 1<<14,
+	GF_FONT_WEIGHT_NORMAL = 1<<15,
+	GF_FONT_WEIGHT_500 = 1<<16,
+	GF_FONT_WEIGHT_600 = 1<<17,
+	GF_FONT_WEIGHT_700 = 1<<18,
+	GF_FONT_WEIGHT_BOLD = 1<<19,
+	GF_FONT_WEIGHT_800 = 1<<20,
+	GF_FONT_WEIGHT_900 = 1<<21,
+	GF_FONT_WEIGHT_BOLDER = 1<<22
+};
+/*mask for font styles used for CSS2 selection*/
+#define GF_FONT_STYLE_MASK	0x00000007
+/*mask for all font weight*/
+#define GF_FONT_WEIGHT_MASK	0xFFFFFC00
+
+/*interface name and version for font engine*/
+#define GF_FONT_READER_INTERFACE		GF_4CC('G','F','T', 0x01)
+
+
+typedef struct _font_reader
+{
+	/* interface declaration*/
+	GF_DECL_MODULE_INTERFACE
+
+	/*inits font engine.*/
+	GF_Err (*init_font_engine)(struct _font_reader *dr);
+	/*shutdown font engine*/
+	GF_Err (*shutdown_font_engine)(struct _font_reader *dr);
+
+	/*set active font . @styles indicates font styles (PLAIN, BOLD, ITALIC, 
+	BOLDITALIC and UNDERLINED, STRIKEOUT)*/
+	GF_Err (*set_font)(struct _font_reader *dr, const char *fontName, u32 styles);
+	/*gets font info*/
+	GF_Err (*get_font_info)(struct _font_reader *dr, char **font_name, s32 *em_size, s32 *ascent, s32 *descent, s32 *underline, s32 *line_spacing, s32 *max_advance_h, s32 *max_advance_v);
+
+	/*translate string to glyph sequence*/
+	GF_Err (*get_glyphs)(struct _font_reader *dr, const char *utf_string, u32 *glyph_id_buffer, u32 *io_glyph_id_buffer_size, const char *xml_lang, Bool *rev_layout);
+
+	/*loads glyph by name - returns NULL if glyph cannot be found*/
+	GF_Glyph *(*load_glyph)(struct _font_reader *dr, u32 glyph_name);
+
+/*module private*/
+	void *udta;
+} GF_FontReader;
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif	/*_GF_MODULE_FONT_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/modules/ipmp.h b/tstools/DtsEdit/src/gpac/modules/ipmp.h
new file mode 100644
index 0000000..3648332
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/modules/ipmp.h
@@ -0,0 +1,131 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / modules interfaces
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+#ifndef _GF_MODULE_IPMP_H_
+#define _GF_MODULE_IPMP_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/module.h>
+
+/*
+	NOTE ON IPMP TOOLS
+
+  The current implementation is very basic and does not follow MPEG-4 IPMPX architecture
+  This is just a place holder for ISMA/OMA-like schemes
+  Currently all operations are synchronous...
+*/
+
+enum
+{
+	/*push some configuration data to the IPMP tool*/
+	GF_IPMP_TOOL_SETUP,
+	/*request access to the object (eg, PLAY)*/
+	GF_IPMP_TOOL_GRANT_ACCESS,
+	/*release access to the object (eg, STOP)*/
+	GF_IPMP_TOOL_RELEASE_ACCESS,
+	/*push some configuration data to the IPMP tool*/
+	GF_IPMP_TOOL_PROCESS_DATA,
+};
+
+typedef struct
+{
+	u32 scheme_version;
+	u32 scheme_type;
+	const char *scheme_uri;
+	const char *kms_uri;
+} GF_ISMACrypConfig;
+
+typedef struct
+{
+	u32 scheme_version;
+	u32 scheme_type;
+	const char *scheme_uri;
+	const char *kms_uri;
+	/*SHA-1 hash*/
+	u8 hash[20];
+
+	const char *contentID;
+	u32 oma_drm_crypt_type;
+	Bool oma_drm_use_pad, oma_drm_use_hdr;
+	const char *oma_drm_textual_headers;
+	u32 oma_drm_textual_headers_len;
+} GF_OMADRM2Config;
+
+/*IPMP events*/
+typedef struct
+{
+	/*event type*/
+	u32 event_type;
+
+	/*gpac's channel triggering this event, NULL if unknown/unspecified*/
+	struct _es_channel *channel;
+
+	/*identifier of the config data (GF_IPMP_TOOL_SETUP)*/
+	u32 config_data_code;
+	/*config data (GF_IPMP_TOOL_SETUP). Type depends on the config_data_code*/
+	void *config_data;
+
+	Bool restart_requested;
+
+	/*data manipulation (GF_IPMP_TOOL_PROCESS_DATA) - data is always processed in-place in a
+	synchronous way*/
+	char *data;
+	u32 data_size;
+	u32 out_data_size;
+	/*indicates if payload passed is encrypted or not - this is used by ISMA, OMA and 3GP*/
+	Bool is_encrypted;
+	/*ISMA payload resync indicator*/
+	u64 isma_BSO;
+} GF_IPMPEvent;
+
+/*interface name and version for IPMP tools*/
+#define GF_IPMP_TOOL_INTERFACE		GF_4CC('G','I','P', 0x01)
+
+typedef struct _ipmp_tool GF_IPMPTool;
+
+struct _ipmp_tool
+{
+	/* interface declaration*/
+	GF_DECL_MODULE_INTERFACE
+
+	/*process an ipmp event*/
+	GF_Err (*process)(GF_IPMPTool *dr, GF_IPMPEvent *evt);
+	/*tool private*/
+	void *udta;
+
+};
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif	/*#define _GF_MODULE_IPMP_H_
+*/
+
diff --git a/tstools/DtsEdit/src/gpac/modules/js_usr.h b/tstools/DtsEdit/src/gpac/modules/js_usr.h
new file mode 100644
index 0000000..877a087
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/modules/js_usr.h
@@ -0,0 +1,66 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / modules interfaces
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+#ifndef _GF_MODULE_JS_USR_H_
+#define _GF_MODULE_JS_USR_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/module.h>
+#include <gpac/scenegraph.h>
+
+/*interface name and version for JavaScript User Extensions*/
+#define GF_JS_USER_EXT_INTERFACE		GF_4CC('G','J','S', 0x01)
+
+typedef struct _js_usr_ext GF_JSUserExtension;
+
+struct _js_usr_ext
+{
+	/* interface declaration*/
+	GF_DECL_MODULE_INTERFACE
+
+	/*load JS extension
+	 doc: scene graph in which the extension is loaded
+	 jsctx: JavaScript context in which the extension is loaded. 
+		For BIFS/VRML/X3D, one context is created per script node
+		For other graphs, one context is created per scene/document
+	 global: JavaScript global object for the context
+	 unload: if true, the extension should be unloaded from the JavaScript context (called upon destroy). Otherwise it should be loaded
+	*/
+	void (*load)(GF_JSUserExtension *jsext, GF_SceneGraph *doc, struct JSContext *jsctx, struct JSObject *global, Bool unload);
+	/*module private*/
+	void *udta;
+};
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif	/*#define _GF_MODULE_JS_USR_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/modules/raster2d.h b/tstools/DtsEdit/src/gpac/modules/raster2d.h
new file mode 100644
index 0000000..0311ce4
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/modules/raster2d.h
@@ -0,0 +1,258 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / modules interfaces
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+#ifndef _GF_MODULE_RASTER2D_H_
+#define _GF_MODULE_RASTER2D_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/path2d.h>
+#include <gpac/module.h>
+#include <gpac/color.h>
+
+
+/*stencil types*/
+typedef enum
+{
+	/*solid color stencil*/
+	GF_STENCIL_SOLID = 0,
+	/*linear color gradient stencil*/
+	GF_STENCIL_LINEAR_GRADIENT,
+	/*radial color gradient stencil*/
+	GF_STENCIL_RADIAL_GRADIENT,
+	/*texture stencil*/
+	GF_STENCIL_VERTEX_GRADIENT,
+	/*texture stencil*/
+	GF_STENCIL_TEXTURE,
+} GF_StencilType;
+
+
+/*gradient filling modes*/
+typedef enum
+{
+	/*edge colors are repeated until path is filled*/
+	GF_GRADIENT_MODE_PAD,
+	/*pattern is inversed each time it's repeated*/
+	GF_GRADIENT_MODE_SPREAD,
+	/*pattern is repeated to fill path*/
+	GF_GRADIENT_MODE_REPEAT
+} GF_GradientMode;
+
+
+/*texture tiling flags*/
+typedef enum
+{
+	/*texture is repeated in its horizontal direction*/
+	GF_TEXTURE_REPEAT_S = (1<<1),
+	/*texture is repeated in its horizontal direction*/
+	GF_TEXTURE_REPEAT_T = (1<<2),
+	/*texture is fliped vertically*/
+	GF_TEXTURE_FLIP = (1<<3),
+} GF_TextureTiling;
+
+/*filter levels for texturing - up to the graphics engine but the following levels are used by
+the client*/
+typedef enum
+{
+	/*high speed mapping (ex, no filtering applied)*/
+	GF_TEXTURE_FILTER_HIGH_SPEED,
+	/*compromise between speed and quality (ex, filter to nearest pixel)*/
+	GF_TEXTURE_FILTER_MID,
+	/*high quality mapping (ex, bi-linear/bi-cubic interpolation)*/
+	GF_TEXTURE_FILTER_HIGH_QUALITY
+} GF_TextureFilter;
+
+/* rasterizer antialiasing depending on the graphics engine*/
+typedef enum
+{
+	/*raster should use fastest mode possible (eg, no antialiasing)*/
+	GF_RASTER_HIGH_SPEED,
+	/*raster should use fast mode and good quality if possible*/
+	GF_RASTER_MID,
+	/*raster should use antialiasing*/
+	GF_RASTER_HIGH_QUALITY
+} GF_RasterLevel;
+
+
+/*user routines for raserizer. common syntaxes:
+	@cbk: user defined callback
+	@x, y: first pixel position of the run, in device memory (top-left) coordinates
+	@run_h_len: number of pixels to fill on line
+	@color: color to fill pixel with. USER MUST IGNORE THE ALPHA COMPONENT OF THIS COLOR, the final 
+		alpha is computed by the lib
+	@alpha: blending amount (0->0xFF) for the pixels
+*/
+typedef struct
+{
+	void *cbk;
+	/*fills line pixels without any blending operation*/
+	void (*fill_run_no_alpha)(void *cbk, u32 x, u32 y, u32 run_h_len, GF_Color color);
+	/*fills line pixels without blending operation - alpha combines both fill color and anti-aliasing blending*/
+	void (*fill_run_alpha)(void *cbk, u32 x, u32 y, u32 run_h_len, GF_Color color, u32 alpha);
+} GF_RasterCallback;
+
+
+
+/*opaque handler for all stencils*/
+typedef void *GF_STENCIL;
+
+/*visual surface handler*/
+typedef void *GF_SURFACE;
+
+/*interface name and version for raster2D*/
+#define GF_RASTER_2D_INTERFACE		GF_4CC('G','R','2', 0x02)
+
+/*graphics driver*/
+typedef struct _raster2d_interface
+{
+	/* interface declaration*/
+	GF_DECL_MODULE_INTERFACE
+
+	GF_STENCIL (*stencil_new) (struct _raster2d_interface *, GF_StencilType type);
+	/*common destructor for all stencils*/
+	void (*stencil_delete) (GF_STENCIL _this);
+	/*set stencil transformation matrix*/
+	GF_Err (*stencil_set_matrix) (GF_STENCIL _this, GF_Matrix2D *mat);
+	/*solid brush - set brush color*/
+	GF_Err (*stencil_set_brush_color) (GF_STENCIL _this, GF_Color c);
+	/*gradient brushes*/
+	/*sets gradient repeat mode - return GF_NOT_SUPPORTED if driver doesn't support this to let the app compute repeat patterns
+	this may be called before the gradient is setup*/
+	GF_Err (*stencil_set_gradient_mode) (GF_STENCIL _this, GF_GradientMode mode);
+	/*set linear gradient.  line is defined by start and end, and you can give interpolation colors at specified positions*/
+	GF_Err (*stencil_set_linear_gradient) (GF_STENCIL _this, Fixed start_x, Fixed start_y, Fixed end_x, Fixed end_y);
+	/*radial gradient brush center point, focal point and radius - colors can only be set through set_interpolation */
+	GF_Err (*stencil_set_radial_gradient) (GF_STENCIL _this, Fixed cx, Fixed cy, Fixed fx, Fixed fy, Fixed x_radius, Fixed y_radius);
+	/*radial and linear gradient (not used with vertex) - set color interpolation at given points, 
+		@pos[i]: distance from (center for radial, start for linear) expressed between 0 and 1 (1 being the gradient bounds)
+		@col[i]: associated color
+	NOTE 1: the colors at 0 and 1.0 MUST be provided
+	NOTE 2: colors shall be fed in order from 0 to 1
+	NOTE 3: this overrides the colors provided for linear gradient
+	*/
+	GF_Err (*stencil_set_gradient_interpolation) (GF_STENCIL _this, Fixed *pos, GF_Color *col, u32 count);
+
+	/*vertex gradient : set limit path */
+	GF_Err (*stencil_set_vertex_path) (GF_STENCIL _this, GF_Path *path);
+	/*set the center of the gradient*/
+	GF_Err (*stencil_set_vertex_center) (GF_STENCIL _this, Fixed cx, Fixed cy, u32 color);
+	/*set the center of the gradient*/
+	GF_Err (*stencil_set_vertex_colors) (GF_STENCIL _this, u32 *colors, u32 nbCol);
+	
+	/*sets global alpha blending level for stencil (texture and gradients)
+	the alpha channel shall be combined with the color matrix if any*/
+	GF_Err (*stencil_set_alpha) (GF_STENCIL _this, u8 alpha);
+	
+	/*set stencil texture
+		@pixels: texture data, from top to bottom
+		@width, @height: texture size
+		@stride: texture horizontal pitch (bytes to skip to get to next row)
+		@pixelFormat: texture pixel format as defined in file constants.h
+		@destination_format_hint: this is the current pixel format of the destination surface, and is given
+		as a hint in case the texture needs to be converted by the stencil
+		@no_copy: if set, specifies the texture data shall not be cached by the module (eg it must be able
+		to directly modify the given memory
+	NOTE: this stencil acts as a data wrapper, the pixel data is not required to be locally copied
+	data is not required to be available for texturing until the stencil is used in a draw operation
+	*/
+	GF_Err (*stencil_set_texture) (GF_STENCIL _this, char *pixels, u32 width, u32 height, u32 stride, GF_PixelFormat pixelFormat, GF_PixelFormat destination_format_hint, Bool no_copy);
+	/*creates internal texture - pixel data is owned by texture brush - set to NULL if not supported - this is used to 
+	cope with engines that don't support random strides (ex: Gdiplus needs stride to be a multiple of 4) 
+	if not set the compositor will create its own mem texture and pass it through set_texture - pixel format shall 
+	be respected as far as Alpha is concerned (eg alpha info shall be kept and used in blit) */
+	GF_Err (*stencil_create_texture) (GF_STENCIL _this, u32 width, u32 height, GF_PixelFormat pixelFormat);
+	/*signals the texture has been modified (internal texture only)*/
+	void (*stencil_texture_modified) (GF_STENCIL _this);
+
+	/*sets texture tile mode*/
+	GF_Err (*stencil_set_tiling) (GF_STENCIL _this, GF_TextureTiling mode);
+	/*sets texture filtering mode*/
+	GF_Err (*stencil_set_filter) (GF_STENCIL _this, GF_TextureFilter filter_mode);
+	/*set stencil color matrix - texture stencils only. If matrix is NULL, resets current color matrix*/
+	GF_Err (*stencil_set_color_matrix) (GF_STENCIL _this, GF_ColorMatrix *cmat);
+
+	/*creates surface object*/
+	/* @center_coords: true indicates mathematical-like coord system, 
+					   false indicates computer-like coord system */
+	GF_SURFACE (*surface_new) (struct _raster2d_interface *, Bool center_coords);
+	/* delete surface object */
+	void (*surface_delete) (GF_SURFACE _this);
+
+	/* attach surface object to device object (Win32: HDC) width and height are target surface size*/
+	GF_Err (*surface_attach_to_device) (GF_SURFACE _this, void *os_handle, u32 width, u32 height);
+	/* attach surface object to stencil object*/
+	GF_Err (*surface_attach_to_texture) (GF_SURFACE _this, GF_STENCIL sten);
+	/* attach surface object to memory buffer if supported
+		@pixels: texture data
+		@width, @height: texture size
+		@stride: texture horizontal pitch (bytes to skip to get to next row)
+		@pixelFormat: texture pixel format
+	*/
+	GF_Err (*surface_attach_to_buffer) (GF_SURFACE _this, char *pixels, u32 width, u32 height, u32 stride, GF_PixelFormat pixelFormat);
+
+	GF_Err (*surface_attach_to_callbacks) (GF_SURFACE _this, GF_RasterCallback *callbacks, u32 width, u32 height);
+
+	/* detach surface object */
+	void (*surface_detach) (GF_SURFACE _this);
+
+	/*sets rasterizer precision */
+	GF_Err (*surface_set_raster_level) (GF_SURFACE _this, GF_RasterLevel RasterSetting);
+	/* set the given matrix as the current transformations for all drawn paths
+	if NULL reset the current transformation */
+	GF_Err (*surface_set_matrix) (GF_SURFACE _this, GF_Matrix2D *mat);
+	/* set the given rectangle as a clipper - nothing will be drawn outside this clipper
+	if the clipper is NULL then no clipper is set
+	NB: the clipper is not affected by the surface matrix and is given in pixels
+	CF ABOVE NOTE ON CLIPPERS*/
+	GF_Err (*surface_set_clipper) (GF_SURFACE _this, GF_IRect *rc);
+
+	/*sets the given path as the current one for drawing - the surface transform is NEVER changed between
+	setting the path and filling, only the clipper may change*/
+	GF_Err (*surface_set_path) (GF_SURFACE _this, GF_Path *path);
+	/*fills the current path using the given stencil - can be called several times with the same current path*/
+	GF_Err (*surface_fill) (GF_SURFACE _this, GF_STENCIL stencil);
+
+	/*flushes to surface*/
+	GF_Err (*surface_flush) (GF_SURFACE _this);
+
+	/*clears given pixel rect on the surface with the given color - REQUIRED
+	the given rect is formatted as a clipper - CF ABOVE NOTE ON CLIPPERS*/
+	GF_Err (*surface_clear)(GF_SURFACE _this, GF_IRect *rc, GF_Color col);
+
+/*private:*/
+	void *internal;
+} GF_Raster2D;
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif	/*_GF_MODULE_RASTER2D_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/modules/service.h b/tstools/DtsEdit/src/gpac/modules/service.h
new file mode 100644
index 0000000..26e0812
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/modules/service.h
@@ -0,0 +1,467 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / modules interfaces
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _GF_SERVICE_H_
+#define _GF_SERVICE_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*for SL, ESD and OD*/
+#include <gpac/mpeg4_odf.h>
+#include <gpac/download.h>
+
+/*handle to service*/
+typedef struct _net_service GF_ClientService;
+
+/*handle to channel*/
+typedef void *LPNETCHANNEL;
+
+enum
+{
+	/*channel control, app->module. Note that most modules don't need to handle pause/resume/set_speed*/
+	GF_NET_CHAN_PLAY,
+	GF_NET_CHAN_STOP,
+	GF_NET_CHAN_PAUSE,
+	GF_NET_CHAN_RESUME,
+	GF_NET_CHAN_SET_SPEED,
+	/*channel configuration, app->module*/
+	GF_NET_CHAN_CONFIG,
+	/*channel duration, app<->module (in case duration is not known at setup)*/
+	GF_NET_CHAN_DURATION,
+	/*channel buffer, app->module*/
+	GF_NET_CHAN_BUFFER,
+	/*channel buffer query, app<-module*/
+	GF_NET_CHAN_BUFFER_QUERY,
+	/*retrieves DSI from channel (DSI may be caried by net with a != value than OD), app->module*/
+	GF_NET_CHAN_GET_DSI,
+	/*set media padding for all AUs fetched (pull mode only). 
+	If not supported the channel will have to run in push mode. app->module*/
+	GF_NET_CHAN_SET_PADDING,
+	/*sets input channel to pull mode if possible, app->module*/
+	GF_NET_CHAN_SET_PULL,
+	/*query channel capability to pause/resume and seek(play from an arbitrary range)
+	a non-interactive channel doesn't have to handle SET_SPEED, PAUSE and RESUME commands but can 
+	still work in pull mode*/
+	GF_NET_CHAN_INTERACTIVE,
+	/*map net time (OTB) to media time (up only) - this is needed by some signaling protocols when the 
+	real play range is not the requested one */
+	GF_NET_CHAN_MAP_TIME,
+	/*reconfiguration of channel comming from network (up only) - this is used to override the SL config
+	if it differs from the one specified at config*/
+	GF_NET_CHAN_RECONFIG,
+	/*signal channel is ISMACryp'ted (net->term only)*/
+	GF_NET_CHAN_DRM_CFG,
+	
+	/*retrieves ESD for channel - net->term only, for cache configuration*/
+	GF_NET_CHAN_GET_ESD,
+	/*retrieves visual PAR as indicated in container if any*/
+	GF_NET_CHAN_GET_PIXEL_AR,
+	
+	/*service buffer query (for all channels running in service), app<-module*/
+	GF_NET_BUFFER_QUERY,
+	/*retrieves network stats for service/channel; app->module*/
+	GF_NET_GET_STATS,
+	/*retrieves whether service can be cached (rtp, http streaming radios, etc) or not. No associated struct*/
+	GF_NET_IS_CACHABLE,
+
+	/*sets info for service - net->term only*/
+	GF_NET_SERVICE_INFO,
+	/*checks if there is an audio stream in the service - term->net only*/
+	GF_NET_SERVICE_HAS_AUDIO,
+};
+
+/*channel command for all commands that don't need params:
+GF_NET_CHAN_SET_PULL: module shall return GF_OK or GF_NOT_SUPPORTED
+GF_NET_CHAN_INTERACTIVE: module shall return GF_OK or GF_NOT_SUPPORTED
+*/
+typedef struct
+{
+	/*command type*/
+	u32 command_type;
+	/*channel*/
+	LPNETCHANNEL on_channel;
+} GF_NetComBase;
+
+/*GF_NET_CHAN_PLAY, GF_NET_CHAN_SET_SPEED*/
+typedef struct
+{
+	u32 command_type;
+	LPNETCHANNEL on_channel;
+	/*params for GF_NET_CHAN_PLAY, ranges in sec - if range is <0, then it is ignored (eg [2, -1] with speed>0 means 2 +oo) */
+	Double start_range, end_range;
+	/*params for GF_NET_CHAN_PLAY and GF_NET_CHAN_SPEED*/
+	Double speed;
+} GF_NetComPlay;
+
+
+/*GF_NET_CHAN_CONFIG, GF_NET_CHAN_RECONFIG
+channel config may happen as soon as the channel is open, even if the module hasn't acknowledge creation
+channel config can also be used from network to app, with GF_NET_CHAN_RECONFIG type - only the SL config is then used
+*/
+typedef struct
+{
+	u32 command_type;
+	LPNETCHANNEL on_channel;
+
+	/*SL config of the stream as delivered in OD (app->channel) or by network (channel->app)*/
+	GF_SLConfig sl_config;		
+	/*stream priority packet drops are more tolerable if low priority - app->channel only*/
+	u32 priority;
+	/*sync ID: all channels with the same sync ID run on the same timeline, thus the module should 
+	try to match this - note this may not be possible (typically RTP/RTSP)*/
+	u32 sync_id;
+	/*audio frame duration and sample rate if any - this is needed by some RTP payload*/
+	u32 frame_duration, sample_rate;
+} GF_NetComConfig;
+
+/*GF_NET_CHAN_BUFFER, GF_NET_CHAN_BUFFER_QUERY*/
+typedef struct
+{
+	u32 command_type;
+	LPNETCHANNEL on_channel;
+	/*the recommended buffering limits in ms - this depends on the modules preferences and on the service 
+	type (multicast, vod, ...) - below buffer_min the stream will pause if possible until buffer_max is reached
+	note the app will fill in default values before querying*/
+	u32 min, max;
+	/*only used with GF_NET_CHAN_BUFFER_QUERY - amount of media in decoding buffer, in ms*/
+	u32 occupancy;
+} GF_NetComBuffer;
+
+/*GF_NET_CHAN_DURATION*/
+typedef struct
+{
+	u32 command_type;
+	LPNETCHANNEL on_channel;
+	/*duration in sec*/
+	Double duration;
+} GF_NetComDuration;
+
+/*GF_NET_CHAN_GET_DSI*/
+typedef struct
+{
+	u32 command_type;
+	LPNETCHANNEL on_channel;
+	/*carries specific info for codec - data shall be allocated by service and is freed by user*/
+	char *dsi;
+	u32 dsi_len;
+} GF_NetComGetDSI;
+
+/*GF_NET_CHAN_SET_PADDING*/
+typedef struct
+{
+	u32 command_type;
+	LPNETCHANNEL on_channel;
+	u32 padding_bytes;
+} GF_NetComPadding;
+
+/*GF_NET_CHAN_MAP_TIME*/
+typedef struct
+{
+	u32 command_type;
+	LPNETCHANNEL on_channel;
+	/*MediaTime at this timestamp*/
+	Double media_time;
+	/*TS where mapping is done (in SL TS resolution)*/
+	u64 timestamp;
+	/*specifies whether decoder input data shall be discarded or only have its timing updated*/
+	Bool reset_buffers;
+} GF_NetComMapTime;
+
+/*GF_NET_CHAN_ISMACRYP_CFG*/
+typedef struct
+{
+	u32 command_type;
+	LPNETCHANNEL on_channel;
+
+
+	/*per channel, regardless of DRM schemes (ISMA, OMA, )*/
+	u32 scheme_version;
+	u32 scheme_type;
+	const char *scheme_uri;
+	const char *kms_uri;
+	/*OMA DRM info*/
+	const char *contentID;
+	u32 oma_drm_crypt_type;
+	Bool oma_drm_use_pad, oma_drm_use_hdr;
+	const char *oma_drm_textual_headers;
+	u32 oma_drm_textual_headers_len;
+
+	/*SHA-1 file hash*/
+	u8 hash[20];
+} GF_NetComDRMConfig;
+
+/*GF_NET_CHAN_GET_ESD*/
+typedef struct
+{
+	u32 command_type;
+	LPNETCHANNEL on_channel;
+	const GF_ESD *esd;
+	Bool is_iod_stream;
+} GF_NetComGetESD;
+
+/*GF_NET_GET_STATS
+Notes
+1: only channels using network must reply. All channels fetching data through a 
+file downloader (cf below) shall NOT answer, the app manages downloader bandwidth internally.
+2: BANDWIDTH USED BY SIGNALING PROTOCOL IS IGNORED IN GPAC
+*/
+typedef struct __netstatcom
+{
+	u32 command_type;
+	/*MAY BE NULL, in which case the module must fill in ONLY the control channel part. This
+	is not used yet, but could be with a protocol using a single control socket for N media channels.*/
+	LPNETCHANNEL on_channel;
+	/*percentage of packet loss from network. This cannot be figured out by the app since there is no
+	one-to-one mapping between the protocol packets and the final SL packet (cf RTP payloads)*/
+	Float pck_loss_percentage;
+	/*channel port, control channel port if any (eg RTCP)*/
+	u16 port, ctrl_port;
+	/*bandwidth used by channel & its control channel if any (both up and down) - expressed in bits per second*/
+	u32 bw_up, bw_down, ctrl_bw_down, ctrl_bw_up;
+	/*set to 0 if channel is not part of a multiplex. Otherwise set to the multiplex port, and 
+	above port info shall be identifiers in the multiplex - note that multiplexing overhead is ignored 
+	in GPAC for the current time*/
+	u16 multiplex_port;
+} GF_NetComStats;
+
+/*GF_NET_CHAN_GET_PIXEL_AR*/
+typedef struct
+{
+	u32 command_type;
+	LPNETCHANNEL on_channel;
+	u32 hSpacing, vSpacing;
+} GF_NetComPixelAR;
+
+/*GF_NET_SERVICE_INFO*/
+typedef struct __netinfocom
+{
+	u32 command_type;
+	/*currently NULL only*/
+	LPNETCHANNEL on_channel;
+	/*packed trackNumber(16 bits)/totaltrack(16 bits)*/
+	u32 track_info;
+	u32 genre;
+	const char *album;
+	const char *artist;
+	const char *comment;
+	const char *composer;
+	const char *name;
+	const char *writer;
+} GF_NetComInfo;
+
+/*GF_NET_CHAN_GET_PIXEL_AR*/
+typedef struct
+{
+	u32 command_type;
+	char *base_url;
+} GF_NetComHasAudio;
+
+typedef union __netcommand
+{
+	u32 command_type;
+	GF_NetComBase base;
+	GF_NetComPlay play;
+	GF_NetComConfig cfg;
+	GF_NetComBuffer buffer;
+	GF_NetComDuration duration;
+	GF_NetComGetDSI get_dsi;
+	GF_NetComPadding pad;
+	GF_NetComMapTime map_time;
+	GF_NetComStats net_stats;
+	GF_NetComDRMConfig drm_cfg;
+	GF_NetComGetESD cache_esd;
+	GF_NetComInfo info;
+	GF_NetComPixelAR par;
+	GF_NetComHasAudio audio;
+} GF_NetworkCommand;
+
+/*
+	network modules
+*/
+
+/*interface name and version for input service*/
+#define GF_NET_CLIENT_INTERFACE			GF_4CC('G', 'I', 'S', 0x01)
+
+typedef struct _netinterface
+{
+	/* interface declaration*/
+	GF_DECL_MODULE_INTERFACE
+
+	/*retuns 1 if module can process this URL, 0 otherwise. This is only called when the file extension/mimeType cannot be
+	retrieved in the cfg file, otherwise the mime type/file ext is used to load service. Typically a module would 
+	register its mime types in this function (cf gf_term_register_mime_type below)
+	*/
+	Bool (*CanHandleURL)(struct _netinterface *, const char *url);
+
+	/*connects the service to the desired URL - the service handle is used for callbacks. 
+	Only one service can be connected to a loaded interface.
+	*/
+	GF_Err (*ConnectService) (struct _netinterface *, GF_ClientService *serv, const char *url);
+
+	/*disconnects service - the module is no longer used after this call - if immediate_shutdown is set the module
+	shall not attempt to get confirmation from remote side, it will be deleted right away
+	
+	NOTE: depending on how the client/server exchange is happening, it may happen that the CloseService is called
+	in the same context as a reply from your module. This can result into deadlocks if you're using threads. 
+	You should therefore only try to destroy threads used in the interface shutdown process, which is guarantee
+	to be in a different context call.
+	*/
+	GF_Err (*CloseService) (struct _netinterface *);
+
+	/*retrieves service decsriptor (expressed as an MPEG4 OD/IOD) for accessing this service 
+	descriptor is allocated by plugin and destroyed by user
+	the IOD shall refer to the service attached to the module
+	@expect_type is a hint in case the service regenerates an IOD. It indicates whether the entry point expected is 
+	INLINE, BIFS animation stream, video, audio or input sensor.
+	@sub_url: indicates fetching of an IOD for a given object in the service.
+	Only used for services handling the optional CanHandleURLInService below
+		NULL for main service
+		service extension for sub-service (cf CanHandleURLInService below). For ex,
+		"rtsp://myserver/file.mp4/ES_ID=3" and "rtsp://myserver/file.mp4/ES_ID=4" 
+		or "file.avi#audio" and "file.avi#video".In this case a partial IOD for the desired object is expected
+	Note: once a service is acknowledged as connected, this function must be executed synchronously
+	The service can return NULL for a descriptor:
+		* if the expected media type is a single media, this means the media couldn't be found
+		* if the expected media type is a scene, this means the terminalk shall create and manage the scene
+	*/
+	GF_Descriptor *(*GetServiceDescriptor) (struct _netinterface *, u32 expect_type, const char *sub_url);
+	
+
+	/*sends command to the service / channel - cf command structure*/
+	GF_Err (*ServiceCommand) (struct _netinterface *, GF_NetworkCommand *com);
+
+	/*data channel setup - url is either
+	"ES_ID=ID" where ID is the stream ID in this service
+	or a control string depending on the service/stream. The URL is first used to load a module able to handle it, 
+	so the module has no redirection to handle
+	*/
+	GF_Err (*ConnectChannel) (struct _netinterface *, LPNETCHANNEL channel, const char *url, Bool upstream);
+	/*teardown of data channel*/
+	GF_Err (*DisconnectChannel) (struct _netinterface *, LPNETCHANNEL channel);
+
+	/*optional - fetch MPEG4 data from channel - data shall not be duplicated and must be released at ReleaseData
+	SL info shall be written to provided header - if the data is a real SL packet the flag sl_compressed shall be 
+	set to signal the app this is a full SL pdu (@out_sl_hdr is then ignored)
+	set to NULL if not supported
+	*/
+	GF_Err (*ChannelGetSLP) (struct _netinterface *, LPNETCHANNEL channel, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr, Bool *sl_compressed, GF_Err *out_reception_status, Bool *is_new_data);
+
+	/*optional - release SLP data allocated on channel by the previous call, if any
+	set to NULL if not supported*/
+	GF_Err (*ChannelReleaseSLP) (struct _netinterface *, LPNETCHANNEL channel);
+
+	/*this is needed for modules to query other modules, the typical case being 2 ESD URLs pointing to the 
+	same media (audio and video streams in an RTSP session). This is always used on loaded modules but 
+	doesn't have to be declared*/
+	Bool (*CanHandleURLInService)(struct _netinterface *, const char *url);
+
+/*private*/
+	void *priv;
+} GF_InputService;
+
+/*callback functions - these can be linked with non-LGPL modules*/
+/*message from service - error is set if error*/
+void gf_term_on_message(GF_ClientService *service, GF_Err error, const char *message);
+/*to call on service (if channel is NULL) or channel connect completed*/
+void gf_term_on_connect(GF_ClientService *service, LPNETCHANNEL ns, GF_Err response);
+/*to call on service (if channel is NULL) or channel disconnect completed*/
+void gf_term_on_disconnect(GF_ClientService *service, LPNETCHANNEL ns, GF_Err response);
+/* acknowledgement of service command - service commands handle both services and channels
+Most of the time commands are NOT acknowledged, typical acknowledgement are needed for setup and control
+with remote servers. 
+command can also be triggered from the service (QoS, broadcast announcements)
+cf above for command usage
+*/
+void gf_term_on_command(GF_ClientService *service, GF_NetworkCommand *com, GF_Err response);
+/*to call when data packet is received. 
+@data, data_size: data received
+@hdr: uncompressed SL header passed with data for stream sync - if not present then data shall be a valid SL packet 
+	(header + PDU). Note that using an SLConfig resulting in an empty GF_SLHeader allows sending raw data directly
+@reception_status: data reception status. To signal end of stream, set this to GF_EOS
+*/
+void gf_term_on_sl_packet(GF_ClientService *service, LPNETCHANNEL ns, char *data, u32 data_size, GF_SLHeader *hdr, GF_Err reception_status);
+/*returns URL associated with service (so that you don't need to store it)*/
+const char *gf_term_get_service_url(GF_ClientService *service);
+
+/*adds a new media from network. !! The media descriptor is then owned/destroyed by the term!!
+media_desc: object descriptor for the new media. May be NULL to force scene rebuilt.
+no_scene_check: specifies if the scene description shall be rebuilt or not.
+*/
+void gf_term_add_media(GF_ClientService *service, GF_Descriptor *media_desc, Bool no_scene_update);
+
+
+/*check if @fileExt extension is supported for given mimeType, and if associated with module. If mimeType not registered, register it for given module*/
+Bool gf_term_check_extension(GF_InputService *ifce, const char *mimeType, const char *extList, const char *description, const char *fileExt);
+/*register mime types & file extensions - most modules should only need the check version above*/
+void gf_term_register_mime_type(GF_InputService *ifce, const char *mimeType, const char *extList, const char *description);
+
+GF_InputService *gf_term_get_service_interface(GF_ClientService *service);
+
+/*file downloading - can and MUST be used by any module (regardless of license) in order not to interfere 
+with net management*/
+/*creates a new downloading session in the given service - if url is relative, it will be interpreted through
+the service URL*/
+GF_DownloadSession * gf_term_download_new(GF_ClientService *service, const char *url, u32 flags, gf_dm_user_io user_io, void *cbk);
+/*closes the downloading session*/
+void gf_term_download_del(GF_DownloadSession * dnload);
+/*send progress and connection messages to user...*/
+void gf_term_download_update_stats(GF_DownloadSession * sess);
+
+
+/*MPEG-4 media cache interface name*/
+#define GF_STREAMING_MEDIA_CACHE		GF_4CC('G', 'M', 'C', 0x01)
+
+typedef struct _cacheinterface
+{
+	/* interface declaration*/
+	GF_DECL_MODULE_INTERFACE
+
+	/*opens media cache at given place - extension is handled by cache module
+	@serv: service owning cache (eg, where to send data when requested)
+	@keep_existing_files: don't overwrite previously recorded sessions*/
+	GF_Err (*Open)(struct _cacheinterface *, GF_ClientService *serv, const char *location_and_name, Bool keep_existing_files);
+	/*closes media cache, delete file(s) if desired*/
+	GF_Err (*Close)(struct _cacheinterface *, Bool delete_cache);
+	/*writes data to cache. data is always a complete AU as reconstructed by gpac core
+	If first time data is written, user should query channel desc through service commands*/
+	GF_Err (*Write)(struct _cacheinterface *, LPNETCHANNEL ch, char *data, u32 data_size, GF_SLHeader *sl_hdr);
+
+	/*same as reader, except they MUST be provided - in other words, only PULL mode is supported for cache
+	at the current time*/
+	GF_Err (*ServiceCommand) (struct _cacheinterface *, GF_NetworkCommand *com);
+	GF_Err (*ChannelGetSLP) (struct _cacheinterface *, LPNETCHANNEL channel, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr, Bool *sl_compressed, GF_Err *out_reception_status, Bool *is_new_data);
+	GF_Err (*ChannelReleaseSLP) (struct _cacheinterface *, LPNETCHANNEL channel);
+
+	/*module private*/
+	void *priv;
+} GF_StreamingCache;
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/*_GF_SERVICE_H_*/
diff --git a/tstools/DtsEdit/src/gpac/modules/term_ext.h b/tstools/DtsEdit/src/gpac/modules/term_ext.h
new file mode 100644
index 0000000..a470f29
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/modules/term_ext.h
@@ -0,0 +1,84 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / modules interfaces
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+#ifndef _GF_MODULE_TERM_EXT_H_
+#define _GF_MODULE_TERM_EXT_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/terminal.h>
+
+/*interface name and version for Terminal Extensions services*/
+#define GF_TERM_EXT_INTERFACE		GF_4CC('G','T','E', 0x01)
+
+typedef struct _term_ext GF_TermExt;
+
+
+enum
+{
+	/*start terminal extension. If 0 is returned, the module will be unloaded*/
+	GF_TERM_EXT_START = 1,
+	/*stop terminal extension*/
+	GF_TERM_EXT_STOP,
+	/*process extension - the GF_TERM_EXT_CAP_NOT_THREADED capability MUST be set*/
+	GF_TERM_EXT_PROCESS,
+};
+
+enum
+{
+	/*signal the extension is to be called on regular basis (once per simulation tick). This MUST be set during
+	the GF_TERM_EXT_START command and cannot be changed at run-time*/
+	GF_TERM_EXT_CAP_NOT_THREADED = 1<<1,
+};
+
+
+struct _term_ext
+{
+	/* interface declaration*/
+	GF_DECL_MODULE_INTERFACE
+
+	/*caps of the module*/
+	u32 caps;
+
+	/*load JS extension
+	 termext: pointer to the module
+	 term: pointer to GPAC terminal
+	*/
+	Bool (*process)(GF_TermExt *termext, GF_Terminal *term, u32 action);
+
+	/*module private*/
+	void *udta;
+};
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif	/*#define _GF_MODULE_TERM_EXT_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/modules/video_out.h b/tstools/DtsEdit/src/gpac/modules/video_out.h
new file mode 100644
index 0000000..ef50124
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/modules/video_out.h
@@ -0,0 +1,190 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / modules interfaces
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+/*
+
+		Note on video driver: this is not a graphics driver, the only thing requested from this driver
+	is accessing video memory and performing stretch of YUV and RGB on the backbuffer (bitmap node)
+	the graphics driver is a different entity that performs 2D rasterization
+
+*/
+
+#ifndef _GF_MODULE_VIDEO_OUT_H_
+#define _GF_MODULE_VIDEO_OUT_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*include module system*/
+#include <gpac/module.h>
+/*include event system*/
+#include <gpac/events.h>
+/*include framebuffer definition*/
+#include <gpac/color.h>
+
+/*
+		Video hardware output module
+*/
+
+enum
+{
+	/*HW supports RGB->backbuffer blitting*/
+	GF_VIDEO_HW_HAS_RGB = (1<<1),
+	/*HW supports RGBA->backbuffer blitting*/
+	GF_VIDEO_HW_HAS_RGBA = (1<<2),
+	/*HW supports YUV->backbuffer blitting*/
+	GF_VIDEO_HW_HAS_YUV = (1<<3),
+	/*HW supports YUV overlays*/
+	GF_VIDEO_HW_HAS_YUV_OVERLAY = (1<<4),
+	/*HW supports OpenGL rendering. Whether this is OpenGL or OpenGL-ES depends on compilation settings
+	and cannot be changed at runtime*/
+	GF_VIDEO_HW_OPENGL = (1<<5),
+	/*HW supports OpenGL offscreen rendering. Whether this is OpenGL or OpenGL-ES depends on compilation settings
+	and cannot be changed at runtime*/
+	GF_VIDEO_HW_OPENGL_OFFSCREEN = (1<<6),
+	/*HW supports OpenGL offscreen rendering with alpha. Whether this is OpenGL or OpenGL-ES depends on compilation settings
+	and cannot be changed at runtime*/
+	GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA = (1<<7),
+};
+
+/*interface name and version for video output*/
+#define GF_VIDEO_OUTPUT_INTERFACE	GF_4CC('G','V','O',0x04) 
+
+/*
+			video output interface
+
+	the video output may run in 2 modes: 2D and 3D.
+
+	** the 2D video output works by accessing a backbuffer surface on the video mem board - 
+	the app accesses to the surface through the GF_VideoSurface handler. 
+	The module may support HW blitting of RGB or YUV data to backbuffer.
+
+	** the 3D video output only handles window management and openGL contexts setup.
+	The context shall be setup in Resize and SetFullScreen calls which are always happening in the main 
+	rendering thread. This will take care of openGL context issues with multithreading
+
+	By default all modules are required to be setup in 2D. If 3D is needed, a GF_EVENT_VIDEO_SETUP will
+	be sent with the desired configuration.
+
+	Except Setup and Shutdown functions, all interface functions are called through the main compositor thread
+	or its user to avoid multithreading issues. Care must still be taken when handling events
+*/
+typedef struct _video_out
+{
+	/* interface declaration*/
+	GF_DECL_MODULE_INTERFACE
+
+	/*setup system - if os_handle is NULL the driver shall create the output display (common case)
+	the other case is currently only used by child windows on win32 and winCE
+	@init_flags: a list of initialization flags as specified in user.h*/
+	GF_Err (*Setup)(struct _video_out *vout, void *os_handle, void *os_display, u32 init_flags);
+	/*shutdown system */
+	void (*Shutdown) (struct _video_out *vout);
+
+	/*flush video: the video shall be presented to screen 
+	the destination area to update is in client display coordinates (0,0) being top-left, (w,h) bottom-right
+	Note: dest is always NULL in 3D mode (buffer flip only)*/
+	GF_Err (*Flush) (struct _video_out *vout, GF_Window *dest);
+
+	GF_Err (*SetFullScreen) (struct _video_out *vout, Bool fs_on, u32 *new_disp_width, u32 *new_disp_height);
+
+	/*window events sent to output:
+	GF_EVENT_SET_CURSOR: sets cursor
+	GF_EVENT_SET_CAPTION: sets caption
+	GF_EVENT_SHOWHIDE: show/hide output window for self-managed output
+	GF_EVENT_SIZE:  inital window resize upon scene load
+	GF_EVENT_VIDEO_SETUP: all HW related setup:
+		* for 2D output, this means resizing the backbuffer if needed (depending on HW constraints)
+		* for 3D output, this means re-setup of OpenGL context (depending on HW constraints).
+			* This can be a request for an offscreen rendering surface. If supported, this surface SHALL
+			be readable through glReadPixels. If not supported, just return an error.
+			Note that GPAC never uses more than one GL context (offscreen or main video)
+			* Depending on windowing systems and implementations, it could be possible to resize a window 
+		without destroying the GL context. If the GL context is destroyed, the module should send an event
+		of the same type to the player.
+	
+	This function is also called with a NULL event at the begining of each rendering cycle, in order to allow event 
+	handling for modules uncapable of safe multithreading (eg X11)
+	*/
+	GF_Err (*ProcessEvent)(struct _video_out *vout, GF_Event *event);
+
+	/*pass events to user (assigned before setup) - return 1 if the event has been processed by GPAC 
+	(eiher scene or navigation), 0 otherwise*/
+	void *evt_cbk_hdl;
+	Bool (*on_event)(void *hdl, GF_Event *event);
+
+	/*
+			All the following are 2D specific and are NEVER called in 3D mode
+	*/
+	/*locks backbuffer video memory
+	do_lock: specifies whether backbuffer shall be locked or released
+	*/
+	GF_Err (*LockBackBuffer)(struct _video_out *vout, GF_VideoSurface *video_info, Bool do_lock);
+
+	/*lock video mem through OS context (only HDC for Win32 at the moment)
+	do_lock: specifies whether OS context shall be locked or released*/
+	void *(*LockOSContext)(struct _video_out *vout, Bool do_lock);
+
+	/*blit surface src to backbuffer - if a window is not specified, the full surface is used
+	the blitter MUST support stretching and RGB24 sources. Support for YUV is indicated in the hw caps
+	of the driver. If none is supported, just set this function to NULL and let gpac performs software blitting.
+	Whenever this function fails, the blit will be performed in software mode
+	if is_overlay is set, this is an overlay on the video memory (Flush would have been called before)
+		overlay_type 1: this is regular overlay without color keying
+		overlay_type 2: this is overlay with color keying
+	*/
+	GF_Err (*Blit)(struct _video_out *vout, GF_VideoSurface *video_src, GF_Window *src_wnd, GF_Window *dst_wnd, u32 overlay_type);
+
+	/*set of above HW flags*/
+	u32 hw_caps;
+	/*main pixel format of video board (informative only)*/
+	u32 pixel_format;
+	/*yuv pixel format if HW YUV blitting is supported (informative only) */
+	u32 yuv_pixel_format;
+	/*maximum resolution of the screen*/
+	u32 max_screen_width, max_screen_height;
+	/* dpi of the screen*/
+	u32 dpi_x, dpi_y;
+
+	/*overlay color key used by the hardware bliter - if not set, only top-level overlay can be used*/
+	u32 overlay_color_key;
+#ifdef ENABLE_JOYSTICK
+	u32 centered_mode;
+#endif
+
+	/*driver private*/
+	void *opaque;
+} GF_VideoOutput;
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif	/*_GF_MODULE_VIDEO_OUT_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/mpeg4_odf.h b/tstools/DtsEdit/src/gpac/mpeg4_odf.h
new file mode 100644
index 0000000..57213b3
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/mpeg4_odf.h
@@ -0,0 +1,1697 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / MPEG-4 Object Descriptor sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _GF_MPEG4_ODF_H_
+#define _GF_MPEG4_ODF_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/list.h>
+#include <gpac/bitstream.h>
+#include <gpac/sync_layer.h>
+
+/***************************************
+			Descriptors Tag
+***************************************/
+enum
+{
+	GF_ODF_OD_TAG			= 0x01,
+	GF_ODF_IOD_TAG			= 0x02,
+	GF_ODF_ESD_TAG			= 0x03,
+	GF_ODF_DCD_TAG			= 0x04,
+	GF_ODF_DSI_TAG			= 0x05,
+	GF_ODF_SLC_TAG			= 0x06,
+	GF_ODF_CI_TAG			= 0x07,
+	GF_ODF_SCI_TAG			= 0x08,
+	GF_ODF_IPI_PTR_TAG		= 0x09,
+	GF_ODF_IPMP_PTR_TAG		= 0x0A,
+	GF_ODF_IPMP_TAG			= 0x0B,
+	GF_ODF_QOS_TAG			= 0x0C,
+	GF_ODF_REG_TAG			= 0x0D,
+
+	/*FILE FORMAT RESERVED IDs - NEVER CREATE / USE THESE DESCRIPTORS*/
+	GF_ODF_ESD_INC_TAG		= 0x0E,
+	GF_ODF_ESD_REF_TAG		= 0x0F,
+	GF_ODF_ISOM_IOD_TAG		= 0x10,
+	GF_ODF_ISOM_OD_TAG		= 0x11,
+	GF_ODF_ISOM_IPI_PTR_TAG	= 0x12,
+	/*END FILE FORMAT RESERVED*/
+	
+	GF_ODF_EXT_PL_TAG		= 0x13,
+	GF_ODF_PL_IDX_TAG		= 0x14,
+	
+	GF_ODF_ISO_BEGIN_TAG	= 0x15,
+	GF_ODF_ISO_END_TAG		= 0x3F,
+
+	GF_ODF_CC_TAG			= 0x40,
+	GF_ODF_KW_TAG			= 0x41,
+	GF_ODF_RATING_TAG		= 0x42,
+	GF_ODF_LANG_TAG			= 0x43,
+	GF_ODF_SHORT_TEXT_TAG	= 0x44,
+	GF_ODF_TEXT_TAG			= 0x45,
+	GF_ODF_CC_NAME_TAG		= 0x46,
+	GF_ODF_CC_DATE_TAG		= 0x47,
+	GF_ODF_OCI_NAME_TAG		= 0x48,
+	GF_ODF_OCI_DATE_TAG		= 0x49,
+	GF_ODF_SMPTE_TAG		= 0x4A,
+
+	GF_ODF_SEGMENT_TAG		= 0x4B,
+	GF_ODF_MEDIATIME_TAG	= 0x4C,
+
+	GF_ODF_IPMP_TL_TAG		= 0x60,
+	GF_ODF_IPMP_TOOL_TAG	= 0x61,
+
+	GF_ODF_ISO_RES_BEGIN_TAG	= 0x62,
+	GF_ODF_ISO_RES_END_TAG		= 0xBF,
+	
+	GF_ODF_USER_BEGIN_TAG	= 0xC0,
+
+	/*internal descriptor for mux input description*/
+	GF_ODF_MUXINFO_TAG		= GF_ODF_USER_BEGIN_TAG,
+	/*internal descriptor for bifs config input description*/
+	GF_ODF_BIFS_CFG_TAG		= GF_ODF_USER_BEGIN_TAG + 1,
+	/*internal descriptor for UI config input description*/
+	GF_ODF_UI_CFG_TAG		= GF_ODF_USER_BEGIN_TAG + 2,
+	/*internal descriptor for TextConfig description*/
+	GF_ODF_TEXT_CFG_TAG		= GF_ODF_USER_BEGIN_TAG + 3,
+	GF_ODF_TX3G_TAG			= GF_ODF_USER_BEGIN_TAG + 4,
+	GF_ODF_ELEM_MASK_TAG	= GF_ODF_USER_BEGIN_TAG + 5,
+	/*internal descriptor for LASeR config input description*/
+	GF_ODF_LASER_CFG_TAG	= GF_ODF_USER_BEGIN_TAG + 6,
+
+	GF_ODF_USER_END_TAG		= 0xFE,
+
+	GF_ODF_OCI_BEGIN_TAG	= 0x40,
+	GF_ODF_OCI_END_TAG		= (GF_ODF_ISO_RES_BEGIN_TAG - 1),
+
+	GF_ODF_EXT_BEGIN_TAG	= 0x80,
+	GF_ODF_EXT_END_TAG		= 0xFE,
+
+
+	/*descriptor for aucilary video data*/
+	GF_ODF_AUX_VIDEO_DATA	= GF_ODF_EXT_BEGIN_TAG + 1,
+};
+
+
+/***************************************
+			Descriptors
+***************************************/
+
+#define BASE_DESCRIPTOR \
+		u8 tag;
+
+typedef struct
+{
+	BASE_DESCRIPTOR
+} GF_Descriptor;
+
+
+/*	default descriptor. 
+	NOTE: The decoderSpecificInfo is used as a default desc with tag 0x05 */
+typedef struct
+{
+	BASE_DESCRIPTOR
+	u32 dataLength;
+	char *data;
+} GF_DefaultDescriptor;
+
+/*Object Descriptor*/
+typedef struct
+{
+	BASE_DESCRIPTOR
+	GF_List *ipmp_tools;
+} GF_IPMP_ToolList;
+
+/*ObjectDescriptor*/
+typedef struct
+{
+	BASE_DESCRIPTOR
+	u16 objectDescriptorID;
+	char *URLString;
+	GF_List *ESDescriptors;
+	GF_List *OCIDescriptors;
+	/*includes BOTH IPMP_DescriptorPointer (IPMP & IPMPX) and GF_IPMP_Descriptor (IPMPX only)*/
+	GF_List *IPMP_Descriptors;
+	GF_List *extensionDescriptors;
+} GF_ObjectDescriptor;
+
+/*GF_InitialObjectDescriptor - WARNING: even though the bitstream IOD is not
+a bit extension of OD, internally it is a real overclass of OD
+we usually typecast IOD to OD when flags are not needed !!!*/
+typedef struct
+{
+	BASE_DESCRIPTOR
+	u16 objectDescriptorID;
+	char *URLString;
+	GF_List *ESDescriptors;
+	GF_List *OCIDescriptors;
+	/*includes BOTH IPMP_DescriptorPointer (IPMP & IPMPX) and GF_IPMP_Descriptor (IPMPX only)*/
+	GF_List *IPMP_Descriptors;
+	GF_List *extensionDescriptors;
+
+	/*IOD extensions*/
+	u8 inlineProfileFlag;
+	u8 OD_profileAndLevel;
+	u8 scene_profileAndLevel;
+	u8 audio_profileAndLevel;
+	u8 visual_profileAndLevel;
+	u8 graphics_profileAndLevel;
+
+	GF_IPMP_ToolList *IPMPToolList;
+} GF_InitialObjectDescriptor;
+
+/*File Format Object Descriptor*/
+typedef struct
+{
+	BASE_DESCRIPTOR
+	u16 objectDescriptorID;
+	char *URLString;
+	GF_List *ES_ID_RefDescriptors;
+	GF_List *OCIDescriptors;
+	GF_List *IPMP_Descriptors;
+	GF_List *extensionDescriptors;
+	GF_List *ES_ID_IncDescriptors;
+} GF_IsomObjectDescriptor;
+
+/*File Format Initial Object Descriptor - same remark as IOD*/
+typedef struct
+{
+	BASE_DESCRIPTOR
+	u16 objectDescriptorID;
+	char *URLString;
+	GF_List *ES_ID_RefDescriptors;
+	GF_List *OCIDescriptors;
+	GF_List *IPMP_Descriptors;
+	GF_List *extensionDescriptors;
+	GF_List *ES_ID_IncDescriptors;
+
+	u8 inlineProfileFlag;
+	u8 OD_profileAndLevel;
+	u8 scene_profileAndLevel;
+	u8 audio_profileAndLevel;
+	u8 visual_profileAndLevel;
+	u8 graphics_profileAndLevel;
+
+	GF_IPMP_ToolList *IPMPToolList;
+} GF_IsomInitialObjectDescriptor;
+
+
+/*File Format ES Descriptor for IOD*/
+typedef struct {
+	BASE_DESCRIPTOR
+	u32 trackID;
+} GF_ES_ID_Inc;
+
+/*File Format ES Descriptor for OD*/
+typedef struct {
+	BASE_DESCRIPTOR
+	u16 trackRef;
+} GF_ES_ID_Ref;
+
+/*Decoder config Descriptor*/
+typedef struct
+{
+	BASE_DESCRIPTOR
+	u8 objectTypeIndication;
+	u8 streamType;
+	u8 upstream;
+	u32 bufferSizeDB;
+	u32 maxBitrate;
+	u32 avgBitrate;
+	GF_DefaultDescriptor *decoderSpecificInfo;
+	GF_List *profileLevelIndicationIndexDescriptor;
+} GF_DecoderConfig;
+
+
+/*Content Identification Descriptor*/
+typedef struct {
+	BASE_DESCRIPTOR
+	u8 compatibility;
+	u8 protectedContent;
+	u8 contentTypeFlag;
+	u8 contentIdentifierFlag;
+	u8 contentType;
+	u8 contentIdentifierType;
+	/*international code string*/
+	char *contentIdentifier;	
+} GF_CIDesc;
+
+/*Supplementary Content Identification Descriptor)*/
+typedef struct {
+	BASE_DESCRIPTOR
+	u32 languageCode;
+	char *supplContentIdentifierTitle;
+	char *supplContentIdentifierValue;
+} GF_SCIDesc;
+
+/*IPI (Intelectual Property Identification) Descriptor Pointer*/
+typedef struct {
+	BASE_DESCRIPTOR
+	u16 IPI_ES_Id;
+} GF_IPIPtr;
+
+/*IPMP Descriptor Pointer*/
+typedef struct {
+	BASE_DESCRIPTOR
+	u8 IPMP_DescriptorID;
+	u16 IPMP_DescriptorIDEx;
+	u16 IPMP_ES_ID;	
+} GF_IPMPPtr;
+
+/*IPMPX control points*/
+enum
+{
+	/*no control point*/
+	IPMP_CP_NONE = 0,
+	/*control point between DB and decoder*/
+	IPMP_CP_DB = 1,
+	/*control point between decoder and CB*/
+	IPMP_CP_CB = 2,
+	/*control point between CB and render*/
+	IPMP_CP_CM = 3,
+	/*control point in BIFS tree (???)*/
+	IPMP_CP_BIFS = 4,
+	/*the rest is reserved or forbidden(0xFF)*/
+};
+
+/*IPMPX base classe*/
+#define GF_IPMPX_BASE	\
+	u8 tag;	\
+	u8 version;	\
+	u32 dataID;	\
+
+typedef struct 
+{
+	GF_IPMPX_BASE
+} GF_GF_IPMPX_Base;
+
+/*IPMP descriptor*/
+typedef struct {
+	BASE_DESCRIPTOR
+	u8 IPMP_DescriptorID;
+	u16 IPMPS_Type;
+	/*if IPMPS_Type=0, NULL-terminated URL, else if IPMPS_Type is not IPMPX, opaque data*/
+	char *opaque_data;
+	/*if IPMPS_Type=0, irrelevant (strlen(URL)), else if IPMPS_Type is not IPMPX, opaque data size*/
+	u32 opaque_data_size;
+
+	/*IPMPX specific*/
+	u16 IPMP_DescriptorIDEx;
+	bin128 IPMP_ToolID;
+	u8 control_point;
+	u8 cp_sequence_code;
+	GF_List *ipmpx_data;
+} GF_IPMP_Descriptor;
+
+
+/*IPMPTool*/
+#define MAX_IPMP_ALT_TOOLS	20
+typedef struct
+{
+	BASE_DESCRIPTOR
+	bin128 IPMP_ToolID;
+	/*if set, this is an alternate tool*/
+	u32 num_alternate;
+	bin128 specificToolID[MAX_IPMP_ALT_TOOLS];
+
+	struct _tagIPMPXParamDesc *toolParamDesc;
+	char *tool_url;
+} GF_IPMP_Tool;
+
+
+/* Elementary Mask of Bifs Config - parsing only */
+typedef struct {
+	BASE_DESCRIPTOR
+	u32 node_id;			// referenced nodeID
+	char *node_name;		// referenced node name
+} GF_ElementaryMask;
+
+/*BIFSConfig - parsing only, STORED IN ESD:DCD:DSI*/
+typedef struct __tag_bifs_config
+{
+	BASE_DESCRIPTOR
+	u32 version;
+	u16 nodeIDbits;
+	u16 routeIDbits;
+	u16 protoIDbits;
+	Bool pixelMetrics;
+	u16 pixelWidth, pixelHeight;
+	/*BIFS-Anim stuff*/
+	Bool randomAccess;
+	GF_List *elementaryMasks;
+	/*internal extensions for encoding*/
+	Bool useNames;
+} GF_BIFSConfig;
+
+/*flags for style*/
+enum
+{
+	GF_TXT_STYLE_NORMAL = 0,
+	GF_TXT_STYLE_BOLD = 1,
+	GF_TXT_STYLE_ITALIC = 2,
+	GF_TXT_STYLE_UNDERLINED = 4
+};
+
+typedef struct
+{
+	u16 startCharOffset;
+	u16 endCharOffset;
+	u16 fontID;
+	u8 style_flags;
+	u8 font_size;
+	/*ARGB*/
+	u32 text_color;
+} GF_StyleRecord;
+
+typedef struct
+{
+	u16 fontID;
+	char *fontName;
+} GF_FontRecord;
+
+typedef struct
+{
+	s16 top, left, bottom, right;
+} GF_BoxRecord;
+
+/*scroll flags*/
+enum
+{
+	GF_TXT_SCROLL_CREDITS = 0,
+	GF_TXT_SCROLL_MARQUEE = 1,
+	GF_TXT_SCROLL_DOWN = 2,
+	GF_TXT_SCROLL_RIGHT = 3
+};
+
+/* display flags*/
+enum
+{
+	GF_TXT_SCROLL_IN = 0x00000020,
+	GF_TXT_SCROLL_OUT = 0x00000040,
+	/*use one of the scroll flags, eg GF_TXT_SCROLL_DIRECTION | GF_TXT_SCROLL_CREDITS*/
+	GF_TXT_SCROLL_DIRECTION = 0x00000180,
+	GF_TXT_KARAOKE	= 0x00000800,
+	GF_TXT_VERTICAL = 0x00020000,
+	GF_TXT_FILL_REGION = 0x00040000,
+};
+
+typedef struct
+{
+	/*this is defined as a descriptor for parsing*/
+	BASE_DESCRIPTOR
+
+	u32 displayFlags;
+	/*left, top: 0 -  centered: 1 - bottom, right: -1*/
+	s8 horiz_justif, vert_justif;
+	/*ARGB*/
+	u32 back_color;
+	GF_BoxRecord default_pos;
+	GF_StyleRecord	default_style;
+
+	u32 font_count;
+	GF_FontRecord *fonts;
+
+	/*unused in isomedia but needed for streamingText*/
+	u8 sample_index;
+} GF_TextSampleDescriptor;
+
+typedef struct
+{
+	BASE_DESCRIPTOR
+	/*only 0x10 shall be used for 3GP text stream*/
+	u8 Base3GPPFormat;
+	/*only 0x10 shall be used for StreamingText*/
+	u8 MPEGExtendedFormat;
+	/*only 0x10 shall be used for StreamingText (base profile, base level)*/
+	u8 profileLevel;
+	u32 timescale;
+	/*0 forbidden, 1: out-of-band desc only, 2: in-band desc only, 3: both*/
+	u8 sampleDescriptionFlags;
+	/*More negative layer values are towards the viewer*/
+	s16 layer;
+	/*text track width & height*/
+	u16 text_width;
+	u16 text_height;
+	/*compatible 3GP formats, same coding as 3GPPBaseFormat*/
+	u8 nb_compatible_formats;
+	u8 compatible_formats[20];
+	/*defined in isomedia.h*/
+	GF_List *sample_descriptions;
+
+	/*if true info below are valid (cf 3GPP for their meaning)*/
+	Bool has_vid_info;
+	u16 video_width;
+	u16 video_height;
+	s16 horiz_offset;
+	s16 vert_offset;
+} GF_TextConfig;
+
+
+/*MuxInfo descriptor - parsing only, stored in ESD:extDescr*/
+typedef struct {
+	BASE_DESCRIPTOR
+	/*input location*/
+	char *file_name;
+	/*input groupID for interleaving*/
+	u32 GroupID;
+	/*input stream format (not required, guessed from file_name)*/
+	char *streamFormat;
+	/*time offset in ms from first TS (appends an edit list in mp4)*/
+	u32 startTime;
+
+	/*media length to import in ms (from 0)*/
+	u32 duration;
+
+	/*SRT/SUB import extensions - only support for text and italic style*/
+	char *textNode;
+	char *fontNode;
+
+	/*video and SUB import*/
+	Double frame_rate;
+
+	/*same as importer flags, cf media.h*/
+	u32 import_flags;
+
+	/*indicates input file shall be destryed - used during SWF import*/
+	Bool delete_file;
+} GF_MuxInfo;
+
+typedef struct
+{
+	BASE_DESCRIPTOR
+	/*input type*/
+	char *deviceName;
+	/*string sensor terminaison (validation) char*/
+	char termChar;
+	/*string sensor deletion char*/
+	char delChar;
+	/*device-specific data*/
+	char *ui_data;
+	u32 ui_data_length;
+} GF_UIConfig;
+
+/*LASERConfig - parsing only, STORED IN ESD:DCD:DSI*/
+typedef struct __tag_laser_config
+{
+	BASE_DESCRIPTOR
+	u8 profile;
+	u8 level;
+	u8 pointsCodec;
+	u8 pathComponents;
+	u8 fullRequestHost;
+	u16 time_resolution;
+	u8 colorComponentBits;
+	s8 resolution;
+	u8 coord_bits;
+	u8 scale_bits_minus_coord_bits;
+	u8 newSceneIndicator;
+	u8 extensionIDBits;
+
+	/*the rest of the structure is never coded, only used for the config of GPAC...*/
+	Bool force_string_ids;/*forces all nodes to be defined with string IDs*/
+} GF_LASERConfig;
+
+
+/***************************************
+			QoS Tags
+***************************************/
+enum
+{
+	QoSMaxDelayTag = 0x01,
+	QoSPrefMaxDelayTag = 0x02,
+	QoSLossProbTag = 0x03,
+	QoSMaxGapLossTag = 0x04,
+	QoSMaxAUSizeTag = 0x41,
+	QoSAvgAUSizeTag = 0x42,
+	QoSMaxAURateTag = 0x43
+};
+
+/***************************************
+			QoS Qualifiers
+***************************************/
+typedef struct {
+	BASE_DESCRIPTOR
+	u8 predefined;
+	GF_List *QoS_Qualifiers;
+} GF_QoS_Descriptor;
+
+
+#define QOS_BASE_QUALIFIER \
+	u8 tag;	\
+	u32 size;
+
+typedef struct {
+	QOS_BASE_QUALIFIER
+} GF_QoS_Default;
+
+typedef struct {
+	QOS_BASE_QUALIFIER
+	u32 MaxDelay;
+} GF_QoS_MaxDelay;
+
+typedef struct {
+	QOS_BASE_QUALIFIER
+	u32 PrefMaxDelay;
+} GF_QoS_PrefMaxDelay;
+
+typedef struct {
+	QOS_BASE_QUALIFIER
+	Float LossProb;
+} GF_QoS_LossProb;
+
+typedef struct {
+	QOS_BASE_QUALIFIER
+	u32 MaxGapLoss;
+} GF_QoS_MaxGapLoss;
+
+typedef struct {
+	QOS_BASE_QUALIFIER
+	u32 MaxAUSize;
+} GF_QoS_MaxAUSize;
+
+typedef struct {
+	QOS_BASE_QUALIFIER
+	u32 AvgAUSize;
+} GF_QoS_AvgAUSize;
+
+typedef struct {
+	QOS_BASE_QUALIFIER
+	u32 MaxAURate;
+} GF_QoS_MaxAURate;
+
+typedef struct {
+	QOS_BASE_QUALIFIER
+	u32 DataLength;		/*max size class : 2^28 - 1*/
+	char *Data;
+} GF_QoS_Private;
+
+
+/*Registration Descriptor*/
+typedef struct {
+	BASE_DESCRIPTOR
+	u32 formatIdentifier;
+	u32 dataLength;
+	char *additionalIdentificationInfo;
+} GF_Registration;
+
+/*Language Descriptor*/
+typedef struct {
+	BASE_DESCRIPTOR
+	u32 langCode;
+} GF_Language;
+
+/*Elementary Stream Descriptor*/
+typedef struct
+{
+	BASE_DESCRIPTOR
+	u16 ESID;
+	u16 OCRESID;
+	u16 dependsOnESID;
+	u8 streamPriority;
+	char *URLString;
+	GF_DecoderConfig *decoderConfig;
+	GF_SLConfig *slConfig;
+	GF_IPIPtr *ipiPtr;
+	GF_QoS_Descriptor *qos;
+	GF_Registration *RegDescriptor;
+	/*0 or 1 lang desc*/
+	GF_Language *langDesc;
+	
+	GF_List *IPIDataSet;
+	GF_List *IPMPDescriptorPointers;
+	GF_List *extensionDescriptors;
+
+} GF_ESD;
+
+
+/*Auxiliary Video Data Descriptor*/
+typedef struct {
+	BASE_DESCRIPTOR
+	u32 aux_video_type;
+	u32 position_offset_h;
+	u32 position_offset_v;
+	u32 knear;
+	u32 kfar;
+	u32 parallax_zero;
+	u32 parallax_scale;
+	u32 dref;
+	u32 wref;
+} GF_AuxVideoDescriptor;
+
+/*Content Classification Descriptor*/
+typedef struct {
+	BASE_DESCRIPTOR
+	u32 classificationEntity;
+	u16 classificationTable;
+	u32 dataLength;
+	char *contentClassificationData;
+} GF_CCDescriptor;
+
+
+/*this structure is used in GF_KeyWord*/
+typedef struct {
+	char *keyWord;
+} GF_KeyWordItem;
+
+/*Key Word Descriptor*/
+typedef struct {
+	BASE_DESCRIPTOR
+	u32 languageCode;
+	u8 isUTF8;
+	GF_List *keyWordsList;
+} GF_KeyWord;
+
+/*Rating Descriptor*/
+typedef struct {
+	BASE_DESCRIPTOR
+	u32 ratingEntity;
+	u16 ratingCriteria;
+	u32 infoLength;
+	char *ratingInfo;
+} GF_Rating;
+
+
+/*Short Textual Descriptor*/
+typedef struct {
+	BASE_DESCRIPTOR
+	u32 langCode;
+	u8 isUTF8;
+	char *eventName;
+	char *eventText;
+} GF_ShortTextual;
+
+
+/*this structure is used in GF_ExpandedTextual*/
+typedef struct {
+	char *text;
+} GF_ETD_ItemText;
+
+/*Expanded Textual Descriptor*/
+typedef struct {
+	BASE_DESCRIPTOR
+	u32 langCode;
+	u8 isUTF8;
+	GF_List *itemDescriptionList;
+	GF_List *itemTextList;
+	char *NonItemText;
+} GF_ExpandedTextual;
+
+/*this structure is used in GF_CC_Name*/
+typedef struct {
+	u32 langCode;
+	u8 isUTF8;
+	char *contentCreatorName;
+} GF_ContentCreatorInfo;
+
+/*Content Creator Name GF_Descriptor
+NOTE: the desctructor will delete all the items in the list
+(GF_ContentCreatorInfo items) */
+typedef struct {
+	BASE_DESCRIPTOR
+	GF_List *ContentCreators;
+} GF_CC_Name;
+
+/*Content Creation Date Descriptor*/
+typedef struct {
+	BASE_DESCRIPTOR
+	char contentCreationDate[5];
+} GF_CC_Date;
+
+
+/*this structure is used in GF_OCICreators*/
+typedef struct {
+	u32 langCode;
+	u8 isUTF8;
+	char *OCICreatorName;
+} GF_OCICreator_item;
+
+/*OCI Creator Name Descriptor*/
+typedef struct {
+	BASE_DESCRIPTOR
+	GF_List *OCICreators;
+} GF_OCICreators;
+
+/*OCI Creation Date Descriptor*/
+typedef struct {
+	BASE_DESCRIPTOR
+	char OCICreationDate[5];
+} GF_OCI_Data;
+
+
+/*this structure is used in GF_SMPTECamera*/
+typedef struct {
+	u8 paramID;
+	u32 param;
+} GF_SmpteParam;
+
+/*Smpte Camera Position Descriptor*/
+typedef struct {
+	BASE_DESCRIPTOR
+	u8 cameraID;
+	GF_List *ParamList;
+} GF_SMPTECamera;
+
+
+/*Extension Profile Level Descriptor*/
+typedef struct {
+	BASE_DESCRIPTOR
+	u8 profileLevelIndicationIndex;
+	u8 ODProfileLevelIndication;
+	u8 SceneProfileLevelIndication;
+	u8 AudioProfileLevelIndication;
+	u8 VisualProfileLevelIndication;
+	u8 GraphicsProfileLevelIndication;
+	u8 MPEGJProfileLevelIndication;
+} GF_PLExt;
+
+/*Profile Level Indication Index Descriptor*/
+typedef struct {
+	BASE_DESCRIPTOR
+	u8 profileLevelIndicationIndex;
+} GF_PL_IDX;
+
+
+/*AVC config descriptor - not a real MPEG-4 descriptor */
+/*used for sequenceParameterSetNALUnit and pictureParameterSetNALUnit*/
+typedef struct
+{
+	u16 size;
+	char *data;
+} GF_AVCConfigSlot;
+
+typedef struct 
+{
+	u8 configurationVersion;
+	u8 AVCProfileIndication;
+	u8 profile_compatibility;
+	u8 AVCLevelIndication; 
+	u8 nal_unit_size;
+	
+	GF_List *sequenceParameterSets;
+	GF_List *pictureParameterSets;
+} GF_AVCConfig;
+
+
+/************************************************************
+				Media Control Extensions
+************************************************************/
+typedef struct
+{
+	BASE_DESCRIPTOR
+	Double startTime;
+	Double Duration;
+	char *SegmentName;
+} GF_Segment;
+
+typedef struct
+{
+	BASE_DESCRIPTOR
+	Double mediaTimeStamp;
+} GF_MediaTime;
+
+
+/****************************************************************************
+
+			MPEG-4 SYSTEM - OBJECT DESCRIPTORS COMMANDS DECLARATION
+
+****************************************************************************/
+
+
+/***************************************
+			Commands Tags
+***************************************/
+enum
+{
+	GF_ODF_OD_UPDATE_TAG					= 0x01,
+	GF_ODF_OD_REMOVE_TAG					= 0x02,
+	GF_ODF_ESD_UPDATE_TAG					= 0x03,
+	GF_ODF_ESD_REMOVE_TAG					= 0x04,
+	GF_ODF_IPMP_UPDATE_TAG					= 0x05,
+	GF_ODF_IPMP_REMOVE_TAG					= 0x06,
+
+	/*file format reserved*/
+	GF_ODF_ESD_REMOVE_REF_TAG				= 0x07,
+
+	GF_ODF_COM_ISO_BEGIN_TAG		= 0x0D,
+	GF_ODF_COM_ISO_END_TAG		= 0xBF,
+	
+	GF_ODF_COM_USER_BEGIN_TAG	= 0xC0,
+	GF_ODF_COM_USER_END_TAG		= 0xFE
+};
+
+/***************************************
+			OD commands
+***************************************/
+#define BASE_OD_COMMAND \
+	u8 tag;
+
+/*the (abstract) base command. */
+typedef struct {
+	BASE_OD_COMMAND
+} GF_ODCom;
+
+/*the default bcommand*/
+typedef struct {
+	BASE_OD_COMMAND
+	u32 dataSize;
+	char *data;
+} GF_BaseODCom;
+
+/*Object Descriptor Update
+NB: the list can contain OD or IOD, except internally in the File Format (only MP4_OD)*/
+typedef struct
+{
+	BASE_OD_COMMAND
+	GF_List *objectDescriptors;
+} GF_ODUpdate;
+
+/*Object Descriptor Remove*/
+typedef struct
+{
+	BASE_OD_COMMAND
+	u32 NbODs;
+	u16 *OD_ID;
+} GF_ODRemove;
+
+/*Elementary Stream Descriptor Update*/
+typedef struct
+{
+	BASE_OD_COMMAND
+	u16 ODID;
+	GF_List *ESDescriptors;
+} GF_ESDUpdate;
+
+/*Elementary Stream Descriptor Remove*/
+typedef struct {
+	BASE_OD_COMMAND
+	u16 ODID;
+	u32 NbESDs;
+	u16 *ES_ID;
+} GF_ESDRemove;
+
+/*IPMP Descriptor Update*/
+typedef struct {
+	BASE_OD_COMMAND
+	GF_List *IPMPDescList;
+} GF_IPMPUpdate;
+
+/*IPMP Descriptor Remove*/
+typedef struct {
+	BASE_OD_COMMAND
+	u32 NbIPMPDs;
+	/*now this is bad: only IPMPv1 descriptors can be removed at run tim...*/
+	u8 *IPMPDescID;
+} GF_IPMPRemove;
+
+
+
+
+
+
+/********************************************************************
+	OD Exports
+********************************************************************/
+
+/*OD CODEC object - just a simple reader/writer*/
+typedef struct tagODCoDec
+{
+	GF_BitStream *bs;
+	GF_List *CommandList;
+} GF_ODCodec;
+
+/*construction / destruction*/
+GF_ODCodec *gf_odf_codec_new();
+void gf_odf_codec_del(GF_ODCodec *codec);
+/* add a command to the codec command list. */
+GF_Err gf_odf_codec_add_com(GF_ODCodec *codec, GF_ODCom *command);
+/*encode the current coimmand list - once called the commands are destroyed*/
+GF_Err gf_odf_codec_encode(GF_ODCodec *codec, Bool delete_content);
+/*get the encoded AU. user is responsible of allocated space*/
+GF_Err gf_odf_codec_get_au(GF_ODCodec *codec, char **outAU, u32 *au_length);
+/* set the encoded AU to the codec*/
+GF_Err gf_odf_codec_set_au(GF_ODCodec *codec, char *au, u32 au_length);
+/*decode the previously set-up AU*/
+GF_Err gf_odf_codec_decode(GF_ODCodec *codec);
+/*get the first OD command in the list. Once called, the command is removed 
+from the command list. Return NULL when commandList is empty*/
+GF_ODCom *gf_odf_codec_get_com(GF_ODCodec *codec);
+
+/*apply a command to the codec command list. Command is duplicated if needed
+This is used for state maintenance and RAP generation.*/
+GF_Err gf_odf_codec_apply_com(GF_ODCodec *codec, GF_ODCom *command);
+
+/************************************************************
+		GF_ODCom Functions
+************************************************************/
+
+/*Commands Creation / Destruction*/
+GF_ODCom *gf_odf_com_new(u8 tag);
+GF_Err gf_odf_com_del(GF_ODCom **com);
+
+
+/************************************************************
+		Descriptors Functions
+************************************************************/
+
+/*Descriptors Creation / Destruction*/
+GF_Descriptor *gf_odf_desc_new(u8 tag);
+void gf_odf_desc_del(GF_Descriptor *desc);
+
+/*use this function to decode a standalone descriptor
+the raw descriptor MUST be formatted with tag and size field!!!
+a new desc is created and you must delete it when done*/
+GF_Err gf_odf_desc_read(char *raw_desc, u32 descSize, GF_Descriptor * *outDesc);
+
+/*use this function to encode a standalone descriptor
+the desc will be formatted with tag and size field
+the output buffer is allocated and you must delete it when done*/
+GF_Err gf_odf_desc_write(GF_Descriptor *desc, char **outEncDesc, u32 *outSize);
+
+/*use this function to get the size of a standalone descriptor (including tag and size fields)
+return 0 if error*/
+u32 gf_odf_desc_size(GF_Descriptor *desc);
+
+/*this is usefull to duplicate on the fly a descriptor*/
+GF_Err gf_odf_desc_copy(GF_Descriptor *inDesc, GF_Descriptor **outDesc);
+
+
+/*This functions handles internally what desc can be added to another desc
+and adds it. NO DUPLICATION of the descriptor, so
+once a desc is added to its parent, destroying the parent WILL DESTROY 
+this descriptor*/
+GF_Err gf_odf_desc_add_desc(GF_Descriptor *parentDesc, GF_Descriptor *newDesc);
+
+
+/*this is a helper for building a preformatted GF_ESD with decoderConfig, decoderSpecificInfo with no data and 
+SLConfig descriptor with predefined*/
+GF_ESD *gf_odf_desc_esd_new(u32 sl_predefined);
+
+
+/*Since IPMP V2, we introduce a new set of functions to read / write a list of descriptors
+that have no containers (a bit like an OD command, but for descriptors)
+This is usefull for IPMPv2 DecoderSpecificInfo which contains a set of IPMP_Declarators
+As it could be used for other purposes we keep it generic
+you must create the list yourself, the functions just encode/decode from/to the list*/
+
+/*uncompress an encoded list of descriptors. You must pass an empty GF_List structure
+to know exactly what was in the buffer*/
+GF_Err gf_odf_desc_list_read(char *raw_list, u32 raw_size, GF_List *descList);
+/*compress all descriptors in the list into a single buffer. The buffer is allocated
+by the lib and must be destroyed by your app
+you must pass (outEncList != NULL  && *outEncList == NULL)*/
+GF_Err gf_odf_desc_list_write(GF_List *descList, char **outEncList, u32 *outSize);
+/*returns size of encoded desc list*/
+GF_Err gf_odf_desc_list_size(GF_List *descList, u32 *outSize);
+/*destroy the descriptors in a list but not the list*/
+GF_Err gf_odf_desc_list_del(GF_List *descList);
+
+/*retuns NULL if unknown, otherwise value*/
+const char *gf_odf_stream_type_name(u32 streamType);
+u32 gf_odf_stream_type_by_name(const char *streamType);
+
+/*special function for authoring - convert DSI to BIFSConfig*/
+GF_BIFSConfig *gf_odf_get_bifs_config(GF_DefaultDescriptor *dsi, u8 oti);
+/*special function for authoring - convert DSI to LASERConfig*/
+GF_Err gf_odf_get_laser_config(GF_DefaultDescriptor *dsi, GF_LASERConfig *cfg);
+/*sepcial function for authoring - convert DSI to TextConfig*/
+GF_Err gf_odf_get_text_config(GF_DefaultDescriptor *dsi, u8 oti, GF_TextConfig *cfg);
+/*special function for authoring - convert DSI to UIConfig*/
+GF_Err gf_odf_get_ui_config(GF_DefaultDescriptor *dsi, GF_UIConfig *cfg);
+/*converts UIConfig to dsi - does not destroy input descr but does create output one*/
+GF_Err gf_odf_encode_ui_config(GF_UIConfig *cfg, GF_DefaultDescriptor **out_dsi);
+
+/*simple constructor/destructor*/
+GF_AVCConfig *gf_odf_avc_cfg_new();
+void gf_odf_avc_cfg_del(GF_AVCConfig *cfg);
+/*gets GF_AVCConfig from MPEG-4 DSI*/
+GF_AVCConfig *gf_odf_avc_cfg_read(char *dsi, u32 dsi_size);
+/*writes GF_AVCConfig as MPEG-4 DSI*/
+GF_Err gf_odf_avc_cfg_write(GF_AVCConfig *cfg, char **outData, u32 *outSize);
+
+
+
+/************************************************************
+		QoS Qualifiers Functions
+************************************************************/
+
+/*QoS Qualifiers Creation / Destruction*/
+GF_QoS_Default *gf_odf_qos_new(u8 tag);
+GF_Err gf_odf_qos_del(GF_QoS_Default **qos);
+
+/*READ/WRITE functions: QoS qualifiers are special descriptors but follow the same rules as descriptors.
+therefore, use gf_odf_desc_read and gf_odf_desc_write for QoS*/
+
+/*same function, but for QoS, as a Qualifier IS NOT a descriptor*/
+GF_Err gf_odf_qos_add_qualif(GF_QoS_Descriptor *desc, GF_QoS_Default *qualif);
+
+
+
+/*
+	OCI Stream AU is a list of OCI event (like OD AU is a list of OD commands)
+*/
+
+typedef struct __tag_oci_event OCIEvent;
+
+OCIEvent *gf_oci_event_new(u16 EventID);
+void gf_oci_event_del(OCIEvent *event);
+
+GF_Err gf_oci_event_set_start_time(OCIEvent *event, u8 Hours, u8 Minutes, u8 Seconds, u8 HundredSeconds, u8 IsAbsoluteTime);
+GF_Err gf_oci_event_set_duration(OCIEvent *event, u8 Hours, u8 Minutes, u8 Seconds, u8 HundredSeconds);
+GF_Err gf_oci_event_add_desc(OCIEvent *event, GF_Descriptor *oci_desc);
+
+GF_Err gf_oci_event_get_id(OCIEvent *event, u16 *ID);
+GF_Err gf_oci_event_get_start_time(OCIEvent *event, u8 *Hours, u8 *Minutes, u8 *Seconds, u8 *HundredSeconds, u8 *IsAbsoluteTime);
+GF_Err gf_oci_event_get_duration(OCIEvent *event, u8 *Hours, u8 *Minutes, u8 *Seconds, u8 *HundredSeconds);
+u32 gf_oci_event_get_desc_count(OCIEvent *event);
+GF_Descriptor *gf_oci_event_get_desc(OCIEvent *event, u32 DescIndex);
+GF_Err gf_oci_event_rem_desc(OCIEvent *event, u32 DescIndex);
+
+
+
+typedef struct __tag_oci_codec OCICodec;
+
+/*construction / destruction
+IsEncoder specifies an OCI Event encoder
+version is for future extensions, and only 0x01 is valid for now*/
+OCICodec *gf_oci_codec_new(u8 IsEncoder, u8 Version);
+void gf_oci_codec_del(OCICodec *codec);
+
+/*				ENCODER FUNCTIONS
+add a command to the codec event list. 
+The event WILL BE DESTROYED BY THE CODEC after encoding*/
+GF_Err gf_oci_codec_add_event(OCICodec *codec, OCIEvent *event);
+
+/*encode AU. The memory allocation is done in place
+WARNING: once this function called, the codec event List is empty 
+and events destroyed
+you must set *outAU = NULL*/
+GF_Err gf_oci_codec_encode(OCICodec *codec, char **outAU, u32 *au_length);
+
+
+
+/*Decoder: decode the previously set-up AU
+the input buffer is cleared once decoded*/
+GF_Err gf_oci_codec_decode(OCICodec *codec, char *au, u32 au_length);
+
+/*get the first OCI Event in the list. Once called, the event is removed 
+from the event list. Return NULL when the event List is empty
+you MUST delete events */
+OCIEvent *gf_oci_codec_get_event(OCICodec *codec);
+
+
+/*OD dump tools*/
+GF_Err gf_odf_dump_au(char *data, u32 dataLength, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_com(void *p, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_desc(void *ptr, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_odf_dump_com_list(GF_List *commandList, FILE *trace, u32 indent, Bool XMTDump);
+
+/*OCI dump tools*/
+GF_Err gf_oci_dump_event(OCIEvent *ev, FILE *trace, u32 indent, Bool XMTDump);
+GF_Err gf_oci_dump_au(u8 version, char *au, u32 au_length, FILE *trace, u32 indent, Bool XMTDump);
+
+
+/*OD parsing tools (XMT/BT)*/
+/*returns desc tag based on name*/
+u32 gf_odf_get_tag_by_name(char *descName);
+/*field type for OD/QoS/IPMPX/etc*/
+enum
+{
+	/*regular type*/
+	GF_ODF_FT_DEFAULT = 0,
+	/*single descriptor type*/
+	GF_ODF_FT_OD = 1,
+	/*descriptor list type*/
+	GF_ODF_FT_OD_LIST = 2,
+	/*IPMP Data type*/
+	GF_ODF_FT_IPMPX = 3,
+	/*IPMP Data list type*/
+	GF_ODF_FT_IPMPX_LIST = 4,
+	/*IPMP ByteArray type*/
+	GF_ODF_FT_IPMPX_BA = 5,
+	/*IPMP ByteArray list type*/
+	GF_ODF_FT_IPMPX_BA_LIST = 6,
+};
+u32 gf_odf_get_field_type(GF_Descriptor *desc, char *fieldName);
+/*set non-descriptor field value - value string shall be presented without ' or " characters*/
+GF_Err gf_odf_set_field(GF_Descriptor *desc, char *fieldName, char *val);
+
+
+
+
+/*
+	IPMPX extensions - IPMP Data only (messages are not supported yet)
+*/
+
+typedef struct
+{
+	u32 length;
+	char *data;
+} GF_IPMPX_ByteArray;
+
+/*IPMPX authentication descriptors*/
+#define GF_IPMPX_AUTH_DESC	\
+	u8 tag;	\
+
+typedef struct
+{
+	GF_IPMPX_AUTH_DESC
+} GF_IPMPX_Authentication;
+
+enum
+{
+	GF_IPMPX_AUTH_Forbidden_Tag = 0x00,
+	GF_IPMPX_AUTH_AlgorithmDescr_Tag = 0x01,
+	GF_IPMPX_AUTH_KeyDescr_Tag = 0x02,
+};
+
+typedef struct
+{
+	GF_IPMPX_AUTH_DESC
+	char *keyBody;
+	u32 keyBodyLength;
+} GF_IPMPX_AUTH_KeyDescriptor;
+
+typedef struct
+{
+	GF_IPMPX_AUTH_DESC
+	/*used if no specAlgoID*/
+	u16 regAlgoID;
+	GF_IPMPX_ByteArray *specAlgoID;
+	GF_IPMPX_ByteArray *OpaqueData;
+} GF_IPMPX_AUTH_AlgorithmDescriptor;
+
+
+/*IPMP data messages*/
+enum 
+{
+	GF_IPMPX_OPAQUE_DATA_TAG = 0x01,
+	GF_IPMPX_AUDIO_WM_INIT_TAG = 0x02,
+	GF_IPMPX_VIDEO_WM_INIT_TAG = 0x03,
+	GF_IPMPX_SEL_DEC_INIT_TAG = 0x04,
+	GF_IPMPX_KEY_DATA_TAG = 0x05,
+	GF_IPMPX_AUDIO_WM_SEND_TAG = 0x06,
+	GF_IPMPX_VIDEO_WM_SEND_TAG = 0x07,
+	GF_IPMPX_RIGHTS_DATA_TAG = 0x08,
+	GF_IPMPX_SECURE_CONTAINER_TAG = 0x09,
+	GF_IPMPX_ADD_TOOL_LISTENER_TAG = 0x0A,
+	GF_IPMPX_REMOVE_TOOL_LISTENER_TAG = 0x0B,
+	GF_IPMPX_INIT_AUTHENTICATION_TAG = 0x0C,
+	GF_IPMPX_MUTUAL_AUTHENTICATION_TAG = 0x0D,
+	GF_IPMPX_USER_QUERY_TAG = 0x0E,
+	GF_IPMPX_USER_RESPONSE_TAG = 0x0F,
+	GF_IPMPX_PARAMETRIC_DESCRIPTION_TAG = 0x10,
+	GF_IPMPX_PARAMETRIC_CAPS_QUERY_TAG = 0x11,
+	GF_IPMPX_PARAMETRIC_CAPS_RESPONSE_TAG = 0x12,
+	/*NO ASSOCIATED STRUCTURE*/
+	GF_IPMPX_GET_TOOLS_TAG = 0x13,
+	GF_IPMPX_GET_TOOLS_RESPONSE_TAG = 0x14,
+	GF_IPMPX_GET_TOOL_CONTEXT_TAG = 0x15,
+	GF_IPMPX_GET_TOOL_CONTEXT_RESPONSE_TAG = 0x16,
+	GF_IPMPX_CONNECT_TOOL_TAG = 0x17,
+	GF_IPMPX_DISCONNECT_TOOL_TAG = 0x18,
+	GF_IPMPX_NOTIFY_TOOL_EVENT_TAG = 0x19,
+	GF_IPMPX_CAN_PROCESS_TAG = 0x1A,
+	GF_IPMPX_TRUST_SECURITY_METADATA_TAG = 0x1B,
+	GF_IPMPX_TOOL_API_CONFIG_TAG = 0x1C,
+
+	/*ISMA*/
+	GF_IPMPX_ISMACRYP_TAG = 0xD0, 
+
+	/*intern ones for parsing (not real datas)*/
+	GF_IPMPX_TRUSTED_TOOL_TAG = 0xA1,
+	GF_IPMPX_TRUST_SPECIFICATION_TAG = 0xA2,
+	/*emulate algo descriptors as base IPMP classes for parsing...*/
+	GF_IPMPX_ALGORITHM_DESCRIPTOR_TAG = 0xA3,
+	GF_IPMPX_KEY_DESCRIPTOR_TAG = 0xA4,
+	GF_IPMPX_PARAM_DESCRIPTOR_ITEM_TAG = 0xA5,
+	GF_IPMPX_SEL_ENC_BUFFER_TAG = 0xA6,
+	GF_IPMPX_SEL_ENC_FIELD_TAG = 0xA7,
+};
+
+typedef char GF_IPMPX_Date[5];
+
+
+#define GF_IPMPX_DATA_BASE	\
+	u8 tag;	\
+	u8 Version;	\
+	u8 dataID;	\
+
+typedef struct
+{
+	GF_IPMPX_DATA_BASE
+} GF_IPMPX_Data;
+
+typedef struct
+{
+	GF_IPMPX_DATA_BASE
+	u32 Context;
+	u8 AuthType;
+} GF_IPMPX_InitAuthentication;
+
+/*NOT a real DATA, only used as data for parsing*/
+typedef struct
+{
+	GF_IPMPX_DATA_BASE
+	GF_IPMPX_Date startDate;
+	u8 attackerProfile;
+	u32 trustedDuration;
+	GF_IPMPX_ByteArray	*CCTrustMetadata;
+} GF_IPMPX_TrustSpecification;
+
+/*NOT a real DATA, only used as data for parsing*/
+typedef struct
+{
+	GF_IPMPX_DATA_BASE
+	bin128 toolID;	
+	GF_IPMPX_Date AuditDate;
+	GF_List *trustSpecifications;
+} GF_IPMPX_TrustedTool;
+
+typedef struct _ipmpx_TrustSecurityMetadata
+{
+	GF_IPMPX_DATA_BASE
+	GF_List *TrustedTools;
+} GF_IPMPX_TrustSecurityMetadata;
+
+
+typedef struct
+{
+	GF_IPMPX_DATA_BASE
+	Bool failedNegotiation;
+
+	GF_List *candidateAlgorithms;
+	GF_List *agreedAlgorithms;
+	GF_IPMPX_ByteArray *AuthenticationData;
+
+	/*inclAuthCodes will be set if any of the members is set (cf spec...)*/
+	u32 certType;
+	/*GF_IPMPX_ByteArray list*/
+	GF_List *certificates;
+	GF_IPMPX_AUTH_KeyDescriptor *publicKey;
+	GF_IPMPX_ByteArray *opaque;
+	GF_IPMPX_TrustSecurityMetadata *trustData;
+	GF_IPMPX_ByteArray *authCodes;
+} GF_IPMPX_MutualAuthentication;
+
+typedef struct
+{
+	GF_IPMPX_DATA_BASE
+	/*if set MAC is part of the encrypted data*/
+	Bool isMACEncrypted;
+
+	GF_IPMPX_ByteArray *encryptedData;
+	GF_IPMPX_Data *protectedMsg;
+	GF_IPMPX_ByteArray *MAC;
+} GF_IPMPX_SecureContainer;
+
+typedef struct
+{
+	GF_List *ipmp_tools;
+} GF_IPMPX_GetToolsResponse;
+
+typedef struct
+{
+	GF_IPMPX_DATA_BASE
+	GF_IPMPX_ByteArray	*main_class;
+	GF_IPMPX_ByteArray	*subClass;
+	GF_IPMPX_ByteArray	*typeData;
+	GF_IPMPX_ByteArray	*type;
+	GF_IPMPX_ByteArray	*addedData;
+} GF_IPMPX_ParametricDescriptionItem;
+
+typedef struct _tagIPMPXParamDesc
+{
+	GF_IPMPX_DATA_BASE
+	GF_IPMPX_ByteArray *descriptionComment;
+	u8 majorVersion;
+	u8 minorVersion;
+	/*list of GF_IPMPX_ParametricDescriptionItem*/
+	GF_List *descriptions;
+} GF_IPMPX_ParametricDescription;
+
+typedef struct
+{
+	GF_IPMPX_DATA_BASE
+	GF_IPMPX_ParametricDescription *description;
+} GF_IPMPX_ToolParamCapabilitiesQuery;
+
+typedef struct
+{
+	GF_IPMPX_DATA_BASE
+	Bool capabilitiesSupported;
+} GF_IPMPX_ToolParamCapabilitiesResponse;
+
+
+typedef struct
+{
+	GF_IPMPX_DATA_BASE
+	GF_IPMP_Descriptor *toolDescriptor;
+} GF_IPMPX_ConnectTool;
+
+typedef struct
+{
+	GF_IPMPX_DATA_BASE
+	u32 IPMP_ToolContextID;
+} GF_IPMPX_DisconnectTool;
+
+
+typedef struct
+{
+	GF_IPMPX_DATA_BASE
+    u8 scope;
+	u16 IPMP_DescriptorIDEx;
+} GF_IPMPX_GetToolContext;
+
+
+typedef struct
+{
+	GF_IPMPX_DATA_BASE
+    u16 OD_ID;
+	u16 ESD_ID;
+    u32 IPMP_ToolContextID;
+} GF_IPMPX_GetToolContextResponse;
+
+/*GF_IPMPX_LISTEN_Types*/
+enum
+{
+	GF_IPMPX_LISTEN_CONNECTED = 0x00,
+	GF_IPMPX_LISTEN_CONNECTIONFAILED = 0x01,
+	GF_IPMPX_LISTEN_DISCONNECTED = 0x02,
+	GF_IPMPX_LISTEN_DISCONNECTIONFAILED = 0x03,
+	GF_IPMPX_LISTEN_WATERMARKDETECTED = 0x04,
+};
+
+typedef struct
+{
+	GF_IPMPX_DATA_BASE
+	u8 scope;
+	/*events to listen to*/
+	u8 eventTypeCount;
+	u8 eventType[10];
+} GF_IPMPX_AddToolNotificationListener;
+
+typedef struct
+{
+	GF_IPMPX_DATA_BASE
+	u8 eventTypeCount;
+	u8 eventType[10];
+} GF_IPMPX_RemoveToolNotificationListener;
+
+typedef struct
+{
+	GF_IPMPX_DATA_BASE
+	u16 OD_ID;
+	u16 ESD_ID;
+	u8 eventType;
+	u32 IPMP_ToolContextID;
+} GF_IPMPX_NotifyToolEvent;
+
+typedef struct
+{
+	GF_IPMPX_DATA_BASE
+	Bool canProcess;
+} GF_IPMPX_CanProcess;
+
+typedef struct
+{
+	GF_IPMPX_DATA_BASE
+	GF_IPMPX_ByteArray *opaqueData;
+} GF_IPMPX_OpaqueData;
+
+
+typedef struct
+{
+	GF_IPMPX_DATA_BASE
+	GF_IPMPX_ByteArray *keyBody;
+	/*flags meaning
+	hasStartDTS = 1;
+	hasStartPacketID = 1<<1;
+	hasExpireDTS = 1<<2;
+	hasExpirePacketID = 1<<3
+	*/
+	u32 flags;
+
+	u64 startDTS;
+	u32 startPacketID;
+	u64 expireDTS;
+	u32 expirePacketID;
+	GF_IPMPX_ByteArray *OpaqueData;
+} GF_IPMPX_KeyData;
+
+typedef struct
+{
+	GF_IPMPX_DATA_BASE
+	GF_IPMPX_ByteArray *rightsInfo;	
+} GF_IPMPX_RightsData;
+
+
+/*not a real GF_IPMPX_Data in spec, but emulated as if for parsing*/
+typedef struct
+{
+	GF_IPMPX_DATA_BASE
+	bin128 cipher_Id; 
+	u8 syncBoundary;
+	/*block mode if stream cypher info is NULL*/
+	u8 mode;  
+	u16 blockSize;
+	u16 keySize;
+	GF_IPMPX_ByteArray *Stream_Cipher_Specific_Init_Info; 
+} GF_IPMPX_SelEncBuffer;
+
+/*not a real GF_IPMPX_Data in spec, but emulated as if for parsing*/
+typedef struct
+{
+	GF_IPMPX_DATA_BASE
+	u8 field_Id; 
+	u8 field_Scope;
+	u8 buf; 
+
+	u16 mappingTableSize;
+	u16 *mappingTable;
+	GF_IPMPX_ByteArray *shuffleSpecificInfo;
+} GF_IPMPX_SelEncField;
+
+
+/*mediaTypeExtension*/
+enum
+{
+	GF_IPMPX_SE_MT_ISO_IEC = 0x00,
+	GF_IPMPX_SE_MT_ITU = 0x01
+	/*the rest is reserved or forbidden*/
+};
+
+/*compliance*/
+enum
+{
+	GF_IPMPX_SE_COMP_FULLY = 0x00,
+	GF_IPMPX_SE_COMP_VIDEO_PACKETS = 0x01,
+	GF_IPMPX_SE_COMP_VIDEO_VOP = 0x02,
+	GF_IPMPX_SE_COMP_VIDEO_NONE = 0x03,
+	GF_IPMPX_SE_COMP_VIDEO_GOB = 0x04,
+	/*0x05-2F	ISO Reserved for video*/
+	GF_IPMPX_SE_COMP_AAC_DF = 0x30,
+	GF_IPMPX_SE_COMP_AAC_NONE = 0x31,
+	/*
+	0x32 -  0x5F	ISO Reserved for audio
+	0x60 - 0xCF	ISO Reserved
+	0xD0 - 0xFE	User Defined
+	0xFF	Forbidden
+	*/
+};
+
+/*syncBoundary*/
+enum
+{
+	GF_IPMPX_SE_SYNC_VID7EO_PACKETS = 0x00,
+	GF_IPMPX_SE_SYNC_VIDEO_VOP = 0x01,
+	GF_IPMPX_SE_SYNC_VIDEO_GOV = 0x02,
+	/*0x03-2F	ISO Reserved for video,*/
+	GF_IPMPX_SE_SYNC_AAC_DF = 0x30,
+	/*0x31 -  0x5F	ISO Reserved for audio
+	0x60 - 0xCF	ISO Reserved
+	0xD0 - 0xFE	User Defined
+	0xFF	Forbidden
+	*/
+};
+
+/*field_Id*/
+enum
+{
+	GF_IPMPX_SE_FID_VIDEO_MV = 0x00,
+	GF_IPMPX_SE_FID_VIDEO_DC = 0x01,
+	GF_IPMPX_SE_FID_VIDEO_DCT_SIGN = 0x02,
+	GF_IPMPX_SE_FID_VIDEO_DQUANT = 0x03,
+	GF_IPMPX_SE_FID_VIDEO_DCT_COEF = 0x04,
+	GF_IPMPX_SE_FID_VIDEO_ALL = 0x05,
+	/*0x06-2F	ISO Reserved for video*/
+	GF_IPMPX_SE_FID_AAC_SIGN = 0x30,
+	GF_IPMPX_SE_FID_AAC_CODEWORDS = 0x31,
+	GF_IPMPX_SE_FID_AAC_SCALE = 0x32,
+	/*0x32 -  0x5F	ISO Reserved for audio
+	0x60 - 0xCF	ISO Reserved
+	0xD0 - 0xFE	User Defined
+	0xFF	Forbidden*/
+};
+
+
+typedef struct
+{
+	GF_IPMPX_DATA_BASE
+	u8 mediaTypeExtension; 
+	u8 mediaTypeIndication;
+	u8 profileLevelIndication; 
+	u8 compliance;
+
+	GF_List *SelEncBuffer;
+
+	GF_List *SelEncFields;
+
+	u16 RLE_DataLength;
+	u16 *RLE_Data;
+} GF_IPMPX_SelectiveDecryptionInit;
+
+
+/*watermark init ops*/
+enum
+{
+	GF_IPMPX_WM_INSERT = 0,
+	GF_IPMPX_WM_EXTRACT = 1,
+	GF_IPMPX_WM_REMARK = 2,
+	GF_IPMPX_WM_DETECT_COMPRESSION = 3,
+};
+
+/*used for both audio and video WM init*/
+typedef struct
+{
+	GF_IPMPX_DATA_BASE
+	/*
+	for audio: PCM defined (0x01) and all audio objectTypeIndications
+	for video: YUV defined (0x01) and all visual objectTypeIndications
+	*/
+	u8 inputFormat;
+	u8 requiredOp;
+
+	/*valid for audio WM, inputFormat=0x01*/
+	u8 nChannels;
+	u8 bitPerSample;
+	u32 frequency;
+
+	/*valid for video WM, inputFormat=0x01*/
+	u16 frame_horizontal_size;
+	u16 frame_vertical_size;
+	u8 chroma_format;
+
+	u32 wmPayloadLen;
+	char *wmPayload;
+
+	u16 wmRecipientId;
+	
+	u32 opaqueDataSize;
+	char *opaqueData;
+} GF_IPMPX_WatermarkingInit;
+
+
+
+/*WM status*/
+enum
+{
+	GF_IPMPX_WM_PAYLOAD = 0,
+	GF_IPMPX_WM_NOPAYLOAD = 1,
+	GF_IPMPX_WM_NONE = 2,
+	GF_IPMPX_WM_UNKNOWN = 3
+};
+
+/*compression status*/
+enum
+{
+	GF_IPMPX_WM_COMPRESSION = 0,
+	GF_IPMPX_WM_NO_COMPRESSION = 1,
+	GF_IPMPX_WM_COMPRESSION_UNKNOWN = 2,
+};
+
+typedef struct
+{
+	GF_IPMPX_DATA_BASE
+	u8 wm_status;
+	u8 compression_status;
+	/*if payload is set, status is FORCED to AUDIO_GF_IPMPX_WM_PAYLOAD*/
+	GF_IPMPX_ByteArray *payload;
+	GF_IPMPX_ByteArray *opaqueData;
+} GF_IPMPX_SendWatermark;
+
+
+typedef struct
+{
+	GF_IPMPX_DATA_BASE
+	/*GPAC only supports non-0 IDs*/
+	u32 Instantiation_API_ID;
+	u32 Messaging_API_ID;
+	GF_IPMPX_ByteArray *opaqueData;
+} GF_IPMPX_ToolAPI_Config;
+
+typedef struct
+{
+	GF_IPMPX_DATA_BASE
+	u8 cryptoSuite;
+	u8 IV_length;
+	Bool use_selective_encryption;
+	u8 key_indicator_length;
+} GF_IPMPX_ISMACryp;
+
+
+/*constructor/destructor*/
+GF_IPMPX_Data *gf_ipmpx_data_new(u8 tag);
+void gf_ipmpx_data_del(GF_IPMPX_Data *p);
+
+/*parse from bitstream*/
+GF_Err gf_ipmpx_data_parse(GF_BitStream *bs, GF_IPMPX_Data **out_data);
+/*get IPMP_Data contained size (eg without tag & sizeofinstance)*/
+u32 gf_ipmpx_data_size(GF_IPMPX_Data *p);
+/*get fulml IPMP_Data encoded size (eg with tag & sizeofinstance)*/
+u32 gf_ipmpx_data_full_size(GF_IPMPX_Data *p);
+/*writes IPMP_Data to buffer*/
+GF_Err gf_ipmpx_data_write(GF_BitStream *bs, GF_IPMPX_Data *_p);
+
+/*returns GF_IPMPX_Tag based on name*/
+u8 gf_ipmpx_get_tag(char *dataName);
+/*return values: cf above */
+u32 gf_ipmpx_get_field_type(GF_IPMPX_Data *p, char *fieldName);
+GF_Err gf_ipmpx_set_field(GF_IPMPX_Data *desc, char *fieldName, char *val);
+/*assign subdata*/
+GF_Err gf_ipmpx_set_sub_data(GF_IPMPX_Data *desc, char *fieldName, GF_IPMPX_Data *subdesc);
+/*assign bytearray*/
+GF_Err gf_ipmpx_set_byte_array(GF_IPMPX_Data *p, char *field, char *str);
+
+/*ipmpx dumper*/
+GF_Err gf_ipmpx_dump_data(GF_IPMPX_Data *_p, FILE *trace, u32 indent, Bool XMTDump);
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/*_GF_MPEG4_ODF_H_*/
diff --git a/tstools/DtsEdit/src/gpac/mpegts.h b/tstools/DtsEdit/src/gpac/mpegts.h
new file mode 100644
index 0000000..c69bb7c
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/mpegts.h
@@ -0,0 +1,681 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Walid B.H - Jean Le Feuvre
+ *    Copyright (c)2006-200X ENST - All rights reserved
+ *
+ *  This file is part of GPAC / MPEG2-TS sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+#ifndef _GF_MPEG_TS_H_
+#define _GF_MPEG_TS_H_
+
+#include <gpac/list.h>
+#include <gpac/internal/odf_dev.h>
+
+typedef struct tag_m2ts_demux GF_M2TS_Demuxer;
+typedef struct tag_m2ts_es GF_M2TS_ES;
+typedef struct tag_m2ts_section_es GF_M2TS_SECTION_ES;
+
+/*Maximum number of streams in a TS*/
+#define GF_M2TS_MAX_STREAMS	8192
+
+/*MPEG-2 TS Media types*/
+enum
+{
+	GF_M2TS_VIDEO_MPEG1				= 0x01,
+	GF_M2TS_VIDEO_MPEG2				= 0x02,
+	GF_M2TS_AUDIO_MPEG1				= 0x03,
+	GF_M2TS_AUDIO_MPEG2				= 0x04, 
+	GF_M2TS_PRIVATE_SECTION			= 0x05,
+	GF_M2TS_PRIVATE_DATA			= 0x06,
+	GF_M2TS_AUDIO_AAC				= 0x0F,
+	GF_M2TS_VIDEO_MPEG4				= 0x10,
+	GF_M2TS_AUDIO_LATM_AAC			= 0x11,
+
+	GF_M2TS_SYSTEMS_MPEG4_PES		= 0x12,
+	GF_M2TS_SYSTEMS_MPEG4_SECTIONS	= 0x13,
+
+	GF_M2TS_VIDEO_H264				= 0x1B,
+
+	GF_M2TS_AUDIO_AC3				= 0x81,
+	GF_M2TS_AUDIO_DTS				= 0x8A,
+	GF_M2TS_SUBTITLE_DVB			= 0x100,
+};
+/*returns readable name for given stream type*/
+const char *gf_m2ts_get_stream_name(u32 streamType);
+
+/*PES data framing modes*/
+enum
+{
+	/*use data framing: recompute start of AUs (data frames)*/
+	GF_M2TS_PES_FRAMING_DEFAULT,
+	/*don't use data framing: all packets are raw PES packets*/
+	GF_M2TS_PES_FRAMING_RAW,
+	/*skip pes processing: all transport packets related to this stream are discarded*/
+	GF_M2TS_PES_FRAMING_SKIP
+};
+
+/*PES packet flags*/
+enum
+{
+	GF_M2TS_PES_PCK_RAP = 1,
+	GF_M2TS_PES_PCK_AU_START = 1<<1,
+	/*visual frame starting in this packet is an I frame or IDR (AVC/H264)*/
+	GF_M2TS_PES_PCK_I_FRAME = 1<<2,
+	/*visual frame starting in this packet is a P frame*/
+	GF_M2TS_PES_PCK_P_FRAME = 1<<3,
+	/*visual frame starting in this packet is a B frame*/
+	GF_M2TS_PES_PCK_B_FRAME = 1<<4
+};
+
+/*Events used by the MPEGTS demuxer*/
+enum
+{
+	/*PAT has been found (service connection) - no assoctiated parameter*/
+	GF_M2TS_EVT_PAT_FOUND = 0,
+	/*PAT has been updated - no assoctiated parameter*/
+	GF_M2TS_EVT_PAT_UPDATE,
+	/*repeated PAT has been found (carousel) - no assoctiated parameter*/
+	GF_M2TS_EVT_PAT_REPEAT,
+	/*PMT has been found (service tune-in) - assoctiated parameter: new PMT*/
+	GF_M2TS_EVT_PMT_FOUND,
+	/*repeated PMT has been found (carousel) - assoctiated parameter: updated PMT*/
+	GF_M2TS_EVT_PMT_REPEAT,
+	/*PMT has been changed - assoctiated parameter: updated PMT*/
+	GF_M2TS_EVT_PMT_UPDATE,
+	/*SDT has been received - assoctiated parameter: none*/
+	GF_M2TS_EVT_SDT_FOUND,
+	/*repeated SDT has been found (carousel) - assoctiated parameter: none*/
+	GF_M2TS_EVT_SDT_REPEAT,
+	/*SDT has been received - assoctiated parameter: none*/
+	GF_M2TS_EVT_SDT_UPDATE,
+	/*INT has been received - assoctiated parameter: none*/
+	GF_M2TS_EVT_INT_FOUND,
+	/*repeated INT has been found (carousel) - assoctiated parameter: none*/
+	GF_M2TS_EVT_INT_REPEAT,
+	/*INT has been received - assoctiated parameter: none*/
+	GF_M2TS_EVT_INT_UPDATE,
+	/*PES packet has been received - assoctiated parameter: PES packet*/
+	GF_M2TS_EVT_PES_PCK,
+	/*PCR has been received - assoctiated parameter: PES packet with no data*/
+	GF_M2TS_EVT_PES_PCR,
+	/*An MPEG-4 SL Packet has been received in a section - assoctiated parameter: SL packet */
+	GF_M2TS_EVT_SL_PCK,
+	/*An IP datagram has been received in a section - assoctiated parameter: IP datagram */
+	GF_M2TS_EVT_IP_DATAGRAM,
+
+	/*AAC config has been extracted - associated parameter: PES Packet with encoded M4ADecSpecInfo in its data
+		THIS MUST BE CLEANED UP
+	*/
+	GF_M2TS_EVT_AAC_CFG,
+#if 0
+	/* An EIT message for the present or following event on this TS has been received */
+	GF_M2TS_EVT_EIT_ACTUAL_PF,
+	/* An EIT message for the schedule of this TS has been received */
+	GF_M2TS_EVT_EIT_ACTUAL_SCHEDULE,
+	/* An EIT message for the present or following event of an other TS has been received */
+	GF_M2TS_EVT_EIT_OTHER_PF,
+	/* An EIT message for the schedule of an other TS has been received */
+	GF_M2TS_EVT_EIT_OTHER_SCHEDULE,
+	/* A message to inform about the current date and time in the TS */
+	GF_M2TS_EVT_TDT,
+	/* A message to inform about the current time offset in the TS */
+	GF_M2TS_EVT_TOT,
+#endif
+	/* A generic event message for EIT, TDT, TOT etc */
+	GF_M2TS_EVT_DVB_GENERAL,
+};
+
+enum
+{
+	GF_M2TS_TABLE_START		= 1,
+	GF_M2TS_TABLE_END		= 1<<1,
+	GF_M2TS_TABLE_FOUND		= 1<<2,
+	GF_M2TS_TABLE_UPDATE	= 1<<3,
+	GF_M2TS_TABLE_REPEAT	= 1<<4,
+};
+
+typedef void (*gf_m2ts_section_callback)(GF_M2TS_Demuxer *ts, GF_M2TS_SECTION_ES *es, GF_List *sections, u8 table_id, u16 ex_table_id, u8 version_number, u8 last_section_number, u32 status); 
+
+typedef struct __m2ts_demux_section
+{
+	unsigned char *data;
+	u32 data_size;
+} GF_M2TS_Section;
+
+typedef struct __m2ts_demux_table
+{
+	struct __m2ts_demux_table *next;
+
+	Bool is_init;
+
+	/*table id*/
+	u8 table_id;
+	u16 ex_table_id;
+
+	/*reassembler state*/
+	u8 version_number;
+	u8 last_version_number;
+
+	u8 current_next_indicator;
+
+	u8 section_number;
+	u8 last_section_number;
+
+	GF_List *sections;
+
+} GF_M2TS_Table;
+
+
+typedef struct GF_M2TS_SectionFilter
+{
+	/*section reassembler*/
+	s16 cc;
+	/*section buffer (max 4096)*/
+	char *section;
+	/*current section length as indicated in section header*/
+	u16 length;
+	/*number of bytes received from current section*/
+	u16 received;
+	/*error indiator when reaggregating sections*/
+	u8 had_error;
+
+	/*section->table aggregator*/
+	GF_M2TS_Table *table;
+	
+	/* indicates that the section and last_section_number do not need to be checked */
+	Bool process_individual;
+
+	/* indicates that the section header with table id and extended table id ... is
+	   not parsed by the TS demuxer and left for the application  */
+	Bool direct_dispatch;
+
+	gf_m2ts_section_callback process_section; 
+} GF_M2TS_SectionFilter;
+
+
+
+/*MPEG-2 TS program object*/
+typedef struct 
+{
+	GF_List *streams;
+	u32 pmt_pid;  
+	u32 pcr_pid;
+	u32 number;
+
+	GF_InitialObjectDescriptor *pmt_iod;
+
+	/*list of additional ODs found per program !! used by media importer only , refine this !! 
+		this list is only created when MPEG-4 over MPEG-2 is detected
+		the list AND the ODs contained in it are destroyed when destroying the demuxer
+	*/
+	GF_List *additional_ods;
+	/*first dts found on this program - this is used by parsers, but not setup by the lib*/
+	u64 first_dts;
+} GF_M2TS_Program;
+
+/*ES flags*/
+enum
+{
+	/*ES is a section stream*/
+	GF_M2TS_ES_IS_SECTION = 1,
+	/*ES is an mpeg-4 flexmux stream*/
+	GF_M2TS_ES_IS_FMC = 1<<1,
+	/*ES is an mpeg-4 SL-packetized stream*/
+	GF_M2TS_ES_IS_SL = 1<<2,
+	/*ES is an mpeg-4 Object Descriptor SL-packetized stream*/
+	GF_M2TS_ES_IS_MPEG4_OD = 1<<3,
+	
+	/*all flags above this mask are used by importers & co*/
+	GF_M2TS_ES_STATIC_FLAGS_MASK = 0x0000FFFF,
+
+	/*Flag used by importers*/
+	GF_M2TS_ES_FIRST_DTS = 1<<20,
+};
+
+/*Abstract Section/PES stream object, only used for type casting*/
+#define ABSTRACT_ES		\
+			GF_M2TS_Program *program; \
+			u32 flags; \
+			u32 pid; \
+			u32 stream_type; \
+			u32 mpeg4_es_id; \
+			void *user; \
+			u64 first_dts;
+
+struct tag_m2ts_es
+{
+	ABSTRACT_ES
+};
+
+/*INT object*/
+typedef struct
+{
+	u32 id;
+} GF_M2TS_INT;
+
+struct tag_m2ts_section_es
+{
+	ABSTRACT_ES
+	GF_M2TS_SectionFilter *sec;
+
+	/* MPE Frame object, MPE-FEC related data */
+	GF_M2TS_INT *ip_mac_not_table;	
+};			
+
+/*******************************************************************************/
+typedef struct tag_m2ts_dvb_sub
+{
+	char language[3];
+	u8 type;
+	u16 composition_page_id;
+	u16 ancillary_page_id;
+} GF_M2TS_DVB_Subtitling_Descriptor;
+
+typedef struct tag_m2ts_dvb_teletext
+{
+	char language[3];
+	u8 type;
+	u8 magazine_number;
+	u8 page_number;
+} GF_M2TS_DVB_Teletext_Descriptor;
+
+/*MPEG-2 TS ES object*/
+typedef struct tag_m2ts_pes
+{
+	ABSTRACT_ES
+	u32 lang;
+
+	/*object info*/
+	u32 vid_w, vid_h, vid_par, aud_sr, aud_nb_ch;
+	/*user private*/
+
+
+	/*mpegts lib private - do not touch :)*/
+	/*PES re-assembler*/
+	unsigned char *data;
+	u32 data_len, pes_len;
+	Bool rap;
+	u64 PTS, DTS;
+	
+	/*PES reframer - if NULL, pes processing is skiped*/
+	u32 frame_state;
+	void (*reframe)(struct tag_m2ts_demux *ts, struct tag_m2ts_pes *pes, u64 DTS, u64 CTS, unsigned char *data, u32 data_len);
+	/*LATM stuff - should be moved out of mpegts*/
+	unsigned char *buf;
+	u32 buf_len;
+
+	GF_M2TS_DVB_Subtitling_Descriptor sub;
+
+} GF_M2TS_PES;
+
+/*SDT information object*/
+typedef struct
+{
+	u16 original_network_id;
+	u16 transport_stream_id;
+	u32 service_id;
+	u32 EIT_schedule;
+	u32 EIT_present_following;
+	u32 running_status;
+	u32 free_CA_mode;
+	u8 service_type;
+	unsigned char *provider, *service;
+} GF_M2TS_SDT;
+
+typedef struct
+{
+	u16 network_id;
+	unsigned char *network_name;
+	u16 original_network_id;
+	u16 transport_stream_id;
+	u16 service_id;
+	u32 service_type;
+	u32 logical_channel_number;
+} GF_M2TS_NIT;
+
+#define GF_M2TS_BASE_DESCRIPTOR u32 tag;
+
+typedef struct {
+	u8 content_nibble_level_1, content_nibble_level_2, user_nibble;
+} GF_M2TS_DVB_Content_Descriptor;
+
+typedef struct {
+	char country_code[3];
+	u8 value;
+} GF_M2TS_DVB_Rating_Descriptor;
+
+typedef struct {
+	unsigned char lang[3];
+	unsigned char *event_name, *event_text;
+} GF_M2TS_DVB_Short_Event_Descriptor;
+
+typedef struct {
+	unsigned char *item;
+	unsigned char *description;
+} GF_M2TS_DVB_Extended_Event_Item;
+
+typedef struct {
+	unsigned char lang[3];
+	u32 last;
+	GF_List *items;
+	unsigned char *text;
+} GF_M2TS_DVB_Extended_Event_Descriptor;
+
+/*EIT information objects*/
+typedef struct
+{
+	u32 year, month, day, time;
+
+	/* local time offset descriptor data */
+	char country_code[3];
+	u8 country_region_id;
+	u8 local_time_offset_polarity;
+	u16 local_time_offset;
+	/*time_of_change*/
+	u32 toc_year, toc_month, toc_day, toc_time;
+	u16 next_time_offset;
+} GF_M2TS_DateTime_Event;
+
+typedef struct {
+	u8 stream_content;
+	u8 component_type;
+	u8 component_tag;
+	char language_code[3];
+	unsigned char *text;
+} GF_M2TS_Component;
+
+typedef struct
+{
+	u16 event_id;
+	GF_M2TS_DateTime_Event start;
+	u32 duration;
+	u8 running_status;
+	u8 free_CA_mode;
+	GF_List *short_events;
+	GF_List *extended_events;
+	GF_List *components;
+	GF_List *contents;
+	GF_List *ratings;
+} GF_M2TS_EIT_Event;
+
+typedef struct
+{
+	u32 original_network_id;
+	u32 transport_stream_id;
+	u16 service_id;
+	GF_List *events;
+} GF_M2TS_EIT;
+
+void gf_m2ts_decode_mjd_date(u32 date, u32 *year, u32 *month, u32 *day);
+
+
+/*MPEG-2 TS packet*/
+typedef struct
+{
+	char *data;
+	u32 data_len;
+	u32 flags;
+	u64 PTS, DTS;
+	/*parent stream*/
+	GF_M2TS_PES *stream;
+} GF_M2TS_PES_PCK;
+
+/*MPEG-4 SL packet from MPEG-2 TS*/
+typedef struct
+{
+	char *data;
+	u32 data_len;
+	/*parent stream */
+	GF_M2TS_ES *stream;
+} GF_M2TS_SL_PCK;
+
+/*MPEG-2 TS demuxer*/
+struct tag_m2ts_demux
+{
+	GF_M2TS_ES *ess[GF_M2TS_MAX_STREAMS];
+	GF_List *programs;
+	/*keep it seperate for now - TODO check if we're sure of the order*/
+	GF_List *SDTs;
+
+	/*user callback - MUST NOT BE NULL*/
+	void (*on_event)(struct tag_m2ts_demux *ts, u32 evt_type, void *par);
+	/*private user data*/
+	void *user;
+
+	/*private resync buffer*/
+	char *buffer;
+	u32 buffer_size, alloc_size;
+	/*default transport PID filters*/
+	GF_M2TS_SectionFilter *pat, *nit, *sdt, *eit, *tdt_tot_st;
+
+	/* Structure to hold all the INT tables if the TS contains IP streams */
+	GF_List *ip_mac_not_tables;
+	
+	Bool has_4on2;
+	/* analyser */
+	FILE *pes_out;
+
+
+};
+
+
+GF_M2TS_Demuxer *gf_m2ts_demux_new();
+void gf_m2ts_demux_del(GF_M2TS_Demuxer *ts);
+void gf_m2ts_reset_parsers(GF_M2TS_Demuxer *ts);
+GF_Err gf_m2ts_set_pes_framing(GF_M2TS_PES *pes, u32 mode);
+GF_Err gf_m2ts_process_data(GF_M2TS_Demuxer *ts, char *data, u32 data_size);
+
+u32 gf_m2ts_crc32_check(char *data, u32 len);
+
+/*MPEG-2 Descriptor tags*/
+enum
+{
+	/* ... */
+	GF_M2TS_VIDEO_STREAM_DESCRIPTOR				= 0x02,
+	GF_M2TS_AUDIO_STREAM_DESCRIPTOR				= 0x03,
+	GF_M2TS_HIERARCHY_DESCRIPTOR				= 0x04,
+	GF_M2TS_REGISTRATION_DESCRIPTOR				= 0x05,
+	GF_M2TS_DATA_STREAM_ALIGNEMENT_DESCRIPTOR		= 0x06,
+	GF_M2TS_TARGET_BACKGROUND_GRID_DESCRIPTOR		= 0x07,
+	GF_M2TS_VIEW_WINDOW_DESCRIPTOR				= 0x08,
+	GF_M2TS_CA_DESCRIPTOR					= 0x09,
+	GF_M2TS_ISO_639_LANGUAGE_DESCRIPTOR			= 0x0A,
+	/* ... */
+	GF_M2TS_STD_DESCRIPTOR					= 0x17,
+	/* ... */
+	GF_M2TS_MPEG4_VIDEO_DESCRIPTOR				= 0x1B,
+	GF_M2TS_MPEG4_AUDIO_DESCRIPTOR				= 0x1C,
+	GF_M2TS_MPEG4_IOD_DESCRIPTOR				= 0x1D,
+	GF_M2TS_MPEG4_SL_DESCRIPTOR				= 0x1E,
+	GF_M2TS_MPEG4_FMC_DESCRIPTOR				= 0x1F,
+	/* ... */
+	GF_M2TS_AVC_VIDEO_DESCRIPTOR				= 0x28,
+	/* ... */	
+	GF_M2TS_AVC_TIMING_HRD_DESCRIPTOR			= 0x2A,
+	/* ... */
+
+	/* 0x2D - 0x3F - ISO/IEC 13818-6 values */
+	/* 0x40 - 0xFF - User Private values */
+	GF_M2TS_DVB_NETWORK_NAME_DESCRIPTOR			= 0x40,
+	GF_M2TS_DVB_SERVICE_LIST_DESCRIPTOR			= 0x41,
+	GF_M2TS_DVB_STUFFING_DESCRIPTOR				= 0x42,
+	GF_M2TS_DVB_SAT_DELIVERY_SYSTEM_DESCRIPTOR		= 0x43,
+	GF_M2TS_DVB_CABLE_DELIVERY_SYSTEM_DESCRIPTOR		= 0x44,
+	GF_M2TS_DVB_VBI_DATA_DESCRIPTOR				= 0x45,
+	GF_M2TS_DVB_VBI_TELETEXT_DESCRIPTOR			= 0x46,
+	GF_M2TS_DVB_BOUQUET_NAME_DESCRIPTOR			= 0x47,
+	GF_M2TS_DVB_SERVICE_DESCRIPTOR				= 0x48,
+	GF_M2TS_DVB_COUNTRY_AVAILABILITY_DESCRIPTOR		= 0x49,
+	GF_M2TS_DVB_LINKAGE_DESCRIPTOR				= 0x4A,
+	GF_M2TS_DVB_NVOD_REFERENCE_DESCRIPTOR			= 0x4B,
+	GF_M2TS_DVB_TIME_SHIFTED_SERVICE_DESCRIPTOR		= 0x4C,
+	GF_M2TS_DVB_SHORT_EVENT_DESCRIPTOR			= 0x4D,
+	GF_M2TS_DVB_EXTENDED_EVENT_DESCRIPTOR			= 0x4E,
+	GF_M2TS_DVB_TIME_SHIFTED_EVENT_DESCRIPTOR		= 0x4F,
+	GF_M2TS_DVB_COMPONENT_DESCRIPTOR			= 0x50,
+	GF_M2TS_DVB_MOSAIC_DESCRIPTOR				= 0x51,
+	GF_M2TS_DVB_STREAM_IDENTIFIER_DESCRIPTOR		= 0x52,
+	GF_M2TS_DVB_CA_IDENTIFIER_DESCRIPTOR			= 0x53,
+	GF_M2TS_DVB_CONTENT_DESCRIPTOR				= 0x54,
+	GF_M2TS_DVB_PARENTAL_RATING_DESCRIPTOR			= 0x55,
+	GF_M2TS_DVB_TELETEXT_DESCRIPTOR				= 0x56,
+	/* ... */
+	GF_M2TS_DVB_LOCAL_TIME_OFFSET_DESCRIPTOR		= 0x58,
+	GF_M2TS_DVB_SUBTITLING_DESCRIPTOR			= 0x59,
+	/* ... */
+	GF_M2TS_DVB_DATA_BROADCAST_DESCRIPTOR			= 0x64,
+	/* ... */
+	GF_M2TS_DVB_DATA_BROADCAST_ID_DESCRIPTOR		= 0x66,
+	/* ... */
+	GF_M2TS_DVB_AC3_DESCRIPTOR				= 0x6A,
+	
+};
+
+/* Reserved PID values */
+enum {
+	GF_M2TS_PID_PAT			= 0x0000,
+	GF_M2TS_PID_CAT			= 0x0001,
+	GF_M2TS_PID_TSDT		= 0x0002,
+	/* reserved 0x0003 to 0x000F */ 
+	GF_M2TS_PID_NIT_ST		= 0x0010,
+	GF_M2TS_PID_SDT_BAT_ST		= 0x0011,
+	GF_M2TS_PID_EIT_ST_CIT		= 0x0012,
+	GF_M2TS_PID_RST_ST		= 0x0013,
+	GF_M2TS_PID_TDT_TOT_ST		= 0x0014,
+	GF_M2TS_PID_NET_SYNC		= 0x0015,
+	GF_M2TS_PID_RNT			= 0x0016,
+	/* reserved 0x0017 to 0x001B */ 
+	GF_M2TS_PID_IN_SIG		= 0x001C,
+	GF_M2TS_PID_MEAS		= 0x001D,
+	GF_M2TS_PID_DIT			= 0x001E,
+	GF_M2TS_PID_SIT			= 0x001F
+};
+
+/* max size includes first header, second header, payload and CRC */
+enum {
+	GF_M2TS_TABLE_ID_PAT			= 0x00,
+	GF_M2TS_TABLE_ID_CAT			= 0x01, 
+	GF_M2TS_TABLE_ID_PMT			= 0x02, 
+	GF_M2TS_TABLE_ID_TSDT			= 0x03, /* max size for section 1024 */
+	GF_M2TS_TABLE_ID_MPEG4_BIFS		= 0x04, /* max size for section 4096 */
+	GF_M2TS_TABLE_ID_MPEG4_OD		= 0x05, /* max size for section 4096 */
+	GF_M2TS_TABLE_ID_METADATA		= 0x06, 
+	GF_M2TS_TABLE_ID_IPMP_CONTROL		= 0x07, 
+	/* 0x08 - 0x37 reserved */
+	/* 0x38 - 0x3D DSM-CC defined */
+	GF_M2TS_TABLE_ID_DSM_CC_PRIVATE		= 0x3E, /* used for MPE (only, not MPE-FEC) */
+	/* 0x3F DSM-CC defined */
+	GF_M2TS_TABLE_ID_NIT_ACTUAL		= 0x40, /* max size for section 1024 */
+	GF_M2TS_TABLE_ID_NIT_OTHER		= 0x41,
+	GF_M2TS_TABLE_ID_SDT_ACTUAL		= 0x42, /* max size for section 1024 */
+	/* 0x43 - 0x45 reserved */
+	GF_M2TS_TABLE_ID_SDT_OTHER		= 0x46, /* max size for section 1024 */
+	/* 0x47 - 0x49 reserved */
+	GF_M2TS_TABLE_ID_BAT			= 0x4a, /* max size for section 1024 */
+	/* 0x4b - 0x4d reserved */
+	GF_M2TS_TABLE_ID_EIT_ACTUAL_PF		= 0x4E, /* max size for section 4096 */
+	GF_M2TS_TABLE_ID_EIT_OTHER_PF		= 0x4F,
+	/* 0x50 - 0x6f EIT SCHEDULE */
+	GF_M2TS_TABLE_ID_EIT_SCHEDULE_MIN	= 0x50,
+	GF_M2TS_TABLE_ID_EIT_SCHEDULE_ACTUAL_MAX= 0x5F,
+	GF_M2TS_TABLE_ID_EIT_SCHEDULE_MAX	= 0x6F,
+
+	GF_M2TS_TABLE_ID_TDT			= 0x70,
+	GF_M2TS_TABLE_ID_RST			= 0x71, /* max size for section 1024 */
+	GF_M2TS_TABLE_ID_ST 			= 0x72, /* max size for section 4096 */
+	GF_M2TS_TABLE_ID_TOT			= 0x73,
+	GF_M2TS_TABLE_ID_AI			= 0x74,
+	GF_M2TS_TABLE_ID_CONT			= 0x75,
+	GF_M2TS_TABLE_ID_RC			= 0x76,
+	GF_M2TS_TABLE_ID_CID			= 0x77,
+	GF_M2TS_TABLE_ID_MPE_FEC		= 0x78,
+	GF_M2TS_TABLE_ID_RES_NOT		= 0x79,
+	/* 0x7A - 0x7D reserved */
+	GF_M2TS_TABLE_ID_DIT			= 0x7E,
+	GF_M2TS_TABLE_ID_SIT			= 0x7F, /* max size for section 4096 */
+	/* 0x80 - 0xfe reserved */
+	/* 0xff reserved */
+};
+
+enum {
+	M2TS_ADAPTATION_RESERVED	= 0,
+	M2TS_ADAPTATION_NONE		= 1,
+	M2TS_ADAPTATION_ONLY		= 2,
+	M2TS_ADAPTATION_AND_PAYLOAD 	= 3,
+};
+
+
+#define SECTION_HEADER_LENGTH 3 /* header till the last bit of the section_length field */
+#define SECTION_ADDITIONAL_HEADER_LENGTH 5 /* header from the last bit of the section_length field to the payload */
+#define	CRC_LENGTH 4
+
+typedef struct
+{
+	u8 sync;
+	u8 error;
+	u8 payload_start;
+	u8 priority;
+	u16 pid;
+	u8 scrambling_ctrl;
+	u8 adaptation_field;
+	u8 continuity_counter;
+} GF_M2TS_Header;
+
+typedef struct
+{
+	u32 discontinuity_indicator;
+	u32 random_access_indicator;
+	u32 priority_indicator;
+
+	u32 PCR_flag;
+	u64 PCR_base, PCR_ext;
+
+	u32 OPCR_flag;
+	u64 OPCR_base, OPCR_ext;
+
+	u32 splicing_point_flag;
+	u32 transport_private_data_flag;
+	u32 adaptation_field_extension_flag;
+/*	
+	u32 splice_countdown;
+	u32 transport_private_data_length;
+	u32 adaptation_field_extension_length;
+	u32 ltw_flag;
+	u32 piecewise_rate_flag;
+	u32 seamless_splice_flag;
+	u32 ltw_valid_flag;
+	u32 ltw_offset;
+	u32 piecewise_rate;
+	u32 splice_type;
+	u32 DTS_next_AU;
+*/
+} GF_M2TS_AdaptationField;
+
+typedef struct 
+{
+	u8 id;
+	u16 pck_len;
+	u8 data_alignment;
+	u64 PTS, DTS;
+	u8 hdr_data_len;
+} GF_M2TS_PESHeader;
+
+#endif	//_GF_MPEG_TS_H_
diff --git a/tstools/DtsEdit/src/gpac/network.h b/tstools/DtsEdit/src/gpac/network.h
new file mode 100644
index 0000000..f41d8c6
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/network.h
@@ -0,0 +1,403 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / common tools sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _GF_NET_H_
+#define _GF_NET_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!
+ *	\file <gpac/network.h>
+ *	\brief IP network functions.
+ */
+
+ /*!
+ *	\addtogroup net_grp network
+ *	\ingroup utils_grp
+ *	\brief IP Network Functions
+ *
+ *This section documents the IP network functions of the GPAC framework.
+ *	@{
+ */
+
+#include <gpac/tools.h>
+
+
+/*!
+ *\brief URL local test
+ *
+ *Tests whether a URL describes a local file or not
+ *\param url the url to analyze
+ *\return 1 if the URL describes a local file, 0 otherwise
+ */
+Bool gf_url_is_local(const char *url);
+
+/*!
+ *\brief gets absolute file path
+ *
+ *Gets the absolute file path from a relative path and its parent absolute one. This can only be used with file paths.
+ *\param pathName the relative path name of a file
+ *\param parentPath the absolute parent path name 
+ *\return absolute path name of the file, or NULL if bad paths are provided.
+ \note the returned string must be freed by user
+ */
+char *gf_url_get_absolute_path(const char *pathName, const char *parentPath);
+/*concatenates URL and gets back full URL - returned string must be freed by user*/
+/*!
+ *\brief URL concatenation
+ *
+ *Concatenates a relative URL with its parent URL
+ *\param parentName URL of the parent service
+ *\param pathName URL of the service
+ *\return absolute path name of the service, or NULL if bad paths are provided or if the service path is already an absolute one.
+ \note the returned string must be freed by user
+ */
+char *gf_url_concatenate(const char *parentName, const char *pathName);
+
+
+/*!
+ *\brief URL to file system
+ *
+ *Converts a local URL to a file system value. Removes all white spaces and similar
+ *\param url url to convert
+ */
+void gf_url_to_fs_path(char *url);
+
+/*!
+ *\brief gets UTC time 
+ *
+ *Gets UTC time since midnight Jan 1970
+ *\param sec number of seconds
+ *\param msec number of milliseconds
+ */
+void gf_utc_time_since_1970(u32 *sec, u32 *msec);
+
+
+/*!
+ *	\brief NTP seconds from 1900 to 1970
+ *	\hideinitializer
+ *
+ *	Macro giving the number of seconds from from 1900 to 1970
+*/
+#define GF_NTP_SEC_1900_TO_1970 2208988800ul
+
+/*!
+ *\brief gets NTP time 
+ *
+ *Gets NTP (Network Time Protocol) in seconds and fractional side
+ \param sec NTP time in seconds
+ \param frac fractional NTP time expressed in 1 / (1<<32 - 1) seconds units
+ */
+void gf_net_get_ntp(u32 *sec, u32 *frac);
+
+/*!
+ * Socket options
+ *	\hideinitializer
+ */
+enum
+{
+	/*!Reuses port.*/
+	GF_SOCK_REUSE_PORT = 1,
+	/*!Forces IPV6 if available.*/
+	GF_SOCK_FORCE_IPV6 = 1<<1
+};
+
+/*!
+ *\brief abstracted socket object
+ *
+ *The abstracted socket object allows you to build client and server applications very simply
+ *with support for unicast and multicast (no IPv6 yet)
+*/
+typedef struct __tag_socket GF_Socket;
+
+/*!Buffer size to pass for IP address retrieval*/
+#define GF_MAX_IP_NAME_LEN	516
+
+/*!socket is a TCP socket*/
+#define GF_SOCK_TYPE_TCP		0x01
+/*!socket is a UDP socket*/
+#define GF_SOCK_TYPE_UDP		0x02
+
+/*!
+ *\brief socket constructor
+ *
+ *Constructs a socket object
+ *\param SocketType the socket type to create, either UDP or TCP
+ *\return the socket object or NULL if network initialization failure
+ */
+GF_Socket *gf_sk_new(u32 SocketType);
+/*!
+ *\brief socket destructor
+ *
+ *Deletes a socket object
+ *\param sock the socket object
+ */
+void gf_sk_del(GF_Socket *sock);
+
+/*!
+ *\brief reset internal buffer
+ *
+ *Forces the internal socket buffer to be reseted (discarded)
+ *\param sock the socket object
+ */
+void gf_sk_reset(GF_Socket *sock);
+/*!
+ *\brief socket buffer size control
+ *
+ *Sets the size of the internal buffer of the socket. The socket MUST be bound or connected before.
+ *\param sock the socket object
+ *\param send_buffer if 0, sets the size of the reception buffer, otherwise sets the size of the emission buffer
+ *\param new_size new size of the buffer in bytes.
+ *\warning This operation may fail depending on the provider, hardware...
+ */
+GF_Err gf_sk_set_buffer_size(GF_Socket *sock, Bool send_buffer, u32 new_size);
+
+/*!
+ *\brief blocking mode control
+ *
+ *Sets the blocking mode of a socket on or off. A blocking socket will wait for the net operation to be possible 
+ *while a non-blocking one would return an error. By default, sockets are created in blocking mode
+ *\param sock the socket object
+ *\param NonBlockingOn set to 1 to use on-blocking sockets, 0 otherwise
+ */
+GF_Err gf_sk_set_block_mode(GF_Socket *sock, Bool NonBlockingOn);
+/*!
+ *\brief socket binding
+ *
+ *Binds the given socket to the specified port.
+ *\param local_ip the local interface IP address if desired. If NULL, the default interface will be used.
+ *\param sock the socket object
+ *\param port port number to bind this socket to
+ *\param peer_name the remote server address
+ *\param peer_port remote port number to connect the socket to
+ *\param options list of option for the bind operation.
+ */
+GF_Err gf_sk_bind(GF_Socket *sock, char *local_ip, u16 port, char *peer_name, u16 peer_port, u32 options);
+/*!
+ *\brief connects a socket 
+ *
+ *Connects a socket to a remote peer on a given port 
+ *\param sock the socket object
+ *\param peer_name the remote server address (IP or DNS)
+ *\param port remote port number to connect the socket to
+ *\param local_ip the local (client) address (IP or DNS) if any, NULL otherwise.
+ */
+GF_Err gf_sk_connect(GF_Socket *sock, char *peer_name, u16 port, char *local_ip);
+/*!
+ *\brief data emission
+ *
+ *Sends a buffer on the socket. The socket must be in a bound or connected mode
+ *\param sock the socket object
+ *\param buffer the data buffer to send
+ *\param length the data length to send
+ */
+GF_Err gf_sk_send(GF_Socket *sock, char *buffer, u32 length);
+/*!
+ *\brief data reception
+ * 
+ *Fetches data on a socket. The socket must be in a bound or connected state
+ *\param sock the socket object
+ *\param buffer the recpetion buffer where data is written
+ *\param length the allocated size of the reception buffer
+ *\param start_from the offset in the reception buffer where to start writing
+ *\param read the actual number of bytes received
+ */
+GF_Err gf_sk_receive(GF_Socket *sock, char *buffer, u32 length, u32 start_from, u32 *read);
+/*!
+ *\brief socket listening
+ *
+ *Sets the socket in a listening state. This socket must have been bound to a port before 
+ *\param sock the socket object
+ *\param max_conn the maximum number of simultaneous connection this socket will accept
+ */
+GF_Err gf_sk_listen(GF_Socket *sock, u32 max_conn);
+/*!
+ *\brief socket accept
+ *
+ *Accepts an incomming connection on a listening socket
+ *\param sock the socket object
+ *\param new_conn the resulting connection socket object
+ */
+GF_Err gf_sk_accept(GF_Socket *sock, GF_Socket **new_conn);
+
+/*!
+ *\brief server socket mode 
+ *
+ *Disable the Nable algo (e.g. set TCP_NODELAY) and set the KEEPALIVE on 
+ *\param sock the socket object
+ *\param server_on sets server mode on or off
+*/
+GF_Err gf_sk_server_mode(GF_Socket *sock, Bool server_on);
+
+/*!
+ *\brief get local host name
+ *
+ *Retrieves local host name.
+ *\param buffer destination buffer for name. Buffer must be GF_MAX_IP_NAME_LEN long
+ */
+GF_Err gf_sk_get_host_name(char *buffer);
+
+/*!
+ *\brief get local IP
+ *
+ *Gets local IP address of a connected socket, typically used for server after an ACCEPT
+ *\param sock the socket object
+ *\param buffer destination buffer for IP address. Buffer must be GF_MAX_IP_NAME_LEN long
+ */
+GF_Err gf_sk_get_local_ip(GF_Socket *sock, char *buffer);
+/*!
+ *\brief get local info
+ *
+ *Gets local socket info of a socket
+ *\param sock the socket object
+ *\param port local port number of the socket
+ *\param sock_type socket type (UDP or TCP)
+ */
+GF_Err gf_sk_get_local_info(GF_Socket *sock, u16 *port, u32 *sock_type);
+
+/*!
+ *\brief get remote address
+ *
+ *Gets the remote address of a peer. The socket MUST be connected.
+ *\param sock the socket object
+ *\param buffer destination buffer for IP address. Buffer must be GF_MAX_IP_NAME_LEN long
+ */
+GF_Err gf_sk_get_remote_address(GF_Socket *sock, char *buffer);
+
+/*!
+ *\brief set remote address
+ *
+ *Sets the remote address of a socket. This is used by connectionless sockets using SendTo and ReceiveFrom
+ *\param sock the socket object
+ *\param address the remote peer address
+ *\param port the remote peer port
+ */
+GF_Err gf_sk_set_remote(GF_Socket *sock, char *address, u16 port);
+
+
+/*!
+ *\brief multicast setup
+ *
+ *Performs multicast setup (BIND and JOIN) for the socket object
+ *\param sock the socket object
+ *\param multi_ip_add the multicast IP address
+ *\param multi_port the multicast port number
+ *\param TTL the multicast TTL (Time-To-Live)
+ *\param no_bind if sets, only join the multicast
+ *\param local_interface_ip the local interface IP address if desired. If NULL, the default interface will be used.
+ */
+GF_Err gf_sk_setup_multicast(GF_Socket *sock, char *multi_ip_add, u16 multi_port, u32 TTL, Bool no_bind, char *local_interface_ip);
+/*!
+ *brief multicast address test
+ *
+ *tests whether an IP address is a multicast one or not
+ *\param multi_ip_add the multicast IP address to test
+ *\return 1 if the address is a multicast one, 0 otherwise
+ */
+u32 gf_sk_is_multicast_address(char *multi_ip_add);
+
+/*!
+ *\brief send data with wait delay
+ *
+ *Sends data with a max wait delay. This is used for http / ftp sockets mainly. The socket must be connected.
+ *\param sock the socket object
+ *\param buffer the data buffer to send
+ *\param length the data length to send
+ *\param delay_sec the maximum delay in second to wait before aborting
+ *\return If the operation timeed out, the function will return a GF_IP_SOCK_WOULD_BLOCK error.
+ */
+GF_Err gf_sk_send_wait(GF_Socket *sock, char *buffer, u32 length, u32 delay_sec);
+/* receive data with a max wait delay of Second - used for http / ftp sockets mainly*/
+/*!
+ *\brief receive data with wait delay
+ *
+ *Fetches data with a max wait delay. This is used for http / ftp sockets mainly. The socket must be connected.
+ *\param sock the socket object
+ *\param buffer the recpetion buffer where data is written
+ *\param length the allocated size of the reception buffer
+ *\param start_from the offset in the reception buffer where to start writing
+ *\param read the actual number of bytes received
+ *\param delay_sec the maximum delay in second to wait before aborting
+ *\return If the operation timeed out, the function will return a GF_IP_SOCK_WOULD_BLOCK error.
+ */
+GF_Err gf_sk_receive_wait(GF_Socket *sock, char *buffer, u32 length, u32 start_from, u32 *read, u32 delay_sec);
+
+/*!
+ *\brief gets socket handle
+ *
+ *Gets the socket low-level handle as used by OpenSSL.
+ *\param sock the socket object
+ *\return the socket handle
+ */
+s32 gf_sk_get_handle(GF_Socket *sock);
+
+
+/*!
+ *\brief gets ipv6 support
+ *
+ *Returns IPV6 support information.
+ *\return 2 if the machine has IPV6 support, 1 if the library was compiled with IPV6 support, 0 otherwise
+ */
+u32 gf_net_has_ipv6();
+
+
+/*!
+ *\brief checks address type
+ *
+ *Checks if an address is an IPV6 or IPV4 one.
+ *\return true 1 if address is IPV6 one, 0 otherwise
+ */
+Bool gf_net_is_ipv6(char *address);
+
+
+/*!
+ *	\brief MobileIP Callback
+ *
+ * The gf_net_mobileip_ctrl_cbk type is the type for the callback of the \ref gf_net_set_mobileip_callback function. By default no mobileip is used
+ *	\param cbck Opaque user data.
+ *	\param start boolean indicating wether the MobileIP subsystem should be started or stoped.
+ *	\return Error code if needed.
+ *
+ */
+typedef GF_Err (*gf_net_mobileip_ctrl_cbk)(Bool start);
+
+/*!
+ *\brief Assigns MobileIP callback
+ *
+ *Assigns the MobileIP control callback.
+ *\param _mobip_cbk MobileIP control callback
+ */
+void gf_net_mobileip_set_callback(gf_net_mobileip_ctrl_cbk _mobip_cbk, const char *MobileIP);
+
+/*! @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif		/*_GF_NET_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/nodes_mpeg4.h b/tstools/DtsEdit/src/gpac/nodes_mpeg4.h
new file mode 100644
index 0000000..92929b9
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/nodes_mpeg4.h
@@ -0,0 +1,1916 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005
+ *					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.
+ *
+ */
+
+
+/*
+	DO NOT MOFIFY - File generated on GMT Thu Aug 07 11:43:26 2008
+
+	BY MPEG4Gen for GPAC Version 0.4.5-DEV
+*/
+
+#ifndef _nodes_mpeg4_H
+#define _nodes_mpeg4_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/scenegraph_vrml.h>
+
+
+
+enum {
+	TAG_MPEG4_Anchor = GF_NODE_RANGE_FIRST_MPEG4,
+	TAG_MPEG4_AnimationStream,
+	TAG_MPEG4_Appearance,
+	TAG_MPEG4_AudioBuffer,
+	TAG_MPEG4_AudioClip,
+	TAG_MPEG4_AudioDelay,
+	TAG_MPEG4_AudioFX,
+	TAG_MPEG4_AudioMix,
+	TAG_MPEG4_AudioSource,
+	TAG_MPEG4_AudioSwitch,
+	TAG_MPEG4_Background,
+	TAG_MPEG4_Background2D,
+	TAG_MPEG4_Billboard,
+	TAG_MPEG4_Bitmap,
+	TAG_MPEG4_Box,
+	TAG_MPEG4_Circle,
+	TAG_MPEG4_Collision,
+	TAG_MPEG4_Color,
+	TAG_MPEG4_ColorInterpolator,
+	TAG_MPEG4_CompositeTexture2D,
+	TAG_MPEG4_CompositeTexture3D,
+	TAG_MPEG4_Conditional,
+	TAG_MPEG4_Cone,
+	TAG_MPEG4_Coordinate,
+	TAG_MPEG4_Coordinate2D,
+	TAG_MPEG4_CoordinateInterpolator,
+	TAG_MPEG4_CoordinateInterpolator2D,
+	TAG_MPEG4_Curve2D,
+	TAG_MPEG4_Cylinder,
+	TAG_MPEG4_CylinderSensor,
+	TAG_MPEG4_DirectionalLight,
+	TAG_MPEG4_DiscSensor,
+	TAG_MPEG4_ElevationGrid,
+	TAG_MPEG4_Expression,
+	TAG_MPEG4_Extrusion,
+	TAG_MPEG4_Face,
+	TAG_MPEG4_FaceDefMesh,
+	TAG_MPEG4_FaceDefTables,
+	TAG_MPEG4_FaceDefTransform,
+	TAG_MPEG4_FAP,
+	TAG_MPEG4_FDP,
+	TAG_MPEG4_FIT,
+	TAG_MPEG4_Fog,
+	TAG_MPEG4_FontStyle,
+	TAG_MPEG4_Form,
+	TAG_MPEG4_Group,
+	TAG_MPEG4_ImageTexture,
+	TAG_MPEG4_IndexedFaceSet,
+	TAG_MPEG4_IndexedFaceSet2D,
+	TAG_MPEG4_IndexedLineSet,
+	TAG_MPEG4_IndexedLineSet2D,
+	TAG_MPEG4_Inline,
+	TAG_MPEG4_LOD,
+	TAG_MPEG4_Layer2D,
+	TAG_MPEG4_Layer3D,
+	TAG_MPEG4_Layout,
+	TAG_MPEG4_LineProperties,
+	TAG_MPEG4_ListeningPoint,
+	TAG_MPEG4_Material,
+	TAG_MPEG4_Material2D,
+	TAG_MPEG4_MovieTexture,
+	TAG_MPEG4_NavigationInfo,
+	TAG_MPEG4_Normal,
+	TAG_MPEG4_NormalInterpolator,
+	TAG_MPEG4_OrderedGroup,
+	TAG_MPEG4_OrientationInterpolator,
+	TAG_MPEG4_PixelTexture,
+	TAG_MPEG4_PlaneSensor,
+	TAG_MPEG4_PlaneSensor2D,
+	TAG_MPEG4_PointLight,
+	TAG_MPEG4_PointSet,
+	TAG_MPEG4_PointSet2D,
+	TAG_MPEG4_PositionInterpolator,
+	TAG_MPEG4_PositionInterpolator2D,
+	TAG_MPEG4_ProximitySensor2D,
+	TAG_MPEG4_ProximitySensor,
+	TAG_MPEG4_QuantizationParameter,
+	TAG_MPEG4_Rectangle,
+	TAG_MPEG4_ScalarInterpolator,
+	TAG_MPEG4_Script,
+	TAG_MPEG4_Shape,
+	TAG_MPEG4_Sound,
+	TAG_MPEG4_Sound2D,
+	TAG_MPEG4_Sphere,
+	TAG_MPEG4_SphereSensor,
+	TAG_MPEG4_SpotLight,
+	TAG_MPEG4_Switch,
+	TAG_MPEG4_TermCap,
+	TAG_MPEG4_Text,
+	TAG_MPEG4_TextureCoordinate,
+	TAG_MPEG4_TextureTransform,
+	TAG_MPEG4_TimeSensor,
+	TAG_MPEG4_TouchSensor,
+	TAG_MPEG4_Transform,
+	TAG_MPEG4_Transform2D,
+	TAG_MPEG4_Valuator,
+	TAG_MPEG4_Viewpoint,
+	TAG_MPEG4_VisibilitySensor,
+	TAG_MPEG4_Viseme,
+	TAG_MPEG4_WorldInfo,
+	TAG_MPEG4_AcousticMaterial,
+	TAG_MPEG4_AcousticScene,
+	TAG_MPEG4_ApplicationWindow,
+	TAG_MPEG4_BAP,
+	TAG_MPEG4_BDP,
+	TAG_MPEG4_Body,
+	TAG_MPEG4_BodyDefTable,
+	TAG_MPEG4_BodySegmentConnectionHint,
+	TAG_MPEG4_DirectiveSound,
+	TAG_MPEG4_Hierarchical3DMesh,
+	TAG_MPEG4_MaterialKey,
+	TAG_MPEG4_PerceptualParameters,
+	TAG_MPEG4_TemporalTransform,
+	TAG_MPEG4_TemporalGroup,
+	TAG_MPEG4_ServerCommand,
+	TAG_MPEG4_InputSensor,
+	TAG_MPEG4_MatteTexture,
+	TAG_MPEG4_MediaBuffer,
+	TAG_MPEG4_MediaControl,
+	TAG_MPEG4_MediaSensor,
+	TAG_MPEG4_BitWrapper,
+	TAG_MPEG4_CoordinateInterpolator4D,
+	TAG_MPEG4_DepthImage,
+	TAG_MPEG4_FFD,
+	TAG_MPEG4_Implicit,
+	TAG_MPEG4_XXLFM_Appearance,
+	TAG_MPEG4_XXLFM_BlendList,
+	TAG_MPEG4_XXLFM_FrameList,
+	TAG_MPEG4_XXLFM_LightMap,
+	TAG_MPEG4_XXLFM_SurfaceMapList,
+	TAG_MPEG4_XXLFM_ViewMapList,
+	TAG_MPEG4_MeshGrid,
+	TAG_MPEG4_NonLinearDeformer,
+	TAG_MPEG4_NurbsCurve,
+	TAG_MPEG4_NurbsCurve2D,
+	TAG_MPEG4_NurbsSurface,
+	TAG_MPEG4_OctreeImage,
+	TAG_MPEG4_XXParticles,
+	TAG_MPEG4_XXParticleInitBox,
+	TAG_MPEG4_XXPlanarObstacle,
+	TAG_MPEG4_XXPointAttractor,
+	TAG_MPEG4_PointTexture,
+	TAG_MPEG4_PositionAnimator,
+	TAG_MPEG4_PositionAnimator2D,
+	TAG_MPEG4_PositionInterpolator4D,
+	TAG_MPEG4_ProceduralTexture,
+	TAG_MPEG4_Quadric,
+	TAG_MPEG4_SBBone,
+	TAG_MPEG4_SBMuscle,
+	TAG_MPEG4_SBSegment,
+	TAG_MPEG4_SBSite,
+	TAG_MPEG4_SBSkinnedModel,
+	TAG_MPEG4_SBVCAnimation,
+	TAG_MPEG4_ScalarAnimator,
+	TAG_MPEG4_SimpleTexture,
+	TAG_MPEG4_SolidRep,
+	TAG_MPEG4_SubdivisionSurface,
+	TAG_MPEG4_SubdivSurfaceSector,
+	TAG_MPEG4_WaveletSubdivisionSurface,
+	TAG_MPEG4_Clipper2D,
+	TAG_MPEG4_ColorTransform,
+	TAG_MPEG4_Ellipse,
+	TAG_MPEG4_LinearGradient,
+	TAG_MPEG4_PathLayout,
+	TAG_MPEG4_RadialGradient,
+	TAG_MPEG4_SynthesizedTexture,
+	TAG_MPEG4_TransformMatrix2D,
+	TAG_MPEG4_Viewport,
+	TAG_MPEG4_XCurve2D,
+	TAG_MPEG4_XFontStyle,
+	TAG_MPEG4_XLineProperties,
+	TAG_LastImplementedMPEG4
+};
+
+typedef struct _tagAnchor
+{
+	BASE_NODE
+	VRML_CHILDREN
+	SFString description;	/*exposedField*/
+	MFString parameter;	/*exposedField*/
+	MFURL url;	/*exposedField*/
+	SFBool activate;	/*eventIn*/
+	void (*on_activate)(GF_Node *pThis);	/*eventInHandler*/
+} M_Anchor;
+
+
+typedef struct _tagAnimationStream
+{
+	BASE_NODE
+	SFBool loop;	/*exposedField*/
+	SFFloat speed;	/*exposedField*/
+	SFTime startTime;	/*exposedField*/
+	SFTime stopTime;	/*exposedField*/
+	MFURL url;	/*exposedField*/
+	SFTime duration_changed;	/*eventOut*/
+	SFBool isActive;	/*eventOut*/
+} M_AnimationStream;
+
+
+typedef struct _tagAppearance
+{
+	BASE_NODE
+	GF_Node *material;	/*exposedField*/
+	GF_Node *texture;	/*exposedField*/
+	GF_Node *textureTransform;	/*exposedField*/
+} M_Appearance;
+
+
+typedef struct _tagAudioBuffer
+{
+	BASE_NODE
+	SFBool loop;	/*exposedField*/
+	SFFloat pitch;	/*exposedField*/
+	SFTime startTime;	/*exposedField*/
+	SFTime stopTime;	/*exposedField*/
+	GF_ChildNodeItem *children;	/*exposedField*/
+	SFInt32 numChan;	/*exposedField*/
+	MFInt32 phaseGroup;	/*exposedField*/
+	SFFloat length;	/*exposedField*/
+	SFTime duration_changed;	/*eventOut*/
+	SFBool isActive;	/*eventOut*/
+} M_AudioBuffer;
+
+
+typedef struct _tagAudioClip
+{
+	BASE_NODE
+	SFString description;	/*exposedField*/
+	SFBool loop;	/*exposedField*/
+	SFFloat pitch;	/*exposedField*/
+	SFTime startTime;	/*exposedField*/
+	SFTime stopTime;	/*exposedField*/
+	MFURL url;	/*exposedField*/
+	SFTime duration_changed;	/*eventOut*/
+	SFBool isActive;	/*eventOut*/
+} M_AudioClip;
+
+
+typedef struct _tagAudioDelay
+{
+	BASE_NODE
+	VRML_CHILDREN
+	SFTime delay;	/*exposedField*/
+	SFInt32 numChan;	/*field*/
+	MFInt32 phaseGroup;	/*field*/
+} M_AudioDelay;
+
+
+typedef struct _tagAudioFX
+{
+	BASE_NODE
+	VRML_CHILDREN
+	SFString orch;	/*exposedField*/
+	SFString score;	/*exposedField*/
+	MFFloat params;	/*exposedField*/
+	SFInt32 numChan;	/*field*/
+	MFInt32 phaseGroup;	/*field*/
+} M_AudioFX;
+
+
+typedef struct _tagAudioMix
+{
+	BASE_NODE
+	VRML_CHILDREN
+	SFInt32 numInputs;	/*exposedField*/
+	MFFloat matrix;	/*exposedField*/
+	SFInt32 numChan;	/*field*/
+	MFInt32 phaseGroup;	/*field*/
+} M_AudioMix;
+
+
+typedef struct _tagAudioSource
+{
+	BASE_NODE
+	VRML_CHILDREN
+	MFURL url;	/*exposedField*/
+	SFFloat pitch;	/*exposedField*/
+	SFFloat speed;	/*exposedField*/
+	SFTime startTime;	/*exposedField*/
+	SFTime stopTime;	/*exposedField*/
+	SFInt32 numChan;	/*field*/
+	MFInt32 phaseGroup;	/*field*/
+} M_AudioSource;
+
+
+typedef struct _tagAudioSwitch
+{
+	BASE_NODE
+	VRML_CHILDREN
+	MFInt32 whichChoice;	/*exposedField*/
+	SFInt32 numChan;	/*field*/
+	MFInt32 phaseGroup;	/*field*/
+} M_AudioSwitch;
+
+
+typedef struct _tagBackground
+{
+	BASE_NODE
+	SFBool set_bind;	/*eventIn*/
+	void (*on_set_bind)(GF_Node *pThis);	/*eventInHandler*/
+	MFFloat groundAngle;	/*exposedField*/
+	MFColor groundColor;	/*exposedField*/
+	MFURL backUrl;	/*exposedField*/
+	MFURL bottomUrl;	/*exposedField*/
+	MFURL frontUrl;	/*exposedField*/
+	MFURL leftUrl;	/*exposedField*/
+	MFURL rightUrl;	/*exposedField*/
+	MFURL topUrl;	/*exposedField*/
+	MFFloat skyAngle;	/*exposedField*/
+	MFColor skyColor;	/*exposedField*/
+	SFBool isBound;	/*eventOut*/
+} M_Background;
+
+
+typedef struct _tagBackground2D
+{
+	BASE_NODE
+	SFBool set_bind;	/*eventIn*/
+	void (*on_set_bind)(GF_Node *pThis);	/*eventInHandler*/
+	SFColor backColor;	/*exposedField*/
+	MFURL url;	/*exposedField*/
+	SFBool isBound;	/*eventOut*/
+} M_Background2D;
+
+
+typedef struct _tagBillboard
+{
+	BASE_NODE
+	VRML_CHILDREN
+	SFVec3f axisOfRotation;	/*exposedField*/
+} M_Billboard;
+
+
+typedef struct _tagBitmap
+{
+	BASE_NODE
+	SFVec2f scale;	/*exposedField*/
+} M_Bitmap;
+
+
+typedef struct _tagBox
+{
+	BASE_NODE
+	SFVec3f size;	/*field*/
+} M_Box;
+
+
+typedef struct _tagCircle
+{
+	BASE_NODE
+	SFFloat radius;	/*exposedField*/
+} M_Circle;
+
+
+typedef struct _tagCollision
+{
+	BASE_NODE
+	VRML_CHILDREN
+	SFBool collide;	/*exposedField*/
+	GF_Node *proxy;	/*field*/
+	SFTime collideTime;	/*eventOut*/
+} M_Collision;
+
+
+typedef struct _tagColor
+{
+	BASE_NODE
+	MFColor color;	/*exposedField*/
+} M_Color;
+
+
+typedef struct _tagColorInterpolator
+{
+	BASE_NODE
+	SFFloat set_fraction;	/*eventIn*/
+	void (*on_set_fraction)(GF_Node *pThis);	/*eventInHandler*/
+	MFFloat key;	/*exposedField*/
+	MFColor keyValue;	/*exposedField*/
+	SFColor value_changed;	/*eventOut*/
+} M_ColorInterpolator;
+
+
+typedef struct _tagCompositeTexture2D
+{
+	BASE_NODE
+	VRML_CHILDREN
+	SFInt32 pixelWidth;	/*exposedField*/
+	SFInt32 pixelHeight;	/*exposedField*/
+	GF_Node *background;	/*exposedField*/
+	GF_Node *viewport;	/*exposedField*/
+	SFInt32 repeatSandT;	/*field*/
+} M_CompositeTexture2D;
+
+
+typedef struct _tagCompositeTexture3D
+{
+	BASE_NODE
+	VRML_CHILDREN
+	SFInt32 pixelWidth;	/*exposedField*/
+	SFInt32 pixelHeight;	/*exposedField*/
+	GF_Node *background;	/*exposedField*/
+	GF_Node *fog;	/*exposedField*/
+	GF_Node *navigationInfo;	/*exposedField*/
+	GF_Node *viewpoint;	/*exposedField*/
+	SFBool repeatS;	/*field*/
+	SFBool repeatT;	/*field*/
+} M_CompositeTexture3D;
+
+
+typedef struct _tagConditional
+{
+	BASE_NODE
+	SFBool activate;	/*eventIn*/
+	void (*on_activate)(GF_Node *pThis);	/*eventInHandler*/
+	SFBool reverseActivate;	/*eventIn*/
+	void (*on_reverseActivate)(GF_Node *pThis);	/*eventInHandler*/
+	SFCommandBuffer buffer;	/*exposedField*/
+	SFBool isActive;	/*eventOut*/
+} M_Conditional;
+
+
+typedef struct _tagCone
+{
+	BASE_NODE
+	SFFloat bottomRadius;	/*field*/
+	SFFloat height;	/*field*/
+	SFBool side;	/*field*/
+	SFBool bottom;	/*field*/
+} M_Cone;
+
+
+typedef struct _tagCoordinate
+{
+	BASE_NODE
+	MFVec3f point;	/*exposedField*/
+} M_Coordinate;
+
+
+typedef struct _tagCoordinate2D
+{
+	BASE_NODE
+	MFVec2f point;	/*exposedField*/
+} M_Coordinate2D;
+
+
+typedef struct _tagCoordinateInterpolator
+{
+	BASE_NODE
+	SFFloat set_fraction;	/*eventIn*/
+	void (*on_set_fraction)(GF_Node *pThis);	/*eventInHandler*/
+	MFFloat key;	/*exposedField*/
+	MFVec3f keyValue;	/*exposedField*/
+	MFVec3f value_changed;	/*eventOut*/
+} M_CoordinateInterpolator;
+
+
+typedef struct _tagCoordinateInterpolator2D
+{
+	BASE_NODE
+	SFFloat set_fraction;	/*eventIn*/
+	void (*on_set_fraction)(GF_Node *pThis);	/*eventInHandler*/
+	MFFloat key;	/*exposedField*/
+	MFVec2f keyValue;	/*exposedField*/
+	MFVec2f value_changed;	/*eventOut*/
+} M_CoordinateInterpolator2D;
+
+
+typedef struct _tagCurve2D
+{
+	BASE_NODE
+	GF_Node *point;	/*exposedField*/
+	SFFloat fineness;	/*exposedField*/
+	MFInt32 type;	/*exposedField*/
+} M_Curve2D;
+
+
+typedef struct _tagCylinder
+{
+	BASE_NODE
+	SFBool bottom;	/*field*/
+	SFFloat height;	/*field*/
+	SFFloat radius;	/*field*/
+	SFBool side;	/*field*/
+	SFBool top;	/*field*/
+} M_Cylinder;
+
+
+typedef struct _tagCylinderSensor
+{
+	BASE_NODE
+	SFBool autoOffset;	/*exposedField*/
+	SFFloat diskAngle;	/*exposedField*/
+	SFBool enabled;	/*exposedField*/
+	SFFloat maxAngle;	/*exposedField*/
+	SFFloat minAngle;	/*exposedField*/
+	SFFloat offset;	/*exposedField*/
+	SFBool isActive;	/*eventOut*/
+	SFRotation rotation_changed;	/*eventOut*/
+	SFVec3f trackPoint_changed;	/*eventOut*/
+} M_CylinderSensor;
+
+
+typedef struct _tagDirectionalLight
+{
+	BASE_NODE
+	SFFloat ambientIntensity;	/*exposedField*/
+	SFColor color;	/*exposedField*/
+	SFVec3f direction;	/*exposedField*/
+	SFFloat intensity;	/*exposedField*/
+	SFBool on;	/*exposedField*/
+} M_DirectionalLight;
+
+
+typedef struct _tagDiscSensor
+{
+	BASE_NODE
+	SFBool autoOffset;	/*exposedField*/
+	SFBool enabled;	/*exposedField*/
+	SFFloat maxAngle;	/*exposedField*/
+	SFFloat minAngle;	/*exposedField*/
+	SFFloat offset;	/*exposedField*/
+	SFBool isActive;	/*eventOut*/
+	SFFloat rotation_changed;	/*eventOut*/
+	SFVec2f trackPoint_changed;	/*eventOut*/
+} M_DiscSensor;
+
+
+typedef struct _tagElevationGrid
+{
+	BASE_NODE
+	MFFloat set_height;	/*eventIn*/
+	void (*on_set_height)(GF_Node *pThis);	/*eventInHandler*/
+	GF_Node *color;	/*exposedField*/
+	GF_Node *normal;	/*exposedField*/
+	GF_Node *texCoord;	/*exposedField*/
+	MFFloat height;	/*field*/
+	SFBool ccw;	/*field*/
+	SFBool colorPerVertex;	/*field*/
+	SFFloat creaseAngle;	/*field*/
+	SFBool normalPerVertex;	/*field*/
+	SFBool solid;	/*field*/
+	SFInt32 xDimension;	/*field*/
+	SFFloat xSpacing;	/*field*/
+	SFInt32 zDimension;	/*field*/
+	SFFloat zSpacing;	/*field*/
+} M_ElevationGrid;
+
+
+typedef struct _tagExtrusion
+{
+	BASE_NODE
+	MFVec2f set_crossSection;	/*eventIn*/
+	void (*on_set_crossSection)(GF_Node *pThis);	/*eventInHandler*/
+	MFRotation set_orientation;	/*eventIn*/
+	void (*on_set_orientation)(GF_Node *pThis);	/*eventInHandler*/
+	MFVec2f set_scale;	/*eventIn*/
+	void (*on_set_scale)(GF_Node *pThis);	/*eventInHandler*/
+	MFVec3f set_spine;	/*eventIn*/
+	void (*on_set_spine)(GF_Node *pThis);	/*eventInHandler*/
+	SFBool beginCap;	/*field*/
+	SFBool ccw;	/*field*/
+	SFBool convex;	/*field*/
+	SFFloat creaseAngle;	/*field*/
+	MFVec2f crossSection;	/*field*/
+	SFBool endCap;	/*field*/
+	MFRotation orientation;	/*field*/
+	MFVec2f scale;	/*field*/
+	SFBool solid;	/*field*/
+	MFVec3f spine;	/*field*/
+} M_Extrusion;
+
+
+typedef struct _tagFog
+{
+	BASE_NODE
+	SFColor color;	/*exposedField*/
+	SFString fogType;	/*exposedField*/
+	SFFloat visibilityRange;	/*exposedField*/
+	SFBool set_bind;	/*eventIn*/
+	void (*on_set_bind)(GF_Node *pThis);	/*eventInHandler*/
+	SFBool isBound;	/*eventOut*/
+} M_Fog;
+
+
+typedef struct _tagFontStyle
+{
+	BASE_NODE
+	MFString family;	/*exposedField*/
+	SFBool horizontal;	/*exposedField*/
+	MFString justify;	/*exposedField*/
+	SFString language;	/*exposedField*/
+	SFBool leftToRight;	/*exposedField*/
+	SFFloat size;	/*exposedField*/
+	SFFloat spacing;	/*exposedField*/
+	SFString style;	/*exposedField*/
+	SFBool topToBottom;	/*exposedField*/
+} M_FontStyle;
+
+
+typedef struct _tagForm
+{
+	BASE_NODE
+	VRML_CHILDREN
+	SFVec2f size;	/*exposedField*/
+	MFInt32 groups;	/*exposedField*/
+	MFString constraints;	/*exposedField*/
+	MFInt32 groupsIndex;	/*exposedField*/
+} M_Form;
+
+
+typedef struct _tagGroup
+{
+	BASE_NODE
+	VRML_CHILDREN
+} M_Group;
+
+
+typedef struct _tagImageTexture
+{
+	BASE_NODE
+	MFURL url;	/*exposedField*/
+	SFBool repeatS;	/*field*/
+	SFBool repeatT;	/*field*/
+} M_ImageTexture;
+
+
+typedef struct _tagIndexedFaceSet
+{
+	BASE_NODE
+	MFInt32 set_colorIndex;	/*eventIn*/
+	void (*on_set_colorIndex)(GF_Node *pThis);	/*eventInHandler*/
+	MFInt32 set_coordIndex;	/*eventIn*/
+	void (*on_set_coordIndex)(GF_Node *pThis);	/*eventInHandler*/
+	MFInt32 set_normalIndex;	/*eventIn*/
+	void (*on_set_normalIndex)(GF_Node *pThis);	/*eventInHandler*/
+	MFInt32 set_texCoordIndex;	/*eventIn*/
+	void (*on_set_texCoordIndex)(GF_Node *pThis);	/*eventInHandler*/
+	GF_Node *color;	/*exposedField*/
+	GF_Node *coord;	/*exposedField*/
+	GF_Node *normal;	/*exposedField*/
+	GF_Node *texCoord;	/*exposedField*/
+	SFBool ccw;	/*field*/
+	MFInt32 colorIndex;	/*field*/
+	SFBool colorPerVertex;	/*field*/
+	SFBool convex;	/*field*/
+	MFInt32 coordIndex;	/*field*/
+	SFFloat creaseAngle;	/*field*/
+	MFInt32 normalIndex;	/*field*/
+	SFBool normalPerVertex;	/*field*/
+	SFBool solid;	/*field*/
+	MFInt32 texCoordIndex;	/*field*/
+} M_IndexedFaceSet;
+
+
+typedef struct _tagIndexedFaceSet2D
+{
+	BASE_NODE
+	MFInt32 set_colorIndex;	/*eventIn*/
+	void (*on_set_colorIndex)(GF_Node *pThis);	/*eventInHandler*/
+	MFInt32 set_coordIndex;	/*eventIn*/
+	void (*on_set_coordIndex)(GF_Node *pThis);	/*eventInHandler*/
+	MFInt32 set_texCoordIndex;	/*eventIn*/
+	void (*on_set_texCoordIndex)(GF_Node *pThis);	/*eventInHandler*/
+	GF_Node *color;	/*exposedField*/
+	GF_Node *coord;	/*exposedField*/
+	GF_Node *texCoord;	/*exposedField*/
+	MFInt32 colorIndex;	/*field*/
+	SFBool colorPerVertex;	/*field*/
+	SFBool convex;	/*field*/
+	MFInt32 coordIndex;	/*field*/
+	MFInt32 texCoordIndex;	/*field*/
+} M_IndexedFaceSet2D;
+
+
+typedef struct _tagIndexedLineSet
+{
+	BASE_NODE
+	MFInt32 set_colorIndex;	/*eventIn*/
+	void (*on_set_colorIndex)(GF_Node *pThis);	/*eventInHandler*/
+	MFInt32 set_coordIndex;	/*eventIn*/
+	void (*on_set_coordIndex)(GF_Node *pThis);	/*eventInHandler*/
+	GF_Node *color;	/*exposedField*/
+	GF_Node *coord;	/*exposedField*/
+	MFInt32 colorIndex;	/*field*/
+	SFBool colorPerVertex;	/*field*/
+	MFInt32 coordIndex;	/*field*/
+} M_IndexedLineSet;
+
+
+typedef struct _tagIndexedLineSet2D
+{
+	BASE_NODE
+	MFInt32 set_colorIndex;	/*eventIn*/
+	void (*on_set_colorIndex)(GF_Node *pThis);	/*eventInHandler*/
+	MFInt32 set_coordIndex;	/*eventIn*/
+	void (*on_set_coordIndex)(GF_Node *pThis);	/*eventInHandler*/
+	GF_Node *color;	/*exposedField*/
+	GF_Node *coord;	/*exposedField*/
+	MFInt32 colorIndex;	/*field*/
+	SFBool colorPerVertex;	/*field*/
+	MFInt32 coordIndex;	/*field*/
+} M_IndexedLineSet2D;
+
+
+typedef struct _tagInline
+{
+	BASE_NODE
+	MFURL url;	/*exposedField*/
+} M_Inline;
+
+
+typedef struct _tagLOD
+{
+	BASE_NODE
+	GF_ChildNodeItem *level;	/*exposedField*/
+	SFVec3f center;	/*field*/
+	MFFloat range;	/*field*/
+} M_LOD;
+
+
+typedef struct _tagLayer2D
+{
+	BASE_NODE
+	VRML_CHILDREN
+	SFVec2f size;	/*exposedField*/
+	GF_Node *background;	/*exposedField*/
+	GF_Node *viewport;	/*exposedField*/
+} M_Layer2D;
+
+
+typedef struct _tagLayer3D
+{
+	BASE_NODE
+	VRML_CHILDREN
+	SFVec2f size;	/*exposedField*/
+	GF_Node *background;	/*exposedField*/
+	GF_Node *fog;	/*exposedField*/
+	GF_Node *navigationInfo;	/*exposedField*/
+	GF_Node *viewpoint;	/*exposedField*/
+} M_Layer3D;
+
+
+typedef struct _tagLayout
+{
+	BASE_NODE
+	VRML_CHILDREN
+	SFBool wrap;	/*exposedField*/
+	SFVec2f size;	/*exposedField*/
+	SFBool horizontal;	/*exposedField*/
+	MFString justify;	/*exposedField*/
+	SFBool leftToRight;	/*exposedField*/
+	SFBool topToBottom;	/*exposedField*/
+	SFFloat spacing;	/*exposedField*/
+	SFBool smoothScroll;	/*exposedField*/
+	SFBool loop;	/*exposedField*/
+	SFBool scrollVertical;	/*exposedField*/
+	SFFloat scrollRate;	/*exposedField*/
+	SFInt32 scrollMode;	/*exposedField*/
+} M_Layout;
+
+
+typedef struct _tagLineProperties
+{
+	BASE_NODE
+	SFColor lineColor;	/*exposedField*/
+	SFInt32 lineStyle;	/*exposedField*/
+	SFFloat width;	/*exposedField*/
+} M_LineProperties;
+
+
+typedef struct _tagListeningPoint
+{
+	BASE_NODE
+	SFBool set_bind;	/*eventIn*/
+	void (*on_set_bind)(GF_Node *pThis);	/*eventInHandler*/
+	SFBool jump;	/*exposedField*/
+	SFRotation orientation;	/*exposedField*/
+	SFVec3f position;	/*exposedField*/
+	SFString description;	/*field*/
+	SFTime bindTime;	/*eventOut*/
+	SFBool isBound;	/*eventOut*/
+} M_ListeningPoint;
+
+
+typedef struct _tagMaterial
+{
+	BASE_NODE
+	SFFloat ambientIntensity;	/*exposedField*/
+	SFColor diffuseColor;	/*exposedField*/
+	SFColor emissiveColor;	/*exposedField*/
+	SFFloat shininess;	/*exposedField*/
+	SFColor specularColor;	/*exposedField*/
+	SFFloat transparency;	/*exposedField*/
+} M_Material;
+
+
+typedef struct _tagMaterial2D
+{
+	BASE_NODE
+	SFColor emissiveColor;	/*exposedField*/
+	SFBool filled;	/*exposedField*/
+	GF_Node *lineProps;	/*exposedField*/
+	SFFloat transparency;	/*exposedField*/
+} M_Material2D;
+
+
+typedef struct _tagMovieTexture
+{
+	BASE_NODE
+	SFBool loop;	/*exposedField*/
+	SFFloat speed;	/*exposedField*/
+	SFTime startTime;	/*exposedField*/
+	SFTime stopTime;	/*exposedField*/
+	MFURL url;	/*exposedField*/
+	SFBool repeatS;	/*field*/
+	SFBool repeatT;	/*field*/
+	SFTime duration_changed;	/*eventOut*/
+	SFBool isActive;	/*eventOut*/
+} M_MovieTexture;
+
+
+typedef struct _tagNavigationInfo
+{
+	BASE_NODE
+	SFBool set_bind;	/*eventIn*/
+	void (*on_set_bind)(GF_Node *pThis);	/*eventInHandler*/
+	MFFloat avatarSize;	/*exposedField*/
+	SFBool headlight;	/*exposedField*/
+	SFFloat speed;	/*exposedField*/
+	MFString type;	/*exposedField*/
+	SFFloat visibilityLimit;	/*exposedField*/
+	SFBool isBound;	/*eventOut*/
+} M_NavigationInfo;
+
+
+typedef struct _tagNormal
+{
+	BASE_NODE
+	MFVec3f vector;	/*exposedField*/
+} M_Normal;
+
+
+typedef struct _tagNormalInterpolator
+{
+	BASE_NODE
+	SFFloat set_fraction;	/*eventIn*/
+	void (*on_set_fraction)(GF_Node *pThis);	/*eventInHandler*/
+	MFFloat key;	/*exposedField*/
+	MFVec3f keyValue;	/*exposedField*/
+	MFVec3f value_changed;	/*eventOut*/
+} M_NormalInterpolator;
+
+
+typedef struct _tagOrderedGroup
+{
+	BASE_NODE
+	VRML_CHILDREN
+	MFFloat order;	/*exposedField*/
+} M_OrderedGroup;
+
+
+typedef struct _tagOrientationInterpolator
+{
+	BASE_NODE
+	SFFloat set_fraction;	/*eventIn*/
+	void (*on_set_fraction)(GF_Node *pThis);	/*eventInHandler*/
+	MFFloat key;	/*exposedField*/
+	MFRotation keyValue;	/*exposedField*/
+	SFRotation value_changed;	/*eventOut*/
+} M_OrientationInterpolator;
+
+
+typedef struct _tagPixelTexture
+{
+	BASE_NODE
+	SFImage image;	/*exposedField*/
+	SFBool repeatS;	/*field*/
+	SFBool repeatT;	/*field*/
+} M_PixelTexture;
+
+
+typedef struct _tagPlaneSensor
+{
+	BASE_NODE
+	SFBool autoOffset;	/*exposedField*/
+	SFBool enabled;	/*exposedField*/
+	SFVec2f maxPosition;	/*exposedField*/
+	SFVec2f minPosition;	/*exposedField*/
+	SFVec3f offset;	/*exposedField*/
+	SFBool isActive;	/*eventOut*/
+	SFVec3f trackPoint_changed;	/*eventOut*/
+	SFVec3f translation_changed;	/*eventOut*/
+} M_PlaneSensor;
+
+
+typedef struct _tagPlaneSensor2D
+{
+	BASE_NODE
+	SFBool autoOffset;	/*exposedField*/
+	SFBool enabled;	/*exposedField*/
+	SFVec2f maxPosition;	/*exposedField*/
+	SFVec2f minPosition;	/*exposedField*/
+	SFVec2f offset;	/*exposedField*/
+	SFBool isActive;	/*eventOut*/
+	SFVec2f trackPoint_changed;	/*eventOut*/
+	SFVec2f translation_changed;	/*eventOut*/
+} M_PlaneSensor2D;
+
+
+typedef struct _tagPointLight
+{
+	BASE_NODE
+	SFFloat ambientIntensity;	/*exposedField*/
+	SFVec3f attenuation;	/*exposedField*/
+	SFColor color;	/*exposedField*/
+	SFFloat intensity;	/*exposedField*/
+	SFVec3f location;	/*exposedField*/
+	SFBool on;	/*exposedField*/
+	SFFloat radius;	/*exposedField*/
+} M_PointLight;
+
+
+typedef struct _tagPointSet
+{
+	BASE_NODE
+	GF_Node *color;	/*exposedField*/
+	GF_Node *coord;	/*exposedField*/
+} M_PointSet;
+
+
+typedef struct _tagPointSet2D
+{
+	BASE_NODE
+	GF_Node *color;	/*exposedField*/
+	GF_Node *coord;	/*exposedField*/
+} M_PointSet2D;
+
+
+typedef struct _tagPositionInterpolator
+{
+	BASE_NODE
+	SFFloat set_fraction;	/*eventIn*/
+	void (*on_set_fraction)(GF_Node *pThis);	/*eventInHandler*/
+	MFFloat key;	/*exposedField*/
+	MFVec3f keyValue;	/*exposedField*/
+	SFVec3f value_changed;	/*eventOut*/
+} M_PositionInterpolator;
+
+
+typedef struct _tagPositionInterpolator2D
+{
+	BASE_NODE
+	SFFloat set_fraction;	/*eventIn*/
+	void (*on_set_fraction)(GF_Node *pThis);	/*eventInHandler*/
+	MFFloat key;	/*exposedField*/
+	MFVec2f keyValue;	/*exposedField*/
+	SFVec2f value_changed;	/*eventOut*/
+} M_PositionInterpolator2D;
+
+
+typedef struct _tagProximitySensor2D
+{
+	BASE_NODE
+	SFVec2f center;	/*exposedField*/
+	SFVec2f size;	/*exposedField*/
+	SFBool enabled;	/*exposedField*/
+	SFBool isActive;	/*eventOut*/
+	SFVec2f position_changed;	/*eventOut*/
+	SFFloat orientation_changed;	/*eventOut*/
+	SFTime enterTime;	/*eventOut*/
+	SFTime exitTime;	/*eventOut*/
+} M_ProximitySensor2D;
+
+
+typedef struct _tagProximitySensor
+{
+	BASE_NODE
+	SFVec3f center;	/*exposedField*/
+	SFVec3f size;	/*exposedField*/
+	SFBool enabled;	/*exposedField*/
+	SFBool isActive;	/*eventOut*/
+	SFVec3f position_changed;	/*eventOut*/
+	SFRotation orientation_changed;	/*eventOut*/
+	SFTime enterTime;	/*eventOut*/
+	SFTime exitTime;	/*eventOut*/
+} M_ProximitySensor;
+
+
+typedef struct _tagQuantizationParameter
+{
+	BASE_NODE
+	SFBool isLocal;	/*field*/
+	SFBool position3DQuant;	/*field*/
+	SFVec3f position3DMin;	/*field*/
+	SFVec3f position3DMax;	/*field*/
+	SFInt32 position3DNbBits;	/*field*/
+	SFBool position2DQuant;	/*field*/
+	SFVec2f position2DMin;	/*field*/
+	SFVec2f position2DMax;	/*field*/
+	SFInt32 position2DNbBits;	/*field*/
+	SFBool drawOrderQuant;	/*field*/
+	SFFloat drawOrderMin;	/*field*/
+	SFFloat drawOrderMax;	/*field*/
+	SFInt32 drawOrderNbBits;	/*field*/
+	SFBool colorQuant;	/*field*/
+	SFFloat colorMin;	/*field*/
+	SFFloat colorMax;	/*field*/
+	SFInt32 colorNbBits;	/*field*/
+	SFBool textureCoordinateQuant;	/*field*/
+	SFFloat textureCoordinateMin;	/*field*/
+	SFFloat textureCoordinateMax;	/*field*/
+	SFInt32 textureCoordinateNbBits;	/*field*/
+	SFBool angleQuant;	/*field*/
+	SFFloat angleMin;	/*field*/
+	SFFloat angleMax;	/*field*/
+	SFInt32 angleNbBits;	/*field*/
+	SFBool scaleQuant;	/*field*/
+	SFFloat scaleMin;	/*field*/
+	SFFloat scaleMax;	/*field*/
+	SFInt32 scaleNbBits;	/*field*/
+	SFBool keyQuant;	/*field*/
+	SFFloat keyMin;	/*field*/
+	SFFloat keyMax;	/*field*/
+	SFInt32 keyNbBits;	/*field*/
+	SFBool normalQuant;	/*field*/
+	SFInt32 normalNbBits;	/*field*/
+	SFBool sizeQuant;	/*field*/
+	SFFloat sizeMin;	/*field*/
+	SFFloat sizeMax;	/*field*/
+	SFInt32 sizeNbBits;	/*field*/
+	SFBool useEfficientCoding;	/*field*/
+} M_QuantizationParameter;
+
+
+typedef struct _tagRectangle
+{
+	BASE_NODE
+	SFVec2f size;	/*exposedField*/
+} M_Rectangle;
+
+
+typedef struct _tagScalarInterpolator
+{
+	BASE_NODE
+	SFFloat set_fraction;	/*eventIn*/
+	void (*on_set_fraction)(GF_Node *pThis);	/*eventInHandler*/
+	MFFloat key;	/*exposedField*/
+	MFFloat keyValue;	/*exposedField*/
+	SFFloat value_changed;	/*eventOut*/
+} M_ScalarInterpolator;
+
+
+typedef struct _tagScript
+{
+	BASE_NODE
+	MFScript url;	/*exposedField*/
+	SFBool directOutput;	/*field*/
+	SFBool mustEvaluate;	/*field*/
+} M_Script;
+
+
+typedef struct _tagShape
+{
+	BASE_NODE
+	GF_Node *appearance;	/*exposedField*/
+	GF_Node *geometry;	/*exposedField*/
+} M_Shape;
+
+
+typedef struct _tagSound
+{
+	BASE_NODE
+	SFVec3f direction;	/*exposedField*/
+	SFFloat intensity;	/*exposedField*/
+	SFVec3f location;	/*exposedField*/
+	SFFloat maxBack;	/*exposedField*/
+	SFFloat maxFront;	/*exposedField*/
+	SFFloat minBack;	/*exposedField*/
+	SFFloat minFront;	/*exposedField*/
+	SFFloat priority;	/*exposedField*/
+	GF_Node *source;	/*exposedField*/
+	SFBool spatialize;	/*field*/
+} M_Sound;
+
+
+typedef struct _tagSound2D
+{
+	BASE_NODE
+	SFFloat intensity;	/*exposedField*/
+	SFVec2f location;	/*exposedField*/
+	GF_Node *source;	/*exposedField*/
+	SFBool spatialize;	/*field*/
+} M_Sound2D;
+
+
+typedef struct _tagSphere
+{
+	BASE_NODE
+	SFFloat radius;	/*field*/
+} M_Sphere;
+
+
+typedef struct _tagSphereSensor
+{
+	BASE_NODE
+	SFBool autoOffset;	/*exposedField*/
+	SFBool enabled;	/*exposedField*/
+	SFRotation offset;	/*exposedField*/
+	SFBool isActive;	/*eventOut*/
+	SFRotation rotation_changed;	/*eventOut*/
+	SFVec3f trackPoint_changed;	/*eventOut*/
+} M_SphereSensor;
+
+
+typedef struct _tagSpotLight
+{
+	BASE_NODE
+	SFFloat ambientIntensity;	/*exposedField*/
+	SFVec3f attenuation;	/*exposedField*/
+	SFFloat beamWidth;	/*exposedField*/
+	SFColor color;	/*exposedField*/
+	SFFloat cutOffAngle;	/*exposedField*/
+	SFVec3f direction;	/*exposedField*/
+	SFFloat intensity;	/*exposedField*/
+	SFVec3f location;	/*exposedField*/
+	SFBool on;	/*exposedField*/
+	SFFloat radius;	/*exposedField*/
+} M_SpotLight;
+
+
+typedef struct _tagSwitch
+{
+	BASE_NODE
+	GF_ChildNodeItem *choice;	/*exposedField*/
+	SFInt32 whichChoice;	/*exposedField*/
+} M_Switch;
+
+
+typedef struct _tagTermCap
+{
+	BASE_NODE
+	SFTime evaluate;	/*eventIn*/
+	void (*on_evaluate)(GF_Node *pThis);	/*eventInHandler*/
+	SFInt32 capability;	/*exposedField*/
+	SFInt32 value;	/*eventOut*/
+} M_TermCap;
+
+
+typedef struct _tagText
+{
+	BASE_NODE
+	MFString string;	/*exposedField*/
+	MFFloat length;	/*exposedField*/
+	GF_Node *fontStyle;	/*exposedField*/
+	SFFloat maxExtent;	/*exposedField*/
+} M_Text;
+
+
+typedef struct _tagTextureCoordinate
+{
+	BASE_NODE
+	MFVec2f point;	/*exposedField*/
+} M_TextureCoordinate;
+
+
+typedef struct _tagTextureTransform
+{
+	BASE_NODE
+	SFVec2f center;	/*exposedField*/
+	SFFloat rotation;	/*exposedField*/
+	SFVec2f scale;	/*exposedField*/
+	SFVec2f translation;	/*exposedField*/
+} M_TextureTransform;
+
+
+typedef struct _tagTimeSensor
+{
+	BASE_NODE
+	SFTime cycleInterval;	/*exposedField*/
+	SFBool enabled;	/*exposedField*/
+	SFBool loop;	/*exposedField*/
+	SFTime startTime;	/*exposedField*/
+	SFTime stopTime;	/*exposedField*/
+	SFTime cycleTime;	/*eventOut*/
+	SFFloat fraction_changed;	/*eventOut*/
+	SFBool isActive;	/*eventOut*/
+	SFTime time;	/*eventOut*/
+} M_TimeSensor;
+
+
+typedef struct _tagTouchSensor
+{
+	BASE_NODE
+	SFBool enabled;	/*exposedField*/
+	SFVec3f hitNormal_changed;	/*eventOut*/
+	SFVec3f hitPoint_changed;	/*eventOut*/
+	SFVec2f hitTexCoord_changed;	/*eventOut*/
+	SFBool isActive;	/*eventOut*/
+	SFBool isOver;	/*eventOut*/
+	SFTime touchTime;	/*eventOut*/
+} M_TouchSensor;
+
+
+typedef struct _tagTransform
+{
+	BASE_NODE
+	VRML_CHILDREN
+	SFVec3f center;	/*exposedField*/
+	SFRotation rotation;	/*exposedField*/
+	SFVec3f scale;	/*exposedField*/
+	SFRotation scaleOrientation;	/*exposedField*/
+	SFVec3f translation;	/*exposedField*/
+} M_Transform;
+
+
+typedef struct _tagTransform2D
+{
+	BASE_NODE
+	VRML_CHILDREN
+	SFVec2f center;	/*exposedField*/
+	SFFloat rotationAngle;	/*exposedField*/
+	SFVec2f scale;	/*exposedField*/
+	SFFloat scaleOrientation;	/*exposedField*/
+	SFVec2f translation;	/*exposedField*/
+} M_Transform2D;
+
+
+typedef struct _tagValuator
+{
+	BASE_NODE
+	SFBool inSFBool;	/*eventIn*/
+	void (*on_inSFBool)(GF_Node *pThis);	/*eventInHandler*/
+	SFColor inSFColor;	/*eventIn*/
+	void (*on_inSFColor)(GF_Node *pThis);	/*eventInHandler*/
+	MFColor inMFColor;	/*eventIn*/
+	void (*on_inMFColor)(GF_Node *pThis);	/*eventInHandler*/
+	SFFloat inSFFloat;	/*eventIn*/
+	void (*on_inSFFloat)(GF_Node *pThis);	/*eventInHandler*/
+	MFFloat inMFFloat;	/*eventIn*/
+	void (*on_inMFFloat)(GF_Node *pThis);	/*eventInHandler*/
+	SFInt32 inSFInt32;	/*eventIn*/
+	void (*on_inSFInt32)(GF_Node *pThis);	/*eventInHandler*/
+	MFInt32 inMFInt32;	/*eventIn*/
+	void (*on_inMFInt32)(GF_Node *pThis);	/*eventInHandler*/
+	SFRotation inSFRotation;	/*eventIn*/
+	void (*on_inSFRotation)(GF_Node *pThis);	/*eventInHandler*/
+	MFRotation inMFRotation;	/*eventIn*/
+	void (*on_inMFRotation)(GF_Node *pThis);	/*eventInHandler*/
+	SFString inSFString;	/*eventIn*/
+	void (*on_inSFString)(GF_Node *pThis);	/*eventInHandler*/
+	MFString inMFString;	/*eventIn*/
+	void (*on_inMFString)(GF_Node *pThis);	/*eventInHandler*/
+	SFTime inSFTime;	/*eventIn*/
+	void (*on_inSFTime)(GF_Node *pThis);	/*eventInHandler*/
+	SFVec2f inSFVec2f;	/*eventIn*/
+	void (*on_inSFVec2f)(GF_Node *pThis);	/*eventInHandler*/
+	MFVec2f inMFVec2f;	/*eventIn*/
+	void (*on_inMFVec2f)(GF_Node *pThis);	/*eventInHandler*/
+	SFVec3f inSFVec3f;	/*eventIn*/
+	void (*on_inSFVec3f)(GF_Node *pThis);	/*eventInHandler*/
+	MFVec3f inMFVec3f;	/*eventIn*/
+	void (*on_inMFVec3f)(GF_Node *pThis);	/*eventInHandler*/
+	SFBool outSFBool;	/*eventOut*/
+	SFColor outSFColor;	/*eventOut*/
+	MFColor outMFColor;	/*eventOut*/
+	SFFloat outSFFloat;	/*eventOut*/
+	MFFloat outMFFloat;	/*eventOut*/
+	SFInt32 outSFInt32;	/*eventOut*/
+	MFInt32 outMFInt32;	/*eventOut*/
+	SFRotation outSFRotation;	/*eventOut*/
+	MFRotation outMFRotation;	/*eventOut*/
+	SFString outSFString;	/*eventOut*/
+	MFString outMFString;	/*eventOut*/
+	SFTime outSFTime;	/*eventOut*/
+	SFVec2f outSFVec2f;	/*eventOut*/
+	MFVec2f outMFVec2f;	/*eventOut*/
+	SFVec3f outSFVec3f;	/*eventOut*/
+	MFVec3f outMFVec3f;	/*eventOut*/
+	SFFloat Factor1;	/*exposedField*/
+	SFFloat Factor2;	/*exposedField*/
+	SFFloat Factor3;	/*exposedField*/
+	SFFloat Factor4;	/*exposedField*/
+	SFFloat Offset1;	/*exposedField*/
+	SFFloat Offset2;	/*exposedField*/
+	SFFloat Offset3;	/*exposedField*/
+	SFFloat Offset4;	/*exposedField*/
+	SFBool Sum;	/*exposedField*/
+} M_Valuator;
+
+
+typedef struct _tagViewpoint
+{
+	BASE_NODE
+	SFBool set_bind;	/*eventIn*/
+	void (*on_set_bind)(GF_Node *pThis);	/*eventInHandler*/
+	SFFloat fieldOfView;	/*exposedField*/
+	SFBool jump;	/*exposedField*/
+	SFRotation orientation;	/*exposedField*/
+	SFVec3f position;	/*exposedField*/
+	SFString description;	/*field*/
+	SFTime bindTime;	/*eventOut*/
+	SFBool isBound;	/*eventOut*/
+} M_Viewpoint;
+
+
+typedef struct _tagVisibilitySensor
+{
+	BASE_NODE
+	SFVec3f center;	/*exposedField*/
+	SFBool enabled;	/*exposedField*/
+	SFVec3f size;	/*exposedField*/
+	SFTime enterTime;	/*eventOut*/
+	SFTime exitTime;	/*eventOut*/
+	SFBool isActive;	/*eventOut*/
+} M_VisibilitySensor;
+
+
+typedef struct _tagWorldInfo
+{
+	BASE_NODE
+	MFString info;	/*field*/
+	SFString title;	/*field*/
+} M_WorldInfo;
+
+
+typedef struct _tagAcousticMaterial
+{
+	BASE_NODE
+	SFFloat ambientIntensity;	/*exposedField*/
+	SFColor diffuseColor;	/*exposedField*/
+	SFColor emissiveColor;	/*exposedField*/
+	SFFloat shininess;	/*exposedField*/
+	SFColor specularColor;	/*exposedField*/
+	SFFloat transparency;	/*exposedField*/
+	MFFloat reffunc;	/*field*/
+	MFFloat transfunc;	/*field*/
+	MFFloat refFrequency;	/*field*/
+	MFFloat transFrequency;	/*field*/
+} M_AcousticMaterial;
+
+
+typedef struct _tagAcousticScene
+{
+	BASE_NODE
+	SFVec3f center;	/*field*/
+	SFVec3f Size;	/*field*/
+	MFTime reverbTime;	/*field*/
+	MFFloat reverbFreq;	/*field*/
+	SFFloat reverbLevel;	/*exposedField*/
+	SFTime reverbDelay;	/*exposedField*/
+} M_AcousticScene;
+
+
+typedef struct _tagApplicationWindow
+{
+	BASE_NODE
+	SFBool isActive;	/*exposedField*/
+	SFTime startTime;	/*exposedField*/
+	SFTime stopTime;	/*exposedField*/
+	SFString description;	/*exposedField*/
+	MFString parameter;	/*exposedField*/
+	MFURL url;	/*exposedField*/
+	SFVec2f size;	/*exposedField*/
+} M_ApplicationWindow;
+
+
+typedef struct _tagDirectiveSound
+{
+	BASE_NODE
+	SFVec3f direction;	/*exposedField*/
+	SFFloat intensity;	/*exposedField*/
+	SFVec3f location;	/*exposedField*/
+	GF_Node *source;	/*exposedField*/
+	GF_Node *perceptualParameters;	/*exposedField*/
+	SFBool roomEffect;	/*exposedField*/
+	SFBool spatialize;	/*exposedField*/
+	MFFloat directivity;	/*field*/
+	MFFloat angles;	/*field*/
+	MFFloat frequency;	/*field*/
+	SFFloat speedOfSound;	/*field*/
+	SFFloat distance;	/*field*/
+	SFBool useAirabs;	/*field*/
+} M_DirectiveSound;
+
+
+typedef struct _tagHierarchical3DMesh
+{
+	BASE_NODE
+	SFInt32 triangleBudget;	/*eventIn*/
+	void (*on_triangleBudget)(GF_Node *pThis);	/*eventInHandler*/
+	SFFloat level;	/*exposedField*/
+	MFURL url;	/*field*/
+	SFBool doneLoading;	/*eventOut*/
+} M_Hierarchical3DMesh;
+
+
+typedef struct _tagMaterialKey
+{
+	BASE_NODE
+	SFBool isKeyed;	/*exposedField*/
+	SFBool isRGB;	/*exposedField*/
+	SFColor keyColor;	/*exposedField*/
+	SFFloat lowThreshold;	/*exposedField*/
+	SFFloat highThreshold;	/*exposedField*/
+	SFFloat transparency;	/*exposedField*/
+} M_MaterialKey;
+
+
+typedef struct _tagPerceptualParameters
+{
+	BASE_NODE
+	SFFloat sourcePresence;	/*exposedField*/
+	SFFloat sourceWarmth;	/*exposedField*/
+	SFFloat sourceBrilliance;	/*exposedField*/
+	SFFloat roomPresence;	/*exposedField*/
+	SFFloat runningReverberance;	/*exposedField*/
+	SFFloat envelopment;	/*exposedField*/
+	SFFloat lateReverberance;	/*exposedField*/
+	SFFloat heavyness;	/*exposedField*/
+	SFFloat liveness;	/*exposedField*/
+	MFFloat omniDirectivity;	/*exposedField*/
+	MFFloat directFilterGains;	/*exposedField*/
+	MFFloat inputFilterGains;	/*exposedField*/
+	SFFloat refDistance;	/*exposedField*/
+	SFFloat freqLow;	/*exposedField*/
+	SFFloat freqHigh;	/*exposedField*/
+	SFTime timeLimit1;	/*exposedField*/
+	SFTime timeLimit2;	/*exposedField*/
+	SFTime timeLimit3;	/*exposedField*/
+	SFTime modalDensity;	/*exposedField*/
+} M_PerceptualParameters;
+
+
+typedef struct _tagTemporalTransform
+{
+	BASE_NODE
+	VRML_CHILDREN
+	MFURL url;	/*exposedField*/
+	SFTime startTime;	/*exposedField*/
+	SFTime optimalDuration;	/*exposedField*/
+	SFBool active;	/*exposedField*/
+	SFFloat speed;	/*exposedField*/
+	SFVec2f scalability;	/*exposedField*/
+	MFInt32 stretchMode;	/*exposedField*/
+	MFInt32 shrinkMode;	/*exposedField*/
+	SFTime maxDelay;	/*exposedField*/
+	SFTime actualDuration;	/*eventOut*/
+} M_TemporalTransform;
+
+
+typedef struct _tagTemporalGroup
+{
+	BASE_NODE
+	VRML_CHILDREN
+	SFBool costart;	/*field*/
+	SFBool coend;	/*field*/
+	SFBool meet;	/*field*/
+	MFFloat priority;	/*exposedField*/
+	SFBool isActive;	/*eventOut*/
+	SFInt32 activeChild;	/*eventOut*/
+} M_TemporalGroup;
+
+
+typedef struct _tagServerCommand
+{
+	BASE_NODE
+	SFBool trigger;	/*eventIn*/
+	void (*on_trigger)(GF_Node *pThis);	/*eventInHandler*/
+	SFBool enable;	/*exposedField*/
+	MFURL url;	/*exposedField*/
+	SFString command;	/*exposedField*/
+} M_ServerCommand;
+
+
+typedef struct _tagInputSensor
+{
+	BASE_NODE
+	SFBool enabled;	/*exposedField*/
+	SFCommandBuffer buffer;	/*exposedField*/
+	MFURL url;	/*exposedField*/
+	SFTime eventTime;	/*eventOut*/
+} M_InputSensor;
+
+
+typedef struct _tagMatteTexture
+{
+	BASE_NODE
+	GF_Node *surfaceA;	/*field*/
+	GF_Node *surfaceB;	/*field*/
+	GF_Node *alphaSurface;	/*field*/
+	SFString operation;	/*exposedField*/
+	SFBool overwrite;	/*field*/
+	SFFloat fraction;	/*exposedField*/
+	MFFloat parameter;	/*exposedField*/
+} M_MatteTexture;
+
+
+typedef struct _tagMediaBuffer
+{
+	BASE_NODE
+	SFFloat bufferSize;	/*exposedField*/
+	MFURL url;	/*exposedField*/
+	SFTime mediaStartTime;	/*exposedField*/
+	SFTime mediaStopTime;	/*exposedField*/
+	SFBool isBuffered;	/*eventOut*/
+	SFBool enabled;	/*exposedField*/
+} M_MediaBuffer;
+
+
+typedef struct _tagMediaControl
+{
+	BASE_NODE
+	MFURL url;	/*exposedField*/
+	SFTime mediaStartTime;	/*exposedField*/
+	SFTime mediaStopTime;	/*exposedField*/
+	SFFloat mediaSpeed;	/*exposedField*/
+	SFBool loop;	/*exposedField*/
+	SFBool preRoll;	/*exposedField*/
+	SFBool mute;	/*exposedField*/
+	SFBool enabled;	/*exposedField*/
+	SFBool isPreRolled;	/*eventOut*/
+} M_MediaControl;
+
+
+typedef struct _tagMediaSensor
+{
+	BASE_NODE
+	MFURL url;	/*exposedField*/
+	SFTime mediaCurrentTime;	/*eventOut*/
+	SFTime streamObjectStartTime;	/*eventOut*/
+	SFTime mediaDuration;	/*eventOut*/
+	SFBool isActive;	/*eventOut*/
+	MFString info;	/*eventOut*/
+} M_MediaSensor;
+
+
+typedef struct _tagCoordinateInterpolator4D
+{
+	BASE_NODE
+	SFFloat set_fraction;	/*eventIn*/
+	void (*on_set_fraction)(GF_Node *pThis);	/*eventInHandler*/
+	MFFloat key;	/*exposedField*/
+	MFVec4f keyValue;	/*exposedField*/
+	MFVec4f value_changed;	/*eventOut*/
+} M_CoordinateInterpolator4D;
+
+
+typedef struct _tagNonLinearDeformer
+{
+	BASE_NODE
+	SFVec3f axis;	/*exposedField*/
+	MFFloat extend;	/*exposedField*/
+	GF_Node *geometry;	/*exposedField*/
+	SFFloat param;	/*exposedField*/
+	SFInt32 type;	/*exposedField*/
+} M_NonLinearDeformer;
+
+
+typedef struct _tagPositionAnimator
+{
+	BASE_NODE
+	SFFloat set_fraction;	/*eventIn*/
+	void (*on_set_fraction)(GF_Node *pThis);	/*eventInHandler*/
+	SFVec2f fromTo;	/*exposedField*/
+	MFFloat key;	/*exposedField*/
+	MFRotation keyOrientation;	/*exposedField*/
+	SFInt32 keyType;	/*exposedField*/
+	MFVec2f keySpline;	/*exposedField*/
+	MFVec3f keyValue;	/*exposedField*/
+	SFInt32 keyValueType;	/*exposedField*/
+	SFVec3f offset;	/*exposedField*/
+	MFFloat weight;	/*exposedField*/
+	SFVec3f endValue;	/*eventOut*/
+	SFRotation rotation_changed;	/*eventOut*/
+	SFVec3f value_changed;	/*eventOut*/
+} M_PositionAnimator;
+
+
+typedef struct _tagPositionAnimator2D
+{
+	BASE_NODE
+	SFFloat set_fraction;	/*eventIn*/
+	void (*on_set_fraction)(GF_Node *pThis);	/*eventInHandler*/
+	SFVec2f fromTo;	/*exposedField*/
+	MFFloat key;	/*exposedField*/
+	SFInt32 keyOrientation;	/*exposedField*/
+	SFInt32 keyType;	/*exposedField*/
+	MFVec2f keySpline;	/*exposedField*/
+	MFVec2f keyValue;	/*exposedField*/
+	SFInt32 keyValueType;	/*exposedField*/
+	SFVec2f offset;	/*exposedField*/
+	MFFloat weight;	/*exposedField*/
+	SFVec2f endValue;	/*eventOut*/
+	SFFloat rotation_changed;	/*eventOut*/
+	SFVec2f value_changed;	/*eventOut*/
+} M_PositionAnimator2D;
+
+
+typedef struct _tagPositionInterpolator4D
+{
+	BASE_NODE
+	SFFloat set_fraction;	/*eventIn*/
+	void (*on_set_fraction)(GF_Node *pThis);	/*eventInHandler*/
+	MFFloat key;	/*exposedField*/
+	MFVec4f keyValue;	/*exposedField*/
+	SFVec4f value_changed;	/*eventOut*/
+} M_PositionInterpolator4D;
+
+
+typedef struct _tagScalarAnimator
+{
+	BASE_NODE
+	SFFloat set_fraction;	/*eventIn*/
+	void (*on_set_fraction)(GF_Node *pThis);	/*eventInHandler*/
+	SFVec2f fromTo;	/*exposedField*/
+	MFFloat key;	/*exposedField*/
+	SFInt32 keyType;	/*exposedField*/
+	MFVec2f keySpline;	/*exposedField*/
+	MFFloat keyValue;	/*exposedField*/
+	SFInt32 keyValueType;	/*exposedField*/
+	SFFloat offset;	/*exposedField*/
+	MFFloat weight;	/*exposedField*/
+	SFFloat endValue;	/*eventOut*/
+	SFFloat value_changed;	/*eventOut*/
+} M_ScalarAnimator;
+
+
+typedef struct _tagClipper2D
+{
+	BASE_NODE
+	VRML_CHILDREN
+	GF_Node *geometry;	/*exposedField*/
+	SFBool inside;	/*exposedField*/
+	GF_Node *transform;	/*exposedField*/
+	SFBool XOR;	/*exposedField*/
+} M_Clipper2D;
+
+
+typedef struct _tagColorTransform
+{
+	BASE_NODE
+	VRML_CHILDREN
+	SFFloat mrr;	/*exposedField*/
+	SFFloat mrg;	/*exposedField*/
+	SFFloat mrb;	/*exposedField*/
+	SFFloat mra;	/*exposedField*/
+	SFFloat tr;	/*exposedField*/
+	SFFloat mgr;	/*exposedField*/
+	SFFloat mgg;	/*exposedField*/
+	SFFloat mgb;	/*exposedField*/
+	SFFloat mga;	/*exposedField*/
+	SFFloat tg;	/*exposedField*/
+	SFFloat mbr;	/*exposedField*/
+	SFFloat mbg;	/*exposedField*/
+	SFFloat mbb;	/*exposedField*/
+	SFFloat mba;	/*exposedField*/
+	SFFloat tb;	/*exposedField*/
+	SFFloat mar;	/*exposedField*/
+	SFFloat mag;	/*exposedField*/
+	SFFloat mab;	/*exposedField*/
+	SFFloat maa;	/*exposedField*/
+	SFFloat ta;	/*exposedField*/
+} M_ColorTransform;
+
+
+typedef struct _tagEllipse
+{
+	BASE_NODE
+	SFVec2f radius;	/*exposedField*/
+} M_Ellipse;
+
+
+typedef struct _tagLinearGradient
+{
+	BASE_NODE
+	SFVec2f endPoint;	/*exposedField*/
+	MFFloat key;	/*exposedField*/
+	MFColor keyValue;	/*exposedField*/
+	MFFloat opacity;	/*exposedField*/
+	SFInt32 spreadMethod;	/*exposedField*/
+	SFVec2f startPoint;	/*exposedField*/
+	GF_Node *transform;	/*exposedField*/
+} M_LinearGradient;
+
+
+typedef struct _tagPathLayout
+{
+	BASE_NODE
+	VRML_CHILDREN
+	GF_Node *geometry;	/*exposedField*/
+	MFInt32 alignment;	/*exposedField*/
+	SFFloat pathOffset;	/*exposedField*/
+	SFFloat spacing;	/*exposedField*/
+	SFBool reverseLayout;	/*exposedField*/
+	SFInt32 wrapMode;	/*exposedField*/
+	SFBool splitText;	/*exposedField*/
+} M_PathLayout;
+
+
+typedef struct _tagRadialGradient
+{
+	BASE_NODE
+	SFVec2f center;	/*exposedField*/
+	SFVec2f focalPoint;	/*exposedField*/
+	MFFloat key;	/*exposedField*/
+	MFColor keyValue;	/*exposedField*/
+	MFFloat opacity;	/*exposedField*/
+	SFFloat radius;	/*exposedField*/
+	SFInt32 spreadMethod;	/*exposedField*/
+	GF_Node *transform;	/*exposedField*/
+} M_RadialGradient;
+
+
+typedef struct _tagTransformMatrix2D
+{
+	BASE_NODE
+	VRML_CHILDREN
+	SFFloat mxx;	/*exposedField*/
+	SFFloat mxy;	/*exposedField*/
+	SFFloat tx;	/*exposedField*/
+	SFFloat myx;	/*exposedField*/
+	SFFloat myy;	/*exposedField*/
+	SFFloat ty;	/*exposedField*/
+} M_TransformMatrix2D;
+
+
+typedef struct _tagViewport
+{
+	BASE_NODE
+	SFBool set_bind;	/*eventIn*/
+	void (*on_set_bind)(GF_Node *pThis);	/*eventInHandler*/
+	SFVec2f position;	/*exposedField*/
+	SFVec2f size;	/*exposedField*/
+	SFFloat orientation;	/*exposedField*/
+	MFInt32 alignment;	/*exposedField*/
+	SFInt32 fit;	/*exposedField*/
+	SFString description;	/*field*/
+	SFTime bindTime;	/*eventOut*/
+	SFBool isBound;	/*eventOut*/
+} M_Viewport;
+
+
+typedef struct _tagXCurve2D
+{
+	BASE_NODE
+	GF_Node *point;	/*exposedField*/
+	SFFloat fineness;	/*exposedField*/
+	MFInt32 type;	/*exposedField*/
+} M_XCurve2D;
+
+
+typedef struct _tagXFontStyle
+{
+	BASE_NODE
+	MFString fontName;	/*exposedField*/
+	SFBool horizontal;	/*exposedField*/
+	MFString justify;	/*exposedField*/
+	SFString language;	/*exposedField*/
+	SFBool leftToRight;	/*exposedField*/
+	SFFloat size;	/*exposedField*/
+	SFString stretch;	/*exposedField*/
+	SFFloat letterSpacing;	/*exposedField*/
+	SFFloat wordSpacing;	/*exposedField*/
+	SFInt32 weight;	/*exposedField*/
+	SFBool fontKerning;	/*exposedField*/
+	SFString style;	/*exposedField*/
+	SFBool topToBottom;	/*exposedField*/
+	MFString featureName;	/*exposedField*/
+	MFInt32 featureStartOffset;	/*exposedField*/
+	MFInt32 featureLength;	/*exposedField*/
+	MFInt32 featureValue;	/*exposedField*/
+} M_XFontStyle;
+
+
+typedef struct _tagXLineProperties
+{
+	BASE_NODE
+	SFColor lineColor;	/*exposedField*/
+	SFInt32 lineStyle;	/*exposedField*/
+	SFBool isCenterAligned;	/*exposedField*/
+	SFBool isScalable;	/*exposedField*/
+	SFInt32 lineCap;	/*exposedField*/
+	SFInt32 lineJoin;	/*exposedField*/
+	SFFloat miterLimit;	/*exposedField*/
+	SFFloat transparency;	/*exposedField*/
+	SFFloat width;	/*exposedField*/
+	SFFloat dashOffset;	/*exposedField*/
+	MFFloat dashes;	/*exposedField*/
+	GF_Node *texture;	/*exposedField*/
+	GF_Node *textureTransform;	/*exposedField*/
+} M_XLineProperties;
+
+
+/*NodeDataType tags*/
+enum {
+	NDT_SFWorldNode = 1,
+	NDT_SF3DNode,
+	NDT_SF2DNode,
+	NDT_SFStreamingNode,
+	NDT_SFAppearanceNode,
+	NDT_SFAudioNode,
+	NDT_SFBackground3DNode,
+	NDT_SFBackground2DNode,
+	NDT_SFGeometryNode,
+	NDT_SFColorNode,
+	NDT_SFTextureNode,
+	NDT_SFCoordinateNode,
+	NDT_SFCoordinate2DNode,
+	NDT_SFExpressionNode,
+	NDT_SFFaceDefMeshNode,
+	NDT_SFFaceDefTablesNode,
+	NDT_SFFaceDefTransformNode,
+	NDT_SFFAPNode,
+	NDT_SFFDPNode,
+	NDT_SFFITNode,
+	NDT_SFFogNode,
+	NDT_SFFontStyleNode,
+	NDT_SFTopNode,
+	NDT_SFLinePropertiesNode,
+	NDT_SFMaterialNode,
+	NDT_SFNavigationInfoNode,
+	NDT_SFNormalNode,
+	NDT_SFTextureCoordinateNode,
+	NDT_SFTextureTransformNode,
+	NDT_SFViewpointNode,
+	NDT_SFVisemeNode,
+	NDT_SFViewportNode,
+	NDT_SFBAPNode,
+	NDT_SFBDPNode,
+	NDT_SFBodyDefTableNode,
+	NDT_SFBodySegmentConnectionHintNode,
+	NDT_SFPerceptualParameterNode,
+	NDT_SFTemporalNode,
+	NDT_SFDepthImageNode,
+	NDT_SFBlendListNode,
+	NDT_SFFrameListNode,
+	NDT_SFLightMapNode,
+	NDT_SFSurfaceMapNode,
+	NDT_SFViewMapNode,
+	NDT_SFParticleInitializerNode,
+	NDT_SFInfluenceNode,
+	NDT_SFDepthTextureNode,
+	NDT_SFSBBoneNode,
+	NDT_SFSBMuscleNode,
+	NDT_SFSBSegmentNode,
+	NDT_SFSBSiteNode,
+	NDT_SFBaseMeshNode,
+	NDT_SFSubdivSurfaceSectorNode
+};
+
+/*All BIFS versions handled*/
+#define GF_BIFS_NUM_VERSION		6
+
+enum {
+	GF_BIFS_V1 = 1,
+	GF_BIFS_V2,
+	GF_BIFS_V3,
+	GF_BIFS_V4,
+	GF_BIFS_V5,
+	GF_BIFS_V6,
+	GF_BIFS_LAST_VERSION = GF_BIFS_V6
+};
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+
+#endif		/*_nodes_mpeg4_H*/
+
diff --git a/tstools/DtsEdit/src/gpac/nodes_svg.h b/tstools/DtsEdit/src/gpac/nodes_svg.h
new file mode 100644
index 0000000..7c10e3b
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/nodes_svg.h
@@ -0,0 +1,491 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Cyril Concolato - Jean Le Feuvre
+ *    Copyright (c)2004-200X ENST - All rights reserved
+ *
+ *  This file is part of GPAC / XML-based 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.
+ *
+ */
+
+#ifndef _GF_XML_NODES_H
+#define _GF_XML_NODES_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/scenegraph_svg.h>
+
+enum {
+	TAG_SVG_a = GF_NODE_RANGE_FIRST_SVG,
+	TAG_SVG_animate,
+	TAG_SVG_animateColor,
+	TAG_SVG_animateMotion,
+	TAG_SVG_animateTransform,
+	TAG_SVG_animation,
+	TAG_SVG_audio,
+	TAG_SVG_circle,
+	TAG_SVG_defs,
+	TAG_SVG_desc,
+	TAG_SVG_discard,
+	TAG_SVG_ellipse,
+	TAG_SVG_font,
+	TAG_SVG_font_face,
+	TAG_SVG_font_face_src,
+	TAG_SVG_font_face_uri,
+	TAG_SVG_foreignObject,
+	TAG_SVG_g,
+	TAG_SVG_glyph,
+	TAG_SVG_handler,
+	TAG_SVG_hkern,
+	TAG_SVG_image,
+	TAG_SVG_line,
+	TAG_SVG_linearGradient,
+	TAG_SVG_listener,
+	TAG_SVG_metadata,
+	TAG_SVG_missing_glyph,
+	TAG_SVG_mpath,
+	TAG_SVG_path,
+	TAG_SVG_polygon,
+	TAG_SVG_polyline,
+	TAG_SVG_prefetch,
+	TAG_SVG_radialGradient,
+	TAG_SVG_rect,
+	TAG_SVG_script,
+	TAG_SVG_set,
+	TAG_SVG_solidColor,
+	TAG_SVG_stop,
+	TAG_SVG_svg,
+	TAG_SVG_switch,
+	TAG_SVG_tbreak,
+	TAG_SVG_text,
+	TAG_SVG_textArea,
+	TAG_SVG_title,
+	TAG_SVG_tspan,
+	TAG_SVG_use,
+	TAG_SVG_video,
+
+	
+	TAG_LSR_conditional,
+	TAG_LSR_cursorManager,
+	TAG_LSR_rectClip,
+	TAG_LSR_selector,
+	TAG_LSR_simpleLayout,
+
+	/*undefined elements (when parsing) use this tag*/
+	TAG_SVG_UndefinedElement
+};
+
+/* Definition of SVG 3 attribute internal tags - 200 defined */
+/* TAG names are made of "TAG_SVG_ATT_" + SVG attribute name (with - replaced by _) */
+enum {
+	TAG_SVG_ATT_id = TAG_SVG_ATT_RANGE_FIRST,
+	TAG_SVG_ATT__class,	
+
+	TAG_SVG_ATT_requiredFeatures,
+	TAG_SVG_ATT_requiredExtensions,
+	TAG_SVG_ATT_requiredFormats,
+	TAG_SVG_ATT_requiredFonts,
+	TAG_SVG_ATT_systemLanguage,
+	TAG_SVG_ATT_display,
+	TAG_SVG_ATT_visibility,
+	TAG_SVG_ATT_image_rendering,
+	TAG_SVG_ATT_pointer_events,
+	TAG_SVG_ATT_shape_rendering,
+	TAG_SVG_ATT_text_rendering,
+	TAG_SVG_ATT_audio_level,
+	TAG_SVG_ATT_viewport_fill,
+	TAG_SVG_ATT_viewport_fill_opacity,
+	TAG_SVG_ATT_overflow,
+	TAG_SVG_ATT_fill_opacity,
+	TAG_SVG_ATT_stroke_opacity,
+	TAG_SVG_ATT_fill,
+	TAG_SVG_ATT_fill_rule,
+	TAG_SVG_ATT_stroke,
+	TAG_SVG_ATT_stroke_dasharray,
+	TAG_SVG_ATT_stroke_dashoffset,
+	TAG_SVG_ATT_stroke_linecap,
+	TAG_SVG_ATT_stroke_linejoin,
+	TAG_SVG_ATT_stroke_miterlimit,
+	TAG_SVG_ATT_stroke_width,
+	TAG_SVG_ATT_color,
+	TAG_SVG_ATT_color_rendering,
+	TAG_SVG_ATT_vector_effect,
+	TAG_SVG_ATT_solid_color,
+	TAG_SVG_ATT_solid_opacity,
+	TAG_SVG_ATT_display_align,
+	TAG_SVG_ATT_line_increment,
+	TAG_SVG_ATT_stop_color,
+	TAG_SVG_ATT_stop_opacity,
+	TAG_SVG_ATT_font_family,
+	TAG_SVG_ATT_font_size,
+	TAG_SVG_ATT_font_style,
+	TAG_SVG_ATT_font_variant,
+	TAG_SVG_ATT_font_weight,
+	TAG_SVG_ATT_text_anchor,
+	TAG_SVG_ATT_text_align,
+	TAG_SVG_ATT_text_decoration,
+	TAG_SVG_ATT_focusHighlight,
+	TAG_SVG_ATT_externalResourcesRequired,
+	TAG_SVG_ATT_focusable,
+	TAG_SVG_ATT_nav_next,
+	TAG_SVG_ATT_nav_prev,
+	TAG_SVG_ATT_nav_up,
+	TAG_SVG_ATT_nav_up_right,
+	TAG_SVG_ATT_nav_right,
+	TAG_SVG_ATT_nav_down_right,
+	TAG_SVG_ATT_nav_down,
+	TAG_SVG_ATT_nav_down_left,
+	TAG_SVG_ATT_nav_left,
+	TAG_SVG_ATT_nav_up_left,
+	TAG_SVG_ATT_transform,
+	TAG_SVG_ATT_target,
+	TAG_SVG_ATT_attributeName,
+	TAG_SVG_ATT_attributeType,
+	TAG_SVG_ATT_begin,
+	TAG_SVG_ATT_dur,
+	TAG_SVG_ATT_end,
+	TAG_SVG_ATT_repeatCount,
+	TAG_SVG_ATT_repeatDur,
+	TAG_SVG_ATT_restart,
+	TAG_SVG_ATT_smil_fill,
+	TAG_SVG_ATT_min,
+	TAG_SVG_ATT_max,
+	TAG_SVG_ATT_to,
+	TAG_SVG_ATT_calcMode,
+	TAG_SVG_ATT_values,
+	TAG_SVG_ATT_keyTimes,
+	TAG_SVG_ATT_keySplines,
+	TAG_SVG_ATT_from,
+	TAG_SVG_ATT_by,
+	TAG_SVG_ATT_additive,
+	TAG_SVG_ATT_accumulate,
+	TAG_SVG_ATT_path,
+	TAG_SVG_ATT_keyPoints,
+	TAG_SVG_ATT_rotate,
+	TAG_SVG_ATT_origin,
+	TAG_SVG_ATT_transform_type,
+	TAG_SVG_ATT_clipBegin,
+	TAG_SVG_ATT_clipEnd,
+	TAG_SVG_ATT_syncBehavior,
+	TAG_SVG_ATT_syncTolerance,
+	TAG_SVG_ATT_syncMaster,
+	TAG_SVG_ATT_syncReference,
+	TAG_SVG_ATT_x,
+	TAG_SVG_ATT_y,
+	TAG_SVG_ATT_width,
+	TAG_SVG_ATT_height,
+	TAG_SVG_ATT_preserveAspectRatio,
+	TAG_SVG_ATT_initialVisibility,
+	TAG_SVG_ATT_type,
+	TAG_SVG_ATT_cx,
+	TAG_SVG_ATT_cy,
+	TAG_SVG_ATT_r,
+	TAG_SVG_ATT_cursorManager_x,
+	TAG_SVG_ATT_cursorManager_y,
+	TAG_SVG_ATT_rx,
+	TAG_SVG_ATT_ry,
+	TAG_SVG_ATT_horiz_adv_x,
+	TAG_SVG_ATT_horiz_origin_x,
+	TAG_SVG_ATT_font_stretch,
+	TAG_SVG_ATT_unicode_range,
+	TAG_SVG_ATT_panose_1,
+	TAG_SVG_ATT_widths,
+	TAG_SVG_ATT_bbox,
+	TAG_SVG_ATT_units_per_em,
+	TAG_SVG_ATT_stemv,
+	TAG_SVG_ATT_stemh,
+	TAG_SVG_ATT_slope,
+	TAG_SVG_ATT_cap_height,
+	TAG_SVG_ATT_x_height,
+	TAG_SVG_ATT_accent_height,
+	TAG_SVG_ATT_ascent,
+	TAG_SVG_ATT_descent,
+	TAG_SVG_ATT_ideographic,
+	TAG_SVG_ATT_alphabetic,
+	TAG_SVG_ATT_mathematical,
+	TAG_SVG_ATT_hanging,
+	TAG_SVG_ATT_underline_position,
+	TAG_SVG_ATT_underline_thickness,
+	TAG_SVG_ATT_strikethrough_position,
+	TAG_SVG_ATT_strikethrough_thickness,
+	TAG_SVG_ATT_overline_position,
+	TAG_SVG_ATT_overline_thickness,
+	TAG_SVG_ATT_d,
+	TAG_SVG_ATT_unicode,
+	TAG_SVG_ATT_glyph_name,
+	TAG_SVG_ATT_arabic_form,
+	TAG_SVG_ATT_lang,
+	TAG_SVG_ATT_u1,
+	TAG_SVG_ATT_g1,
+	TAG_SVG_ATT_u2,
+	TAG_SVG_ATT_g2,
+	TAG_SVG_ATT_k,
+	TAG_SVG_ATT_opacity,
+	TAG_SVG_ATT_x1,
+	TAG_SVG_ATT_y1,
+	TAG_SVG_ATT_x2,
+	TAG_SVG_ATT_y2,
+	TAG_SVG_ATT_gradientUnits,
+	TAG_SVG_ATT_spreadMethod,
+	TAG_SVG_ATT_gradientTransform,
+	TAG_SVG_ATT_pathLength,
+	TAG_SVG_ATT_points,
+	TAG_SVG_ATT_mediaSize,
+	TAG_SVG_ATT_mediaTime,
+	TAG_SVG_ATT_mediaCharacterEncoding,
+	TAG_SVG_ATT_mediaContentEncodings,
+	TAG_SVG_ATT_bandwidth,
+	TAG_SVG_ATT_fx,
+	TAG_SVG_ATT_fy,
+	TAG_SVG_ATT_size,
+	TAG_SVG_ATT_choice,
+	TAG_SVG_ATT_delta,
+	TAG_SVG_ATT_offset,
+	TAG_SVG_ATT_syncBehaviorDefault,
+	TAG_SVG_ATT_syncToleranceDefault,
+	TAG_SVG_ATT_viewBox,
+	TAG_SVG_ATT_zoomAndPan,
+	TAG_SVG_ATT_version,
+	TAG_SVG_ATT_baseProfile,
+	TAG_SVG_ATT_contentScriptType,
+	TAG_SVG_ATT_snapshotTime,
+	TAG_SVG_ATT_timelineBegin,
+	TAG_SVG_ATT_playbackOrder,
+	TAG_SVG_ATT_editable,
+	TAG_SVG_ATT_text_x,
+	TAG_SVG_ATT_text_y,
+	TAG_SVG_ATT_text_rotate,
+	TAG_SVG_ATT_transformBehavior,
+	TAG_SVG_ATT_overlay,
+	TAG_SVG_ATT_fullscreen,
+	TAG_SVG_ATT_motionTransform,
+};
+
+struct _all_atts {
+	XML_Space *xml_space;
+	XMLRI *xml_base;
+	SVG_ID *xml_id;
+	SVG_LanguageID *xml_lang;
+
+	DOM_String *xlink_type;
+	XMLRI *xlink_role;
+	XMLRI *xlink_arcrole;
+	DOM_String *xlink_title;
+	XMLRI *xlink_href;
+	DOM_String *xlink_show;
+	DOM_String *xlink_actuate;
+
+	XMLEV_Event *event;
+	XMLEV_Phase *phase;
+	XMLEV_Propagate *propagate;
+	XMLEV_DefaultAction *defaultAction;
+	XML_IDREF *observer;
+	XML_IDREF *listener_target;
+	XMLRI *handler;
+
+	SVG_ID *id;
+	SVG_String *_class;
+	SVG_ListOfIRI *requiredFeatures;
+	SVG_ListOfIRI *requiredExtensions;
+	SVG_FormatList *requiredFormats;
+	SVG_FontList *requiredFonts;
+	SVG_LanguageIDs *systemLanguage;
+	SVG_Display *display;
+	SVG_Visibility *visibility;
+	SVG_RenderingHint *image_rendering;
+	SVG_PointerEvents *pointer_events;
+	SVG_RenderingHint *shape_rendering;
+	SVG_RenderingHint *text_rendering;
+	SVG_Number *audio_level;
+	SVG_Paint *viewport_fill;
+	SVG_Number *viewport_fill_opacity;
+	SVG_String *overflow;
+	SVG_Number *fill_opacity;
+	SVG_Number *stroke_opacity;
+	SVG_Paint *fill;
+	SVG_FillRule *fill_rule;
+	SVG_Paint *stroke;
+	SVG_StrokeDashArray *stroke_dasharray;
+	SVG_Length *stroke_dashoffset;
+	SVG_StrokeLineCap *stroke_linecap;
+	SVG_StrokeLineJoin *stroke_linejoin;
+	SVG_Number *stroke_miterlimit;
+	SVG_Length *stroke_width;
+	SVG_Paint *color;
+	SVG_RenderingHint *color_rendering;
+	SVG_VectorEffect *vector_effect;
+	SVG_SVGColor *solid_color;
+	SVG_Number *solid_opacity;
+	SVG_DisplayAlign *display_align;
+	SVG_Number *line_increment;
+	SVG_SVGColor *stop_color;
+	SVG_Number *stop_opacity;
+	SVG_FontFamily *font_family;
+	SVG_FontSize *font_size;
+	SVG_FontStyle *font_style;
+	SVG_FontVariant *font_variant;
+	SVG_FontWeight *font_weight;
+	SVG_TextAnchor *text_anchor;
+	SVG_TextAlign *text_align;
+	SVG_String *text_decoration;
+	SVG_FocusHighlight *focusHighlight;
+	SVG_Boolean *externalResourcesRequired;
+	SVG_Focusable *focusable;
+	SVG_Focus *nav_next;
+	SVG_Focus *nav_prev;
+	SVG_Focus *nav_up;
+	SVG_Focus *nav_up_right;
+	SVG_Focus *nav_right;
+	SVG_Focus *nav_down_right;
+	SVG_Focus *nav_down;
+	SVG_Focus *nav_down_left;
+	SVG_Focus *nav_left;
+	SVG_Focus *nav_up_left;
+	SVG_Transform *transform;
+	SVG_String *target;
+	SMIL_AttributeName *attributeName;
+	SMIL_AttributeType *attributeType;
+	SMIL_Times *begin;
+	SVG_Boolean *lsr_enabled;
+	SMIL_Duration *dur;
+	SMIL_Times *end;
+	SMIL_RepeatCount *repeatCount;
+	SMIL_Duration *repeatDur;
+	SMIL_Restart *restart;
+	SMIL_Fill *smil_fill;
+	SMIL_Duration *min;
+	SMIL_Duration *max;
+	SMIL_AnimateValue *to;
+	SMIL_CalcMode *calcMode;
+	SMIL_AnimateValues *values;
+	SMIL_KeyTimes *keyTimes;
+	SMIL_KeySplines *keySplines;
+	SMIL_AnimateValue *from;
+	SMIL_AnimateValue *by;
+	SMIL_Additive *additive;
+	SMIL_Accumulate *accumulate;
+	SVG_PathData *path;
+	SMIL_KeyPoints *keyPoints;
+	SVG_Rotate *rotate;
+	SVG_String *origin;
+	SVG_TransformType *transform_type;
+	SVG_Clock *clipBegin;
+	SVG_Clock *clipEnd;
+	SMIL_SyncBehavior *syncBehavior;
+	SMIL_SyncTolerance *syncTolerance;
+	SVG_Boolean *syncMaster;
+	XMLRI *syncReference;
+	SVG_Coordinate *x;
+	SVG_Coordinate *y;
+	SVG_Length *width;
+	SVG_Length *height;
+	SVG_PreserveAspectRatio *preserveAspectRatio;
+	SVG_InitialVisibility *initialVisibility;
+	SVG_ContentType *type;
+	SVG_Coordinate *cx;
+	SVG_Coordinate *cy;
+	SVG_Length *r;
+	SVG_Length *cursorManager_x;
+	SVG_Length *cursorManager_y;
+	SVG_Length *rx;
+	SVG_Length *ry;
+	SVG_Number *horiz_adv_x;
+	SVG_Number *horiz_origin_x;
+	SVG_String *font_stretch;
+	SVG_String *unicode_range;
+	SVG_String *panose_1;
+	SVG_String *widths;
+	SVG_String *bbox;
+	SVG_Number *units_per_em;
+	SVG_Number *stemv;
+	SVG_Number *stemh;
+	SVG_Number *slope;
+	SVG_Number *cap_height;
+	SVG_Number *x_height;
+	SVG_Number *accent_height;
+	SVG_Number *ascent;
+	SVG_Number *descent;
+	SVG_Number *ideographic;
+	SVG_Number *alphabetic;
+	SVG_Number *mathematical;
+	SVG_Number *hanging;
+	SVG_Number *underline_position;
+	SVG_Number *underline_thickness;
+	SVG_Number *strikethrough_position;
+	SVG_Number *strikethrough_thickness;
+	SVG_Number *overline_position;
+	SVG_Number *overline_thickness;
+	SVG_PathData *d;
+	SVG_String *unicode;
+	SVG_String *glyph_name;
+	SVG_String *arabic_form;
+	SVG_LanguageIDs *lang;
+	SVG_String *u1;
+	SVG_String *g1;
+	SVG_String *u2;
+	SVG_String *g2;
+	SVG_Number *k;
+	SVG_Number *opacity;
+	SVG_Coordinate *x1;
+	SVG_Coordinate *y1;
+	SVG_Coordinate *x2;
+	SVG_Coordinate *y2;
+	SVG_GradientUnit *gradientUnits;
+	SVG_SpreadMethod *spreadMethod;
+	SVG_Transform *gradientTransform;
+	SVG_Number *pathLength;
+	SVG_Points *points;
+	SVG_Number *mediaSize;
+	SVG_String *mediaTime;
+	SVG_String *mediaCharacterEncoding;
+	SVG_String *mediaContentEncodings;
+	SVG_Number *bandwidth;
+	SVG_Coordinate *fx;
+	SVG_Coordinate *fy;
+	LASeR_Size *size;
+	LASeR_Choice *choice;
+	LASeR_Size *delta;
+	SVG_Number *offset;
+	SMIL_SyncBehavior *syncBehaviorDefault;
+	SMIL_SyncTolerance *syncToleranceDefault;
+	SVG_ViewBox *viewBox;
+	SVG_ZoomAndPan *zoomAndPan;
+	SVG_String *version;
+	SVG_String *baseProfile;
+	SVG_ContentType *contentScriptType;
+	SVG_Clock *snapshotTime;
+	SVG_TimelineBegin *timelineBegin;
+	SVG_PlaybackOrder *playbackOrder;
+	SVG_Boolean *editable;
+	SVG_Coordinates *text_x;
+	SVG_Coordinates *text_y;
+	SVG_Numbers *text_rotate;
+	SVG_TransformBehavior *transformBehavior;
+	SVG_Overlay *overlay;
+	SVG_Boolean *fullscreen;
+	SVG_Motion *motionTransform;
+};
+#ifdef __cplusplus
+}
+#endif
+
+
+
+#endif		/*_GF_SVG_NODES_H*/
+
diff --git a/tstools/DtsEdit/src/gpac/nodes_x3d.h b/tstools/DtsEdit/src/gpac/nodes_x3d.h
new file mode 100644
index 0000000..98d2511
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/nodes_x3d.h
@@ -0,0 +1,1396 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / X3D 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.
+ *
+ */
+
+
+/*
+	DO NOT MOFIFY - File generated on GMT Thu Aug 07 11:44:22 2008
+
+	BY X3DGen for GPAC Version 0.4.5-DEV
+*/
+
+#ifndef _GF_X3D_NODES_H
+#define _GF_X3D_NODES_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/scenegraph_vrml.h>
+
+
+
+enum {
+	TAG_X3D_Anchor = GF_NODE_RANGE_FIRST_X3D,
+	TAG_X3D_Appearance,
+	TAG_X3D_Arc2D,
+	TAG_X3D_ArcClose2D,
+	TAG_X3D_AudioClip,
+	TAG_X3D_Background,
+	TAG_X3D_Billboard,
+	TAG_X3D_BooleanFilter,
+	TAG_X3D_BooleanSequencer,
+	TAG_X3D_BooleanToggle,
+	TAG_X3D_BooleanTrigger,
+	TAG_X3D_Box,
+	TAG_X3D_Circle2D,
+	TAG_X3D_Collision,
+	TAG_X3D_Color,
+	TAG_X3D_ColorInterpolator,
+	TAG_X3D_ColorRGBA,
+	TAG_X3D_Cone,
+	TAG_X3D_Contour2D,
+	TAG_X3D_ContourPolyline2D,
+	TAG_X3D_Coordinate,
+	TAG_X3D_CoordinateDouble,
+	TAG_X3D_Coordinate2D,
+	TAG_X3D_CoordinateInterpolator,
+	TAG_X3D_CoordinateInterpolator2D,
+	TAG_X3D_Cylinder,
+	TAG_X3D_CylinderSensor,
+	TAG_X3D_DirectionalLight,
+	TAG_X3D_Disk2D,
+	TAG_X3D_ElevationGrid,
+	TAG_X3D_EspduTransform,
+	TAG_X3D_Extrusion,
+	TAG_X3D_FillProperties,
+	TAG_X3D_Fog,
+	TAG_X3D_FontStyle,
+	TAG_X3D_GeoCoordinate,
+	TAG_X3D_GeoElevationGrid,
+	TAG_X3D_GeoLocation,
+	TAG_X3D_GeoLOD,
+	TAG_X3D_GeoMetadata,
+	TAG_X3D_GeoOrigin,
+	TAG_X3D_GeoPositionInterpolator,
+	TAG_X3D_GeoTouchSensor,
+	TAG_X3D_GeoViewpoint,
+	TAG_X3D_Group,
+	TAG_X3D_HAnimDisplacer,
+	TAG_X3D_HAnimHumanoid,
+	TAG_X3D_HAnimJoint,
+	TAG_X3D_HAnimSegment,
+	TAG_X3D_HAnimSite,
+	TAG_X3D_ImageTexture,
+	TAG_X3D_IndexedFaceSet,
+	TAG_X3D_IndexedLineSet,
+	TAG_X3D_IndexedTriangleFanSet,
+	TAG_X3D_IndexedTriangleSet,
+	TAG_X3D_IndexedTriangleStripSet,
+	TAG_X3D_Inline,
+	TAG_X3D_IntegerSequencer,
+	TAG_X3D_IntegerTrigger,
+	TAG_X3D_KeySensor,
+	TAG_X3D_LineProperties,
+	TAG_X3D_LineSet,
+	TAG_X3D_LoadSensor,
+	TAG_X3D_LOD,
+	TAG_X3D_Material,
+	TAG_X3D_MetadataDouble,
+	TAG_X3D_MetadataFloat,
+	TAG_X3D_MetadataInteger,
+	TAG_X3D_MetadataSet,
+	TAG_X3D_MetadataString,
+	TAG_X3D_MovieTexture,
+	TAG_X3D_MultiTexture,
+	TAG_X3D_MultiTextureCoordinate,
+	TAG_X3D_MultiTextureTransform,
+	TAG_X3D_NavigationInfo,
+	TAG_X3D_Normal,
+	TAG_X3D_NormalInterpolator,
+	TAG_X3D_NurbsCurve,
+	TAG_X3D_NurbsCurve2D,
+	TAG_X3D_NurbsOrientationInterpolator,
+	TAG_X3D_NurbsPatchSurface,
+	TAG_X3D_NurbsPositionInterpolator,
+	TAG_X3D_NurbsSet,
+	TAG_X3D_NurbsSurfaceInterpolator,
+	TAG_X3D_NurbsSweptSurface,
+	TAG_X3D_NurbsSwungSurface,
+	TAG_X3D_NurbsTextureCoordinate,
+	TAG_X3D_NurbsTrimmedSurface,
+	TAG_X3D_OrientationInterpolator,
+	TAG_X3D_PixelTexture,
+	TAG_X3D_PlaneSensor,
+	TAG_X3D_PointLight,
+	TAG_X3D_PointSet,
+	TAG_X3D_Polyline2D,
+	TAG_X3D_Polypoint2D,
+	TAG_X3D_PositionInterpolator,
+	TAG_X3D_PositionInterpolator2D,
+	TAG_X3D_ProximitySensor,
+	TAG_X3D_ReceiverPdu,
+	TAG_X3D_Rectangle2D,
+	TAG_X3D_ScalarInterpolator,
+	TAG_X3D_Script,
+	TAG_X3D_Shape,
+	TAG_X3D_SignalPdu,
+	TAG_X3D_Sound,
+	TAG_X3D_Sphere,
+	TAG_X3D_SphereSensor,
+	TAG_X3D_SpotLight,
+	TAG_X3D_StaticGroup,
+	TAG_X3D_StringSensor,
+	TAG_X3D_Switch,
+	TAG_X3D_Text,
+	TAG_X3D_TextureBackground,
+	TAG_X3D_TextureCoordinate,
+	TAG_X3D_TextureCoordinateGenerator,
+	TAG_X3D_TextureTransform,
+	TAG_X3D_TimeSensor,
+	TAG_X3D_TimeTrigger,
+	TAG_X3D_TouchSensor,
+	TAG_X3D_Transform,
+	TAG_X3D_TransmitterPdu,
+	TAG_X3D_TriangleFanSet,
+	TAG_X3D_TriangleSet,
+	TAG_X3D_TriangleSet2D,
+	TAG_X3D_TriangleStripSet,
+	TAG_X3D_Viewpoint,
+	TAG_X3D_VisibilitySensor,
+	TAG_X3D_WorldInfo,
+	TAG_LastImplementedX3D
+};
+
+typedef struct _tagX3DAnchor
+{
+	BASE_NODE
+	VRML_CHILDREN
+	SFString description;	/*exposedField*/
+	MFString parameter;	/*exposedField*/
+	MFURL url;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_Anchor;
+
+
+typedef struct _tagX3DAppearance
+{
+	BASE_NODE
+	GF_Node *material;	/*exposedField*/
+	GF_Node *texture;	/*exposedField*/
+	GF_Node *textureTransform;	/*exposedField*/
+	GF_Node *fillProperties;	/*exposedField*/
+	GF_Node *lineProperties;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_Appearance;
+
+
+typedef struct _tagX3DArc2D
+{
+	BASE_NODE
+	SFFloat endAngle;	/*field*/
+	SFFloat radius;	/*field*/
+	SFFloat startAngle;	/*field*/
+	GF_Node *metadata;	/*exposedField*/
+} X_Arc2D;
+
+
+typedef struct _tagX3DArcClose2D
+{
+	BASE_NODE
+	SFString closureType;	/*field*/
+	SFFloat endAngle;	/*field*/
+	SFFloat radius;	/*field*/
+	SFFloat startAngle;	/*field*/
+	GF_Node *metadata;	/*exposedField*/
+} X_ArcClose2D;
+
+
+typedef struct _tagX3DAudioClip
+{
+	BASE_NODE
+	SFString description;	/*exposedField*/
+	SFBool loop;	/*exposedField*/
+	SFFloat pitch;	/*exposedField*/
+	SFTime startTime;	/*exposedField*/
+	SFTime stopTime;	/*exposedField*/
+	MFURL url;	/*exposedField*/
+	SFTime duration_changed;	/*eventOut*/
+	SFBool isActive;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+	SFTime pauseTime;	/*exposedField*/
+	SFTime resumeTime;	/*exposedField*/
+	SFTime elapsedTime;	/*eventOut*/
+	SFBool isPaused;	/*eventOut*/
+} X_AudioClip;
+
+
+typedef struct _tagX3DBackground
+{
+	BASE_NODE
+	SFBool set_bind;	/*eventIn*/
+	void (*on_set_bind)(GF_Node *pThis);	/*eventInHandler*/
+	MFFloat groundAngle;	/*exposedField*/
+	MFColor groundColor;	/*exposedField*/
+	MFURL backUrl;	/*exposedField*/
+	MFURL bottomUrl;	/*exposedField*/
+	MFURL frontUrl;	/*exposedField*/
+	MFURL leftUrl;	/*exposedField*/
+	MFURL rightUrl;	/*exposedField*/
+	MFURL topUrl;	/*exposedField*/
+	MFFloat skyAngle;	/*exposedField*/
+	MFColor skyColor;	/*exposedField*/
+	SFBool isBound;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+	SFTime bindTime;	/*eventOut*/
+} X_Background;
+
+
+typedef struct _tagX3DBillboard
+{
+	BASE_NODE
+	VRML_CHILDREN
+	SFVec3f axisOfRotation;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_Billboard;
+
+
+typedef struct _tagX3DBooleanFilter
+{
+	BASE_NODE
+	SFBool set_boolean;	/*eventIn*/
+	void (*on_set_boolean)(GF_Node *pThis);	/*eventInHandler*/
+	SFBool inputFalse;	/*eventOut*/
+	SFBool inputNegate;	/*eventOut*/
+	SFBool inputTrue;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+} X_BooleanFilter;
+
+
+typedef struct _tagX3DBooleanSequencer
+{
+	BASE_NODE
+	SFBool next;	/*eventIn*/
+	void (*on_next)(GF_Node *pThis);	/*eventInHandler*/
+	SFBool previous;	/*eventIn*/
+	void (*on_previous)(GF_Node *pThis);	/*eventInHandler*/
+	SFFloat set_fraction;	/*eventIn*/
+	void (*on_set_fraction)(GF_Node *pThis);	/*eventInHandler*/
+	MFFloat key;	/*exposedField*/
+	MFBool keyValue;	/*exposedField*/
+	SFBool value_changed;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+} X_BooleanSequencer;
+
+
+typedef struct _tagX3DBooleanToggle
+{
+	BASE_NODE
+	SFBool set_boolean;	/*eventIn*/
+	void (*on_set_boolean)(GF_Node *pThis);	/*eventInHandler*/
+	SFBool toggle;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_BooleanToggle;
+
+
+typedef struct _tagX3DBooleanTrigger
+{
+	BASE_NODE
+	SFTime set_triggerTime;	/*eventIn*/
+	void (*on_set_triggerTime)(GF_Node *pThis);	/*eventInHandler*/
+	SFBool triggerTrue;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+} X_BooleanTrigger;
+
+
+typedef struct _tagX3DBox
+{
+	BASE_NODE
+	SFVec3f size;	/*field*/
+	GF_Node *metadata;	/*exposedField*/
+} X_Box;
+
+
+typedef struct _tagX3DCircle2D
+{
+	BASE_NODE
+	SFFloat radius;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_Circle2D;
+
+
+typedef struct _tagX3DCollision
+{
+	BASE_NODE
+	VRML_CHILDREN
+	SFBool enabled;	/*exposedField*/
+	GF_Node *proxy;	/*field*/
+	SFTime collideTime;	/*eventOut*/
+	SFBool isActive;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+} X_Collision;
+
+
+typedef struct _tagX3DColor
+{
+	BASE_NODE
+	MFColor color;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_Color;
+
+
+typedef struct _tagX3DColorInterpolator
+{
+	BASE_NODE
+	SFFloat set_fraction;	/*eventIn*/
+	void (*on_set_fraction)(GF_Node *pThis);	/*eventInHandler*/
+	MFFloat key;	/*exposedField*/
+	MFColor keyValue;	/*exposedField*/
+	SFColor value_changed;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+} X_ColorInterpolator;
+
+
+typedef struct _tagX3DColorRGBA
+{
+	BASE_NODE
+	MFColorRGBA color;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_ColorRGBA;
+
+
+typedef struct _tagX3DCone
+{
+	BASE_NODE
+	SFFloat bottomRadius;	/*field*/
+	SFFloat height;	/*field*/
+	SFBool side;	/*field*/
+	SFBool bottom;	/*field*/
+	GF_Node *metadata;	/*exposedField*/
+} X_Cone;
+
+
+typedef struct _tagX3DContour2D
+{
+	BASE_NODE
+	VRML_CHILDREN
+	GF_Node *metadata;	/*exposedField*/
+} X_Contour2D;
+
+
+typedef struct _tagX3DContourPolyline2D
+{
+	BASE_NODE
+	MFVec2f point;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_ContourPolyline2D;
+
+
+typedef struct _tagX3DCoordinate
+{
+	BASE_NODE
+	MFVec3f point;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_Coordinate;
+
+
+typedef struct _tagX3DCoordinateDouble
+{
+	BASE_NODE
+	MFVec3d point;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_CoordinateDouble;
+
+
+typedef struct _tagX3DCoordinate2D
+{
+	BASE_NODE
+	MFVec2f point;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_Coordinate2D;
+
+
+typedef struct _tagX3DCoordinateInterpolator
+{
+	BASE_NODE
+	SFFloat set_fraction;	/*eventIn*/
+	void (*on_set_fraction)(GF_Node *pThis);	/*eventInHandler*/
+	MFFloat key;	/*exposedField*/
+	MFVec3f keyValue;	/*exposedField*/
+	MFVec3f value_changed;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+} X_CoordinateInterpolator;
+
+
+typedef struct _tagX3DCoordinateInterpolator2D
+{
+	BASE_NODE
+	SFFloat set_fraction;	/*eventIn*/
+	void (*on_set_fraction)(GF_Node *pThis);	/*eventInHandler*/
+	MFFloat key;	/*exposedField*/
+	MFVec2f keyValue;	/*exposedField*/
+	MFVec2f value_changed;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+} X_CoordinateInterpolator2D;
+
+
+typedef struct _tagX3DCylinder
+{
+	BASE_NODE
+	SFBool bottom;	/*field*/
+	SFFloat height;	/*field*/
+	SFFloat radius;	/*field*/
+	SFBool side;	/*field*/
+	SFBool top;	/*field*/
+	GF_Node *metadata;	/*exposedField*/
+} X_Cylinder;
+
+
+typedef struct _tagX3DCylinderSensor
+{
+	BASE_NODE
+	SFBool autoOffset;	/*exposedField*/
+	SFFloat diskAngle;	/*exposedField*/
+	SFBool enabled;	/*exposedField*/
+	SFFloat maxAngle;	/*exposedField*/
+	SFFloat minAngle;	/*exposedField*/
+	SFFloat offset;	/*exposedField*/
+	SFBool isActive;	/*eventOut*/
+	SFRotation rotation_changed;	/*eventOut*/
+	SFVec3f trackPoint_changed;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+	SFString description;	/*exposedField*/
+	SFBool isOver;	/*eventOut*/
+} X_CylinderSensor;
+
+
+typedef struct _tagX3DDirectionalLight
+{
+	BASE_NODE
+	SFFloat ambientIntensity;	/*exposedField*/
+	SFColor color;	/*exposedField*/
+	SFVec3f direction;	/*exposedField*/
+	SFFloat intensity;	/*exposedField*/
+	SFBool on;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_DirectionalLight;
+
+
+typedef struct _tagX3DDisk2D
+{
+	BASE_NODE
+	SFFloat innerRadius;	/*field*/
+	SFFloat outerRadius;	/*field*/
+	GF_Node *metadata;	/*exposedField*/
+} X_Disk2D;
+
+
+typedef struct _tagX3DElevationGrid
+{
+	BASE_NODE
+	MFFloat set_height;	/*eventIn*/
+	void (*on_set_height)(GF_Node *pThis);	/*eventInHandler*/
+	GF_Node *color;	/*exposedField*/
+	GF_Node *normal;	/*exposedField*/
+	GF_Node *texCoord;	/*exposedField*/
+	MFFloat height;	/*field*/
+	SFBool ccw;	/*field*/
+	SFBool colorPerVertex;	/*field*/
+	SFFloat creaseAngle;	/*field*/
+	SFBool normalPerVertex;	/*field*/
+	SFBool solid;	/*field*/
+	SFInt32 xDimension;	/*field*/
+	SFFloat xSpacing;	/*field*/
+	SFInt32 zDimension;	/*field*/
+	SFFloat zSpacing;	/*field*/
+	GF_Node *metadata;	/*exposedField*/
+} X_ElevationGrid;
+
+
+typedef struct _tagX3DExtrusion
+{
+	BASE_NODE
+	MFVec2f set_crossSection;	/*eventIn*/
+	void (*on_set_crossSection)(GF_Node *pThis);	/*eventInHandler*/
+	MFRotation set_orientation;	/*eventIn*/
+	void (*on_set_orientation)(GF_Node *pThis);	/*eventInHandler*/
+	MFVec2f set_scale;	/*eventIn*/
+	void (*on_set_scale)(GF_Node *pThis);	/*eventInHandler*/
+	MFVec3f set_spine;	/*eventIn*/
+	void (*on_set_spine)(GF_Node *pThis);	/*eventInHandler*/
+	SFBool beginCap;	/*field*/
+	SFBool ccw;	/*field*/
+	SFBool convex;	/*field*/
+	SFFloat creaseAngle;	/*field*/
+	MFVec2f crossSection;	/*field*/
+	SFBool endCap;	/*field*/
+	MFRotation orientation;	/*field*/
+	MFVec2f scale;	/*field*/
+	SFBool solid;	/*field*/
+	MFVec3f spine;	/*field*/
+	GF_Node *metadata;	/*exposedField*/
+} X_Extrusion;
+
+
+typedef struct _tagX3DFillProperties
+{
+	BASE_NODE
+	SFBool filled;	/*exposedField*/
+	SFColor hatchColor;	/*exposedField*/
+	SFBool hatched;	/*exposedField*/
+	SFInt32 hatchStyle;	/*exposedField*/
+} X_FillProperties;
+
+
+typedef struct _tagX3DFog
+{
+	BASE_NODE
+	SFColor color;	/*exposedField*/
+	SFString fogType;	/*exposedField*/
+	SFFloat visibilityRange;	/*exposedField*/
+	SFBool set_bind;	/*eventIn*/
+	void (*on_set_bind)(GF_Node *pThis);	/*eventInHandler*/
+	SFBool isBound;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+	SFTime bindTime;	/*eventOut*/
+} X_Fog;
+
+
+typedef struct _tagX3DFontStyle
+{
+	BASE_NODE
+	MFString family;	/*exposedField*/
+	SFBool horizontal;	/*exposedField*/
+	MFString justify;	/*exposedField*/
+	SFString language;	/*exposedField*/
+	SFBool leftToRight;	/*exposedField*/
+	SFFloat size;	/*exposedField*/
+	SFFloat spacing;	/*exposedField*/
+	SFString style;	/*exposedField*/
+	SFBool topToBottom;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_FontStyle;
+
+
+typedef struct _tagX3DGroup
+{
+	BASE_NODE
+	VRML_CHILDREN
+	GF_Node *metadata;	/*exposedField*/
+} X_Group;
+
+
+typedef struct _tagX3DImageTexture
+{
+	BASE_NODE
+	MFURL url;	/*exposedField*/
+	SFBool repeatS;	/*field*/
+	SFBool repeatT;	/*field*/
+	GF_Node *metadata;	/*exposedField*/
+} X_ImageTexture;
+
+
+typedef struct _tagX3DIndexedFaceSet
+{
+	BASE_NODE
+	MFInt32 set_colorIndex;	/*eventIn*/
+	void (*on_set_colorIndex)(GF_Node *pThis);	/*eventInHandler*/
+	MFInt32 set_coordIndex;	/*eventIn*/
+	void (*on_set_coordIndex)(GF_Node *pThis);	/*eventInHandler*/
+	MFInt32 set_normalIndex;	/*eventIn*/
+	void (*on_set_normalIndex)(GF_Node *pThis);	/*eventInHandler*/
+	MFInt32 set_texCoordIndex;	/*eventIn*/
+	void (*on_set_texCoordIndex)(GF_Node *pThis);	/*eventInHandler*/
+	GF_Node *color;	/*exposedField*/
+	GF_Node *coord;	/*exposedField*/
+	GF_Node *normal;	/*exposedField*/
+	GF_Node *texCoord;	/*exposedField*/
+	SFBool ccw;	/*field*/
+	MFInt32 colorIndex;	/*field*/
+	SFBool colorPerVertex;	/*field*/
+	SFBool convex;	/*field*/
+	MFInt32 coordIndex;	/*field*/
+	SFFloat creaseAngle;	/*field*/
+	MFInt32 normalIndex;	/*field*/
+	SFBool normalPerVertex;	/*field*/
+	SFBool solid;	/*field*/
+	MFInt32 texCoordIndex;	/*field*/
+	GF_Node *metadata;	/*exposedField*/
+} X_IndexedFaceSet;
+
+
+typedef struct _tagX3DIndexedLineSet
+{
+	BASE_NODE
+	MFInt32 set_colorIndex;	/*eventIn*/
+	void (*on_set_colorIndex)(GF_Node *pThis);	/*eventInHandler*/
+	MFInt32 set_coordIndex;	/*eventIn*/
+	void (*on_set_coordIndex)(GF_Node *pThis);	/*eventInHandler*/
+	GF_Node *color;	/*exposedField*/
+	GF_Node *coord;	/*exposedField*/
+	MFInt32 colorIndex;	/*field*/
+	SFBool colorPerVertex;	/*field*/
+	MFInt32 coordIndex;	/*field*/
+	GF_Node *metadata;	/*exposedField*/
+} X_IndexedLineSet;
+
+
+typedef struct _tagX3DIndexedTriangleFanSet
+{
+	BASE_NODE
+	MFInt32 set_index;	/*eventIn*/
+	void (*on_set_index)(GF_Node *pThis);	/*eventInHandler*/
+	GF_Node *color;	/*exposedField*/
+	GF_Node *coord;	/*exposedField*/
+	GF_Node *normal;	/*exposedField*/
+	GF_Node *texCoord;	/*exposedField*/
+	SFBool ccw;	/*field*/
+	SFBool colorPerVertex;	/*field*/
+	SFBool normalPerVertex;	/*field*/
+	SFBool solid;	/*field*/
+	MFInt32 index;	/*field*/
+	GF_Node *metadata;	/*exposedField*/
+} X_IndexedTriangleFanSet;
+
+
+typedef struct _tagX3DIndexedTriangleSet
+{
+	BASE_NODE
+	MFInt32 set_index;	/*eventIn*/
+	void (*on_set_index)(GF_Node *pThis);	/*eventInHandler*/
+	GF_Node *color;	/*exposedField*/
+	GF_Node *coord;	/*exposedField*/
+	GF_Node *normal;	/*exposedField*/
+	GF_Node *texCoord;	/*exposedField*/
+	SFBool ccw;	/*field*/
+	SFBool colorPerVertex;	/*field*/
+	SFBool normalPerVertex;	/*field*/
+	SFBool solid;	/*field*/
+	MFInt32 index;	/*field*/
+	GF_Node *metadata;	/*exposedField*/
+} X_IndexedTriangleSet;
+
+
+typedef struct _tagX3DIndexedTriangleStripSet
+{
+	BASE_NODE
+	MFInt32 set_index;	/*eventIn*/
+	void (*on_set_index)(GF_Node *pThis);	/*eventInHandler*/
+	GF_Node *color;	/*exposedField*/
+	GF_Node *coord;	/*exposedField*/
+	SFFloat creaseAngle;	/*exposedField*/
+	GF_Node *normal;	/*exposedField*/
+	GF_Node *texCoord;	/*exposedField*/
+	SFBool ccw;	/*field*/
+	SFBool normalPerVertex;	/*field*/
+	SFBool solid;	/*field*/
+	MFInt32 index;	/*field*/
+	GF_Node *metadata;	/*exposedField*/
+} X_IndexedTriangleStripSet;
+
+
+typedef struct _tagX3DInline
+{
+	BASE_NODE
+	MFURL url;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+	SFBool load;	/*exposedField*/
+} X_Inline;
+
+
+typedef struct _tagX3DIntegerSequencer
+{
+	BASE_NODE
+	SFBool next;	/*eventIn*/
+	void (*on_next)(GF_Node *pThis);	/*eventInHandler*/
+	SFBool previous;	/*eventIn*/
+	void (*on_previous)(GF_Node *pThis);	/*eventInHandler*/
+	SFFloat set_fraction;	/*eventIn*/
+	void (*on_set_fraction)(GF_Node *pThis);	/*eventInHandler*/
+	MFFloat key;	/*exposedField*/
+	MFInt32 keyValue;	/*exposedField*/
+	SFInt32 value_changed;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+} X_IntegerSequencer;
+
+
+typedef struct _tagX3DIntegerTrigger
+{
+	BASE_NODE
+	SFBool set_boolean;	/*eventIn*/
+	void (*on_set_boolean)(GF_Node *pThis);	/*eventInHandler*/
+	SFInt32 integerKey;	/*exposedField*/
+	SFInt32 triggerValue;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+} X_IntegerTrigger;
+
+
+typedef struct _tagX3DKeySensor
+{
+	BASE_NODE
+	SFBool enabled;	/*exposedField*/
+	SFInt32 actionKeyPress;	/*eventOut*/
+	SFInt32 actionKeyRelease;	/*eventOut*/
+	SFBool altKey;	/*eventOut*/
+	SFBool controlKey;	/*eventOut*/
+	SFBool isActive;	/*eventOut*/
+	SFString keyPress;	/*eventOut*/
+	SFString keyRelease;	/*eventOut*/
+	SFBool shiftKey;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+} X_KeySensor;
+
+
+typedef struct _tagX3DLineProperties
+{
+	BASE_NODE
+	SFBool applied;	/*exposedField*/
+	SFInt32 linetype;	/*exposedField*/
+	SFFloat linewidthScaleFactor;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_LineProperties;
+
+
+typedef struct _tagX3DLineSet
+{
+	BASE_NODE
+	GF_Node *color;	/*exposedField*/
+	GF_Node *coord;	/*exposedField*/
+	MFInt32 vertexCount;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_LineSet;
+
+
+typedef struct _tagX3DLOD
+{
+	BASE_NODE
+	VRML_CHILDREN
+	SFVec3f center;	/*field*/
+	MFFloat range;	/*field*/
+	GF_Node *metadata;	/*exposedField*/
+} X_LOD;
+
+
+typedef struct _tagX3DMaterial
+{
+	BASE_NODE
+	SFFloat ambientIntensity;	/*exposedField*/
+	SFColor diffuseColor;	/*exposedField*/
+	SFColor emissiveColor;	/*exposedField*/
+	SFFloat shininess;	/*exposedField*/
+	SFColor specularColor;	/*exposedField*/
+	SFFloat transparency;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_Material;
+
+
+typedef struct _tagX3DMetadataDouble
+{
+	BASE_NODE
+	SFString name;	/*exposedField*/
+	SFString reference;	/*exposedField*/
+	MFDouble value;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_MetadataDouble;
+
+
+typedef struct _tagX3DMetadataFloat
+{
+	BASE_NODE
+	SFString name;	/*exposedField*/
+	SFString reference;	/*exposedField*/
+	MFFloat value;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_MetadataFloat;
+
+
+typedef struct _tagX3DMetadataInteger
+{
+	BASE_NODE
+	SFString name;	/*exposedField*/
+	SFString reference;	/*exposedField*/
+	MFInt32 value;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_MetadataInteger;
+
+
+typedef struct _tagX3DMetadataSet
+{
+	BASE_NODE
+	SFString name;	/*exposedField*/
+	SFString reference;	/*exposedField*/
+	GF_ChildNodeItem *value;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_MetadataSet;
+
+
+typedef struct _tagX3DMetadataString
+{
+	BASE_NODE
+	SFString name;	/*exposedField*/
+	SFString reference;	/*exposedField*/
+	MFString value;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_MetadataString;
+
+
+typedef struct _tagX3DMovieTexture
+{
+	BASE_NODE
+	SFBool loop;	/*exposedField*/
+	SFFloat speed;	/*exposedField*/
+	SFTime startTime;	/*exposedField*/
+	SFTime stopTime;	/*exposedField*/
+	MFURL url;	/*exposedField*/
+	SFBool repeatS;	/*field*/
+	SFBool repeatT;	/*field*/
+	SFTime duration_changed;	/*eventOut*/
+	SFBool isActive;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+	SFTime resumeTime;	/*exposedField*/
+	SFTime pauseTime;	/*exposedField*/
+	SFTime elapsedTime;	/*eventOut*/
+	SFBool isPaused;	/*eventOut*/
+} X_MovieTexture;
+
+
+typedef struct _tagX3DMultiTexture
+{
+	BASE_NODE
+	SFFloat alpha;	/*exposedField*/
+	SFColor color;	/*exposedField*/
+	MFString function;	/*exposedField*/
+	MFString mode;	/*exposedField*/
+	MFString source;	/*exposedField*/
+	GF_ChildNodeItem *texture;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_MultiTexture;
+
+
+typedef struct _tagX3DMultiTextureCoordinate
+{
+	BASE_NODE
+	GF_ChildNodeItem *texCoord;	/*MultiTextureCoordinate*/
+	GF_Node *metadata;	/*exposedField*/
+} X_MultiTextureCoordinate;
+
+
+typedef struct _tagX3DMultiTextureTransform
+{
+	BASE_NODE
+	GF_ChildNodeItem *textureTransform;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_MultiTextureTransform;
+
+
+typedef struct _tagX3DNavigationInfo
+{
+	BASE_NODE
+	SFBool set_bind;	/*eventIn*/
+	void (*on_set_bind)(GF_Node *pThis);	/*eventInHandler*/
+	MFFloat avatarSize;	/*exposedField*/
+	SFBool headlight;	/*exposedField*/
+	SFFloat speed;	/*exposedField*/
+	MFString type;	/*exposedField*/
+	SFFloat visibilityLimit;	/*exposedField*/
+	SFBool isBound;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+	MFString transitionType;	/*exposedField*/
+	SFTime bindTime;	/*eventOut*/
+} X_NavigationInfo;
+
+
+typedef struct _tagX3DNormal
+{
+	BASE_NODE
+	MFVec3f vector;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_Normal;
+
+
+typedef struct _tagX3DNormalInterpolator
+{
+	BASE_NODE
+	SFFloat set_fraction;	/*eventIn*/
+	void (*on_set_fraction)(GF_Node *pThis);	/*eventInHandler*/
+	MFFloat key;	/*exposedField*/
+	MFVec3f keyValue;	/*exposedField*/
+	MFVec3f value_changed;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+} X_NormalInterpolator;
+
+
+typedef struct _tagX3DOrientationInterpolator
+{
+	BASE_NODE
+	SFFloat set_fraction;	/*eventIn*/
+	void (*on_set_fraction)(GF_Node *pThis);	/*eventInHandler*/
+	MFFloat key;	/*exposedField*/
+	MFRotation keyValue;	/*exposedField*/
+	SFRotation value_changed;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+} X_OrientationInterpolator;
+
+
+typedef struct _tagX3DPixelTexture
+{
+	BASE_NODE
+	SFImage image;	/*exposedField*/
+	SFBool repeatS;	/*field*/
+	SFBool repeatT;	/*field*/
+	GF_Node *metadata;	/*exposedField*/
+} X_PixelTexture;
+
+
+typedef struct _tagX3DPlaneSensor
+{
+	BASE_NODE
+	SFBool autoOffset;	/*exposedField*/
+	SFBool enabled;	/*exposedField*/
+	SFVec2f maxPosition;	/*exposedField*/
+	SFVec2f minPosition;	/*exposedField*/
+	SFVec3f offset;	/*exposedField*/
+	SFBool isActive;	/*eventOut*/
+	SFVec3f trackPoint_changed;	/*eventOut*/
+	SFVec3f translation_changed;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+	SFString description;	/*exposedField*/
+	SFBool isOver;	/*eventOut*/
+} X_PlaneSensor;
+
+
+typedef struct _tagX3DPointLight
+{
+	BASE_NODE
+	SFFloat ambientIntensity;	/*exposedField*/
+	SFVec3f attenuation;	/*exposedField*/
+	SFColor color;	/*exposedField*/
+	SFFloat intensity;	/*exposedField*/
+	SFVec3f location;	/*exposedField*/
+	SFBool on;	/*exposedField*/
+	SFFloat radius;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_PointLight;
+
+
+typedef struct _tagX3DPointSet
+{
+	BASE_NODE
+	GF_Node *color;	/*exposedField*/
+	GF_Node *coord;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_PointSet;
+
+
+typedef struct _tagX3DPolyline2D
+{
+	BASE_NODE
+	MFVec2f lineSegments;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_Polyline2D;
+
+
+typedef struct _tagX3DPolypoint2D
+{
+	BASE_NODE
+	MFVec2f point;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_Polypoint2D;
+
+
+typedef struct _tagX3DPositionInterpolator
+{
+	BASE_NODE
+	SFFloat set_fraction;	/*eventIn*/
+	void (*on_set_fraction)(GF_Node *pThis);	/*eventInHandler*/
+	MFFloat key;	/*exposedField*/
+	MFVec3f keyValue;	/*exposedField*/
+	SFVec3f value_changed;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+} X_PositionInterpolator;
+
+
+typedef struct _tagX3DPositionInterpolator2D
+{
+	BASE_NODE
+	SFFloat set_fraction;	/*eventIn*/
+	void (*on_set_fraction)(GF_Node *pThis);	/*eventInHandler*/
+	MFFloat key;	/*exposedField*/
+	MFVec2f keyValue;	/*exposedField*/
+	SFVec2f value_changed;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+} X_PositionInterpolator2D;
+
+
+typedef struct _tagX3DProximitySensor
+{
+	BASE_NODE
+	SFVec3f center;	/*exposedField*/
+	SFVec3f size;	/*exposedField*/
+	SFBool enabled;	/*exposedField*/
+	SFBool isActive;	/*eventOut*/
+	SFVec3f position_changed;	/*eventOut*/
+	SFRotation orientation_changed;	/*eventOut*/
+	SFTime enterTime;	/*eventOut*/
+	SFTime exitTime;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+	SFVec3f centerOfRotation_changed;	/*eventOut*/
+} X_ProximitySensor;
+
+
+typedef struct _tagX3DRectangle2D
+{
+	BASE_NODE
+	SFVec2f size;	/*field*/
+	GF_Node *metadata;	/*exposedField*/
+} X_Rectangle2D;
+
+
+typedef struct _tagX3DScalarInterpolator
+{
+	BASE_NODE
+	SFFloat set_fraction;	/*eventIn*/
+	void (*on_set_fraction)(GF_Node *pThis);	/*eventInHandler*/
+	MFFloat key;	/*exposedField*/
+	MFFloat keyValue;	/*exposedField*/
+	SFFloat value_changed;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+} X_ScalarInterpolator;
+
+
+typedef struct _tagX3DScript
+{
+	BASE_NODE
+	MFScript url;	/*exposedField*/
+	SFBool directOutput;	/*field*/
+	SFBool mustEvaluate;	/*field*/
+	GF_Node *metadata;	/*exposedField*/
+} X_Script;
+
+
+typedef struct _tagX3DShape
+{
+	BASE_NODE
+	GF_Node *appearance;	/*exposedField*/
+	GF_Node *geometry;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_Shape;
+
+
+typedef struct _tagX3DSound
+{
+	BASE_NODE
+	SFVec3f direction;	/*exposedField*/
+	SFFloat intensity;	/*exposedField*/
+	SFVec3f location;	/*exposedField*/
+	SFFloat maxBack;	/*exposedField*/
+	SFFloat maxFront;	/*exposedField*/
+	SFFloat minBack;	/*exposedField*/
+	SFFloat minFront;	/*exposedField*/
+	SFFloat priority;	/*exposedField*/
+	GF_Node *source;	/*exposedField*/
+	SFBool spatialize;	/*field*/
+	GF_Node *metadata;	/*exposedField*/
+} X_Sound;
+
+
+typedef struct _tagX3DSphere
+{
+	BASE_NODE
+	SFFloat radius;	/*field*/
+	GF_Node *metadata;	/*exposedField*/
+} X_Sphere;
+
+
+typedef struct _tagX3DSphereSensor
+{
+	BASE_NODE
+	SFBool autoOffset;	/*exposedField*/
+	SFBool enabled;	/*exposedField*/
+	SFRotation offset;	/*exposedField*/
+	SFBool isActive;	/*eventOut*/
+	SFRotation rotation_changed;	/*eventOut*/
+	SFVec3f trackPoint_changed;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+	SFString description;	/*exposedField*/
+	SFBool isOver;	/*eventOut*/
+} X_SphereSensor;
+
+
+typedef struct _tagX3DSpotLight
+{
+	BASE_NODE
+	SFFloat ambientIntensity;	/*exposedField*/
+	SFVec3f attenuation;	/*exposedField*/
+	SFFloat beamWidth;	/*exposedField*/
+	SFColor color;	/*exposedField*/
+	SFFloat cutOffAngle;	/*exposedField*/
+	SFVec3f direction;	/*exposedField*/
+	SFFloat intensity;	/*exposedField*/
+	SFVec3f location;	/*exposedField*/
+	SFBool on;	/*exposedField*/
+	SFFloat radius;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_SpotLight;
+
+
+typedef struct _tagX3DStaticGroup
+{
+	BASE_NODE
+	VRML_CHILDREN
+	GF_Node *metadata;	/*exposedField*/
+} X_StaticGroup;
+
+
+typedef struct _tagX3DStringSensor
+{
+	BASE_NODE
+	SFBool deletionAllowed;	/*exposedField*/
+	SFBool enabled;	/*exposedField*/
+	SFString enteredText;	/*eventOut*/
+	SFString finalText;	/*eventOut*/
+	SFBool isActive;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+} X_StringSensor;
+
+
+typedef struct _tagX3DSwitch
+{
+	BASE_NODE
+	VRML_CHILDREN
+	SFInt32 whichChoice;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_Switch;
+
+
+typedef struct _tagX3DText
+{
+	BASE_NODE
+	MFString string;	/*exposedField*/
+	MFFloat length;	/*exposedField*/
+	GF_Node *fontStyle;	/*exposedField*/
+	SFFloat maxExtent;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_Text;
+
+
+typedef struct _tagX3DTextureBackground
+{
+	BASE_NODE
+	SFBool set_bind;	/*eventIn*/
+	void (*on_set_bind)(GF_Node *pThis);	/*eventInHandler*/
+	MFFloat groundAngle;	/*exposedField*/
+	MFColor groundColor;	/*exposedField*/
+	GF_Node *backTexture;	/*exposedField*/
+	GF_Node *bottomTexture;	/*exposedField*/
+	GF_Node *frontTexture;	/*exposedField*/
+	GF_Node *leftTexture;	/*exposedField*/
+	GF_Node *rightTexture;	/*exposedField*/
+	GF_Node *topTexture;	/*exposedField*/
+	MFFloat skyAngle;	/*exposedField*/
+	MFColor skyColor;	/*exposedField*/
+	MFFloat transparency;	/*exposedField*/
+	SFTime bindTime;	/*exposedField*/
+	SFBool isBound;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_TextureBackground;
+
+
+typedef struct _tagX3DTextureCoordinate
+{
+	BASE_NODE
+	MFVec2f point;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_TextureCoordinate;
+
+
+typedef struct _tagX3DTextureCoordinateGenerator
+{
+	BASE_NODE
+	SFString mode;	/*exposedField*/
+	MFFloat parameter;	/*TextureCoordinateGenerator*/
+	GF_Node *metadata;	/*exposedField*/
+} X_TextureCoordinateGenerator;
+
+
+typedef struct _tagX3DTextureTransform
+{
+	BASE_NODE
+	SFVec2f center;	/*exposedField*/
+	SFFloat rotation;	/*exposedField*/
+	SFVec2f scale;	/*exposedField*/
+	SFVec2f translation;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_TextureTransform;
+
+
+typedef struct _tagX3DTimeSensor
+{
+	BASE_NODE
+	SFTime cycleInterval;	/*exposedField*/
+	SFBool enabled;	/*exposedField*/
+	SFBool loop;	/*exposedField*/
+	SFTime startTime;	/*exposedField*/
+	SFTime stopTime;	/*exposedField*/
+	SFTime cycleTime;	/*eventOut*/
+	SFFloat fraction_changed;	/*eventOut*/
+	SFBool isActive;	/*eventOut*/
+	SFTime time;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+	SFTime pauseTime;	/*exposedField*/
+	SFTime resumeTime;	/*exposedField*/
+	SFTime elapsedTime;	/*eventOut*/
+	SFBool isPaused;	/*eventOut*/
+} X_TimeSensor;
+
+
+typedef struct _tagX3DTimeTrigger
+{
+	BASE_NODE
+	SFBool set_boolean;	/*eventIn*/
+	void (*on_set_boolean)(GF_Node *pThis);	/*eventInHandler*/
+	SFTime triggerTime;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+} X_TimeTrigger;
+
+
+typedef struct _tagX3DTouchSensor
+{
+	BASE_NODE
+	SFBool enabled;	/*exposedField*/
+	SFVec3f hitNormal_changed;	/*eventOut*/
+	SFVec3f hitPoint_changed;	/*eventOut*/
+	SFVec2f hitTexCoord_changed;	/*eventOut*/
+	SFBool isActive;	/*eventOut*/
+	SFBool isOver;	/*eventOut*/
+	SFTime touchTime;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+	SFString description;	/*exposedField*/
+} X_TouchSensor;
+
+
+typedef struct _tagX3DTransform
+{
+	BASE_NODE
+	VRML_CHILDREN
+	SFVec3f center;	/*exposedField*/
+	SFRotation rotation;	/*exposedField*/
+	SFVec3f scale;	/*exposedField*/
+	SFRotation scaleOrientation;	/*exposedField*/
+	SFVec3f translation;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_Transform;
+
+
+typedef struct _tagX3DTriangleFanSet
+{
+	BASE_NODE
+	GF_Node *color;	/*exposedField*/
+	GF_Node *coord;	/*exposedField*/
+	MFInt32 fanCount;	/*exposedField*/
+	GF_Node *normal;	/*exposedField*/
+	GF_Node *texCoord;	/*exposedField*/
+	SFBool ccw;	/*field*/
+	SFBool colorPerVertex;	/*field*/
+	SFBool normalPerVertex;	/*field*/
+	SFBool solid;	/*field*/
+	GF_Node *metadata;	/*exposedField*/
+} X_TriangleFanSet;
+
+
+typedef struct _tagX3DTriangleSet
+{
+	BASE_NODE
+	GF_Node *color;	/*exposedField*/
+	GF_Node *coord;	/*exposedField*/
+	GF_Node *normal;	/*exposedField*/
+	GF_Node *texCoord;	/*exposedField*/
+	SFBool ccw;	/*field*/
+	SFBool colorPerVertex;	/*field*/
+	SFBool normalPerVertex;	/*field*/
+	SFBool solid;	/*field*/
+	GF_Node *metadata;	/*exposedField*/
+} X_TriangleSet;
+
+
+typedef struct _tagX3DTriangleSet2D
+{
+	BASE_NODE
+	MFVec2f vertices;	/*exposedField*/
+	GF_Node *metadata;	/*exposedField*/
+} X_TriangleSet2D;
+
+
+typedef struct _tagX3DTriangleStripSet
+{
+	BASE_NODE
+	GF_Node *color;	/*exposedField*/
+	GF_Node *coord;	/*exposedField*/
+	GF_Node *normal;	/*exposedField*/
+	MFInt32 stripCount;	/*exposedField*/
+	GF_Node *texCoord;	/*exposedField*/
+	SFBool ccw;	/*field*/
+	SFBool colorPerVertex;	/*field*/
+	SFBool normalPerVertex;	/*field*/
+	SFBool solid;	/*field*/
+	GF_Node *metadata;	/*exposedField*/
+} X_TriangleStripSet;
+
+
+typedef struct _tagX3DViewpoint
+{
+	BASE_NODE
+	SFBool set_bind;	/*eventIn*/
+	void (*on_set_bind)(GF_Node *pThis);	/*eventInHandler*/
+	SFFloat fieldOfView;	/*exposedField*/
+	SFBool jump;	/*exposedField*/
+	SFRotation orientation;	/*exposedField*/
+	SFVec3f position;	/*exposedField*/
+	SFString description;	/*field*/
+	SFTime bindTime;	/*eventOut*/
+	SFBool isBound;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+	SFVec3f centerOfRotation;	/*exposedField*/
+} X_Viewpoint;
+
+
+typedef struct _tagX3DVisibilitySensor
+{
+	BASE_NODE
+	SFVec3f center;	/*exposedField*/
+	SFBool enabled;	/*exposedField*/
+	SFVec3f size;	/*exposedField*/
+	SFTime enterTime;	/*eventOut*/
+	SFTime exitTime;	/*eventOut*/
+	SFBool isActive;	/*eventOut*/
+	GF_Node *metadata;	/*exposedField*/
+} X_VisibilitySensor;
+
+
+typedef struct _tagX3DWorldInfo
+{
+	BASE_NODE
+	MFString info;	/*field*/
+	SFString title;	/*field*/
+	GF_Node *metadata;	/*exposedField*/
+} X_WorldInfo;
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+
+#endif		/*_GF_X3D_NODES_H*/
+
diff --git a/tstools/DtsEdit/src/gpac/nodes_xbl.h b/tstools/DtsEdit/src/gpac/nodes_xbl.h
new file mode 100644
index 0000000..0fb7964
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/nodes_xbl.h
@@ -0,0 +1,70 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Cyril Concolato - Jean Le Feuvre
+ *    Copyright (c)2004-200X ENST - All rights reserved
+ *
+ *  This file is part of GPAC / XBL Elements 
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.	
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+
+#ifndef _GF_XBL_NODES_H
+#define _GF_XBL_NODES_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/internal/scenegraph_dev.h>
+#include <gpac/svg_types.h>
+
+#define XBL_String_datatype SVG_String_datatype 
+
+struct _all_atts {
+	DOM_String *id;
+	DOM_String *extends;
+	DOM_String *display;
+	DOM_String *inheritstyle;
+	DOM_String *includes;
+	DOM_String *name;
+	DOM_String *implements;
+	DOM_String *type;
+	DOM_String *readonly;
+	DOM_String *onget;
+	DOM_String *onset;
+	DOM_String *event;
+	DOM_String *action;
+	DOM_String *phase;
+	DOM_String *button;
+	DOM_String *modifiers;
+	DOM_String *keycode;
+	DOM_String *key;
+	DOM_String *charcode;
+	DOM_String *clickcount;
+	DOM_String *command;
+	DOM_String *preventdefault;
+	DOM_String *src;
+};
+#ifdef __cplusplus
+}
+#endif
+
+
+
+#endif		/*_GF_SVG_NODES_H*/
+
diff --git a/tstools/DtsEdit/src/gpac/options.h b/tstools/DtsEdit/src/gpac/options.h
new file mode 100644
index 0000000..1db6a80
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/options.h
@@ -0,0 +1,291 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Stream Management sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+
+#ifndef _GF_OPTIONS_H_
+#define _GF_OPTIONS_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*AspectRatio Type */
+enum
+{
+	GF_ASPECT_RATIO_KEEP = 0, /*keep AR*/
+	GF_ASPECT_RATIO_16_9, /*keep 16/9*/
+	GF_ASPECT_RATIO_4_3, /*keep 4/3*/
+	GF_ASPECT_RATIO_FILL_SCREEN /*none (all rendering area used)*/
+};
+
+/*AntiAlias settings*/
+enum
+{
+	GF_ANTIALIAS_NONE = 0, /*no antialiasing*/
+	GF_ANTIALIAS_TEXT, /*only text has antialiasing*/
+	GF_ANTIALIAS_FULL /*full antialiasing*/
+};
+
+/*GF_StreamingCache settings*/
+enum
+{
+	GF_MEDIA_CACHE_ENABLED = 0, /*cache on (with SET option, turns it on if possible)*/
+	GF_MEDIA_CACHE_DISABLED, /*cache off (with SET option saves current cache if any)*/
+	GF_MEDIA_CACHE_DISCARD, /*only used for SET option: turns cache off and discards current cache if any*/
+	GF_MEDIA_CACHE_RUNNING,	/*only used in GET option: caching is enabled and currently running*/
+};
+
+/*PlayState settings*/
+enum
+{
+	GF_STATE_PLAYING = 0,	/*terminal is playing*/
+	GF_STATE_PAUSED, /*terminal is paused*/
+	GF_STATE_STEP_PAUSE, /*get/set only: terminal will pause after next frame (simulation tick). On get, indicates that rendering step hasn't performed yet*/
+};
+
+/*refresh mode*/
+enum
+{
+	GF_REFRESH_NORMAL = 0, /*posts normal redraw message */
+	GF_REFRESH_FULL, /*posts full redraw message, including reset of hardware resources*/
+};
+
+/*interaction level settings*/
+enum
+{	
+	/*regular interactions enabled (touch sensors)*/
+	GF_INTERACT_NORMAL = 1,
+	/*InputSensor interactions enabled (mouse and keyboard)*/
+	GF_INTERACT_INPUT_SENSOR = 2,
+	/*all navigation interactions enabled (mouse and keyboard)*/
+	GF_INTERACT_NAVIGATION = 4,
+
+	/*NOTE: GF_INTERACT_NORMAL and GF_INTERACT_NAVIGATION filter events. If set, any event processed by
+	these 2 modules won't be forwarded to the user*/
+};
+
+/*BoundingVolume settings*/
+enum
+{
+	GF_BOUNDS_NONE = 0, /*doesn't draw bounding volume*/
+	GF_BOUNDS_BOX, /*draw object bounding box / rect*/
+	GF_BOUNDS_AABB	/*draw object AABB tree (3D only) */
+};
+
+/*Wireframe settings*/
+enum
+{
+	GF_WIREFRAME_NONE = 0, /*draw solid volumes*/
+	GF_WIREFRAME_ONLY, /*draw only wireframe*/
+	GF_WIREFRAME_SOLID /*draw wireframe on solid object*/
+};
+
+
+/*navigation type*/
+enum 
+{
+	/*navigation is disabled by content and cannot be forced by user*/
+	GF_NAVIGATE_TYPE_NONE,
+	/*2D navigation modes only can be used*/
+	GF_NAVIGATE_TYPE_2D,
+	/*3D navigation modes only can be used*/
+	GF_NAVIGATE_TYPE_3D
+};
+
+/*navigation modes - non-VRML ones are simply blaxxun contact ones*/
+enum
+{
+	/*no navigation*/
+	GF_NAVIGATE_NONE = 0,
+	/*3D navigation modes*/
+	/*walk navigation*/
+	GF_NAVIGATE_WALK,
+	/*fly navigation*/
+	GF_NAVIGATE_FLY,
+	/*pan navigation*/
+	GF_NAVIGATE_PAN,
+	/*game navigation*/
+	GF_NAVIGATE_GAME,
+	/*slide navigation, for 2D and 3D*/
+	GF_NAVIGATE_SLIDE,
+	/*all modes below disable collision detection & gravity in 3D*/
+	/*examine navigation, for 2D and 3D */
+	GF_NAVIGATE_EXAMINE,
+	/*orbit navigation - 3D only*/
+	GF_NAVIGATE_ORBIT,
+	/*QT-VR like navigation - 3D only*/
+	GF_NAVIGATE_VR,
+};
+
+/*collision flags*/
+enum
+{
+	/*no collision*/
+	GF_COLLISION_NONE,
+	/*regular collision*/
+	GF_COLLISION_NORMAL,
+	/*collision with camera displacement*/
+	GF_COLLISION_DISPLACEMENT,
+};
+
+/*TextTexturing settings*/
+enum
+{
+	GF_TEXTURE_TEXT_DEFAULT = 0, /*text drawn as texture in 3D mode, regular in 2D mode*/
+	GF_TEXTURE_TEXT_NEVER, /*text never drawn as texture*/
+	GF_TEXTURE_TEXT_ALWAYS /*text always drawn*/
+};
+
+/*Normal drawing settings*/
+enum
+{
+	GF_NORMALS_NONE = 0, /*normals never drawn*/
+	GF_NORMALS_FACE, /*normals drawn per face (at barycenter)*/
+	GF_NORMALS_VERTEX /*normals drawn per vertex*/
+};
+
+
+/*Back-face culling mode*/
+enum
+{
+	GF_BACK_CULL_OFF = 0, /*backface culling disabled*/
+	GF_BACK_CULL_ON, /*backface culliong enabled*/
+	GF_BACK_CULL_ALPHA, /*backface culling enabled alos for transparent meshes*/
+};
+
+/*high-level options*/
+enum
+{
+	/*set/get antialias flag (value: one of the AntiAlias enum) - may be ignored in OpenGL mode depending on graphic cards*/
+	GF_OPT_ANTIALIAS  =0,
+	/*set/get fast mode (value: boolean) */
+	GF_OPT_HIGHSPEED,
+	/*set/get fullscreen flag (value: boolean) */
+	GF_OPT_FULLSCREEN,
+	/*reset top-level transform to original (value: boolean)*/
+	GF_OPT_ORIGINAL_VIEW,
+	/*overrides BIFS size info for simple AV - this is not recommended since
+	it will resize the window to the size of the biggest texture (thus some elements
+	may be lost)*/
+	GF_OPT_OVERRIDE_SIZE,
+	/*set / get audio volume (value is intensity between 0 and 100) */
+	GF_OPT_AUDIO_VOLUME,
+	/*set / get audio pan (value is pan between 0 (all left) and 100(all right) )*/
+	GF_OPT_AUDIO_PAN,
+	/*get javascript flag (no set, depends on compil) - value: boolean, true if JS enabled in build*/
+	GF_OPT_HAS_JAVASCRIPT,
+	/*get selectable stream flag (no set) - value: boolean, true if audio/video/subtitle stream selection is 
+	possible with content (if an MPEG-4 scene description is not present). Use regular OD browsing to get streams*/
+	GF_OPT_CAN_SELECT_STREAMS,
+	/*set/get control interaction, OR'ed combination of interaction flags*/
+	GF_OPT_INTERACTION_LEVEL,
+	/*set display window visible / get show/hide state*/
+	GF_OPT_VISIBLE,
+	/*set freeze display on/off / get freeze state freeze_display prevents any screen updates 
+	needed when output driver uses direct video memory access*/
+	GF_OPT_FREEZE_DISPLAY,
+	/*get isOver flag: if true the file can be restarted, otherwise it should not
+	this is used to check is there are several timelines, timesensors or interactions, in which case 
+	the file could be running for an undetermined period.
+	Note that nothing prevents the user app to restart such a file*/
+	GF_OPT_IS_FINISHED,
+	/*set/get aspect ratio (value: one of AspectRatio enum) */
+	GF_OPT_ASPECT_RATIO,
+	/*send a redraw message (SetOption only): all graphics info (display list, vectorial path) is 
+	recomputed, and textures are reloaded in HW*/
+	GF_OPT_REFRESH,
+	/*set/get stress mode (value: boolean) - in stress mode a GF_OPT_FORCE_REDRAW is emulated at each frame*/
+	GF_OPT_STRESS_MODE,
+	/*get/set bounding volume drawing (value: one of the above option)*/
+	GF_OPT_DRAW_BOUNDS,
+	/*get/set texture text option - when enabled and usable (that depends on content), text is first rendered 
+	to a texture and only the texture is drawn, rather than drawing all the text each time (CPU intensive)*/
+	GF_OPT_TEXTURE_TEXT,
+	/*fake option, reload config file (set only), including drivers. Plugins configs are not reloaded*/
+	GF_OPT_RELOAD_CONFIG,
+	/*get: returns whether the content enable navigation and if it's 2D or 3D.
+	set: reset viewpoint (whatever value is given)*/
+	GF_OPT_NAVIGATION_TYPE,
+	/*get current navigation mode - set navigation mode if allowed by content - this is not a resident
+	option (eg not stored in cfg)*/
+	GF_OPT_NAVIGATION,
+	/*get/set GF_StreamingCache state - cf above states for set*/
+	GF_OPT_MEDIA_CACHE,
+	/*get/set Play state - cf above states for set*/
+	GF_OPT_PLAY_STATE,
+	/*get/set OpenGL force mode - returns error if OpenGL is not supported*/
+	GF_OPT_USE_OPENGL,
+
+	/*set/get direct draw flag. In direct draw, the screen is entirely redrawn at each frame
+	value: boolean
+	*/
+	GF_OPT_DIRECT_DRAW,
+	/*set/get scalable zoom (value: boolean)*/
+	GF_OPT_SCALABLE_ZOOM,
+	/*set/get YUV acceleration (value: boolean) */
+	GF_OPT_YUV_HARDWARE,
+	/*get (set not supported yet) hardware YUV format (value: YUV 4CC) */
+	GF_OPT_YUV_FORMAT,
+
+	/*max video cache size in kbytes*/
+	GF_OPT_VIDEO_CACHE_SIZE,
+
+	
+	/*		3D ONLY OPTIONS		*/
+	/*set/get raster outline flag (value: boolean) - when set, no vectorial outlining is done, only 
+	openGL raster outline*/
+	GF_OPT_RASTER_OUTLINES,
+	/*set/get pow2 emulation flag (value: boolean) - when set, video textures with non power of 2 dimensions
+	are emulated as pow2 by expanding the video buffer (image is not scaled). Otherwise the entire image
+	is rescaled. This flag does not affect image textures, which are always rescaled*/
+	GF_OPT_EMULATE_POW2,
+	/*get/set polygon antialiasing flag (value: boolean) (may be ugly with some cards)*/
+	GF_OPT_POLYGON_ANTIALIAS,
+	/*get/set wireframe flag (value: cf above) (may be ugly with some cards)*/
+	GF_OPT_WIREFRAME,
+	/*get/set wireframe flag (value: cf above) (may be ugly with some cards)*/
+	GF_OPT_NORMALS,
+	/*disable backface culling*/
+	GF_OPT_BACK_CULL,
+	/*get/set RECT Ext flag (value: boolean) - when set, GL rectangular texture extension is not used 
+	(but NPO2 texturing is if available)*/
+	GF_OPT_NO_RECT_TEXTURE,
+	/*get/set bitmap draw mode. If set, bitmap doesn't use texturing but direct video copy*/
+	GF_OPT_BITMAP_COPY,
+	/*set/get headlight (value: boolean)*/
+	GF_OPT_HEADLIGHT,
+	/*set/get collision (value: cf above)*/
+	GF_OPT_COLLISION,
+	/*set/get gravity*/
+	GF_OPT_GRAVITY,
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/*_GF_USER_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/path2d.h b/tstools/DtsEdit/src/gpac/path2d.h
new file mode 100644
index 0000000..7041cac
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/path2d.h
@@ -0,0 +1,611 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / common tools sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+#ifndef _GF_PATH2D_H_
+#define _GF_PATH2D_H_
+
+/*!
+ *	\file <gpac/path2d.h>
+ *	\brief 2D Vectorial Path functions.
+ */
+
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/math.h>
+#include <gpac/constants.h>
+
+
+/*!
+ *\addtogroup path_grp path2d
+ *\ingroup utils_grp
+ *\brief Vectorial 2D Path manipulation functions
+ *
+ *This section documents the 2D path object used in the GPAC framework. 
+ *	@{
+ */
+
+	
+/*!\brief 2D Path Object
+ *
+ *The 2D path object is used to construct complex 2D shapes for later drawing
+ * or outlining.
+ */
+typedef struct
+{
+	/*! number of contours in path*/
+	u32 n_contours;
+	/*! number of points in path and alloc size*/
+	u32 n_points, n_alloc_points;
+	/*! path points */
+	GF_Point2D *points;
+	/*! point tags (one per point)*/
+	u8 *tags;
+	/*! contour end points*/
+	u32 *contours;
+	/*! path bbox - NEVER USE WITHOUT FIRST CALLING \ref gf_path_get_bounds*/
+	GF_Rect bbox;
+	/*! path flags*/
+	s32 flags;
+	/*! fineness to use whenever flattening the path - default is \ref FIX_ONE*/
+	Fixed fineness;
+} GF_Path;
+
+
+/*!
+ *	\brief path constructor
+ *
+ *	Constructs an empty 2D path object
+ *	\return new path object
+ */
+GF_Path *gf_path_new();
+/*!
+ *	\brief path destructor
+ *
+ *	Destructs a 2D path object
+ *	\param gp the target path
+ */
+void gf_path_del(GF_Path *gp);
+/*!
+ *	\brief path reset
+ *
+ *	Resets the 2D path object
+ *	\param gp the target path
+ */
+void gf_path_reset(GF_Path *gp);
+/*!
+ *	\brief path copy constuctor
+ *
+ *	Resets a copy of a 2D path object
+ *	\param gp the target path
+ *	\return new path copy
+ */
+GF_Path *gf_path_clone(GF_Path *gp);
+/*!
+ *	\brief path close
+ *
+ *	Closes current path contour
+ *	\param gp the target path
+ *	\return error code if any error, \ref GF_OK otherwise
+ */
+GF_Err gf_path_close(GF_Path *gp);
+/*!
+ *	\brief path moveTo
+ *
+ *	Starts a new contour from the specified point
+ *	\param gp the target path
+ *	\param x x-coordinate of the new point
+ *	\param y y-coordinate of the new point
+ *	\return error code if any error, \ref GF_OK otherwise
+ */
+GF_Err gf_path_add_move_to(GF_Path *gp, Fixed x, Fixed y);
+/*!
+ *	\brief starts new contour
+ *
+ *	Starts a new contour from the specified point
+ *	\param gp the target path
+ *	\param pt pointer to the new start point
+ *	\return error code if any error, \ref GF_OK otherwise
+ */
+GF_Err gf_path_add_move_to_vec(GF_Path *gp, GF_Point2D *pt);
+/*!
+ *	\brief adds line to path
+ *
+ *	Adds a line from the current point in path to the specified point
+ *	\param gp the target path
+ *	\param x x-coordinate of the line end
+ *	\param y y-coordinate of the line end
+ *	\return error code if any error, \ref GF_OK otherwise
+ */
+GF_Err gf_path_add_line_to(GF_Path *gp, Fixed x, Fixed y);
+/*!
+ *	\brief adds line to path
+ *
+ *	Adds a line from the current point in path to the specified point
+ *	\param gp the target path
+ *	\param pt line end
+ *	\return error code if any error, \ref GF_OK otherwise
+ */
+GF_Err gf_path_add_line_to_vec(GF_Path *gp, GF_Point2D *pt);
+/*!
+ *	\brief adds cubic to path
+ *
+ *	Adds a cubic bezier curve to the current contour, starting from the current path point
+ *	\param gp the target path
+ *	\param c1_x x-coordinate of the first control point of the cubic curve
+ *	\param c1_y y-coordinate of the first control point of the cubic curve
+ *	\param c2_x x-coordinate of the second control point of the cubic curve
+ *	\param c2_y y-coordinate of the second control point of the cubic curve
+ *	\param x x-coordinate of the end point of the cubic curve
+ *	\param y y-coordinate of the end point of the cubic curve
+ *	\return error code if any error, \ref GF_OK otherwise
+ */
+GF_Err gf_path_add_cubic_to(GF_Path *gp, Fixed c1_x, Fixed c1_y, Fixed c2_x, Fixed c2_y, Fixed x, Fixed y);
+/*!
+ *	\brief adds cubic to path
+ *
+ *	Adds a cubic bezier curve to the current contour, starting from the current path point
+ *	\param gp the target path
+ *	\param c1 first control point of the cubic curve
+ *	\param c2 second control point of the cubic curve
+ *	\param pt end point of the cubic curve
+ *	\return error code if any error, \ref GF_OK otherwise
+ */
+GF_Err gf_path_add_cubic_to_vec(GF_Path *gp, GF_Point2D *c1, GF_Point2D *c2, GF_Point2D *pt);
+/*!
+ *	\brief adds quadratic to path
+ *
+ *	Adds a quadratic bezier curve to the current contour, starting from the current path point
+ *	\param gp the target path
+ *	\param c_x x-coordinate of the control point of the quadratic curve
+ *	\param c_y y-coordinate of the control point of the quadratic curve
+ *	\param x x-coordinate of the end point of the cubic quadratic
+ *	\param y y-coordinate of the end point of the cubic quadratic
+ *	\return error code if any error, \ref GF_OK otherwise
+ */
+GF_Err gf_path_add_quadratic_to(GF_Path *gp, Fixed c_x, Fixed c_y, Fixed x, Fixed y);
+/*!
+ *	\brief adds quadratic to path
+ *
+ *	Adds a quadratic bezier curve to the current contour, starting from the current path point
+ *	\param gp the target path
+ *	\param c control point of the quadratic curve
+ *	\param pt end point of the cubic quadratic
+ *	\return error code if any error, \ref GF_OK otherwise
+ */
+GF_Err gf_path_add_quadratic_to_vec(GF_Path *gp, GF_Point2D *c, GF_Point2D *pt);
+/*!
+ *	\brief adds rectangle to path
+ *
+ *	Adds a rectangle contour to the path
+ *	\param gp the target path
+ *	\param cx x-coordinate of the rectangle center
+ *	\param cy y-coordinate of the rectangle center
+ *	\param w width of the rectangle
+ *	\param h height of the rectangle
+ *	\return error code if any error, \ref GF_OK otherwise
+ */
+GF_Err gf_path_add_rect_center(GF_Path *gp, Fixed cx, Fixed cy, Fixed w, Fixed h);
+/*!
+ *	\brief adds rectangle to path
+ *
+ *	Adds a rectangle contour to the path
+ *	\param gp the target path
+ *	\param ox left-most coordinate of the rectangle 
+ *	\param oy top-most coordinate of the rectangle
+ *	\param w width of the rectangle
+ *	\param h height of the rectangle
+ *	\return error code if any error, \ref GF_OK otherwise
+ */
+GF_Err gf_path_add_rect(GF_Path *gp, Fixed ox, Fixed oy, Fixed w, Fixed h);
+/*!
+ *	\brief adds ellipse to path
+ *
+ *	Adds an ellipse contour to the path
+ *	\param gp the target path
+ *	\param cx x-coordinate of the ellipse center
+ *	\param cy y-coordinate of the ellipse center
+ *	\param a_axis length of the horizontal ellipse axis
+ *	\param b_axis length of the vertical ellipse axis
+ *	\return error code if any error, \ref GF_OK otherwise
+ */
+GF_Err gf_path_add_ellipse(GF_Path *gp, Fixed cx, Fixed cy, Fixed a_axis, Fixed b_axis);
+/*!
+ *	\brief adds N-bezier curve to path
+ *
+ *	Adds an N-degree bezier curve to the path, starting from the current point
+ *	\param gp the target path
+ *	\param pts points used to define the curve
+ *	\param nb_pts number of points used to define the curve. The degree of the curve is therefore (nb_pts-1).
+ *	\return error code if any error, \ref GF_OK otherwise
+ *	\note the fineness of the path must be set before calling this function.
+ */
+GF_Err gf_path_add_bezier(GF_Path *gp, GF_Point2D *pts, u32 nb_pts);
+/*!
+ *	\brief adds arc as described in MPEG-4 BIFS to path
+ *
+ *	Adds an arc contour to the path from focal and end points.
+ *	\param gp the target path
+ *	\param end_x x-coordinate of the arc end point
+ *	\param end_y y-coordinate of the arc end point
+ *	\param fa_x x-coordinate of the arc first focal point
+ *	\param fa_y y-coordinate of the arc first focal point
+ *	\param fb_x x-coordinate of the arc second focal point
+ *	\param fb_y y-coordinate of the arc second focal point
+ *	\param cw if 1, the arc will be clockwise, otherwise counter-clockwise.
+ *	\return error code if any error, \ref GF_OK otherwise
+ */
+GF_Err gf_path_add_arc_to(GF_Path *gp, Fixed end_x, Fixed end_y, Fixed fa_x, Fixed fa_y, Fixed fb_x, Fixed fb_y, Bool cw);
+/*!
+ *	\brief adds arc as described in SVG to path
+ *
+ *	Adds an arc contour to the path from end point, radii and 3 parameters.
+ *	\param gp the target path
+ *	\param end_x x-coordinate of the arc end point
+ *	\param end_y y-coordinate of the arc end point
+ *	\param r_x x-axis radius
+ *	\param r_y y-axis radius 
+ *	\param x_axis_rotation angle for the x-axis
+ *	\param large_arc_flag large or short arc selection
+ *	\param sweep_flag if 1, the arc will be clockwise, otherwise counter-clockwise.
+ *	\return error code if any error, \ref GF_OK otherwise
+ */
+GF_Err gf_path_add_svg_arc_to(GF_Path *gp, Fixed end_x, Fixed end_y, Fixed r_x, Fixed r_y, Fixed x_axis_rotation, Bool large_arc_flag, Bool sweep_flag);
+/*!
+ *	\brief adds arc to path
+ *
+ *	Adds an arc contour to the path.
+ *	\param gp the target path
+ *	\param radius radius of the arc 
+ *	\param start_angle start angle of the arc in radians
+ *	\param end_angle end angle of the arc in radians
+ *	\param close_type closing type: 0 for open arc, 1 for close arc, 2 for pie
+ *	\return error code if any error, \ref GF_OK otherwise
+ */
+GF_Err gf_path_add_arc(GF_Path *gp, Fixed radius, Fixed start_angle, Fixed end_angle, u32 close_type);
+
+/*!
+ *	\brief concatenates path
+ *
+ *	Adds a sub-path to the path with a given transform.
+ *	\param gp the target path
+ *	\param subpath the path to add
+ *	\param mat Matrix for subpath 
+ *	\return error code if any error, \ref GF_OK otherwise
+ */
+GF_Err gf_path_add_subpath(GF_Path *gp, GF_Path *subpath, GF_Matrix2D *mx);
+/*!
+ *	\brief gets path control bounds
+ *
+ *	Gets the path control bounds, i.e. the rectangle covering all lineTo and bezier control points.
+ *	\param gp the target path
+ *	\param rc pointer to rectangle receiving the control rectangle
+ *	\return error code if any error, \ref GF_OK otherwise
+ */
+GF_Err gf_path_get_control_bounds(GF_Path *gp, GF_Rect *rc);
+/*!
+ *	\brief gets path bounds
+ *
+ *	Gets the path bounds, i.e. the rectangle covering all points in path except bezier control points.
+ *	\param gp the target path
+ *	\param rc pointer to rectangle receiving the control rectangle
+ *	\return error code if any error, \ref GF_OK otherwise
+ */
+GF_Err gf_path_get_bounds(GF_Path *gp, GF_Rect *rc);
+/*!
+ *	\brief flattens path 
+ *
+ *	Flattens the path, i.e. transform all bezier curves to lines according to the path flatness.
+ *	\param gp the target path
+ */
+void gf_path_flatten(GF_Path *gp);
+/*!
+ *	\brief gets flatten copy of path 
+ *
+ *	Gets a flatten copy of the path.
+ *	\param gp the target path
+ *	\return the flatten path
+ */
+GF_Path *gf_path_get_flatten(GF_Path *gp);
+/*!
+ *	\brief point over path testing
+ *
+ *	Tests if a point is over a path or not, according to the path filling rule.
+ *	\param gp the target path
+ *	\param x x-coordinate of the point to check
+ *	\param y y-coordinate of the point to check
+ *	\return 1 if the point is over the path, 0 otherwise.
+ */
+Bool gf_path_point_over(GF_Path *gp, Fixed x, Fixed y);
+
+/*!
+ *	\brief path init testing
+ *
+ *	Tests if the path is empty or not.
+ *	\param gp the target path
+ *	\return 1 if the path is empty, 0 otherwise.
+ */
+Bool gf_path_is_empty(GF_Path *gp);
+
+/*!
+ *	\brief path iterator 
+ *
+ *	The path iterator object is used to compute the length of a given path as well
+ * as transformation matrices along this path.
+ */
+typedef struct _path_iterator GF_PathIterator;
+
+/*!
+ *	\brief path iterator constructor
+ *
+ *	Creates a new path iterator from a given path
+ *	\param gp the target path
+ *	\return the path iterator object.
+ */
+GF_PathIterator *gf_path_iterator_new(GF_Path *gp);
+/*!
+ *	\brief path iterator destructor
+ *
+ *	Destructs the path iterator object
+ *	\param it the target path iterator
+ */
+void gf_path_iterator_del(GF_PathIterator *it);
+
+/*!
+ *	\brief get path length
+ *
+ *	Gets a path length from its iterator
+ *	\param it the target path iterator
+ *	\return the length of the path
+ */
+Fixed gf_path_iterator_get_length(GF_PathIterator *it);
+/*!
+ *\brief gets transformation matrix at given point on path
+ *
+ * Gets the transformation of a given point on the path, given by offset from origin. 
+ *The transform is so that a local system is translated to the given point, its x-axis tangent 
+ *to the path and in the same direction. The path direction is from first point to last point
+ *of the path.
+ *	\param it the target path iterator
+ *	\param offset length on the path in local system unit
+ *	\param follow_tangent indicates if transformation shall be computed if offset indicates a point outside the path (<0 or >path_length). In which case the path shall be virtually extended by the tangent at origin (offset <0) or at end (offset>path_length). Otherwise the transformation is not computed and 0 is returned.
+ *	\param mat matrix to be transformed (transformation shall be appended) - the matrix shall not be initialized
+ *	\param smooth_edges indicates if discontinuities shall be smoothed. If not set, the rotation angle THETA is the slope (DX/DY) of the current segment found.
+ *	\param length_after_point if set and smooth_edges is set, the amount of the object that lies on next segment shall be computed according to length_after_point. 
+ \code
+  Let:
+	len_last: length of current checked segment
+	len1: length of all previous segments so that len1 + len_last >= offset then if (offset + length_after_point > len1 + len_last) {
+	ratio = (len1 + len_last - offset) / length_after_point;
+	then THETA = ratio * slope(L1) + (1-ratio) * slope(L2)
+
+  Of course care must be taken for PI/2 angles and similar situations 
+ \endcode
+
+ *	\return 1 if matrix has been updated, 0 otherwise, if failure or if point is out of path without tangent extension.
+ */
+Bool gf_path_iterator_get_transform(GF_PathIterator *it, Fixed offset, Bool follow_tangent, GF_Matrix2D *mat, Bool smooth_edges, Fixed length_after_point);
+
+
+
+/*! brief gets convexity type for a 2D polygon
+ *
+ * Gets the convexity type of the given 2D polygon
+ * \param pts the points of the polygon
+ * \param nb_pts number of points in the polygon
+ * \return the convexity type of the polygon
+*/
+u32 gf_polygone2d_get_convexity(GF_Point2D *pts, u32 nb_pts);
+
+
+/* 2D Path constants */
+
+/*!
+ *2D Path point tags
+ *	\hideinitializer
+ */
+enum
+{
+	/*/! Point is on curve (moveTo, lineTo, end of splines)*/
+	GF_PATH_CURVE_ON = 1,
+	/*! Point is a contour close*/
+	GF_PATH_CLOSE	= 5,
+	/*! Point is a quadratic control point*/
+	GF_PATH_CURVE_CONIC = 0,
+	/*! Point is a cubic control point*/
+	GF_PATH_CURVE_CUBIC = 2,
+};
+
+
+/*!
+ *2D Path flags
+ *	\hideinitializer
+ */
+enum
+{
+	/*! Path is filled using the zero-nonzero rule. If not set, filling uses odd/even rule*/
+	GF_PATH_FILL_ZERO_NONZERO = 1,
+	/*! When set bbox must be recomputed. 
+	\note Read only, used to avoid wasting time on bounds calculation*/
+	GF_PATH_BBOX_DIRTY = 2,
+	/*! Indicates the path is flattened flattened
+	\note Read only, used to avoid wasting time on flattening*/
+	GF_PATH_FLATTENED = 4,
+};
+
+/*!
+ * 2D Polygon convexity type
+ *	\hideinitializer
+ */
+enum
+{
+	/*! Polygon is either complex or unknown*/
+	GF_POLYGON_COMPLEX,
+	/*! Polygon is complex, starting in counter-clockwise order*/
+	GF_POLYGON_COMPLEX_CCW,
+	/*! Polygon is complex, starting in clockwise order*/
+	GF_POLYGON_COMPLEX_CW,
+	/*! Polygon is a counter-clockwise convex polygon*/
+	GF_POLYGON_CONVEX_CCW,
+	/*! Polygon is a clockwise convex polygon*/
+	GF_POLYGON_CONVEX_CW,
+	/*! Polygon is a convex line (degenerated path with all segments aligned)*/
+	GF_POLYGON_CONVEX_LINE
+};
+
+/*!
+ * Stencil alignment type for outlining
+ *	\hideinitializer
+ */
+enum
+{	
+	/*! outline is centered on the path (default)*/
+	GF_PATH_LINE_CENTER = 0,
+	/*! outline is inside the path*/
+	GF_PATH_LINE_INSIDE,
+	/*! outline is outside the path*/
+	GF_PATH_LINE_OUTSIDE,
+};
+
+/*!
+ * Line cap type for outlining
+ *	\hideinitializer
+ */
+enum
+{
+	/*! End of line is flat (default)*/
+	GF_LINE_CAP_FLAT = 0,
+	/*! End of line is round*/
+	GF_LINE_CAP_ROUND,
+	/*! End of line is square*/
+	GF_LINE_CAP_SQUARE,
+	/*! End of line is triangle*/
+	GF_LINE_CAP_TRIANGLE,
+};
+
+/*!
+ * Line join type for outlining
+ *	\hideinitializer
+ */
+enum
+{
+	/*! Line join is a miter join (default)*/
+	GF_LINE_JOIN_MITER = 0,
+	/*! Line join is a round join*/
+	GF_LINE_JOIN_ROUND,
+	/*! Line join is a bevel join*/
+	GF_LINE_JOIN_BEVEL,
+	/*! Line join is a miter then bevel join*/
+	GF_LINE_JOIN_MITER_SVG
+};
+
+/*!
+ * Dash types for outlining
+ *	\hideinitializer
+ */
+enum
+{
+	/*! No dashing is used (default)*/
+	GF_DASH_STYLE_PLAIN = 0,
+	/*! Predefined dash pattern is used*/
+	GF_DASH_STYLE_DASH,
+	/*! Predefined dot pattern is used*/
+	GF_DASH_STYLE_DOT,
+	/*! Predefined dash-dot pattern is used*/
+	GF_DASH_STYLE_DASH_DOT,
+	/*! Predefined dash-dash-dot pattern is used*/
+	GF_DASH_STYLE_DASH_DASH_DOT,
+	/*! Predefined dash-dot-dot pattern is used*/
+	GF_DASH_STYLE_DASH_DOT_DOT,
+	/*! Custom pattern is used. Dash lengths are given in percentage of the pen width*/
+	GF_DASH_STYLE_CUSTOM,
+	/*! SVG pattern is used. Dash lengths are given in the same unit as the pen width
+	and dash offset follows SVG specs (offset in dash pattern)*/
+	GF_DASH_STYLE_SVG,
+};
+
+
+/*!\brief Custom dash pattern
+ *
+ *The custom dash pattern object is used to specify custom dashes when outlining a path.
+ */
+typedef struct
+{
+	/*! Number of dashes in the pattern*/
+	u32 num_dash;
+	/*! Value of the pattern dashes. Unit depends on the dash type*/
+	Fixed *dashes;
+} GF_DashSettings;
+
+/*!\brief Pen properties 
+ *
+ *The pen properties object is used to specify several parameters used when building
+ *the vectorial outline of a path.
+ */
+typedef struct
+{
+	/*! The width of the outline*/
+	Fixed width;
+	/*! The style of the lines ends*/
+	u8 cap;
+	/*! The style of the lines joins*/
+	u8 join;
+	/*! The alignment of the outline with regard to the path*/
+	u8 align;
+	/*! The dash style of the line*/
+	u8 dash;
+	/*! The miter limit of the line joins*/
+	Fixed miterLimit;
+	/*! The initial dash offset in the outline. All points before this offset will be 
+	* ignored when building the outline*/
+	Fixed dash_offset;
+	/*! The dash pattern used for curstom dashing*/
+	GF_DashSettings *dash_set;
+	/*! The author-specified path length. Ignored if <= 0*/
+	Fixed path_length;
+} GF_PenSettings;
+
+/*! brief builds the vectorial outline of a path
+ *
+ * Builds the vectorial outline of a path for the given settings. The outline of a path is a path.
+ * \param path the desired path to outline
+ * \param pen the properties of the virtual pen used for outlining
+ * \return the outline of the path 
+*/
+GF_Path *gf_path_get_outline(GF_Path *path, GF_PenSettings pen);
+
+
+/*! @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif	/*_GF_PATH2D_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/scene_manager.h b/tstools/DtsEdit/src/gpac/scene_manager.h
new file mode 100644
index 0000000..613c359
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/scene_manager.h
@@ -0,0 +1,429 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Authoring Tools sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _GF_SCENE_MANAGER_H_
+#define _GF_SCENE_MANAGER_H_
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/isomedia.h>
+#include <gpac/scenegraph_vrml.h>
+
+/*
+		Memory scene management
+
+*/
+
+/*NDT check - return 1 if node belongs to given NDT. Handles proto, and assumes undefined nodes
+always belong to the desired NDT*/
+Bool gf_node_in_table(GF_Node *node, u32 NDTType);
+
+/*generic systems access unit context*/
+typedef struct
+{	
+	/*AU timing in TimeStampResolution*/
+	u64 timing;
+	/*timing in sec - used if timing isn't set*/
+	Double timing_sec;
+	/*random access indication - may be overriden by encoder*/
+	Bool is_rap;
+	/*opaque command list per stream type*/
+	GF_List *commands;
+
+	/*pointer to owner stream*/
+	struct _stream_context *owner;
+} GF_AUContext;
+
+/*generic stream context*/
+typedef struct _stream_context
+{
+	/*ESID of stream, or 0 if unknown in which case it is automatically updated at encode stage*/
+	u16 ESID;
+	/*stream type - used as a hint, the encoder(s) may override it*/
+	u8 streamType;
+	u8 objectType;
+	u32 timeScale;
+	GF_List *AUs;
+
+	u64 dump_time_offset;
+	/*last stream AU time, when playing the context directly*/
+	u64 last_au_time;
+	/*set if stream is part of root OD (playback only)*/
+	Bool in_root_od;
+} GF_StreamContext;
+
+/*generic presentation context*/
+typedef struct 
+{
+	/*the one and only scene graph used by the scene manager.*/
+	GF_SceneGraph *scene_graph;
+
+	/*all systems streams used in presentation*/
+	GF_List *streams;
+	/*(initial) object descriptor if any - if not set the encoder will generate it*/
+	GF_ObjectDescriptor *root_od;
+
+	/*scene resolution*/
+	u32 scene_width, scene_height;
+	Bool is_pixel_metrics;
+
+	/*BIFS encoding - these is needed for:
+	- protos in protos which define subscene graph, hence seperate namespace, but are coded with the same IDs
+	- route insertions which are not tracked by the scene graph
+	we could do this by hand (counting protos & route insert) but let's be lazy
+	*/
+	u32 max_node_id, max_route_id, max_proto_id;
+} GF_SceneManager;
+
+/*scene manager constructor - @scene_graph: scene graph used by the manager. */
+GF_SceneManager *gf_sm_new(GF_SceneGraph *scene_graph);
+/*scene manager destructor - does not destroy the attached scene graph*/
+void gf_sm_del(GF_SceneManager *ctx);
+/*retrive or create a stream context in the presentation context
+WARNING: if a stream with the same streamType and no ESID already exists in the context, 
+it is assigned the requested ES_ID - this is needed to solve base layer*/
+GF_StreamContext *gf_sm_stream_new(GF_SceneManager *ctx, u16 ES_ID, u8 streamType, u8 objectType);
+/*removes and destroy stream context from presentation context*/
+void gf_sm_stream_del(GF_SceneManager *ctx, GF_StreamContext *sc);
+/*locate a stream based on its id*/
+GF_StreamContext *gf_sm_stream_find(GF_SceneManager *ctx, u16 ES_ID);
+/*create a new AU context in the given stream context*/
+GF_AUContext *gf_sm_stream_au_new(GF_StreamContext *stream, u64 timing, Double time_ms, Bool isRap);
+
+/*reset the context: 
+- purge all access units on all streams 
+- destroy root OD
+*/
+void gf_sm_reset(GF_SceneManager *ctx);
+
+/*applies all commands in all streams (only BIFS for now): the context manager will only have one command per
+stream, this command being a random access*/
+GF_Err gf_sm_make_random_access(GF_SceneManager *ctx);
+
+/*translates SRT/SUB (TTXT not supported) source into BIFS command stream source
+	@src: GF_ESD of new stream (MUST be created before to store TS resolution)
+	@mux: GF_MuxInfo of src stream - shall contain a valid file, and at least the textNode member set
+*/
+GF_Err gf_sm_import_bifs_subtitle(GF_SceneManager *ctx, GF_ESD *src, GF_MuxInfo *mux);
+
+
+/*SWF to MPEG-4 flags*/
+enum
+{
+	/*all data in dictionary is in first frame*/
+	GF_SM_SWF_STATIC_DICT = 1,
+	/*remove all text*/
+	GF_SM_SWF_NO_TEXT = (1<<1),
+	/*remove embedded fonts (force device font usage)*/
+	GF_SM_SWF_NO_FONT = (1<<2),
+	/*forces XCurve2D which supports quadratic bezier*/
+	GF_SM_SWF_QUAD_CURVE = (1<<3),
+	/*forces line remove*/
+	GF_SM_SWF_NO_LINE = (1<<4),
+	/*forces XLineProperties (supports scalable lines)*/
+	GF_SM_SWF_SCALABLE_LINE = (1<<5),
+	/*forces gradient remove (using center color) */
+	GF_SM_SWF_NO_GRADIENT = (1<<6),
+	/*use a dedicated BIFS stream to control display list. This allows positioning in the movie
+	(jump to frame, etc..) as well as looping from inside the movie (set by default)*/
+	GF_SM_SWF_SPLIT_TIMELINE = (1<<7),
+	/*enable appearance reuse*/
+	GF_SM_SWF_REUSE_APPEARANCE = (1<<9),
+	/*enable IndexedCurve2D proto*/
+	GF_SM_SWF_USE_IC2D = (1<<10),
+};
+
+/*general loader flags*/
+enum
+{
+	/*if set, always load MPEG-4 nodes, otherwise X3D versions are used for vrml/x3d*/
+	GF_SM_LOAD_MPEG4_STRICT = 1,
+	/*signal loading is done for playback:	
+		scrips will be queued in their parent command for later loading
+		SFTime (MPEG-4 only) fields will be handled correctly when inserting/creating nodes based on AU timing
+	*/
+	GF_SM_LOAD_FOR_PLAYBACK = 1<<1,
+
+	/*special flag indicating that the context is already loaded & valid (eg no default stream creations & co)
+	this is used when performing diff encoding (eg the file to load only has updates).
+	When set, gf_sm_load_init will NOT attempt to parse first frame*/
+	GF_SM_LOAD_CONTEXT_READY = 1<<2,
+
+	/* in this mode, each root svg tag will be interpreted as a REPLACE SCENE */
+	GF_SM_LOAD_CONTEXT_STREAMING = 1<<3,
+};
+
+/*loader type, usually detected based on file ext*/
+enum
+{	
+	GF_SM_LOAD_BT = 1, /*BT loader*/
+	GF_SM_LOAD_VRML, /*VRML97 loader*/
+	GF_SM_LOAD_X3DV, /*X3D VRML loader*/
+	GF_SM_LOAD_XMTA, /*XMT-A loader*/
+	GF_SM_LOAD_X3D, /*X3D XML loader*/
+	GF_SM_LOAD_SVG_DA, /*SVG loader with dynamic allocation of attributes */
+	GF_SM_LOAD_XSR, /*LASeR+XML loader*/
+	GF_SM_LOAD_DIMS, /*DIMS LASeR+XML loader*/
+	GF_SM_LOAD_SWF, /*SWF->MPEG-4 converter*/
+	GF_SM_LOAD_QT, /*MOV->MPEG-4 converter (only cubic QTVR for now)*/
+	GF_SM_LOAD_MP4, /*MP4 memory loader*/
+	GF_SM_LOAD_XBL
+};
+
+typedef struct
+{
+	/*scene graph worked on - may be NULL if ctx is present*/
+	GF_SceneGraph *scene_graph;
+
+	struct _inline_scene  *is;
+
+	/*context manager to load (MUST BE RESETED BEFORE if needed) - may be NULL for loaders not using commands, 
+	in which case the graph will be directly updated*/
+	GF_SceneManager *ctx;
+	/*file to import except IsoMedia files*/
+	const char *fileName;
+	/*IsoMedia file to import (we need to be able to load from an opened file for scene stats)*/
+	GF_ISOFile *isom;
+	/*swf import flags*/
+	u32 swf_import_flags;
+	/*swf flatten limit: angle limit below which 2 lines are considered as aligned, 
+	in which case the lines are merged as one. If 0, no flattening happens*/
+	Float swf_flatten_limit;
+	/*swf extraction path: if set, swf media (mp3, jpeg) are extracted to this path. If not set
+	media are extracted to original file directory*/
+	const char *localPath;
+
+	/*loader flags*/
+	u32 flags;
+
+	/*private to loader*/
+	void *loader_priv;
+	/*loader type, one of the above value. If not set, detected based on file extension*/
+	u32 type;
+} GF_SceneLoader;
+
+/*initializes the context loader - this will load any IOD and the first frame of the main scene*/
+GF_Err gf_sm_load_init(GF_SceneLoader *load);
+/*completely loads context*/
+GF_Err gf_sm_load_run(GF_SceneLoader *load);
+/*terminates the context loader*/
+void gf_sm_load_done(GF_SceneLoader *load);
+
+/*parses memory scene (any textural format) into the context
+!! THE LOADER TYPE MUST BE ASSIGNED (BT/WRL/XMT/X3D/SVG only) !!
+The string MUST be at least 4 bytes long in order to detect BOM (unicode encoding). 
+The string can ba either UTF-8 or UTF-16 data
+if clean_at_end is set, associated parser is destroyed. Otherwise, a call to gf_sm_load_done must be done 
+to clean ressources (needed for SAX progressive loading)
+*/
+GF_Err gf_sm_load_string(GF_SceneLoader *load, char *str, Bool clean_at_end);
+
+
+/*scene dump mode*/
+enum
+{
+	/*BT*/
+	GF_SM_DUMP_BT = 0,
+	/*XMT-A*/
+	GF_SM_DUMP_XMTA,
+	/*VRML Text (WRL)*/
+	GF_SM_DUMP_VRML,
+	/*X3D Text (x3dv)*/
+	GF_SM_DUMP_X3D_VRML,
+	/*X3D XML*/
+	GF_SM_DUMP_X3D_XML,
+	/*LASeR XML*/
+	GF_SM_DUMP_LASER,
+	/*SVG dump (only dumps svg root of the first LASeR unit*/
+	GF_SM_DUMP_SVG,
+	/*blind XML dump*/
+	GF_SM_DUMP_XML,
+	/*automatic selection of MPEG4 vs X3D, text mode*/
+	GF_SM_DUMP_AUTO_TXT,
+	/*automatic selection of MPEG4 vs X3D, xml mode*/
+	GF_SM_DUMP_AUTO_XML,
+};
+
+#ifndef GPAC_READ_ONLY
+
+/*dumps scene context to BT or XMT
+@rad_name: file name & loc without extension - if NULL dump will happen in stdout
+@dump_mode: one of the above*/
+GF_Err gf_sm_dump(GF_SceneManager *ctx, char *rad_name, u32 dump_mode);
+
+#endif
+
+
+/*encoding flags*/
+enum
+{
+	/*if flag set, DEF names are encoded*/
+	GF_SM_ENCODE_USE_NAMES =	1,
+	/*if flag set, RAP are generated inband rather than as redundant samples*/
+	GF_SM_ENCODE_RAP_INBAND = 2,
+	/*if flag set, RAP are generated inband rather than as sync shadow samples*/
+	GF_SM_ENCODE_RAP_SHADOW = 4,
+};
+
+typedef struct
+{
+	/*encoding flags*/
+	u32 flags;
+	/*delay between 2 RAP in ms. If 0 RAPs are not forced - BIFS and LASeR only for now*/
+	u32 rap_freq;
+	/*if set, any unknown stream in the scene will be looked for in @mediaSource (MP4 only)*/
+	char *mediaSource;
+	/*LASeR */
+	/*resolution*/
+	s32 resolution;
+	/*coordBits, scaleBits*/
+	u32 coord_bits, scale_bits;
+	/*auto quantification type:
+		0: none
+		1: LASeR
+		2: BIFS
+	*/
+	u32 auto_quant;
+} GF_SMEncodeOptions;
+
+/*
+encodes scene context into @mp4.
+if @log is set, generates BIFS encoder log file
+*/
+GF_Err gf_sm_encode_to_file(GF_SceneManager *ctx, GF_ISOFile *mp4, GF_SMEncodeOptions *opt);
+
+/*Dumping tools*/
+typedef struct _scenedump GF_SceneDumper;
+/*create a scene dumper 
+@graph: scene graph being dumped
+@rad_name: file radical (NULL for stdout) - if not NULL MUST BE GF_MAX_PATH length
+@indent_char: indent format
+@XMLDump: if set, dumps in XML format otherwise regular text
+returns NULL if can't create a file
+*/
+GF_SceneDumper *gf_sm_dumper_new(GF_SceneGraph *graph, char *rad_name, char indent_char, Bool XMLDump);
+void gf_sm_dumper_del(GF_SceneDumper *bd);
+
+/*dumps commands list
+@indent: indent to use
+@skip_replace_scene_header: if set and dumping in BT mode, the initial REPLACE SCENE header is skipped
+*/
+GF_Err gf_sm_dump_command_list(GF_SceneDumper *sdump, GF_List *comList, u32 indent, Bool skip_first_replace);
+
+/*dumps complete graph - 
+@skip_proto: proto declarations are skipped
+@skip_routes: routes are not dumped
+*/
+GF_Err gf_sm_dump_graph(GF_SceneDumper *sdump, Bool skip_proto, Bool skip_routes);
+
+
+#ifndef GPAC_READ_ONLY
+
+/*stat object - to refine :)*/
+
+/*store nodes or proto stats*/
+typedef struct
+{
+	/*node type or protoID*/
+	u32 tag;
+	const char *name;
+	/*number of created nodes*/
+	u32 nb_created;
+	/*number of used nodes*/
+	u32 nb_used;
+	/*number of used nodes*/
+	u32 nb_del;
+} GF_NodeStats;
+
+typedef struct _scenestat
+{
+	GF_List *node_stats;
+	GF_List *proto_stats;
+	
+	/*ranges of all SFVec2fs for points only (MFVec2fs)*/
+	SFVec2f max_2d, min_2d;
+	/* resolution of 2D points (nb bits for integer part and decimal part)*/
+	u32 int_res_2d, frac_res_2d;
+	/* resolution of scale coefficient (nb bits for integer part)*/
+	u32 scale_int_res_2d, scale_frac_res_2d;
+
+	Fixed max_fixed, min_fixed;
+
+	/*number of parsed 2D points*/
+	u32 count_2d;
+	/*number of deleted 2D points*/
+	u32 rem_2d;
+
+	/*ranges of all SFVec3fs for points only (MFVec3fs)*/
+	SFVec3f max_3d, min_3d;
+	u32 count_3d;
+	/*number of deleted 3D points*/
+	u32 rem_3d;
+
+	u32 count_float, rem_float;
+	u32 count_color, rem_color;
+	/*all SFVec2f other than MFVec2fs elements*/
+	u32 count_2f;
+	/*all SFVec3f other than MFVec3fs elements*/
+	u32 count_3f;
+
+	u32 nb_svg_attributes;
+
+	GF_StreamContext *base_layer;
+} GF_SceneStatistics;
+
+typedef struct _statman GF_StatManager;
+
+/*creates new stat handler*/
+GF_StatManager *gf_sm_stats_new();
+/*deletes stat handler*/
+void gf_sm_stats_del(GF_StatManager *stat);
+/*reset statistics*/
+void gf_sm_stats_reset(GF_StatManager *stat);
+
+/*get statistics - do NOT modify the returned structure*/
+GF_SceneStatistics *gf_sm_stats_get(GF_StatManager *stat);
+
+/*produces stat report for a complete graph*/
+GF_Err gf_sm_stats_for_graph(GF_StatManager *stat, GF_SceneGraph *sg);
+
+/*produces stat report for the full scene*/
+GF_Err gf_sm_stats_for_scene(GF_StatManager *stat, GF_SceneManager *sm);
+
+/*produces stat report for the given command*/
+GF_Err gf_sm_stats_for_command(GF_StatManager *stat, GF_Command *com);
+
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif	/*_GF_SCENE_MANAGER_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/scenegraph.h b/tstools/DtsEdit/src/gpac/scenegraph.h
new file mode 100644
index 0000000..580491e
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/scenegraph.h
@@ -0,0 +1,761 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005
+ *					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. 
+ *
+ */
+
+
+#ifndef _GF_SCENEGRAPH_H_
+#define _GF_SCENEGRAPH_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/list.h>
+#include <gpac/math.h>
+
+/*
+	TAG definitions are static, in order to be able to mix nodes from different standard
+	in a single scenegraph. These TAGs are only used internally (they do not match any
+	binary encoding)
+*/
+enum {
+	/*undefined node: just the base node class, used for parsing*/
+	TAG_UndefinedNode = 0,
+	/*all MPEG-4/VRML/X3D proto instances have this tag*/
+	TAG_ProtoNode,
+
+	/*reserved TAG ranges per standard*/
+
+	/*range for MPEG4*/
+	GF_NODE_RANGE_FIRST_MPEG4,
+	GF_NODE_RANGE_LAST_MPEG4 = GF_NODE_RANGE_FIRST_MPEG4+512,
+
+	/*range for X3D*/
+	GF_NODE_RANGE_FIRST_X3D, 
+	GF_NODE_RANGE_LAST_X3D = GF_NODE_RANGE_FIRST_X3D+512,
+
+	/*all nodes after this are always parent nodes*/
+	GF_NODE_RANGE_LAST_VRML,
+
+	/*DOM container for BIFS/LASeR/etc updates*/
+	TAG_DOMUpdates,
+
+	/*all nodes below MUST be parent nodes*/
+	GF_NODE_FIRST_PARENT_NODE_TAG,
+
+	/*DOM text node*/
+	TAG_DOMText,
+	/*all nodes below MUST use the base DOM structure (with dyn attribute list)*/
+	GF_NODE_FIRST_DOM_NODE_TAG,
+	
+	/*full node*/
+	TAG_DOMFullNode = GF_NODE_FIRST_DOM_NODE_TAG,
+
+	/*range for SVG*/
+	GF_NODE_RANGE_FIRST_SVG, 
+	GF_NODE_RANGE_LAST_SVG = GF_NODE_RANGE_FIRST_SVG+100,
+
+	/*range for XBL*/
+	GF_NODE_RANGE_FIRST_XBL, 
+	TAG_XBL_bindings = GF_NODE_RANGE_FIRST_XBL,
+	TAG_XBL_binding,
+	TAG_XBL_content,
+	TAG_XBL_children,
+	TAG_XBL_implementation,
+	TAG_XBL_constructor,
+	TAG_XBL_destructor,
+	TAG_XBL_field,
+	TAG_XBL_property,
+	TAG_XBL_getter,
+	TAG_XBL_setter,
+	TAG_XBL_method,
+	TAG_XBL_parameter,
+	TAG_XBL_body,
+	TAG_XBL_handlers,
+	TAG_XBL_handler,
+	TAG_XBL_resources,
+	TAG_XBL_stylesheet,
+	TAG_XBL_image,
+	GF_NODE_RANGE_LAST_XBL,
+};
+
+
+
+/*private handler for this library on all nodes*/
+#define BASE_NODE	struct _nodepriv *sgprivate;
+
+/*base node type*/
+typedef struct _base_node
+{
+	BASE_NODE
+} GF_Node;
+
+/*child storage - this is not integrated in the base node, because of VRML/MPEG-4 USE: a node
+may be present at different places in the tree, hence have different "next" siblings.*/
+typedef struct _child_node
+{
+	struct _child_node *next;
+	GF_Node *node;
+} GF_ChildNodeItem;
+
+/*grouping nodes macro :
+	children: list of children SFNodes
+*/
+
+#define CHILDREN									\
+	struct _child_node *children;
+
+typedef struct
+{
+	BASE_NODE
+	CHILDREN
+} GF_ParentNode;
+
+/*adds a child to a given container*/
+GF_Err gf_node_list_add_child(GF_ChildNodeItem **list, GF_Node *n);
+/*adds a child to a given container, updating last position*/
+GF_Err gf_node_list_add_child_last(GF_ChildNodeItem **list, GF_Node *n, GF_ChildNodeItem **last_child);
+/*inserts a child to a given container - if pos doesn't match, append the child*/
+GF_Err gf_node_list_insert_child(GF_ChildNodeItem **list, GF_Node *n, u32 pos);
+/*removes a child to a given container - return 0 if child not found*/
+Bool gf_node_list_del_child(GF_ChildNodeItem **list, GF_Node *n);
+/*finds a child in a given container, returning its 0-based index if found, -1 otherwise*/
+s32 gf_node_list_find_child(GF_ChildNodeItem *list, GF_Node *n);
+/*finds a child in a given container given its index, returning the child or NULL if not found
+if pos is <0, returns the last child*/
+GF_Node *gf_node_list_get_child(GF_ChildNodeItem *list, s32 pos);
+/*gets the number of children in a given container*/
+u32 gf_node_list_get_count(GF_ChildNodeItem *list);
+/*deletes node entry at given idx, returning node if found, NULL otherwise*/
+GF_Node *gf_node_list_del_child_idx(GF_ChildNodeItem **list, u32 pos);
+
+
+
+/*tag is set upon creation and cannot be modified*/
+u32 gf_node_get_tag(GF_Node*);
+/*set node def
+	@ID: node ID, !=0 set def node - if a different node with the same ID exists, returns error. 
+You may change the node ID by recalling the function with a different ID value. You may get a node ID
+by calling the gf_sg_get_next_available_node_id function
+	@defName: optional readable name (script, MPEGJ). To change the name, recall the function with a different name and the same ID
+*/
+GF_Err gf_node_set_id(GF_Node*n, u32 nodeID, const char *nodeDEFName);
+/*get def name of the node , NULL if not set*/
+const char *gf_node_get_name(GF_Node*);
+/*get def name of the node , or the string representation of the node pointer if not set*/
+const char *gf_node_get_log_name(GF_Node*);
+/*get def ID of the node, 0 if node not def*/
+u32 gf_node_get_id(GF_Node*);
+/* gets node built-in name (eg 'Appearance', ..) */
+const char *gf_node_get_class_name(GF_Node *Node);
+
+u32 gf_sg_node_get_tag_by_class_name(const char *name, u32 xmlns);
+
+/*unset the node ID*/
+GF_Err gf_node_remove_id(GF_Node *p);
+
+/*get/set user private stack*/
+void *gf_node_get_private(GF_Node*);
+void gf_node_set_private(GF_Node*, void *);
+
+/*set traversal callback function. If a node has no associated callback, the traversing of the 
+graph won't propagate below it. It is the app responsability to setup traversing functions as needed
+VRML/MPEG4:  Instanciated Protos are handled internally as well as interpolators, valuators and scripts
+@is_destroy: set when the node is about to be destroyed
+*/
+GF_Err gf_node_set_callback_function(GF_Node *, void (*NodeFunction)(GF_Node *node, void *traverse_state, Bool is_destroy) );
+
+/*register a node (DEFed or not), specifying parent if any.
+A node must be registered whenever used by something (a parent node, a command, whatever) to prevent its 
+destruction (think of it as a reference counting).
+NOTE: NODES ARE CREATED WITHOUT BEING REGISTERED
+*/
+GF_Err gf_node_register(GF_Node *node, GF_Node *parent_node);
+
+/*unregister a node from parent (node may or not be DEF'ed). Parent may be NULL (DEF root node, commands).
+This MUST be called whenever a node is destroyed (removed from a parent node)
+If this is the last instance of the node, the node is destroyed
+NOTE: NODES ARE CREATED WITHOUT BEING REGISTERED, hence they MUST be registered at least once before 
+being destroyed
+*/
+GF_Err gf_node_unregister(GF_Node *node, GF_Node *parent_node);
+/*deletes all node instances in the given list*/
+void gf_node_unregister_children(GF_Node *node, GF_ChildNodeItem *childrenlist);
+
+/*get all parents of the node and replace the old_node by the new node in all parents
+Note: if the new node is not DEFed, only the first instance of "old_node" will be replaced, the other ones deleted*/
+GF_Err gf_node_replace(GF_Node *old_node, GF_Node *new_node, Bool updateOrderedGroup);
+
+/*returns number of instances for this node*/
+u32 gf_node_get_num_instances(GF_Node *node);
+
+
+/*calls node traverse callback routine on this node*/
+void gf_node_traverse(GF_Node *node, void *udta);
+/*allows a node to be re-rendered - by default a node in its render phase will never be rendered a second time. 
+Use this function to enable a second render for this node - this must be called while node is being rendered*/
+void gf_node_allow_cyclic_traverse(GF_Node *node);
+
+/*blindly calls traverse callback on all children nodes */
+void gf_node_traverse_children(GF_Node *node, void *renderStack);
+/*returns number of parent for this node (parent are kept regardless of DEF state)*/
+u32 gf_node_get_parent_count(GF_Node *node);
+/*returns desired parent for this node (parent are kept regardless of DEF state)
+idx is 0-based parent index*/
+GF_Node *gf_node_get_parent(GF_Node *node, u32 idx);
+
+
+enum
+{
+	/*flag set whenever a field of the node has been modified*/
+	GF_SG_NODE_DIRTY = 1,
+	/*flag set whenever a child node of this node has been modified
+	NOTE: unloaded extern protos always invalidate their parent subgraph to get a chance
+	of being loaded. It is the user responsability to clear the CHILD_DIRTY flag before traversing
+	if relying on this flag for sub-tree discarding (eg, culling or similar)*/
+	GF_SG_CHILD_DIRTY = 1<<1,
+
+	/*flag set by bindable nodes to indicate a modification of the bindable stack. This is 
+	only used for offscreen rendering of Layer3D*/
+	GF_SG_VRML_BINDABLE_DIRTY = 1<<2,
+
+	/*flag set whenever a ColorTransform node is removed from a parent node*/
+	GF_SG_VRML_COLOR_DIRTY = 1<<3,
+
+
+	/*SVG-specific flags due to mix of geometry and appearance & co attributes*/
+	/*SVG geometry changed is the same as base flag*/
+	GF_SG_SVG_GEOMETRY_DIRTY		= GF_SG_NODE_DIRTY,
+	GF_SG_SVG_COLOR_DIRTY			= GF_SG_VRML_BINDABLE_DIRTY,
+	GF_SG_SVG_DISPLAYALIGN_DIRTY	= 1<<3,
+	GF_SG_SVG_FILL_DIRTY			= 1<<4,
+	GF_SG_SVG_FILLOPACITY_DIRTY		= 1<<5,
+	GF_SG_SVG_FILLRULE_DIRTY		= 1<<6,
+	GF_SG_SVG_FONTFAMILY_DIRTY		= 1<<7,
+	GF_SG_SVG_FONTSIZE_DIRTY		= 1<<8,
+	GF_SG_SVG_FONTSTYLE_DIRTY		= 1<<9,
+	GF_SG_SVG_FONTVARIANT_DIRTY		= 1<<10,
+	GF_SG_SVG_FONTWEIGHT_DIRTY		= 1<<11,
+	GF_SG_SVG_LINEINCREMENT_DIRTY	= 1<<12,
+	GF_SG_SVG_OPACITY_DIRTY			= 1<<13,
+	GF_SG_SVG_SOLIDCOLOR_OR_OPACITY_DIRTY		= 1<<14,
+	GF_SG_SVG_STOPCOLOR_OR_OPACITY_DIRTY		= 1<<15,
+	GF_SG_SVG_STROKE_DIRTY			= 1<<16,
+	GF_SG_SVG_STROKEDASHARRAY_DIRTY	= 1<<17,
+	GF_SG_SVG_STROKEDASHOFFSET_DIRTY= 1<<18,
+	GF_SG_SVG_STROKELINECAP_DIRTY	= 1<<19,
+	GF_SG_SVG_STROKELINEJOIN_DIRTY	= 1<<20,
+	GF_SG_SVG_STROKEMITERLIMIT_DIRTY= 1<<21,
+	GF_SG_SVG_STROKEOPACITY_DIRTY	= 1<<22,
+	GF_SG_SVG_STROKEWIDTH_DIRTY		= 1<<23,
+	GF_SG_SVG_TEXTPOSITION_DIRTY	= 1<<24,
+	GF_SG_SVG_DISPLAY_DIRTY			= 1<<25,
+	GF_SG_SVG_VECTOREFFECT_DIRTY	= 1<<26,
+	GF_SG_SVG_XLINK_HREF_DIRTY		= 1<<27,
+};
+
+/*set dirty flags.
+if @flags is 0, sets the base flags on (GF_SG_NODE_DIRTY).
+if @flags is not 0, adds the flags to the node dirty state
+
+If @invalidate_parents is set, all parent subtrees for this node are marked as GF_SG_CHILD_DIRTY
+Note: parent subtree marking aborts if a node in the subtree is already marked with GF_SG_CHILD_DIRTY
+which means tat if you never clean the dirty flags, no propagation will take place
+*/
+void gf_node_dirty_set(GF_Node *node, u32 flags, Bool dirty_parents);
+
+/*mark all parent subtrees for this node as GF_SG_CHILD_DIRTY
+Note: parent subtree marking aborts if a node in the subtree is already marked with GF_SG_CHILD_DIRTY
+which means that if you never clean the dirty flags, no propagation will take place
+*/
+void gf_node_dirty_parents(GF_Node *node);
+
+/*set dirty flag off. It is the user responsability to clear dirty flags
+if @flags is 0, all flags are set off
+if @flags is not 0, removes the indicated flags from the node dirty state
+*/
+void gf_node_dirty_clear(GF_Node *node, u32 flags);
+
+/*if the node is in a dirty state, resets it and the state of all its children*/
+void gf_node_dirty_reset(GF_Node *node);
+
+/*get dirty flag value*/
+u32 gf_node_dirty_get(GF_Node *node);
+
+/*Notes on GF_FieldInfo
+all scene graph implementations should answer node field query with this interface. 
+In case an implementation does not use this:
+	- the implementation shall handle the parent node dirty flag itself most of the time
+	- the implementation shall NOT allow referencing of a graph node in a parent graph node (when inlining
+content) otherwise the app is guaranteed to crash.
+*/
+
+/*other fieldTypes may be ignored by implmentation not using VRML/MPEG4 native types*/
+
+typedef struct
+{	
+	/*0-based index of the field in the node*/
+	u32 fieldIndex;
+	/*field type - VRML/MPEG4 types are listed in scenegraph_vrml.h*/
+	u32 fieldType;
+	/*far ptr to the field (eg GF_Node **, GF_List**, MFInt32 *, ...)*/
+	void *far_ptr;
+	/*field name*/
+	const char *name;
+	/*NDT type in case of SF/MFNode field - cf BIFS specific tools*/
+	u32 NDTtype;
+	/*event type*/
+	u32 eventType;
+	/*eventin handler if any*/
+	void (*on_event_in)(GF_Node *pNode);
+} GF_FieldInfo;
+
+/*returns number of field for this node*/
+u32 gf_node_get_field_count(GF_Node *node);
+
+/*fill the field info structure for the given field*/
+GF_Err gf_node_get_field(GF_Node *node, u32 FieldIndex, GF_FieldInfo *info);
+
+/*get the field by its name*/
+GF_Err gf_node_get_field_by_name(GF_Node *node, char *name, GF_FieldInfo *field);
+
+typedef struct __tag_scene_graph GF_SceneGraph;
+
+/*scene graph constructor*/
+GF_SceneGraph *gf_sg_new();
+
+/*creates a sub scene graph (typically used with Inline node): independent graph with same private stack, 
+and user callbacks as parent. All routes triggered in this subgraph are executed in the parent graph (this 
+means you only have to activate routes on the main graph)
+NOTE: the resulting graph is not destroyed when the parent graph is 
+*/
+GF_SceneGraph *gf_sg_new_subscene(GF_SceneGraph *scene);
+
+/*destructor*/
+void gf_sg_del(GF_SceneGraph *sg);
+/*reset the full graph - all nodes, routes and protos are destroyed*/
+void gf_sg_reset(GF_SceneGraph *sg);
+
+/*parses the given XML document and returns a scene graph composed of GF_DOMFullNode*/
+GF_Err gf_sg_new_from_xml_doc(const char *src, GF_SceneGraph **scene);
+
+/*set/get user private data*/
+void gf_sg_set_private(GF_SceneGraph *sg, void *user_priv);
+void *gf_sg_get_private(GF_SceneGraph *sg);
+
+/*set the scene timer (fct returns time in sec)*/
+void gf_sg_set_scene_time_callback(GF_SceneGraph *scene, Double (*GetSceneTime)(void *user_priv) );
+
+enum
+{
+	/*function called upon node creation. 
+		ctxdata is not used*/
+	GF_SG_CALLBACK_INIT = 0,
+	/*function called upon node modification. You typically will set some of the dirty flags here.
+		ctxdata is the fieldInfo pointer of the modified field*/
+	GF_SG_CALLBACK_MODIFIED,
+	/*function called when the a "set dirty" propagates to root node of the graph
+		ctxdata is not used*/
+	GF_SG_CALLBACK_GRAPH_DIRTY,
+};
+
+/*set node callback: function called upon node creation. 
+Application should instanciate the node rendering stack and any desired callback*/
+void gf_sg_set_node_callback(GF_SceneGraph *sg, void (*NodeCallback)(void *user_priv, u32 type, GF_Node *node, void *ctxdata) );
+
+/*get/set the root node of the graph*/
+GF_Node *gf_sg_get_root_node(GF_SceneGraph *sg);
+void gf_sg_set_root_node(GF_SceneGraph *sg, GF_Node *node);
+
+/*finds a registered node by ID*/
+GF_Node *gf_sg_find_node(GF_SceneGraph *sg, u32 nodeID);
+/*finds a registered node by DEF name*/
+GF_Node *gf_sg_find_node_by_name(GF_SceneGraph *sg, char *name);
+
+/*used to signal modification of a node, indicating which field is modified - exposed for BIFS codec, 
+should not be needed by other apps*/
+void gf_node_changed(GF_Node *node, GF_FieldInfo *fieldChanged);
+
+/*returns the graph this node belongs to*/
+GF_SceneGraph *gf_node_get_graph(GF_Node *node);
+
+/*Set size info for the graph - by default graphs have no size and are in meter metrics (VRML like)
+if any of width or height is 0, the graph has no size info*/
+void gf_sg_set_scene_size_info(GF_SceneGraph *sg, u32 width, u32 Height, Bool usePixelMetrics);
+/*returns 1 if pixelMetrics*/
+Bool gf_sg_use_pixel_metrics(GF_SceneGraph *sg);
+/*returns 0 if no size info, otherwise 1 and set width/height*/
+Bool gf_sg_get_scene_size_info(GF_SceneGraph *sg, u32 *width, u32 *Height);
+
+/*creates a node of the given tag. sg is the parent scenegraph of the node,
+eg the root one for scene nodes or the proto one for proto code (cf proto)
+Note:
+	- NODE IS NOT REGISTERED (no instances) AND CANNOT BE DESTROYED UNTIL REGISTERED
+	- this doesn't perform application setup for the node, this must be done by the caller
+*/
+GF_Node *gf_node_new(GF_SceneGraph *sg, u32 tag);
+/*inits node (either internal stack or user-defined) - usually called once the node has been fully loaded*/
+void gf_node_init(GF_Node *node);
+
+/*clones a node in the given graph and register with parent cloned. The cloning handles ID based on id_suffix:
+ id_suffix = NULL: all IDs are removed from the cloned subtree, (each node instance will become a hard copy)
+ id_suffix = "": ID will be kept exactly as they where in the original subtree - this may lead to errors due to 
+		the presence of the same ID depending on the standard (DOM, ...).
+ id_suffix = anything: all IDs are translated ($(name) -> $(name)id_suffix) and bynary IDs are generated on the fly
+*/
+GF_Node *gf_node_clone(GF_SceneGraph *inScene, GF_Node *orig, GF_Node *cloned_parent, char *id_suffix, Bool deep);
+
+/*gets scene time for scene this node belongs too, 0 if timeline not specified*/
+Double gf_node_get_scene_time(GF_Node *node);
+
+/*retuns next available NodeID*/
+u32 gf_sg_get_next_available_node_id(GF_SceneGraph *sg);
+/*retuns max ID used in graph*/
+u32 gf_sg_get_max_node_id(GF_SceneGraph *sg);
+
+const char *gf_node_get_name_and_id(GF_Node*node, u32 *id);
+
+
+enum
+{
+	GF_SG_FOCUS_AUTO = 1,
+	GF_SG_FOCUS_NEXT,
+	GF_SG_FOCUS_PREV,
+	GF_SG_FOCUS_NORTH,
+	GF_SG_FOCUS_NORTH_EAST,
+	GF_SG_FOCUS_EAST,
+	GF_SG_FOCUS_SOUTH_EAST,
+	GF_SG_FOCUS_SOUTH,
+	GF_SG_FOCUS_SOUTH_WEST,
+	GF_SG_FOCUS_WEST,
+	GF_SG_FOCUS_NORTH_WEST
+};
+
+typedef struct
+{
+	const char *url;
+	const char **params;
+	u32 nb_params;
+} GF_JSAPIURI;
+
+typedef struct
+{
+	const char *section;
+	const char *key;
+	const char *key_val;
+} GF_JSAPIOPT;
+
+	/*for script message option*/
+typedef struct
+{
+	GF_Err e;
+	const char *msg;
+} GF_JSAPIINFO;
+
+
+typedef union
+{
+	u32 opt;
+	Fixed val;
+	GF_Point2D pt;
+	GF_Rect rc;
+	Double time;
+	GF_BBox bbox;
+	GF_Matrix mx;
+	GF_JSAPIURI uri;
+	GF_JSAPIOPT gpac_cfg;
+	GF_Node *node;
+	struct __gf_download_manager *dnld_man;
+	GF_SceneGraph *scene;
+	void *term;
+	GF_JSAPIINFO info;
+} GF_JSAPIParam;
+
+enum
+{
+	/*!push message from script engine.*/
+	GF_JSAPI_OP_MESSAGE,
+	/*!get scene URI.*/
+	GF_JSAPI_OP_GET_SCENE_URI,
+	/*!get current user agent scale.*/
+	GF_JSAPI_OP_GET_SCALE,
+	/*!set current user agent scale.*/
+	GF_JSAPI_OP_SET_SCALE,
+	/*!get current user agent rotation.*/
+	GF_JSAPI_OP_GET_ROTATION,
+	/*!set current user agent rotation.*/
+	GF_JSAPI_OP_SET_ROTATION,
+	/*!get current user agent translation.*/
+	GF_JSAPI_OP_GET_TRANSLATE,
+	/*!set current user agent translation.*/
+	GF_JSAPI_OP_SET_TRANSLATE,
+	/*!get node time.*/
+	GF_JSAPI_OP_GET_TIME,
+	/*!set node time.*/
+	GF_JSAPI_OP_SET_TIME,
+	/*!get current viewport.*/
+	GF_JSAPI_OP_GET_VIEWPORT,
+	/*!get object bounding box in object local coord system.*/
+	GF_JSAPI_OP_GET_LOCAL_BBOX,
+	/*!get object bounding box in world (screen) coord system.*/
+	GF_JSAPI_OP_GET_SCREEN_BBOX,
+	/*!get transform matrix at object.*/
+	GF_JSAPI_OP_GET_TRANSFORM,
+	/*!move focus according to opt value.*/
+	GF_JSAPI_OP_MOVE_FOCUS,
+	/*!set focus to given node.*/
+	GF_JSAPI_OP_GET_FOCUS,
+	/*!set focus to given node.*/
+	GF_JSAPI_OP_SET_FOCUS,
+	/*!replace target scene URL*/
+	GF_JSAPI_OP_LOAD_URL,
+	/*!get option by section and key*/
+	GF_JSAPI_OP_GET_OPT,
+	/*!get option by section and key*/
+	GF_JSAPI_OP_SET_OPT,
+	/*!retrieve download manager*/
+	GF_JSAPI_OP_GET_DOWNLOAD_MANAGER,
+	/*!get navigation speed if any*/
+	GF_JSAPI_OP_GET_SPEED,
+	/*!get current frame rate*/
+	GF_JSAPI_OP_GET_FPS,
+	/*!set current title*/
+	GF_JSAPI_OP_SET_TITLE,
+	/*!gets DCCI scenegraph if any*/
+	GF_JSAPI_OP_GET_DCCI,
+	/*!gets subscene for current node if any*/
+	GF_JSAPI_OP_GET_SUBSCENE,
+	/*!resolves relative Xlink based on xml:base*/
+	GF_JSAPI_OP_RESOLVE_XLINK,
+	/*!evaluates if the given IRI is available for playback (returns 1) or not. If the IRI is
+	NULL, this evaluates whether the scene is ready for composition (canvas setup) or not.*/
+	GF_JSAPI_OP_EVAL_IRI,
+
+	/*!gets GPAC terminal*/
+	GF_JSAPI_OP_GET_TERM,
+
+	/*!pauses an SVG element*/
+	GF_JSAPI_OP_PAUSE_SVG,
+	/*!resumes an SVG ELEMENT*/
+	GF_JSAPI_OP_RESUME_SVG,
+	/*!gets the DPI*/
+	GF_JSAPI_OP_GET_DPI_X,
+	GF_JSAPI_OP_GET_DPI_Y,
+};
+/*
+interface to various get/set options:
+	type: operand type, one of the above
+	node: target node, scene root node or NULL
+	param: i/o param, depending on operand type
+*/
+typedef Bool (*gf_sg_script_action)(void *callback, u32 type, GF_Node *node, GF_JSAPIParam *param);
+
+/*assign API to scene graph - by default, sub-graphs inherits the API if set*/
+void gf_sg_set_script_action(GF_SceneGraph *scene, gf_sg_script_action script_act, void *cbk);
+
+/*load script into engine - this should be called only for script in main scene, loading of scripts
+in protos is done internally when instanciating the proto*/
+void gf_sg_script_load(GF_Node *script);
+
+/*returns true if current lib has javascript support*/
+Bool gf_sg_has_scripting();
+
+
+
+/*
+			scene graph command tools used for BIFS and LASeR
+		These are used to store updates in memory without applying changes to the graph, 
+	for dumpers, encoders ... 
+		The commands can then be applied through this lib
+*/
+
+/*
+		Currently defined possible modifications
+*/
+enum
+{
+	/*BIFS commands*/
+	GF_SG_SCENE_REPLACE = 0,
+	GF_SG_NODE_REPLACE,
+	GF_SG_FIELD_REPLACE, 
+	GF_SG_INDEXED_REPLACE,
+	GF_SG_ROUTE_REPLACE,
+	GF_SG_NODE_DELETE,
+	GF_SG_INDEXED_DELETE,
+	GF_SG_ROUTE_DELETE,
+	GF_SG_NODE_INSERT,
+	GF_SG_INDEXED_INSERT,
+	GF_SG_ROUTE_INSERT,
+	/*extended updates (BIFS-only)*/
+	GF_SG_PROTO_INSERT,
+	GF_SG_PROTO_DELETE,
+	GF_SG_PROTO_DELETE_ALL,
+	GF_SG_MULTIPLE_REPLACE,
+	GF_SG_MULTIPLE_INDEXED_REPLACE,
+	GF_SG_GLOBAL_QUANTIZER,
+	/*same as NodeDelete, and also updates OrderedGroup.order when deleting a child*/
+	GF_SG_NODE_DELETE_EX,
+
+	/*BIFS*/
+	GF_SG_FIELD_REPLACE_OP, 
+	GF_SG_INDEXED_REPLACE_OP,
+
+	GF_SG_LAST_BIFS_COMMAND,
+
+
+	/*LASER commands*/
+	GF_SG_LSR_NEW_SCENE,
+	GF_SG_LSR_REFRESH_SCENE,
+	GF_SG_LSR_ADD,
+	GF_SG_LSR_CLEAN,
+	GF_SG_LSR_REPLACE,
+	GF_SG_LSR_DELETE,
+	GF_SG_LSR_INSERT,
+	GF_SG_LSR_RESTORE,
+	GF_SG_LSR_SAVE,
+	GF_SG_LSR_SEND_EVENT,
+	GF_SG_LSR_ACTIVATE,
+	GF_SG_LSR_DEACTIVATE,
+
+	GF_SG_UNDEFINED
+};
+
+
+/*
+				single command wrapper
+
+  NOTE: In order to maintain node registry, the nodes replaced/inserted MUST be registered with 
+  their parents even when the command is never applied. Registering shall be performed 
+  with gf_node_register (see below).
+  If you fail to do so, a node may be destroyed when destroying a command while still used
+  in another command or in the graph - this will just crash.
+*/
+
+/*structure used to store field info, pos and static pointers to GF_Node/MFNode in commands*/
+typedef struct
+{
+	u32 fieldIndex;
+	/*field type*/
+	u32 fieldType;
+	/*field pointer for multiple replace/multiple indexed replace - if multiple indexed replace, must be the SF field being changed*/
+	void *field_ptr;
+	/*replace/insert/delete pos - -1 is append except in multiple indexed replace*/
+	s32 pos;
+
+	/*Whenever field pointer is of type GF_Node, store the node here and set the far pointer to this address.*/
+	GF_Node *new_node;
+	/*Whenever field pointer is of type MFNode, store the node list here and set the far pointer to this address.*/
+	GF_ChildNodeItem *node_list;
+} GF_CommandField;
+
+typedef struct
+{
+	GF_SceneGraph *in_scene;
+	u32 tag;
+
+	/*node the command applies to - may be NULL*/
+	GF_Node *node;
+
+	/*list of GF_CommandField for all field commands replace/ index insert / index replace / index delete / MultipleReplace / MultipleIndexedreplace 
+	the content is destroyed when deleting the command*/
+	GF_List *command_fields;
+
+	/*may be NULL, and may be present with any command inserting a node*/
+	GF_List *scripts_to_load;
+	/*for authoring purposes - must be cleaned by user*/
+	Bool unresolved;
+	char *unres_name;
+	
+	/*scene replace command: 
+		root node is stored in com->node
+		protos are stored in com->new_proto_list
+		routes are stored as RouteInsert in the same frame
+		BIFS only
+	*/
+	Bool use_names;
+
+	/*proto list to insert - BIFS only*/
+	GF_List *new_proto_list;
+	/*proto ID list to delete - BIFS only*/
+	u32 *del_proto_list;
+	u32 del_proto_list_size;
+
+
+	/*route insert, replace and delete (BIFS only)
+		fromNodeID is also used to identify operandElementId in LASeR Add/Replace
+
+	OR
+		sendEvent
+	*/
+//	union {
+		u32 RouteID;
+		u32 send_event_name;
+//	};
+//	union {
+		char *def_name;
+		char *send_event_string;
+//	};
+//	union {
+		u32 fromNodeID;
+		s32 send_event_integer;
+//	};
+	u32 fromFieldIndex;
+
+//	union {
+		u32 toNodeID;
+		s32 send_event_x;
+//	};
+//	union {
+		u32 toFieldIndex;
+		s32 send_event_y;
+//	};
+	Bool aggregated;
+} GF_Command;
+
+
+/*creates command - graph only needed for SceneReplace*/
+GF_Command *gf_sg_command_new(GF_SceneGraph *in_scene, u32 tag);
+/*deletes command*/
+void gf_sg_command_del(GF_Command *com);
+/*apply command to graph - the command content is kept unchanged for authoring purposes - THIS NEEDS TESTING AND FIXING
+@time_offset: offset for time fields if desired*/
+GF_Err gf_sg_command_apply(GF_SceneGraph *inScene, GF_Command *com, Double time_offset);
+/*apply list if command to graph - the command content is kept unchanged for authoring purposes
+@time_offset: offset for time fields if desired*/
+GF_Err gf_sg_command_apply_list(GF_SceneGraph *graph, GF_List *comList, Double time_offset);
+/*returns new commandFieldInfo structure and registers it with command*/
+GF_CommandField *gf_sg_command_field_new(GF_Command *com);
+/*clones the command in another graph - needed for uncompressed conditional in protos
+if force_clone is not set and the target graph is the same as the command graph, nodes are just registered
+with the new commands rather than cloned*/
+GF_Command *gf_sg_command_clone(GF_Command *com, GF_SceneGraph *inGraph, Bool force_clone);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+
+#endif /*_GF_SCENEGRAPH_H_*/
+
+
diff --git a/tstools/DtsEdit/src/gpac/scenegraph_svg.h b/tstools/DtsEdit/src/gpac/scenegraph_svg.h
new file mode 100644
index 0000000..c153120
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/scenegraph_svg.h
@@ -0,0 +1,620 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Cyril Concolato 2004
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / SVG 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. 
+ *
+ */
+
+#ifndef _GF_SG_SVG_H_
+#define _GF_SG_SVG_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/scenegraph.h>
+#include <gpac/svg_types.h>
+
+/*******************************************************************************
+ * 
+ *          DOM base scene graph
+ *
+ *******************************************************************************/
+
+enum
+{
+	/*should never be used, this is only a parsing error*/
+	TAG_DOM_ATTRIBUTE_NULL,
+	/*this tag is set for a full dom attribute only - attribute name is then available*/
+	TAG_DOM_ATT_any,
+
+	TAG_XML_ATT_RANGE_FIRST,
+	TAG_XML_ATT_id = TAG_XML_ATT_RANGE_FIRST,
+	TAG_XML_ATT_base,
+	TAG_XML_ATT_lang,
+	TAG_XML_ATT_space,
+	TAG_XML_ATT_RANGE_LAST,
+	TAG_XLINK_ATT_RANGE_FIRST,
+
+	TAG_XLINK_ATT_type = TAG_XLINK_ATT_RANGE_FIRST,
+	TAG_XLINK_ATT_role,
+	TAG_XLINK_ATT_arcrole,
+	TAG_XLINK_ATT_title,
+	TAG_XLINK_ATT_href,
+	TAG_XLINK_ATT_show,
+	TAG_XLINK_ATT_actuate,
+	TAG_XLINK_ATT_RANGE_LAST,
+
+	TAG_XMLEV_ATT_RANGE_FIRST,
+	TAG_XMLEV_ATT_event,
+	TAG_XMLEV_ATT_phase,
+	TAG_XMLEV_ATT_propagate,
+	TAG_XMLEV_ATT_defaultAction,
+	TAG_XMLEV_ATT_observer,
+	TAG_XMLEV_ATT_target,
+	TAG_XMLEV_ATT_handler,
+	TAG_XMLEV_ATT_RANGE_LAST,
+
+	TAG_LSR_ATT_RANGE_FIRST,
+	TAG_LSR_ATT_enabled,
+	TAG_LSR_ATT_RANGE_LAST,
+	/*these attribute types are only use for binary purpose*/
+	TAG_LSR_ATT_children,
+	TAG_LSR_ATT_overflow,
+	TAG_LSR_ATT_rotation,
+	TAG_LSR_ATT_scale,
+	TAG_LSR_ATT_translation,
+	TAG_LSR_ATT_svg_width,
+	TAG_LSR_ATT_svg_height,
+	TAG_LSR_ATT_textContent,
+	/*WHAT THE HECK IS THIS THING IN THE SDL BUT NOWHERE IN THE SPEC ?*/
+	TAG_LSR_ATT_text_display,
+
+	TAG_SVG_ATT_RANGE_FIRST,
+
+	TAG_XBL_ATT_RANGE_FIRST = TAG_SVG_ATT_RANGE_FIRST + 256,
+	TAG_XBL_ATT_id = TAG_XBL_ATT_RANGE_FIRST,
+	TAG_XBL_ATT_extends,
+	TAG_XBL_ATT_display,
+	TAG_XBL_ATT_inheritstyle,
+	TAG_XBL_ATT_includes,
+	TAG_XBL_ATT_name,
+	TAG_XBL_ATT_implements,
+	TAG_XBL_ATT_type,
+	TAG_XBL_ATT_readonly,
+	TAG_XBL_ATT_onget,
+	TAG_XBL_ATT_onset,
+	TAG_XBL_ATT_event,
+	TAG_XBL_ATT_action,
+	TAG_XBL_ATT_phase,
+	TAG_XBL_ATT_button,
+	TAG_XBL_ATT_modifiers,
+	TAG_XBL_ATT_keycode,
+	TAG_XBL_ATT_key,
+	TAG_XBL_ATT_charcode,
+	TAG_XBL_ATT_clickcount,
+	TAG_XBL_ATT_command,
+	TAG_XBL_ATT_preventdefault,
+	TAG_XBL_ATT_src,
+};
+
+
+#define GF_DOM_BASE_ATTRIBUTE	\
+	u16 tag;	/*attribute identifier*/	\
+	u16 data_type; /*attribute datatype*/	  \
+	void *data; /*data pointer*/				\
+	struct __dom_base_attribute *next; /*next attribute*/
+
+#define GF_DOM_FULL_ATTRIBUTE	\
+	GF_DOM_ATTRIBUTE	\
+
+typedef struct __dom_base_attribute
+{
+	GF_DOM_BASE_ATTRIBUTE
+} GF_DOMAttribute;
+
+typedef struct __dom_full_attribute
+{
+	GF_DOM_BASE_ATTRIBUTE
+	u32 xmlns;
+	char *name; /*attribute name - in this case, the data field is the attribute literal value*/
+} GF_DOMFullAttribute;
+
+#define GF_DOM_BASE_NODE	 \
+	BASE_NODE				\
+	CHILDREN				\
+	GF_DOMAttribute *attributes;
+
+typedef struct __dom_base_node
+{
+	GF_DOM_BASE_NODE
+} GF_DOMNode;
+
+typedef struct __dom_full_node
+{
+	GF_DOM_BASE_NODE
+	char *name;
+	u32 ns;
+} GF_DOMFullNode;
+
+
+
+enum
+{
+	/*no NS specified, it will be evaluated from attribute/node name*/
+	GF_XMLNS_NONE,
+
+	GF_XMLNS_XML,
+	GF_XMLNS_XLINK,
+	GF_XMLNS_XMLEV,
+	GF_XMLNS_LASER,
+	GF_XMLNS_SVG,
+	GF_XMLNS_XBL,
+
+	/*any other namespace uses the CRC32 of the namespace as an identifier*/
+};
+
+GF_Err gf_sg_add_namespace(GF_SceneGraph *sg, char *name, char *qname);
+GF_Err gf_sg_remove_namespace(GF_SceneGraph *sg, char *name, char *qname);
+u32 gf_sg_get_namespace_code(GF_SceneGraph *sg, char *qname);
+u32 gf_sg_get_namespace_code_from_name(GF_SceneGraph *sg, char *name);
+const char *gf_sg_get_namespace_qname(GF_SceneGraph *sg, u32 xmlns_id);
+
+u32 gf_xml_get_element_namespace(GF_Node *n);
+const char *gf_sg_get_namespace(GF_SceneGraph *sg, u32 xmlns_id);
+
+void gf_xml_push_namespaces(GF_DOMNode *elt);
+void gf_xml_pop_namespaces(GF_DOMNode *elt);
+
+
+
+
+enum
+{
+	GF_DOM_TEXT_REGULAR = 0,
+	GF_DOM_TEXT_CDATA,
+	/*inserted text node (typically external script)*/
+	GF_DOM_TEXT_INSERTED
+};
+
+typedef struct
+{
+	BASE_NODE
+	CHILDREN
+	char *textContent;
+	u32 type;
+} GF_DOMText;
+
+/*creates a new text node, assign string (does NOT duplicate it) and register node with parent if desired*/
+GF_DOMText *gf_dom_add_text_node(GF_Node *parent, char *text_data);
+
+/*creates a new text node - this DOES NOT register the node at all*/
+GF_DOMText *gf_dom_new_text_node(GF_SceneGraph *sg);
+
+typedef struct
+{
+	BASE_NODE
+	CHILDREN
+	char *data;
+	u32 data_size;
+	GF_List *updates;
+} GF_DOMUpdates;
+
+/*creates a new updates node and register node with parent*/
+GF_DOMUpdates *gf_dom_add_updates_node(GF_Node *parent);
+
+typedef struct
+{
+	Bool bufferValid;
+	u32 level;
+	Fixed remaining_time;
+	u16 status;
+	const char *session_name;
+	u32 nb_streams;
+	struct mae_item {u32 streamType; u32 mediaType; u32 transport; } streams[20];
+} GF_DOMMediaAccessEvent;
+
+/* 
+	DOM event handling
+*/
+enum
+{
+	GF_DOM_EVENT_PHASE_CAPTURE = 1,
+	GF_DOM_EVENT_PHASE_AT_TARGET = 2,
+	GF_DOM_EVENT_PHASE_BUBBLE = 3,
+
+	/*special phase indicating the event has been canceled*/
+	GF_DOM_EVENT_PHASE_CANCEL = 1<<5,
+	/*special phase indicating the event has been canceled immediately*/
+	GF_DOM_EVENT_PHASE_CANCEL_ALL = 1<<6,
+	/*special phase indicating the default action of the event is prevented*/
+	GF_DOM_EVENT_PHASE_PREVENT = 1<<7,
+};
+
+/*possible event targets*/
+enum
+{
+	GF_DOM_EVENT_NODE,
+	GF_DOM_EVENT_DOCUMENT,
+	GF_DOM_EVENT_XHR,
+	GF_DOM_EVENT_TIMER,
+	GF_DOM_EVENT_CONNECTION,
+};
+
+typedef struct 
+{
+	GF_List *evt_list;
+	void *ptr;
+	u32 ptr_type;
+} GF_DOMEventTarget;
+
+GF_Err gf_dom_listener_add(GF_Node *listener, GF_DOMEventTarget *evt_target);
+
+
+typedef struct
+{
+	/*event type, as defined in <gpac/events.h>*/
+	u32 type;
+	/*event phase type, READ-ONLY
+	0: at target, 1: bubbling, 2: capturing , 3: canceled
+	*/
+	u8 event_phase;
+	u8 bubbles;
+	u8 cancelable;
+	/*output only - indicates UI events (mouse) have been detected*/
+	u8 has_ui_events;
+	
+	/*we don't use a GF_DOMEventTarget here since the structure is only created when events are attached */
+	void *target;
+	u32 target_type;
+
+	GF_DOMEventTarget *currentTarget;
+	Double timestamp;
+	/*UIEvent extension.	
+		For mouse extensions: number of clicks 
+		For key event: the key code
+		For SMIL event: number of iteration (repeat)
+	*/
+	u32 detail;
+
+	/*MouseEvent extension*/
+	s32 screenX, screenY;
+	s32 clientX, clientY;
+	u32 button;
+	/*key flags*/
+	u32 key_flags;
+	/*key hardware code*/
+	u32 key_hw_code;
+	GF_Node *relatedTarget;
+	/*Zoom event*/
+	GF_Rect screen_rect;
+	GF_Point2D prev_translate, new_translate;
+	Fixed prev_scale, new_scale;
+	/* CPU */
+	u32 cpu_percentage;
+	/* Battery */
+	Bool onBattery;
+	u32 batteryState, batteryLevel;
+	/*smil event time*/
+	Double smil_event_time;
+	/* mutation event */
+	GF_Node *relatedNode;
+
+	/*DOM event used in VRML (GPAC's internal)*/
+	Bool is_vrml;
+	GF_DOMMediaAccessEvent *mae;
+
+	/*number of listeners triggered by the event*/
+	u32 consumed;
+} GF_DOM_Event;
+
+/*fires event on the specified node
+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);
+
+/*fires event on the specified node
+BE CAREFULL: event execution may very well destroy ANY node, especially the event target node !!
+use_stack: a list of parent node/use node pairs for bubbling phase - may be NULL
+*/
+Bool gf_dom_event_fire_ex(GF_Node *node, GF_DOM_Event *event, GF_List *use_stack);
+
+u32 gf_dom_event_type_by_name(const char *name);
+const char *gf_dom_event_get_name(u32 type);
+
+const char *gf_dom_get_key_name(u32 key_identifier);
+u32 gf_dom_get_key_type(char *key_name);
+
+
+/*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.*/
+
+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_DOMHandler;
+
+
+
+enum
+{
+	/*basic DOM events*/
+	GF_DOM_EVENT_DOM = 1,
+	/*DOM mutation events*/
+	GF_DOM_EVENT_MUTATION = 1<<1,
+	/*DOM mouse events*/
+	GF_DOM_EVENT_MOUSE = 1<<2,
+	/*DOM focus events*/
+	GF_DOM_EVENT_FOCUS = 1<<3,
+	/*DOM key events*/
+	GF_DOM_EVENT_KEY = 1<<4,
+	/*DOM/SVG/HTML UI events (resize, scroll, ...)*/
+	GF_DOM_EVENT_UI = 1<<5,
+	/*text events*/
+	GF_DOM_EVENT_TEXT = 1<<6,
+	/*SVG events*/
+	GF_DOM_EVENT_SVG = 1<<7,
+	/*SMIL events*/
+	GF_DOM_EVENT_SMIL = 1<<8,
+	/*LASeR events*/
+	GF_DOM_EVENT_LASER = 1<<9,
+	/*MediaAccess events*/
+	GF_DOM_EVENT_MEDIA_ACCESS = 1<<10,
+
+	/*fake events - these events are NEVER fired*/
+	GF_DOM_EVENT_FAKE = 1<<31,
+};
+u32 gf_dom_event_get_category(u32 type);
+u32 gf_sg_get_dom_event_filter(GF_SceneGraph *sg);
+u32 gf_node_get_dom_event_filter(GF_Node *node);
+
+void gf_sg_register_event_type(GF_SceneGraph *sg, u32 type);
+void gf_sg_unregister_event_type(GF_SceneGraph *sg, u32 type);
+
+/*adds a listener to the node.
+The listener node is NOT registered with the node (it may very well not be a direct child of the node)
+@listener is a listenerElement (XML event)
+*/
+GF_Err gf_node_dom_listener_add(GF_Node *node, GF_Node *listener);
+u32 gf_dom_listener_count(GF_Node *node);
+GF_Node *gf_dom_listener_get(GF_Node *node, u32 i);
+
+/*creates a default listener/handler for the given event on the given node, and return the 
+handler element to allow for handler function override
+Listener/handler are stored at the node level*/
+GF_DOMHandler *gf_dom_listener_build(GF_Node *observer, u32 event_type, u32 event_param);
+
+
+void gf_node_register_iri(GF_SceneGraph *sg, XMLRI *iri);
+void gf_node_unregister_iri(GF_SceneGraph *sg, XMLRI *iri);
+u32 gf_node_animation_count(GF_Node *node);
+
+GF_Err gf_node_store_embedded_data(XMLRI *iri, const char *cache_dir, const char *base_filename);
+
+
+/**************************************************
+ *  SVG's styling properties (see 6.1 in REC 1.1) *
+ *************************************************/
+
+typedef struct {
+	/* Tiny 1.2 properties*/
+	SVG_Paint					*color;
+	SVG_Paint					*fill; 
+	SVG_Paint					*stroke;
+	SVG_Paint					*solid_color;
+	SVG_Paint					*stop_color;
+	SVG_Paint					*viewport_fill;
+
+	SVG_Number					*fill_opacity;
+	SVG_Number					*solid_opacity;
+	SVG_Number					*stop_opacity;
+	SVG_Number					*stroke_opacity;
+	SVG_Number					*viewport_fill_opacity;
+	SVG_Number					*opacity; /* Restricted property in Tiny 1.2 */
+
+	SVG_Number					*audio_level;
+	Fixed						computed_audio_level;
+
+	SVG_RenderingHint			*color_rendering;
+	SVG_RenderingHint			*image_rendering;
+	SVG_RenderingHint			*shape_rendering;
+	SVG_RenderingHint			*text_rendering;
+
+	SVG_Display					*display; 
+	SVG_Visibility				*visibility;
+	SVG_Overflow				*overflow; /* Restricted property in Tiny 1.2 */
+	
+	SVG_FontFamily				*font_family;
+	SVG_FontSize				*font_size;
+	SVG_FontStyle				*font_style; 
+	SVG_FontWeight				*font_weight; 
+	SVG_FontVariant				*font_variant; 
+	SVG_Number					*line_increment;	
+	SVG_TextAnchor				*text_anchor;
+	SVG_DisplayAlign			*display_align;
+	SVG_TextAlign				*text_align;
+
+	SVG_PointerEvents			*pointer_events;
+	
+	SVG_FillRule				*fill_rule; 
+	
+	SVG_StrokeDashArray			*stroke_dasharray;
+	SVG_Length					*stroke_dashoffset;
+	SVG_StrokeLineCap			*stroke_linecap; 
+	SVG_StrokeLineJoin			*stroke_linejoin; 
+	SVG_Number					*stroke_miterlimit; 
+	SVG_Length					*stroke_width;
+	SVG_VectorEffect			*vector_effect;
+	
+	/* Full 1.1 props, i.e. not implemented */
+/*
+	SVG_String *font;
+	SVG_String *font_size_adjust;
+	SVG_String *font_stretch;
+	SVG_String *direction;
+	SVG_String *letter_spacing;
+	SVG_String *text_decoration;
+	SVG_String *unicode_bidi;
+	SVG_String *word_spacing;
+	SVG_String *clip; 
+	SVG_String *cursor;
+	SVG_String *clip_path;
+	SVG_String *clip_rule;
+	SVG_String *mask;
+	SVG_String *enable_background;
+	SVG_String *filter;
+	SVG_String *flood_color;
+	SVG_String *flood_opacity;
+	SVG_String *lighting_color;
+	SVG_String *color_interpolation;
+	SVG_String *color_interpolation_filters;
+	SVG_String *color_profile;
+	SVG_String *marker;
+	SVG_String *marker_end;
+	SVG_String *marker_mid;
+	SVG_String *marker_start;
+	SVG_String *alignment_baseline;
+	SVG_String *baseline_shift;
+	SVG_String *dominant_baseline;
+	SVG_String *glyph_orientation_horizontal;
+	SVG_String *glyph_orientation_vertical;
+	SVG_String *kerning;
+	SVG_String *writing_mode;
+*/
+} SVGPropertiesPointers;
+
+/*************************************
+ * Generic SVG element functions     *
+ *************************************/
+
+void gf_svg_properties_init_pointers(SVGPropertiesPointers *svg_props);
+void gf_svg_properties_reset_pointers(SVGPropertiesPointers *svg_props);
+
+void gf_svg_apply_animations(GF_Node *node, SVGPropertiesPointers *render_svg_props);
+Bool gf_svg_has_appearance_flag_dirty(u32 flags);
+
+Bool gf_svg_is_element_transformable(u32 tag);
+
+void *gf_svg_create_attribute_value(u32 attribute_type);
+void gf_svg_delete_attribute_value(u32 type, void *value, GF_SceneGraph *sg);
+/* a == b */
+Bool gf_svg_attributes_equal(GF_FieldInfo *a, GF_FieldInfo *b);
+/* a = b */
+GF_Err gf_svg_attributes_copy(GF_FieldInfo *a, GF_FieldInfo *b, Bool clamp);
+/* c = a + b */
+GF_Err gf_svg_attributes_add(GF_FieldInfo *a, GF_FieldInfo *b, GF_FieldInfo *c, Bool clamp);
+Bool gf_svg_attribute_is_interpolatable(u32 type) ;
+/* c = coef * a + (1 - coef) * b */
+GF_Err gf_svg_attributes_interpolate(GF_FieldInfo *a, GF_FieldInfo *b, GF_FieldInfo *c, Fixed coef, Bool clamp);
+/* c = alpha * a + beta * b */
+GF_Err gf_svg_attributes_muladd(Fixed alpha, GF_FieldInfo *a, Fixed beta, GF_FieldInfo *b, GF_FieldInfo *c, Bool clamp);
+
+GF_Err gf_node_get_attribute_by_tag(GF_Node *node, u32 attribute_tag, Bool create_if_not_found, Bool set_default, GF_FieldInfo *field);
+
+char *gf_svg_attribute_type_to_string(u32 att_type);
+GF_Err gf_svg_parse_attribute(GF_Node *n, GF_FieldInfo *info, char *attribute_content, u8 anim_value_type);
+void gf_svg_parse_style(GF_Node *n, char *style);
+
+GF_Err gf_svg_dump_attribute(GF_Node *elt, GF_FieldInfo *info, char *attValue);
+GF_Err gf_svg_dump_attribute_indexed(GF_Node *elt, GF_FieldInfo *info, char *attValue);
+
+void gf_svg_path_build(GF_Path *path, GF_List *commands, GF_List *points);
+
+GF_Err gf_svg_parse_element_id(GF_Node *n, const char *nodename, Bool warning_if_defined);
+
+const char *gf_svg_get_system_paint_server_name(u32 paint_type);
+u32 gf_svg_get_system_paint_server_type(const char *name);
+
+
+Bool gf_smil_notify_timed_elements(GF_SceneGraph *sg);
+void gf_smil_timing_insert_clock(GF_Node *elt, Bool is_end, Double clock);
+
+void gf_svg_parse_transformlist(GF_Matrix2D *mat, char *attribute_content);
+
+typedef struct _smil_timing_rti SMIL_Timing_RTI;
+
+enum
+{
+	SMIL_TIMING_EVAL_NONE = 0,
+	SMIL_TIMING_EVAL_UPDATE,
+	SMIL_TIMING_EVAL_FREEZE,
+	SMIL_TIMING_EVAL_REMOVE,
+	SMIL_TIMING_EVAL_REPEAT,
+	SMIL_TIMING_EVAL_FRACTION,
+	SMIL_TIMING_EVAL_DISCARD,
+	/*signaled the animation element has been inserted in the DOM tree*/
+	SMIL_TIMING_EVAL_ACTIVATE,
+	/*signaled the animation element has been removed from the DOM tree*/
+	SMIL_TIMING_EVAL_DEACTIVATE,
+};
+
+void gf_smil_set_evaluation_callback(GF_Node *smil_time, 
+									 void (*smil_evaluate)(struct _smil_timing_rti *rti, Fixed normalized_simple_time, u32 state));
+
+void gf_smil_set_media_duration(SMIL_Timing_RTI *rti, Double media_duration);
+Double gf_smil_get_media_duration(SMIL_Timing_RTI *rti);
+GF_Node *gf_smil_get_element(SMIL_Timing_RTI *rti);
+
+Bool gf_smil_timing_is_active(GF_Node *node);
+void gf_smil_timing_modified(GF_Node *node, GF_FieldInfo *field);
+
+/*******************************************************************************
+ * 
+ *          SVG Scene Graph for dynamic allocation of attributes	           *
+ *
+ *******************************************************************************/
+
+/*SVG attributes are just DOM ones*/
+typedef struct __dom_base_attribute SVGAttribute;
+typedef struct __dom_full_attribute SVGExtendedAttribute;
+typedef struct __dom_base_node SVG_Element;
+
+typedef struct __xml_ev_handler SVG_handlerElement;
+
+
+typedef struct _all_atts SVGAllAttributes;
+
+void gf_svg_flatten_attributes(SVG_Element *e, SVGAllAttributes *all_atts);
+const char *gf_svg_get_attribute_name(GF_Node *elt, u32 tag);
+u32 gf_svg_apply_inheritance(SVGAllAttributes *all_atts, SVGPropertiesPointers *render_svg_props) ;
+
+GF_DOMAttribute *gf_xml_create_attribute(GF_Node *node, u32 tag);
+u32 gf_xml_get_attribute_type(u32 tag);
+u32 gf_xml_get_attribute_tag(GF_Node *node, char *attribute_name, u32 ns);
+
+u32 gf_xml_get_element_tag(const char *element_name, u32 xmlns);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	//_GF_SG_SVG_H_
diff --git a/tstools/DtsEdit/src/gpac/scenegraph_vrml.h b/tstools/DtsEdit/src/gpac/scenegraph_vrml.h
new file mode 100644
index 0000000..f0af8fb
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/scenegraph_vrml.h
@@ -0,0 +1,623 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005
+ *					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. 
+ *
+ */
+
+
+#ifndef _GF_SG_VRML_H_
+#define _GF_SG_VRML_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/scenegraph.h>
+#include <gpac/math.h>
+
+/*
+	All extensions for VRML/MPEG-4/X3D graph structure	
+*/
+
+/*reserved NDT for MPEG4 (match binary coding)*/
+#define MPEG4_RESERVED_NDT		200
+
+/*the NDTs used in X3D not defined in MPEG4*/
+enum
+{
+	NDT_SFMetadataNode = MPEG4_RESERVED_NDT+1,
+	NDT_SFFillPropertiesNode,
+	NDT_SFX3DLinePropertiesNode,
+	NDT_SFGeoOriginNode,
+	NDT_SFHAnimNode,
+	NDT_SFHAnimDisplacerNode,
+	NDT_SFNurbsControlCurveNode,
+	NDT_SFNurbsSurfaceNode,
+	NDT_SFNurbsCurveNode
+};
+
+/*
+	VRML / BIFS TYPES DEFINITION
+*/
+
+/*
+				event types, as defined in the specs 
+	this should not be needed by non binary codecs
+*/
+enum
+{
+	GF_SG_EVENT_FIELD		=	0,
+	GF_SG_EVENT_EXPOSED_FIELD	=	1,
+	GF_SG_EVENT_IN		=	2,
+	GF_SG_EVENT_OUT		=	3,
+	GF_SG_EVENT_UNKNOWN	=	4
+};
+const char *gf_sg_vrml_get_event_type_name(u32 EventType, Bool forX3D);
+
+/*
+				field coding mode
+
+	BIFS defines the bitstream syntax contextually, and therefore sometimes refer to fields as indexed
+  in the node ("all" mode) or just as a sub-set (in, out, def, dyn modes) of similar types
+*/
+enum
+{
+	/*all fields and events*/
+	GF_SG_FIELD_CODING_ALL		=	0,
+	/*defined fields (exposedField and Field)*/
+	GF_SG_FIELD_CODING_DEF		=	1,
+	/*input field (exposedField and eventIn)*/
+	GF_SG_FIELD_CODING_IN		=	2,
+	/*output field (exposedField and eventOut)*/
+	GF_SG_FIELD_CODING_OUT		=	3,
+	/*field that can be animated (subset of inFields) used in BIFS_Anim only*/
+	GF_SG_FIELD_CODING_DYN		=	4
+};
+
+/*get the number of field in the given mode (BIFS specific)*/
+u32 gf_node_get_num_fields_in_mode(GF_Node *Node, u8 IndexMode);
+
+/*		SF Types	*/
+typedef Bool SFBool;
+typedef s32 SFInt32;
+typedef s32 SFInt;
+typedef Fixed SFFloat;
+typedef Double SFDouble;
+
+typedef struct
+{
+	char* buffer;
+} SFString;
+
+typedef Double SFTime;
+
+typedef struct {
+	Fixed	red;
+	Fixed	green;
+	Fixed	blue;
+} SFColor;
+
+typedef struct {
+	Fixed	red;
+	Fixed	green;
+	Fixed	blue;
+	Fixed	alpha;
+} SFColorRGBA;
+
+typedef struct {
+	u32 OD_ID;
+	char *url;
+} SFURL;
+
+typedef struct {
+	Double	x;
+	Double	y;
+} SFVec2d;
+
+typedef struct {
+	Double	x;
+	Double	y;
+	Double	z;
+} SFVec3d;
+
+/*typedef's to main math tools*/
+typedef struct __vec2f SFVec2f;
+typedef struct __vec3f SFVec3f;
+typedef struct __vec4f SFRotation;
+typedef struct __vec4f SFVec4f;
+
+typedef struct {
+	u32 width;
+	u32 height;
+	u8 numComponents;
+	unsigned char* pixels;
+} SFImage;
+typedef struct {
+	u32 bufferSize;
+	unsigned char* buffer;
+	/*uncompressed command list*/
+	GF_List *commandList;
+} SFCommandBuffer;
+
+/*Note on SFScript: the javascript or vrml script is handled in its decompressed (textual) format
+since most JS interpreter work with text*/
+typedef struct {
+	unsigned char* script_text;
+} SFScript;
+
+
+/*		MF Types	*/
+
+/*generic MF field: all MF fields use the same syntax except MFNode which uses GF_List. You  can thus use
+this structure to safely typecast MF field pointers*/
+typedef struct {
+	u32 count;
+	char *array;
+} GenMFField;
+
+typedef struct {
+	u32 count;
+	s32* vals;
+} MFInt32;
+typedef struct {
+	u32 count;
+	s32* vals;
+} MFInt;
+typedef struct {
+	u32 count;
+	Fixed *vals;
+} MFFloat;
+typedef struct {
+	u32 count;
+	Double *vals;
+} MFDouble;
+typedef struct {
+	u32 count;
+	u32* vals;
+} MFBool;
+typedef struct {
+	u32 count;
+	SFColor* vals;
+} MFColor;
+typedef struct {
+	u32 count;
+	SFColorRGBA* vals;
+} MFColorRGBA;
+typedef struct {
+	u32 count;
+	SFRotation*	vals;
+} MFRotation;
+typedef struct {
+	u32 count;
+	Double* vals;
+} MFTime;
+typedef struct {
+	u32 count;
+	SFVec2f* vals;
+} MFVec2f;
+typedef struct {
+	u32 count;
+	SFVec2d* vals;
+} MFVec2d;
+typedef struct {
+	u32 count;
+	SFVec3f* vals;
+} MFVec3f;
+typedef struct {
+	u32 count;
+	SFVec3d* vals;
+} MFVec3d;
+typedef struct {
+	u32 count;
+	SFVec4f* vals;
+} MFVec4f;
+
+typedef struct {
+	u32 count;
+	SFURL* vals;
+} MFURL;
+typedef struct {
+	u32 count;
+	char** vals;
+} MFString;
+typedef struct {
+	u32 count;
+	SFScript *vals;
+} MFScript;
+
+
+SFColorRGBA gf_sg_sfcolor_to_rgba(SFColor val);
+
+/*field types, as defined in BIFS encoding (used for scripts and proto coding)*/
+enum
+{
+	GF_SG_VRML_SFBOOL		=	0,
+	GF_SG_VRML_SFFLOAT		=	1,
+	GF_SG_VRML_SFTIME		=	2,
+	GF_SG_VRML_SFINT32		=	3,
+	GF_SG_VRML_SFSTRING		=	4,
+	GF_SG_VRML_SFVEC3F		=	5,
+	GF_SG_VRML_SFVEC2F		=	6,
+	GF_SG_VRML_SFCOLOR		=	7,
+	GF_SG_VRML_SFROTATION	=	8,
+	GF_SG_VRML_SFIMAGE		=	9,
+	GF_SG_VRML_SFNODE		=	10,
+	/*TO CHECK*/
+	GF_SG_VRML_SFVEC4F		=	11,
+
+	/*used types in GPAC but not defined in the MPEG4 spec*/
+	GF_SG_VRML_SFURL,
+	GF_SG_VRML_SFSCRIPT,
+	GF_SG_VRML_SFCOMMANDBUFFER,
+	/*used types in X3D*/
+	GF_SG_VRML_SFDOUBLE,
+	GF_SG_VRML_SFCOLORRGBA,
+	GF_SG_VRML_SFVEC2D,
+	GF_SG_VRML_SFVEC3D,
+
+	GF_SG_VRML_FIRST_MF		= 32,
+	GF_SG_VRML_MFBOOL		= GF_SG_VRML_FIRST_MF,
+	GF_SG_VRML_MFFLOAT,
+	GF_SG_VRML_MFTIME,
+	GF_SG_VRML_MFINT32,
+	GF_SG_VRML_MFSTRING,
+	GF_SG_VRML_MFVEC3F,
+	GF_SG_VRML_MFVEC2F,
+	GF_SG_VRML_MFCOLOR,
+	GF_SG_VRML_MFROTATION,
+	GF_SG_VRML_MFIMAGE,
+	GF_SG_VRML_MFNODE,
+	GF_SG_VRML_MFVEC4F,
+
+	/*used types in GPAC but not defined in the MPEG4 spec*/
+	GF_SG_VRML_MFURL,
+	GF_SG_VRML_MFSCRIPT,
+
+	/*used types in X3D*/
+	GF_SG_VRML_MFDOUBLE,
+	GF_SG_VRML_MFCOLORRGBA,
+	GF_SG_VRML_MFVEC2D,
+	GF_SG_VRML_MFVEC3D,
+
+	GF_SG_VRML_UNKNOWN
+};
+const char *gf_sg_vrml_get_field_type_by_name(u32 FieldType);
+
+
+/*
+allocates a new field and gets it back. 
+	NOTE:
+			GF_SG_VRML_MFNODE will return a pointer to a GF_List structure (eg GF_List *)
+			GF_SG_VRML_SFNODE will return NULL
+*/
+void *gf_sg_vrml_field_pointer_new(u32 FieldType);
+/*deletes a field pointer (including SF an,d MF nodes)*/
+void gf_sg_vrml_field_pointer_del(void *field, u32 FieldType);
+
+Bool gf_sg_vrml_is_sf_field(u32 FieldType);
+
+/*translates MF/SF to SF type*/
+u32 gf_sg_vrml_get_sf_type(u32 FieldType);
+
+
+/*
+	MFField manipulation  - MFNode cannot use these, use the GF_List functions instead
+	or the Node_* insertion functions
+	FieldType shall always be given when manipulating MFFields
+*/
+/*Insert (+alloc) a slot in the MFField with a specified position for insertion and sets the ptr
+to the newly created slot
+@InsertAt is the 0-based index for the new slot
+*/
+GF_Err gf_sg_vrml_mf_insert(void *mf, u32 FieldType, void **new_ptr, u32 InsertAt);
+/*adds at the end and gets the ptr*/
+GF_Err gf_sg_vrml_mf_append(void *mf, u32 FieldType, void **new_ptr);
+/*remove the desired item*/
+GF_Err gf_sg_vrml_mf_remove(void *mf, u32 FieldType, u32 RemoveFrom);
+/*alloc a fixed array*/
+GF_Err gf_sg_vrml_mf_alloc(void *mf, u32 FieldType, u32 NbItems);
+/*get the item in the array*/
+GF_Err gf_sg_vrml_mf_get_item(void *mf, u32 FieldType, void **new_ptr, u32 ItemPos);
+/*remove all items of the MFField*/
+GF_Err gf_sg_vrml_mf_reset(void *mf, u32 FieldType);
+
+/*clones a field content EXCEPT SF/MFNode. Pointers to field shall be used
+@dest, @orig: pointers to field
+@FieldType: type of the field
+*/
+void gf_sg_vrml_field_copy(void *dest, void *orig, u32 FieldType);
+
+/*indicates whether 2 fields of same type EXCEPT SF/MFNode are equal
+@dest, @orig: pointers to field
+@FieldType: type of the field
+*/
+Bool gf_sg_vrml_field_equal(void *dest, void *orig, u32 FieldType);
+
+
+
+/*VRML grouping nodes macro - note we have inverted the children field to be 
+compatible with the base GF_ParentNode node
+All grouping nodes (with "children" field) implement the following: 
+
+addChildren: chain containing nodes to add passed as eventIn - handled internally through ROUTE
+void (*on_addChildren)(GF_Node *pNode): add eventIn signaler - this is handled internally by the scene_graph and SHALL 
+NOT BE OVERRIDEN since it takes care of node(s) routing
+
+removeChildren: chain containing nodes to remove passed as eventIn - handled internally through ROUTE
+
+void (*on_removeChildren)(GF_Node *pNode): remove eventIn signaler - this is handled internally by the scene_graph and SHALL 
+NOT BE OVERRIDEN since it takes care of node(s) routing
+
+children: list of children SFNodes
+*/
+
+#define VRML_CHILDREN							\
+	CHILDREN									\
+	GF_ChildNodeItem *addChildren;							\
+	void (*on_addChildren)(GF_Node *pNode);		\
+	GF_ChildNodeItem *removeChildren;						\
+	void (*on_removeChildren)(GF_Node *pNode);		\
+
+typedef struct
+{
+	BASE_NODE
+	VRML_CHILDREN
+} GF_VRMLParent;
+
+void gf_sg_vrml_parent_setup(GF_Node *pNode);
+void gf_sg_vrml_parent_destroy(GF_Node *pNode);
+
+
+/*set proto loader - callback is the same as simulation time callback
+	GetExternProtoLib is a pointer to the proto lib loader - this callback shall return the LPSCENEGRAPH
+of the extern proto lib if found and loaded, NULL if not found and GF_SG_INTERNAL_PROTO for internal
+hardcoded protos (extensions of MPEG-4 scene graph used for module deveopment)
+*/
+#define GF_SG_INTERNAL_PROTO	(GF_SceneGraph *) 0xFFFFFFFF
+
+/*GF_Route manip: routes are used to pass events between nodes. Event handling is managed by the scene graph
+however only the nodes overloading the EventIn handler associated with the event will process the eventIn*/
+typedef struct _route GF_Route;
+
+/*creates a new route:
+	@fromNode: @fromField: address of the eventOut field triggering the route
+	@toNode: @toField: address of the destination eventIn field
+NOTE: routes are automatically destroyed if either the target or origin node of the route is destroyed
+*/
+GF_Route *gf_sg_route_new(GF_SceneGraph *sg, GF_Node *fromNode, u32 fromField, GF_Node *toNode, u32 toField);
+
+/*delete route*/
+void gf_sg_route_del(GF_Route *route);
+GF_Err gf_sg_route_del_by_id(GF_SceneGraph *sg,u32 routeID);
+
+/*locate route by ID/name*/
+GF_Route *gf_sg_route_find(GF_SceneGraph *sg, u32 RouteID);
+GF_Route *gf_sg_route_find_by_name(GF_SceneGraph *sg, char *name);
+/*assign route ID - fails if a route with same ID already exist*/
+GF_Err gf_sg_route_set_id(GF_Route *route, u32 ID);
+u32 gf_sg_route_get_id(GF_Route *route);
+/*assign route name if desired*/
+GF_Err gf_sg_route_set_name(GF_Route *route, char *name);
+char *gf_sg_route_get_name(GF_Route *route);
+
+/*retuns next available RouteID - Note this doesn't track inserted routes, that's the user responsability*/
+u32 gf_sg_get_next_available_route_id(GF_SceneGraph *sg);
+/*set max defined route ID used in the scene - used to handle RouteInsert commands
+note that this must be called by the user to be effective,; otherwise the max route ID is computed
+from the routes present in scene*/
+void gf_sg_set_max_defined_route_id(GF_SceneGraph *sg, u32 ID);
+
+
+/*activates all routes currently triggered - this follows the event cascade model of VRML/MPEG4:
+	- routes are collected during eventOut generation
+	- routes are activated. If eventOuts are generated during activation the cycle goes on.
+
+  A route cannot be activated twice in the same simulation tick, hence this function shall be called 
+  ONCE AND ONLY ONCE per simulation tick
+
+Note that children scene graphs register their routes with the top-level graph, so only the main 
+scene graph needs to be activated*/
+void gf_sg_activate_routes(GF_SceneGraph *sg);
+
+
+/*
+				proto handling
+
+	The lib allows you to construct prototype nodes as defined in VRML/MPEG4 by constructing 
+	proto interfaces and instanciating them. An instanciated proto is handled as a single node for
+	rendering, thus an application will never handle proto instances for rendering
+*/
+
+/*opaque handler for a proto object (declaration)*/
+typedef struct _proto GF_Proto;
+/*opaque handler for a proto field object (declaration)*/
+typedef struct _protofield GF_ProtoFieldInterface;
+
+
+/*retuns next available NodeID*/
+u32 gf_sg_get_next_available_proto_id(GF_SceneGraph *sg);
+
+/*proto constructor identified by ID/name in the given scene
+2 protos in the same scene may not have the same ID/name
+
+@unregistered: used for memory handling of scene graph only, the proto is not stored
+in the graph main proto list but in an alternate list. Several protos with the same ID/Name can be stored unregistered
+*/
+GF_Proto *gf_sg_proto_new(GF_SceneGraph *inScene, u32 ProtoID, char *name, Bool unregistered);
+
+/*destroy proto interface - can be used even if instances of the proto are still present*/
+GF_Err gf_sg_proto_del(GF_Proto *proto);
+
+/*used for memory handling of scene graph only. move proto from off-graph to in-graph or reverse*/
+GF_Err gf_sg_proto_set_in_graph(GF_Proto *proto, GF_SceneGraph *inScene, Bool set_in);
+
+/*returns graph associated with this proto. Such a graph cannot be used for rendering but is needed during
+construction of proto dictionaries in case of nested protos*/
+GF_SceneGraph *gf_sg_proto_get_graph(GF_Proto *proto);
+
+/*get/set private data*/
+void gf_sg_proto_set_private(GF_Proto *proto, void *ptr, void (*OnDelete)(void *ptr) );
+void *gf_sg_proto_get_private(GF_Proto *proto);
+
+/*add node code - a proto is build of several nodes, the first node is used for rendering
+and the others are kept private. This set of nodes is refered to as the proto "node code"*/
+GF_Err gf_sg_proto_add_node_code(GF_Proto *proto, GF_Node *pNode);
+
+/*gets number of field in the proto interface*/
+u32 gf_sg_proto_get_field_count(GF_Proto *proto);
+/*locates field declaration by name*/
+GF_ProtoFieldInterface *gf_sg_proto_field_find_by_name(GF_Proto *proto, char *fieldName);
+/*locates field declaration by index (0-based)*/
+GF_ProtoFieldInterface *gf_sg_proto_field_find(GF_Proto *proto, u32 fieldIndex);
+
+/*creates a new field declaration in the proto. of given fieldtype and eventType
+fieldName can be NULL, if so the name will be fieldN, N being the index of the created field*/
+GF_ProtoFieldInterface *gf_sg_proto_field_new(GF_Proto *proto, u32 fieldType, u32 eventType, char *fieldName);
+
+/*assign the node field to a field of the proto (the node field IS the proto field)
+the node shall be a node of the proto scenegraph, and the fieldtype/eventType of both fields shall match
+(except SF/MFString and MF/SFURL which are allowed) due to BIFS semantics*/
+GF_Err gf_sg_proto_field_set_ised(GF_Proto *proto, u32 protoFieldIndex, GF_Node *node, u32 nodeFieldIndex);
+/*set/get user private data for the proto field declaration*/
+void gf_sg_proto_field_set_private(GF_ProtoFieldInterface *field, void *ptr, void (*OnDelete)(void *ptr) );
+void *gf_sg_proto_field_get_private(GF_ProtoFieldInterface *field);
+/*returns field info of the field - this is typically used to setup the default value of the field*/
+GF_Err gf_sg_proto_field_get_field(GF_ProtoFieldInterface *field, GF_FieldInfo *info);
+
+/*
+	NOTE on proto instances:
+		The proto instance is handled as an GF_Node outside the scenegraph lib, and is manipulated with the same functions 
+		as an GF_Node 
+		The proto instance may or may not be loaded. 
+		An unloaded instance only contains the proto instance fields 
+		A loaded instance contains the proto instance fields plus all the proto code (Nodes, routes) and 
+		will load any scripts present in it. This allows keeping the memory usage of proto very low, especially
+		when nested protos (protos used as building blocks of their parent proto) are used.
+*/
+
+/*creates the proto interface without the proto code.*/
+GF_Node *gf_sg_proto_create_instance(GF_SceneGraph *sg, GF_Proto *proto);
+
+/*lodes code in this instance - all subprotos are automatically created, thus you must only instanciate
+top-level protos. VRML/BIFS doesn't allow for non top-level proto instanciation in the main graph
+All nodes created in this proto will be forwarded to the app for initialization*/
+GF_Err gf_sg_proto_load_code(GF_Node *proto_inst);
+
+/*locate a prototype definition by ID or by name. when looking by name, ID is ignored*/
+GF_Proto *gf_sg_find_proto(GF_SceneGraph *sg, u32 ProtoID, char *name);
+
+/*deletes all protos in given scene - does NOT delete instances of protos, only the proto object is destroyed */
+GF_Err gf_sg_delete_all_protos(GF_SceneGraph *scene);
+
+
+/*tools for hardcoded proto*/
+/*gets proto of this node - if the node is not a prototype instance, returns NULL*/
+GF_Proto *gf_node_get_proto(GF_Node *node);
+/*returns the ID of the proto*/
+u32 gf_sg_proto_get_id(GF_Proto *proto);
+/*returns proto name*/
+const char *gf_sg_proto_get_class_name(GF_Proto *proto);
+
+/*Returns 1 if the given field is ISed to a startTime/stopTime field (MPEG-4 specific for updates)*/
+Bool gf_sg_proto_field_is_sftime_offset(GF_Node *node, GF_FieldInfo *field);
+
+/*set an ISed field in a proto instance (not a proto) - this is needed with dynamic node creation inside a proto
+instance (conditionals)*/
+GF_Err gf_sg_proto_instance_set_ised(GF_Node *protoinst, u32 protoFieldIndex, GF_Node *node, u32 nodeFieldIndex);
+
+/*returns root node (the one and only one being traversed) of this proto instance if any*/
+GF_Node *gf_node_get_proto_root(GF_Node *node);
+
+/*returns parent ProtoInstance node if this node is in a proto*/
+GF_Node *gf_node_get_proto_parent(GF_Node *node);
+
+/*indicates proto field has been parsed and its value is valid - this is needed for externProtos not specifying default
+values*/
+void gf_sg_proto_mark_field_loaded(GF_Node *proto_inst, GF_FieldInfo *info);
+
+/*
+			JavaScript tools
+*/
+
+/*script fields type don't have the same value as the bifs ones...*/
+enum
+{
+	GF_SG_SCRIPT_TYPE_FIELD = 0,
+	GF_SG_SCRIPT_TYPE_EVENT_IN,
+	GF_SG_SCRIPT_TYPE_EVENT_OUT,
+};
+
+typedef struct _scriptfield GF_ScriptField;
+/*creates new sript field - script fields are dynamically added to the node, and thus can be accessed through the
+same functions as other GF_Node fields*/
+GF_ScriptField *gf_sg_script_field_new(GF_Node *script, u32 eventType, u32 fieldType, const char *name);
+/*retrieves field info, usefull to get the field index*/
+GF_Err gf_sg_script_field_get_info(GF_ScriptField *field, GF_FieldInfo *info);
+
+/*activate eventIn for script node - needed for BIFS field replace*/
+void gf_sg_script_event_in(GF_Node *node, GF_FieldInfo *in_field);
+
+
+
+/*set the scene proto loader function for externProto - callback is the same as the scene callback*/
+void gf_sg_set_proto_loader(GF_SceneGraph *scene, GF_SceneGraph *(*GetExternProtoLib)(void *SceneCallback, MFURL *lib_url));
+
+/*get a pointer to the MF URL field for externProto info - DO NOT TOUCH THIS FIELD*/
+MFURL *gf_sg_proto_get_extern_url(GF_Proto *proto);
+
+SFRotation gf_sg_sfrotation_interpolate(SFRotation kv1, SFRotation kv2, Fixed fraction);
+
+
+
+
+/*adds a new node to the "children" field
+position is the 0-BASED index in the list of children, -1 means end of list (append)
+DOES NOT CHECK CHILD/PARENT type compatibility
+*/
+GF_Err gf_node_insert_child(GF_Node *parent, GF_Node *new_child, s32 Position);
+/*removes an existing node from the "children" field*/
+GF_Err gf_node_remove_child(GF_Node *parent, GF_Node *toremove_child);
+/*remove and replace given child by specified node. If node is NULL, only delete target node
+position is the 0-BASED index in the list of children, -1 means end of list (append)
+DOES NOT CHECK CHILD/PARENT type compatibility
+*/
+GF_Err gf_node_replace_child(GF_Node *node, GF_ChildNodeItem **container, s32 pos, GF_Node *newNode);
+
+/*signals eventOut has been set. FieldIndex/eventName identify the eventOut field. Routes are automatically triggered
+when the event is signaled*/
+void gf_node_event_out(GF_Node *node, u32 FieldIndex);
+void gf_node_event_out_str(GF_Node *node, const char *eventName);
+
+
+/*exported for parsers*/
+u32 gf_node_mpeg4_type_by_class_name(const char *node_name);
+u32 gf_node_x3d_type_by_class_name(const char *node_name);
+
+/*exported for URL handling in compositor*/
+void gf_sg_mfurl_del(MFURL url);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+
+#endif /*_GF_SG_VRML_H_*/
diff --git a/tstools/DtsEdit/src/gpac/setup.h b/tstools/DtsEdit/src/gpac/setup.h
new file mode 100644
index 0000000..3edc13a
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/setup.h
@@ -0,0 +1,377 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / general OS configuration file
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  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_SETUP_H_
+#define _GF_SETUP_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*WIN32 and WinCE config*/
+#if defined(WIN32) || defined(_WIN32_WCE)
+
+#ifdef GPAC_HAVE_CONFIG_H
+
+#if defined(__GNUC__)
+#include <gpac/internal/config.h>
+#else
+#include <gpac/internal/config_static.h>
+#endif
+
+#endif
+
+/*common win32 parts*/
+#include <stdio.h>
+#include <stdlib.h>
+
+
+typedef unsigned __int64 u64;
+typedef unsigned int u32;
+typedef unsigned short u16;
+typedef unsigned char u8;
+typedef __int64 s64;
+typedef int s32;
+typedef short s16;
+typedef char s8;
+
+#if defined(__GNUC__)
+#define GFINLINE inline
+#else
+#define GFINLINE __inline
+#endif
+
+#define GF_PATH_SEPARATOR	'\\'
+#define GF_MAX_PATH	1024
+
+/*WINCE config*/
+#if defined(_WIN32_WCE)
+
+/*winCE read-only (smaller)*/
+#ifndef GPAC_READ_ONLY
+#define GPAC_READ_ONLY
+#endif
+
+/*winCE always fixed-point*/
+#ifndef GPAC_FIXED_POINT
+#define GPAC_FIXED_POINT
+#endif
+
+/*win32 assert*/
+#ifndef assert
+
+void CE_Assert(u32 valid, char *file, u32 line);
+
+#ifndef NDEBUG
+#define assert( t )	CE_Assert((unsigned int) (t), __FILE__, __LINE__ )
+#else
+#define assert(t)
+#endif
+
+#endif
+
+
+/*performs wide->char and char->wide conversion on a buffer GF_MAX_PATH long*/
+void CE_WideToChar(unsigned short *w_str, char *str);
+void CE_CharToWide(char *str, unsigned short *w_str);
+
+
+#define strdup _strdup
+#define stricmp _stricmp
+#define strnicmp _strnicmp
+#define strupr _strupr
+
+#ifndef _PTRDIFF_T_DEFINED
+typedef int ptrdiff_t;
+#define PTRDIFF(p1, p2, type)	((p1) - (p2))
+#define _PTRDIFF_T_DEFINED
+#endif
+
+#ifndef _SIZE_T_DEFINED
+typedef unsigned int size_t;
+#define _SIZE_T_DEFINED
+#endif
+
+#ifndef offsetof
+#define offsetof(s,m) ((size_t)&(((s*)0)->m))
+#endif
+
+#ifndef getenv
+#define getenv(a) 0L
+#endif
+
+#define strupr _strupr
+#define strlwr _strlwr
+
+//#define GPAC_DISABLE_LOG
+
+#else	/*END WINCE*/
+
+/*WIN32 not-WinCE*/
+#include <ctype.h>
+#include <string.h>
+#include <float.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <assert.h>
+
+
+#endif	/*END WIN32 non win-ce*/
+/*end WIN32 config*/
+
+/*start SYMBIAN config*/
+#elif defined(__SYMBIAN32__)
+
+#define GFINLINE inline
+#define GF_PATH_SEPARATOR	'\\'
+
+/*we must explicitely export our functions...*/
+#define GF_EXPORT EXPORT_C
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <limits.h>
+#include <ctype.h>
+#include <string.h>
+#include <assert.h>
+
+#ifdef __SERIES60_3X__
+
+typedef unsigned __int64 u64;
+typedef __int64 s64;
+
+#else 
+
+/*FIXME - we don't have 64bit support here we should get rid of all 64bits divisions*/
+//typedef unsigned long long u64;
+//typedef long long s64;
+
+typedef unsigned int u64;
+typedef signed int s64;
+
+#endif	/*symbian 8*/
+
+/*SYMBIAN always fixed-point*/
+#ifndef GPAC_FIXED_POINT
+#define GPAC_FIXED_POINT
+#endif
+
+
+typedef unsigned int u32;
+typedef unsigned short u16;
+typedef unsigned char u8;
+typedef int s32;
+typedef short s16;
+typedef signed char s8;
+
+#pragma mpwc_relax on
+
+#define GF_MAX_PATH	260
+
+/*sorry this was developed under w32 :)*/
+#define stricmp		strcasecmp
+#define strnicmp	strncasecmp
+
+#ifndef strupr
+char * my_str_upr(char *str);
+#define strupr my_str_upr
+#endif
+
+#ifndef strlwr
+char * my_str_lwr(char *str);
+#define strlwr my_str_lwr
+#endif
+
+#ifndef DBL_MAX
+#include <libc/ieeefp.h>
+#define DBL_MAX	(__IEEE_DBL_MAXPOWTWO)
+#endif
+
+#ifndef FLT_MAX
+#include <libc/ieeefp.h>
+#define FLT_MAX	(__IEEE_FLT_MAXPOWTWO)
+#endif
+
+#ifndef FLT_EPSILON
+#define FLT_EPSILON 1
+#endif
+
+/*end SYMBIAN config*/
+
+#else 
+
+/*UNIX likes*/
+
+#ifdef GPAC_HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+
+/*force large file support*/
+#ifndef _FILE_OFFSET_BITS
+#define _FILE_OFFSET_BITS 64
+#endif
+#ifndef _LARGEFILE_SOURCE
+#define _LARGEFILE_SOURCE
+#endif
+#ifndef _LARGEFILE64_SOURCE
+#define _LARGEFILE64_SOURCE
+#endif
+
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <limits.h>
+#include <float.h>
+#include <ctype.h>
+#include <string.h>
+#include <assert.h>
+
+
+typedef uint64_t u64;
+typedef uint32_t u32;
+typedef uint16_t u16;
+typedef uint8_t u8;
+typedef int64_t s64;
+typedef int32_t s32;
+typedef int16_t s16;
+typedef int8_t s8;
+
+#define GFINLINE	inline
+
+/*sorry this was developed under w32 :)*/
+#define stricmp		strcasecmp
+#define strnicmp	strncasecmp
+
+#ifndef strupr
+char * my_str_upr(char *str);
+#define strupr my_str_upr
+#endif
+
+#ifndef strlwr
+char * my_str_lwr(char *str);
+#define strlwr my_str_lwr
+#endif
+
+#define GF_PATH_SEPARATOR	'/'
+
+#ifdef PATH_MAX
+#define GF_MAX_PATH	PATH_MAX
+#else
+/*PATH_MAX not defined*/
+#define GF_MAX_PATH	1023
+#endif
+
+
+#endif /* end platform specific Win32/WinCE/UNIX*/
+
+/*define what's missing*/
+#ifndef NULL
+#define NULL 0
+#endif
+
+
+typedef double Double;
+typedef float Float;
+/* 128 bit IDs */
+typedef u8 bin128[16];
+
+#define GF_MAX_DOUBLE		DBL_MAX
+#define GF_MIN_DOUBLE		-GF_MAX_DOUBLE
+#define GF_MAX_FLOAT		FLT_MAX
+#define GF_MIN_FLOAT		-GF_MAX_FLOAT
+#define GF_EPSILON_FLOAT	FLT_EPSILON
+#define GF_SHORT_MAX		SHRT_MAX
+#define GF_SHORT_MIN		SHRT_MIN
+
+#ifndef MIN
+#define MIN(X, Y) ((X)<(Y)?(X):(Y))
+#endif
+#ifndef MAX
+#define MAX(X, Y) ((X)>(Y)?(X):(Y))
+#endif
+
+#define ABSDIFF(a, b)	( ( (a) > (b) ) ? ((a) - (b)) : ((b) - (a)) )
+
+#ifndef ABS
+#define ABS(a)	( ( (a) > 0 ) ? (a) : - (a) )
+#endif
+
+#ifndef Bool
+typedef u32 Bool;
+#endif
+
+/*GPAC memory tracking*/
+#define GPAC_MEMORY_TRACKING	0
+
+#if GPAC_MEMORY_TRACKING
+void *gf_malloc(size_t size);
+void *gf_realloc(void *ptr, size_t size);
+void gf_free(void *ptr);
+char *gf_strdup(const char *str);
+
+#undef malloc
+#define malloc gf_malloc
+#undef realloc
+#define realloc gf_realloc
+#undef free
+#define free gf_free
+#undef strdup
+#define strdup gf_strdup
+
+#endif
+/*end GPAC memory tracking*/
+
+#if defined (WIN32) && !defined(__GNUC__)
+#define LLD "%I64d"
+#define LLU "%I64u"
+#define LLD_CAST
+#define LLU_CAST
+#elif defined (__SYMBIAN32__)
+#define LLD "%d"
+#define LLU "%u"
+#define LLD_CAST (u32)
+#define LLU_CAST (s32)
+#else
+#define LLD "%lld"
+#define LLU "%llu"
+#define LLD_CAST
+#define LLU_CAST
+#endif
+
+
+#ifndef GF_EXPORT
+/*use def files for windows or let compiler decide*/
+#define GF_EXPORT 
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/*_GF_SETUP_H_*/
diff --git a/tstools/DtsEdit/src/gpac/svg_types.h b/tstools/DtsEdit/src/gpac/svg_types.h
new file mode 100644
index 0000000..0697007
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/svg_types.h
@@ -0,0 +1,887 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Cyril Concolato - Jean Le Feuvre
+ *			Copyright (c) 2004-200X ENST
+ *			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. 
+ *
+ */
+
+#ifndef _GF_SVG_SVG_TYPES_H_
+#define _GF_SVG_SVG_TYPES_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/path2d.h>
+
+
+
+/* Attributes in SVG can be accessed using a GF_FieldInfo structure 
+   like it is done in the BIFS part of the implementation:
+
+	fieldIndex:		attribute tag to identify the attribute in the element in the case of dynamic alloc (default)
+	             or index of the attribute in the element in the case of static allocation of attributes
+
+	fieldType:		attribute data type as in the enumeration below
+	
+	name:			attribute name (WARNING: this may be NULL)
+
+	far_ptr:		pointer to the actual data with one of the type given in this file
+
+	NDTType:		unused in SVG
+	eventType:		unused in SVG
+	on_event_in:	unused in SVG 
+*/
+
+/* SVG attribute types */
+enum {
+	SVG_Unknown_datatype					= 0,
+
+	/* keyword enum types */
+	XML_Space_datatype,
+	XMLEV_Propagate_datatype,
+	XMLEV_DefaultAction_datatype,
+	XMLEV_Phase_datatype,
+	SVG_FillRule_datatype,
+	SVG_StrokeLineJoin_datatype,
+	SVG_StrokeLineCap_datatype,
+	SVG_FontStyle_datatype,
+	SVG_FontWeight_datatype,
+	SVG_FontVariant_datatype,
+	SVG_TextAnchor_datatype,
+	SVG_TransformType_datatype, 
+	SVG_Display_datatype, 
+	SVG_Visibility_datatype,
+	SVG_Overflow_datatype,
+	SVG_ZoomAndPan_datatype,
+	SVG_DisplayAlign_datatype,
+	SVG_PointerEvents_datatype,
+	SVG_RenderingHint_datatype,
+	SVG_VectorEffect_datatype,
+	SVG_PlaybackOrder_datatype,
+	SVG_TimelineBegin_datatype,
+	SVG_GradientUnit_datatype,
+	SVG_InitialVisibility_datatype,
+	SVG_FocusHighlight_datatype,
+	SVG_Overlay_datatype,
+	SVG_TransformBehavior_datatype,
+	SVG_SpreadMethod_datatype,
+	SVG_TextAlign_datatype,
+	SVG_Focusable_datatype,
+	SMIL_SyncBehavior_datatype,
+	SMIL_SyncTolerance_datatype,
+	SMIL_AttributeType_datatype,
+	SMIL_CalcMode_datatype,
+	SMIL_Additive_datatype,
+	SMIL_Accumulate_datatype,
+	SMIL_Restart_datatype,
+	SMIL_Fill_datatype,	
+
+	SVG_LAST_U8_PROPERTY,
+
+	DOM_String_datatype,
+	DOM_StringList_datatype,
+
+	XMLEV_Event_datatype,
+	XMLRI_datatype,
+	XMLRI_List_datatype,
+	XML_IDREF_datatype,
+
+	SMIL_KeyTimes_datatype,
+	SMIL_KeySplines_datatype,
+	SMIL_KeyPoints_datatype,
+	SMIL_Times_datatype,
+
+	/* animated (untyped) value */
+	SMIL_AnimateValue_datatype,
+	SMIL_AnimateValues_datatype,
+	SMIL_Duration_datatype,
+	SMIL_RepeatCount_datatype,
+	SMIL_AttributeName_datatype,
+
+	/* SVG Number */
+	SVG_Number_datatype,
+	SVG_FontSize_datatype,
+	SVG_Length_datatype,
+	SVG_Coordinate_datatype,
+	SVG_Rotate_datatype,
+
+	/* List of */
+	SVG_Numbers_datatype,
+	SVG_Points_datatype,
+	SVG_Coordinates_datatype,
+
+	/*all other types*/
+	SVG_Boolean_datatype,
+	SVG_Color_datatype,
+	SVG_Paint_datatype,
+	SVG_PathData_datatype,
+	SVG_FontFamily_datatype,
+	SVG_ID_datatype,
+
+	SVG_StrokeDashArray_datatype,
+	SVG_PreserveAspectRatio_datatype,
+	SVG_ViewBox_datatype,
+	SVG_GradientOffset_datatype,
+	SVG_Focus_datatype,
+	SVG_Clock_datatype,
+	SVG_ContentType_datatype,
+	SVG_LanguageID_datatype,
+
+	/* Matrix related types */
+	SVG_Transform_datatype,
+	SVG_Transform_Translate_datatype,
+	SVG_Transform_Scale_datatype,
+	SVG_Transform_SkewX_datatype,
+	SVG_Transform_SkewY_datatype,
+	SVG_Transform_Rotate_datatype,
+	SVG_Motion_datatype,
+
+	/*LASeR types*/
+	LASeR_Choice_datatype,
+	LASeR_Size_datatype,
+};
+
+/* Definition of SVG base data types */
+typedef char *DOM_String;
+typedef DOM_String SVG_String;
+typedef DOM_String SVG_ContentType;
+typedef DOM_String SVG_LanguageID;
+typedef DOM_String SVG_TextContent;
+
+/* types not yet handled properly, i.e. for the moment using strings */
+typedef DOM_String SVG_ID;
+typedef DOM_String SVG_LinkTarget;
+typedef DOM_String SVG_GradientOffset;
+
+typedef Double SVG_Clock;
+
+typedef GF_List *ListOfXXX;
+typedef GF_List *SVG_Numbers;
+typedef GF_List *SVG_Coordinates;
+typedef GF_List	*SVG_FeatureList;
+typedef GF_List	*SVG_ExtensionList;
+typedef GF_List	*SVG_FormatList;
+typedef GF_List	*SVG_ListOfIRI;
+typedef GF_List	*SVG_LanguageIDs;
+typedef GF_List	*SVG_FontList;
+typedef GF_List *SVG_TransformList;
+typedef GF_List *SVG_Points;
+typedef GF_List *SMIL_Times;
+typedef GF_List *SMIL_KeyTimes;
+typedef GF_List *SMIL_KeyPoints;
+/* Fixed between 0 and 1 */
+typedef GF_List *SMIL_KeySplines;
+
+typedef GF_Matrix2D SVG_Motion;
+
+/* SMIL Anim types */
+typedef struct {
+	/*field type*/
+	u32 type;
+	/*field pointer*/
+	void *field_ptr;
+	/*attribute name for textual parsing*/
+	char *name;
+	/*attribute tag for live transcoding*/
+	u32 tag;
+} SMIL_AttributeName;
+
+enum {
+	/*clock time*/
+	GF_SMIL_TIME_CLOCK			= 0,
+	/*wallclock time*/
+	GF_SMIL_TIME_WALLCLOCK		= 1,
+	/*resolved time of an event, discarded when restarting animation.*/
+	GF_SMIL_TIME_EVENT_RESOLVED	= 2,
+	/*event time*/
+	GF_SMIL_TIME_EVENT			= 3,
+	/*indefinite time*/
+	GF_SMIL_TIME_INDEFINITE		= 4,
+};
+
+#define GF_SMIL_TIME_IS_CLOCK(v) (v<=GF_SMIL_TIME_EVENT_RESOLVED)
+#define GF_SMIL_TIME_IS_SPECIFIED_CLOCK(v) (v<GF_SMIL_TIME_EVENT_RESOLVED)
+
+typedef struct
+{
+	u32 type;
+	/*for accessKey and mouse button, or repeatCount when the event is a SMIL repeat */
+	u32 parameter;
+} XMLEV_Event;
+
+typedef struct {
+	/* Type of timing value*/
+	u8 type;
+	/* in case of syncbase, event, repeat value: this is the pointer to the source of the event */
+	GF_Node *element; 
+	/* id of the element before resolution of the pointer to the element */
+	char *element_id; 
+	/* listener associated with event */
+	GF_Node *listener; 
+
+	/* event type and parameter */
+	XMLEV_Event event; 
+	/*set if event is 
+		begin rather than beginEvent,
+		end rather than endEvent,
+		repeat rather than repeatEvent */
+	Bool is_absolute_event;
+	/*clock offset (absolute or relative to event)*/
+	Double clock;
+
+} SMIL_Time;
+
+enum {
+	SMIL_DURATION_AUTO  = 0,
+	SMIL_DURATION_INDEFINITE,
+	SMIL_DURATION_MEDIA,
+	SMIL_DURATION_NONE,
+	SMIL_DURATION_DEFINED,
+};
+typedef struct {
+	u8 type;
+	Double clock_value;
+} SMIL_Duration;
+
+enum {
+	SMIL_RESTART_ALWAYS = 0,
+	SMIL_RESTART_NEVER,
+	SMIL_RESTART_WHENNOTACTIVE,
+};
+typedef u8 SMIL_Restart;
+
+enum {
+	SMIL_FILL_FREEZE=0,
+	SMIL_FILL_REMOVE,
+	
+};
+typedef u8 SMIL_Fill;
+
+enum {
+	SMIL_REPEATCOUNT_INDEFINITE  = 0,
+	SMIL_REPEATCOUNT_DEFINED	 = 1,
+	/* used only for static allocation of SVG attributes */
+	SMIL_REPEATCOUNT_UNSPECIFIED = 2
+};
+typedef struct {
+	u8 type;
+	Fixed count;
+} SMIL_RepeatCount;
+
+typedef struct {
+	u8 type;
+	void *value;
+} SMIL_AnimateValue;
+
+typedef struct {
+	u8 type;
+	GF_List *values;
+} SMIL_AnimateValues;
+
+enum {
+	SMIL_ADDITIVE_REPLACE = 0,
+	SMIL_ADDITIVE_SUM
+}; 
+typedef u8 SMIL_Additive;
+
+enum {
+	SMIL_ACCUMULATE_NONE = 0,
+	SMIL_ACCUMULATE_SUM
+}; 
+typedef u8 SMIL_Accumulate;
+
+enum {
+	/*WARNING: default value is linear, order changed for LASeR coding*/
+	SMIL_CALCMODE_DISCRETE = 0,
+	SMIL_CALCMODE_LINEAR,
+	SMIL_CALCMODE_PACED,
+	SMIL_CALCMODE_SPLINE
+};
+typedef u8 SMIL_CalcMode;
+/* end of SMIL Anim types */
+
+enum {
+	XMLRI_ELEMENTID = 0,
+	XMLRI_STRING,
+	XMLRI_STREAMID
+};
+typedef struct __xml_ri {
+	u8 type;
+	char *string;
+	void *target;
+	u32 lsr_stream_id;
+} XMLRI;
+
+/*the same structure is used to watch for IDREF changes (LASeR node replace)*/
+typedef struct __xml_ri XML_IDREF;
+
+enum
+{
+	SVG_FOCUS_AUTO = 0, 
+	SVG_FOCUS_SELF, 
+	SVG_FOCUS_IRI, 
+};
+
+typedef struct
+{
+	u8 type;
+	XMLRI target;
+} SVG_Focus;
+
+enum {
+	SVG_FONTFAMILY_INHERIT = 0,
+	SVG_FONTFAMILY_VALUE
+};
+
+typedef struct {
+	u8 type;
+	SVG_String value;
+} SVG_FontFamily;
+
+enum {
+	SVG_FONTSTYLE_INHERIT = 0,
+	SVG_FONTSTYLE_ITALIC = 1,  
+	SVG_FONTSTYLE_NORMAL = 2,
+	SVG_FONTSTYLE_OBLIQUE = 3
+}; 
+typedef u8 SVG_FontStyle;
+
+/*the values are chosen to match LASeR code points*/
+enum {
+	SVG_PATHCOMMAND_M = 3,
+	SVG_PATHCOMMAND_L = 2,
+	SVG_PATHCOMMAND_C = 0,
+	SVG_PATHCOMMAND_S = 5,
+	SVG_PATHCOMMAND_Q = 4,
+	SVG_PATHCOMMAND_T = 6,
+	SVG_PATHCOMMAND_A = 20,
+	SVG_PATHCOMMAND_Z = 8
+};
+
+#define USE_GF_PATH 1
+
+#if USE_GF_PATH
+typedef GF_Path SVG_PathData;
+#else
+typedef struct {
+	GF_List *commands;
+	GF_List *points;
+} SVG_PathData;
+#endif
+
+typedef struct {
+	Fixed x, y;
+} SVG_Point;
+
+typedef struct {
+	Fixed x, y, angle;
+} SVG_Point_Angle;
+
+typedef struct {
+	Bool is_set;
+	Fixed x, y, width, height;
+} SVG_ViewBox;
+
+typedef Bool SVG_Boolean;
+
+/*WARNING - THESE ARE PATH FLAGS, CHECK IF WORKING*/
+enum {
+	SVG_FILLRULE_EVENODD= 0,
+	SVG_FILLRULE_NONZERO,
+	SVG_FILLRULE_INHERIT
+};
+typedef u8 SVG_FillRule;
+	
+enum {
+	SVG_STROKELINEJOIN_MITER = GF_LINE_JOIN_MITER_SVG,
+	SVG_STROKELINEJOIN_ROUND = GF_LINE_JOIN_ROUND,
+	SVG_STROKELINEJOIN_BEVEL = GF_LINE_JOIN_BEVEL,
+	SVG_STROKELINEJOIN_INHERIT = 100
+};
+typedef u8 SVG_StrokeLineJoin;
+
+/* Warning: GPAC naming is not the same as SVG naming for line cap Flat = butt and Butt = square*/
+enum {
+	SVG_STROKELINECAP_BUTT = GF_LINE_CAP_FLAT,
+	SVG_STROKELINECAP_ROUND = GF_LINE_CAP_ROUND,
+	SVG_STROKELINECAP_SQUARE = GF_LINE_CAP_SQUARE,
+	SVG_STROKELINECAP_INHERIT = 100
+};
+typedef u8 SVG_StrokeLineCap;
+
+enum {
+	SVG_OVERFLOW_INHERIT	= 0,
+	SVG_OVERFLOW_VISIBLE	= 1,
+	SVG_OVERFLOW_HIDDEN		= 2,
+	SVG_OVERFLOW_SCROLL		= 3,
+	SVG_OVERFLOW_AUTO		= 4
+};
+typedef u8 SVG_Overflow;
+
+enum {
+	SVG_COLOR_RGBCOLOR = 0,
+	SVG_COLOR_INHERIT,
+	SVG_COLOR_CURRENTCOLOR,
+	SVG_COLOR_ACTIVE_BORDER, /*Active window border*/
+	SVG_COLOR_ACTIVE_CAPTION, /*Active window caption. */
+	SVG_COLOR_APP_WORKSPACE, /*Background color of multiple document interface. */
+	SVG_COLOR_BACKGROUND, /*Desktop background. */
+	SVG_COLOR_BUTTON_FACE, /* Face color for three-dimensional display elements. */
+	SVG_COLOR_BUTTON_HIGHLIGHT, /* Dark shadow for three-dimensional display elements (for edges facing away from the light source). */
+	SVG_COLOR_BUTTON_SHADOW, /* Shadow color for three-dimensional display elements. */
+	SVG_COLOR_BUTTON_TEXT, /*Text on push buttons. */
+	SVG_COLOR_CAPTION_TEXT, /* Text in caption, size box, and scrollbar arrow box. */
+	SVG_COLOR_GRAY_TEXT, /* Disabled ('grayed') text. */
+	SVG_COLOR_HIGHLIGHT, /* Item(s) selected in a control. */
+	SVG_COLOR_HIGHLIGHT_TEXT, /*Text of item(s) selected in a control. */
+	SVG_COLOR_INACTIVE_BORDER, /* Inactive window border. */
+	SVG_COLOR_INACTIVE_CAPTION, /* Inactive window caption. */
+	SVG_COLOR_INACTIVE_CAPTION_TEXT, /*Color of text in an inactive caption. */
+	SVG_COLOR_INFO_BACKGROUND, /* Background color for tooltip controls. */
+	SVG_COLOR_INFO_TEXT,  /*Text color for tooltip controls. */
+	SVG_COLOR_MENU, /*Menu background. */
+	SVG_COLOR_MENU_TEXT, /* Text in menus. */
+	SVG_COLOR_SCROLLBAR, /* Scroll bar gray area. */
+	SVG_COLOR_3D_DARK_SHADOW, /* Dark shadow for three-dimensional display elements. */
+	SVG_COLOR_3D_FACE, /* Face color for three-dimensional display elements. */
+	SVG_COLOR_3D_HIGHLIGHT, /* Highlight color for three-dimensional display elements. */
+	SVG_COLOR_3D_LIGHT_SHADOW, /* Light color for three-dimensional display elements (for edges facing the light source). */
+	SVG_COLOR_3D_SHADOW, /* Dark shadow for three-dimensional display elements. */
+	SVG_COLOR_WINDOW, /* Window background. */
+	SVG_COLOR_WINDOW_FRAME, /* Window frame. */
+	SVG_COLOR_WINDOW_TEXT /* Text in windows.*/
+};
+
+typedef struct {
+	u8 type;
+	Fixed red, green, blue;
+} SVG_Color;
+
+enum {
+	SVG_PAINT_NONE		= 0,
+	SVG_PAINT_COLOR		= 1,
+	SVG_PAINT_URI		= 2,
+	SVG_PAINT_INHERIT	= 3
+};
+
+typedef struct {
+	u8 type;
+	SVG_Color color;
+	XMLRI iri;
+} SVG_Paint, SVG_SVGColor;
+
+enum {
+	SVG_NUMBER_VALUE		= 0,
+	SVG_NUMBER_PERCENTAGE	= 1,
+	SVG_NUMBER_EMS			= 2,
+	SVG_NUMBER_EXS			= 3,
+	SVG_NUMBER_PX			= 4,
+	SVG_NUMBER_CM			= 5,
+	SVG_NUMBER_MM			= 6,
+	SVG_NUMBER_IN			= 7,
+	SVG_NUMBER_PT			= 8,
+	SVG_NUMBER_PC			= 9,
+	SVG_NUMBER_INHERIT		= 10,
+	SVG_NUMBER_AUTO			= 11,
+	SVG_NUMBER_AUTO_REVERSE	= 12
+};
+
+typedef struct {
+	u8 type;
+	Fixed value;
+} SVG_Number, 
+  SVG_FontSize, 
+  SVG_Length, 
+  SVG_Coordinate, 
+  SVG_Rotate;
+
+typedef struct {
+	u8 is_ref;
+	GF_Matrix2D mat;
+} SVG_Transform;
+
+enum {
+	SVG_TRANSFORM_MATRIX	= 0,
+	SVG_TRANSFORM_TRANSLATE = 1,
+	SVG_TRANSFORM_SCALE		= 2,
+	SVG_TRANSFORM_ROTATE	= 3,
+	SVG_TRANSFORM_SKEWX		= 4,
+	SVG_TRANSFORM_SKEWY		= 5
+};
+
+typedef u8 SVG_TransformType; 
+
+enum {
+	SVG_FONTWEIGHT_100 = 0, 
+	SVG_FONTWEIGHT_200,
+	SVG_FONTWEIGHT_300, 
+	SVG_FONTWEIGHT_400,
+	SVG_FONTWEIGHT_500,
+	SVG_FONTWEIGHT_600,
+	SVG_FONTWEIGHT_700,
+	SVG_FONTWEIGHT_800,
+	SVG_FONTWEIGHT_900,
+	SVG_FONTWEIGHT_BOLD, 
+	SVG_FONTWEIGHT_BOLDER, 
+	SVG_FONTWEIGHT_INHERIT,
+	SVG_FONTWEIGHT_LIGHTER, 
+	SVG_FONTWEIGHT_NORMAL
+};
+typedef u8 SVG_FontWeight;
+
+enum {
+	SVG_FONTVARIANT_INHERIT		= 0,
+	SVG_FONTVARIANT_NORMAL		= 1,
+	SVG_FONTVARIANT_SMALLCAPS	= 2
+};
+typedef u8 SVG_FontVariant;
+
+enum {
+	SVG_VISIBILITY_HIDDEN   = 0,
+	SVG_VISIBILITY_INHERIT	= 1,
+	SVG_VISIBILITY_VISIBLE  = 2,
+	SVG_VISIBILITY_COLLAPSE = 3
+};
+typedef u8 SVG_Visibility;
+
+enum {
+	SVG_DISPLAY_INHERIT = 0,
+	SVG_DISPLAY_NONE    = 1,
+	SVG_DISPLAY_INLINE  = 2,
+	SVG_DISPLAY_BLOCK,
+	SVG_DISPLAY_LIST_ITEM,
+	SVG_DISPLAY_RUN_IN,
+	SVG_DISPLAY_COMPACT,
+	SVG_DISPLAY_MARKER,
+	SVG_DISPLAY_TABLE,
+	SVG_DISPLAY_INLINE_TABLE,
+	SVG_DISPLAY_TABLE_ROW_GROUP,
+	SVG_DISPLAY_TABLE_HEADER_GROUP,
+	SVG_DISPLAY_TABLE_FOOTER_GROUP,
+	SVG_DISPLAY_TABLE_ROW,
+	SVG_DISPLAY_TABLE_COLUMN_GROUP,
+	SVG_DISPLAY_TABLE_COLUMN,
+	SVG_DISPLAY_TABLE_CELL,
+	SVG_DISPLAY_TABLE_CAPTION
+};
+typedef u8 SVG_Display;
+
+enum {
+	SVG_DISPLAYALIGN_INHERIT	= 0,
+	SVG_DISPLAYALIGN_AUTO		= 1,
+	SVG_DISPLAYALIGN_AFTER		= 2,
+	SVG_DISPLAYALIGN_BEFORE		= 3,
+	SVG_DISPLAYALIGN_CENTER		= 4
+};
+typedef u8 SVG_DisplayAlign;
+
+enum {
+	SVG_TEXTALIGN_INHERIT	= 0,
+	SVG_TEXTALIGN_START		= 1,
+	SVG_TEXTALIGN_CENTER	= 2,
+	SVG_TEXTALIGN_END		= 3
+};
+typedef u8 SVG_TextAlign;
+
+enum {
+	SVG_STROKEDASHARRAY_NONE	= 0,
+	SVG_STROKEDASHARRAY_INHERIT = 1,
+	SVG_STROKEDASHARRAY_ARRAY	= 2
+};
+
+typedef struct {
+	u32 count;
+	Fixed* vals;
+} Array;
+
+typedef struct {
+	u8 type;
+	Array array;
+} SVG_StrokeDashArray;
+
+enum {
+	SVG_TEXTANCHOR_INHERIT	= 0,
+	SVG_TEXTANCHOR_END		= 1,
+	SVG_TEXTANCHOR_MIDDLE	= 2,
+	SVG_TEXTANCHOR_START	= 3
+};
+typedef u8 SVG_TextAnchor;
+
+enum {
+	SVG_ANGLETYPE_UNKNOWN		= 0,
+	SVG_ANGLETYPE_UNSPECIFIED	= 1,
+	SVG_ANGLETYPE_DEG			= 2,
+	SVG_ANGLETYPE_RAD			= 3,
+	SVG_ANGLETYPE_GRAD			= 4
+};
+
+enum {
+	SVG_UNIT_TYPE_UNKNOWN			= 0,
+	SVG_UNIT_TYPE_USERSPACEONUSE	= 1,
+	SVG_UNIT_TYPE_OBJECTBOUNDINGBOX = 2
+};
+
+enum {
+	// Alignment Types
+	SVG_PRESERVEASPECTRATIO_NONE = 1,
+	SVG_PRESERVEASPECTRATIO_XMINYMIN = 2,
+	SVG_PRESERVEASPECTRATIO_XMIDYMIN = 3,
+	SVG_PRESERVEASPECTRATIO_XMAXYMIN = 4,
+	SVG_PRESERVEASPECTRATIO_XMINYMID = 5,
+	SVG_PRESERVEASPECTRATIO_XMIDYMID = 0, //default
+	SVG_PRESERVEASPECTRATIO_XMAXYMID = 6,
+	SVG_PRESERVEASPECTRATIO_XMINYMAX = 7,
+	SVG_PRESERVEASPECTRATIO_XMIDYMAX = 8,
+	SVG_PRESERVEASPECTRATIO_XMAXYMAX = 9
+};
+
+enum {
+	// Meet_or_slice Types
+	SVG_MEETORSLICE_MEET  = 0,
+	SVG_MEETORSLICE_SLICE = 1
+};
+
+typedef struct {
+	Bool defer;
+	u8 align;
+	u8 meetOrSlice;
+} SVG_PreserveAspectRatio; 
+
+enum {
+	SVG_ZOOMANDPAN_DISABLE = 0,
+	SVG_ZOOMANDPAN_MAGNIFY,
+};
+
+typedef u8 SVG_ZoomAndPan;
+
+enum {
+	LENGTHADJUST_UNKNOWN   = 0,
+	LENGTHADJUST_SPACING     = 1,
+	LENGTHADJUST_SPACINGANDGLYPHS     = 2
+};
+
+enum {
+    // textPath Method Types
+	TEXTPATH_METHODTYPE_UNKNOWN   = 0,
+	TEXTPATH_METHODTYPE_ALIGN     = 1,
+	TEXTPATH_METHODTYPE_STRETCH     = 2
+};
+enum {
+    // textPath Spacing Types
+	TEXTPATH_SPACINGTYPE_UNKNOWN   = 0,
+	TEXTPATH_SPACINGTYPE_AUTO     = 1,
+	TEXTPATH_SPACINGTYPE_EXACT     = 2
+};
+
+enum {
+    // Marker Unit Types
+	SVG_MARKERUNITS_UNKNOWN        = 0,
+	SVG_MARKERUNITS_USERSPACEONUSE = 1,
+	SVG_MARKERUNITS_STROKEWIDTH    = 2
+};
+enum {
+    // Marker Orientation Types
+	SVG_MARKER_ORIENT_UNKNOWN      = 0,
+	SVG_MARKER_ORIENT_AUTO         = 1,
+	SVG_MARKER_ORIENT_ANGLE        = 2
+};
+
+enum {
+    // Spread Method Types
+	SVG_SPREADMETHOD_UNKNOWN = 0,
+	SVG_SPREADMETHOD_PAD     = 1,
+	SVG_SPREADMETHOD_REFLECT = 2,
+	SVG_SPREADMETHOD_REPEAT  = 3
+};
+
+enum {
+	SVG_POINTEREVENTS_INHERIT			= 0,
+	SVG_POINTEREVENTS_ALL				= 1,
+	SVG_POINTEREVENTS_FILL				= 2,
+	SVG_POINTEREVENTS_NONE				= 3,
+	SVG_POINTEREVENTS_PAINTED			= 4,
+	SVG_POINTEREVENTS_STROKE			= 5,
+	SVG_POINTEREVENTS_VISIBLE			= 6,
+	SVG_POINTEREVENTS_VISIBLEFILL		= 7,
+	SVG_POINTEREVENTS_VISIBLEPAINTED	= 8,
+	SVG_POINTEREVENTS_VISIBLESTROKE		= 9,
+	SVG_POINTEREVENTS_BOUNDINGBOX		= 10
+};
+typedef u8 SVG_PointerEvents;
+
+enum {
+	SVG_RENDERINGHINT_INHERIT				= 0,
+	SVG_RENDERINGHINT_AUTO					= 1,
+	SVG_RENDERINGHINT_OPTIMIZEQUALITY		= 2,
+	SVG_RENDERINGHINT_OPTIMIZESPEED			= 3,
+	SVG_RENDERINGHINT_OPTIMIZELEGIBILITY	= 4,
+	SVG_RENDERINGHINT_CRISPEDGES			= 5,
+	SVG_RENDERINGHINT_GEOMETRICPRECISION	= 6,
+
+};
+typedef u8 SVG_RenderingHint;
+
+enum {
+	SVG_VECTOREFFECT_INHERIT			= 0,
+	SVG_VECTOREFFECT_NONE				= 1,
+	SVG_VECTOREFFECT_NONSCALINGSTROKE	= 2,
+};
+typedef u8 SVG_VectorEffect;
+
+enum {
+	XMLEVENT_PROPAGATE_CONTINUE = 0,
+	XMLEVENT_PROPAGATE_STOP		= 1
+};
+typedef u8 XMLEV_Propagate;
+
+enum {
+	XMLEVENT_DEFAULTACTION_CANCEL = 0,
+	XMLEVENT_DEFAULTACTION_PERFORM,
+	
+};
+typedef u8 XMLEV_DefaultAction;
+
+enum {
+	XMLEVENT_PHASE_DEFAULT	= 0,
+	XMLEVENT_PHASE_CAPTURE	= 1
+};
+typedef u8 XMLEV_Phase;
+
+enum {
+	SMIL_SYNCBEHAVIOR_INHERIT		= 0,
+	/*LASeR order*/
+	SMIL_SYNCBEHAVIOR_CANSLIP,
+	SMIL_SYNCBEHAVIOR_DEFAULT,
+	SMIL_SYNCBEHAVIOR_INDEPENDENT,
+	SMIL_SYNCBEHAVIOR_LOCKED,
+};
+typedef u8 SMIL_SyncBehavior;
+
+enum {
+	SMIL_SYNCTOLERANCE_INHERIT		= 0,
+	SMIL_SYNCTOLERANCE_DEFAULT		= 1,
+	SMIL_SYNCTOLERANCE_VALUE		= 2
+};
+
+typedef struct {
+	u8 type;
+	SVG_Clock value;
+} SMIL_SyncTolerance;
+
+enum {
+	SMIL_ATTRIBUTETYPE_CSS	= 0,
+	SMIL_ATTRIBUTETYPE_XML,
+	SMIL_ATTRIBUTETYPE_AUTO,
+};
+typedef u8 SMIL_AttributeType;
+
+enum {
+	SVG_PLAYBACKORDER_ALL			= 0,
+	SVG_PLAYBACKORDER_FORWARDONLY	= 1,
+};
+typedef u8 SVG_PlaybackOrder;
+
+enum {
+	SVG_TIMELINEBEGIN_ONLOAD=0,
+	SVG_TIMELINEBEGIN_ONSTART,
+};
+typedef u8 SVG_TimelineBegin;
+
+enum {
+	XML_SPACE_DEFAULT		= 0,
+	XML_SPACE_PRESERVE		= 1
+};
+typedef u8 XML_Space;
+
+
+enum {
+	SVG_GRADIENTUNITS_OBJECT = 0,
+	SVG_GRADIENTUNITS_USER = 1
+};
+typedef u8 SVG_GradientUnit;
+
+enum {
+	SVG_FOCUSHIGHLIGHT_AUTO = 0,
+	SVG_FOCUSHIGHLIGHT_NONE	= 1
+};
+typedef u8 SVG_FocusHighlight;
+
+enum {
+	SVG_INITIALVISIBILTY_WHENSTARTED = 0,
+	SVG_INITIALVISIBILTY_ALWAYS		 = 1
+};
+typedef u8 SVG_InitialVisibility;
+
+enum {
+	SVG_TRANSFORMBEHAVIOR_GEOMETRIC = 0,
+	SVG_TRANSFORMBEHAVIOR_PINNED,
+	SVG_TRANSFORMBEHAVIOR_PINNED180,
+	SVG_TRANSFORMBEHAVIOR_PINNED270,
+	SVG_TRANSFORMBEHAVIOR_PINNED90,
+};
+typedef u8 SVG_TransformBehavior;
+
+enum {
+	SVG_OVERLAY_NONE = 0,
+	SVG_OVERLAY_TOP,
+};
+typedef u8 SVG_Overlay;
+
+enum {
+	SVG_FOCUSABLE_AUTO = 0,
+	SVG_FOCUSABLE_TRUE,
+	SVG_FOCUSABLE_FALSE,
+};
+typedef u8 SVG_Focusable;
+
+
+enum {
+	SVG_SPREAD_PAD = 0,
+	SVG_SPREAD_REFLECT,
+	SVG_SPREAD_REPEAT,
+};
+typedef u8 SVG_SpreadMethod;
+
+enum {
+	LASeR_CHOICE_ALL   = 0,
+	LASeR_CHOICE_NONE  = 1,
+	LASeR_CHOICE_N	   = 2
+};
+typedef u8 LASeR_Choice_enum;
+
+typedef struct {
+	u32 type;
+	u32 choice_index;
+} LASeR_Choice;
+
+typedef struct {
+	Fixed width, height;
+} LASeR_Size;
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*_GF_SVG_SVG_TYPES_H_*/
+
+
diff --git a/tstools/DtsEdit/src/gpac/sync_layer.h b/tstools/DtsEdit/src/gpac/sync_layer.h
new file mode 100644
index 0000000..90e8c7c
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/sync_layer.h
@@ -0,0 +1,125 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / SL header file
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  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_SYNC_LAYER_H_
+#define _GF_SYNC_LAYER_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+	
+/*the Sync Layer config descriptor*/
+typedef struct
+{
+	/*base descriptor*/
+	u8 tag;
+
+	u8 predefined;
+	u8 useAccessUnitStartFlag;
+	u8 useAccessUnitEndFlag;
+	u8 useRandomAccessPointFlag;
+	u8 hasRandomAccessUnitsOnlyFlag;
+	u8 usePaddingFlag;
+	u8 useTimestampsFlag;
+	u8 useIdleFlag;
+	u8 durationFlag;
+	u32 timestampResolution;
+	u32 OCRResolution;
+	u8 timestampLength;
+	u8 OCRLength;
+	u8 AULength;
+	u8 instantBitrateLength;
+	u8 degradationPriorityLength;
+	u8 AUSeqNumLength;
+	u8 packetSeqNumLength;
+	u32 timeScale;
+	u16 AUDuration;
+	u16 CUDuration;
+	u64 startDTS;
+	u64 startCTS;
+} GF_SLConfig;
+
+/***************************************
+			SLConfig Tag
+***************************************/
+enum
+{
+	SLPredef_Null = 0x01,
+	SLPredef_MP4 = 0x02,
+	/*intern to GPAC, means NO SL at all (for streams unable to handle AU reconstruction a timing)*/
+	SLPredef_SkipSL = 0xF0
+};
+
+/*set SL predefined (assign all fields according to sl->predefined value)*/
+GF_Err gf_odf_slc_set_pref(GF_SLConfig *sl);
+
+
+typedef struct
+{
+	u8 accessUnitStartFlag;
+	u8 accessUnitEndFlag;
+	u8 paddingFlag;
+	u8 randomAccessPointFlag;
+	u8 OCRflag;
+	u8 idleFlag;
+	u8 decodingTimeStampFlag;
+	u8 compositionTimeStampFlag;
+	u8 instantBitrateFlag;
+	u8 degradationPriorityFlag;
+
+	u8 paddingBits;
+	u16 packetSequenceNumber;
+	u64 objectClockReference;
+	u16 AU_sequenceNumber;
+	u64 decodingTimeStamp;
+	u64 compositionTimeStamp;
+	u16 accessUnitLength;
+	u32 instantBitrate;
+	u16 degradationPriority;
+
+	/*this is NOT part of standard SL, only used internally: signals duration of access unit if known
+	this is usefull for streams with very random updates, to prevent buffering for instance a subtitle stream
+	which is likely to have no updates during the first minutes... expressed in media timescale*/
+	u32 au_duration;
+	/*ISMACryp extensions*/
+	u8 isma_encrypted;
+	u64 isma_BSO;
+} GF_SLHeader;
+
+
+/*packetize SL-PDU. If PDU is NULL or size 0, only writes the SL header*/
+void gf_sl_packetize(GF_SLConfig* slConfig, GF_SLHeader *Header, char *PDU, u32 size, char **outPacket, u32 *OutSize);
+/*gets SL header size in bytes*/
+u32 gf_sl_get_header_size(GF_SLConfig* slConfig, GF_SLHeader *Header);
+
+/*depacketize SL-PDU*/
+void gf_sl_depacketize(GF_SLConfig *slConfig, GF_SLHeader *Header, char *PDU, u32 PDULength, u32 *HeaderLen);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/*_GF_SYNC_LAYER_H_*/
diff --git a/tstools/DtsEdit/src/gpac/term_info.h b/tstools/DtsEdit/src/gpac/term_info.h
new file mode 100644
index 0000000..144bf4e
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/term_info.h
@@ -0,0 +1,161 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Stream Management sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+
+#ifndef _GF_TERM_INFO_H_
+#define _GF_TERM_INFO_H_
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+	OD Browsing API - YOU MUST INCLUDE <gpac/terminal.h> before 
+	(this has been separated from terminal.h to limit dependency of core to mpeg4_odf.h header)
+	ALL ITEMS ARE READ-ONLY AND SHALL NOT BE MODIFIED
+*/
+#include <gpac/mpeg4_odf.h>
+
+/*returns top-level OD of the presentation*/
+GF_ObjectManager *gf_term_get_root_object(GF_Terminal *term);
+/*returns number of sub-ODs in the current root. scene_od must be an inline OD*/
+u32 gf_term_get_object_count(GF_Terminal *term, GF_ObjectManager *scene_od);
+/*returns indexed (0-based) OD manager in the scene*/
+GF_ObjectManager *gf_term_get_object(GF_Terminal *term, GF_ObjectManager *scene_od, u32 index);
+/*return values:
+	0: regular media object, not inline
+	1: root scene
+	2: inline scene
+	3: externProto library
+*/
+u32 gf_term_object_subscene_type(GF_Terminal *term, GF_ObjectManager *odm);
+
+/*select given object when stream selection is available*/
+void gf_term_select_object(GF_Terminal *term, GF_ObjectManager *odm);
+
+typedef struct
+{
+	GF_ObjectDescriptor *od;
+	Double duration;
+	Double current_time;
+	/*0: stoped, 1: playing, 2: paused, 3: not setup, 4; setup failed.*/
+	u32 status;
+	/*if set, the PL flags are valid*/
+	Bool has_profiles;
+	Bool inline_pl;
+	u8 OD_pl; 
+	u8 scene_pl;
+	u8 audio_pl;
+	u8 visual_pl;
+	u8 graphics_pl;
+
+	/*name of module handling the service service */
+	const char *service_handler;
+	/*name of service*/
+	const char *service_url;
+	/*set if the service is owned by this object*/
+	Bool owns_service;
+
+	/*stream buffer:
+		-2: stream is not playing
+		-1: stream has no buffering
+		>=0: amount of media data present in buffer, in ms
+	*/
+	s32 buffer;
+	/*number of AUs in DB (cumulated on all input channels)*/
+	u32 db_unit_count;
+	/*number of CUs in composition memory (if any) and CM capacity*/
+	u16 cb_unit_count, cb_max_count;
+	/*clock drift in ms of object clock: this is the delay set by the audio renderer to keep AV in sync*/
+	s32 clock_drift;
+	/*codec name*/
+	const char *codec_name;
+	/*object type - match streamType (cf constants.h)*/
+	u32 od_type;
+	/*audio properties*/
+	u32 sample_rate, bits_per_sample, num_channels;
+	/*video properties (w & h also used for scene codecs)*/
+	u32 width, height, pixelFormat, par;
+
+	/*average birate over last second and max bitrate over one second at decoder input - expressed in bits per sec*/
+	u32 avg_bitrate, max_bitrate;
+	u32 total_dec_time, max_dec_time, nb_dec_frames, nb_droped;
+
+	/*set if ISMACryp present on the object - will need refinement for IPMPX...
+	0: not protected - 1: protected and OK - 2: protected and DRM failed*/
+	u32 protection;
+
+	u32 lang;
+
+	/*name of media if not defined in OD framework*/
+	const char *media_url;
+} GF_MediaInfo;
+
+/*fills the GF_MediaInfo structure describing the OD manager*/
+GF_Err gf_term_get_object_info(GF_Terminal *term, GF_ObjectManager *odm, GF_MediaInfo *info);
+/*gets current downloads info for the service - only use if ODM owns thesrevice, returns 0 otherwise.
+	@d_enum: in/out current enum - shall start to 0, incremented at each call. fct returns 0 if no more 
+	downloads
+	@server: server name
+	@path: file/data location on server
+	@bytes_done, @total_bytes: file info. total_bytes may be 0 (eg http streaming)
+	@bytes_per_sec: guess what
+*/
+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);
+
+/*same principles as above , struct __netcom is defined in service.h*/
+typedef struct __netstatcom NetStatCommand;
+Bool gf_term_get_channel_net_info(GF_Terminal *term, GF_ObjectManager *odm, u32 *d_enum, u32 *chid, NetStatCommand *netcom, GF_Err *ret_code);
+
+/*same principles as above , struct __netinfo is defined in service.h*/
+typedef struct __netinfocom NetInfoCommand;
+GF_Err gf_term_get_service_info(GF_Terminal *term, GF_ObjectManager *odm, NetInfoCommand *netcom);
+
+/*retrieves world info of the scene @od belongs to. 
+If @odm is or points to an inlined OD the world info of the inlined content is retrieved
+If @odm is NULL the world info of the main scene is retrieved
+returns NULL if no WorldInfo available
+returns world title if available 
+@descriptions: any textual descriptions is stored here
+  strings are not allocated
+*/
+const char *gf_term_get_world_info(GF_Terminal *term, GF_ObjectManager *scene_od, GF_List *descriptions);
+
+/*dumps scene graph in specified file, in BT or XMT format
+@rad_name: file radical (NULL for stdout) - if not NULL MUST BE GF_MAX_PATH length
+if @skip_proto is set proto declarations are not dumped
+If @odm is or points to an inlined OD the inlined scene is dumped
+If @odm is NULL the main scene is dumped
+*/
+GF_Err gf_term_dump_scene(GF_Terminal *term, char *rad_name, Bool xml_dump, Bool skip_proto, GF_ObjectManager *odm);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif	/*_GF_TERM_INFO_H_*/
diff --git a/tstools/DtsEdit/src/gpac/terminal.h b/tstools/DtsEdit/src/gpac/terminal.h
new file mode 100644
index 0000000..0d95ff2
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/terminal.h
@@ -0,0 +1,183 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Stream Management sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _GF_TERMINAL_H_
+#define _GF_TERMINAL_H_
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/user.h>
+
+/*creates a new terminal for a userApp callback*/
+GF_Terminal *gf_term_new(GF_User *user);
+
+/*delete the app - stop is done automatically, you don't have to do it before deleting the app
+returns GF_IO_ERR if client couldn't be shutdown normally*/
+GF_Err gf_term_del(GF_Terminal *term);
+
+/*connects to a URL*/
+void gf_term_connect(GF_Terminal *term, const char *URL);
+/*disconnects the url*/
+void gf_term_disconnect(GF_Terminal *term);
+/*navigates to a given destination or shutdown/restart the current one if any.
+This is the only safe way of restarting/jumping a presentation from inside the EventProc 
+where doing a disconnect/connect could deadlock if toURL is NULL, uses the current URL*/
+void gf_term_navigate_to(GF_Terminal *term, const char *toURL);
+/*restarts url from given time (in ms). Return value: 
+	0: service is not connected yet
+	1: service has no seeking capabilities
+	2: service has been seeked
+*/
+u32 gf_term_play_from_time(GF_Terminal *term, u64 from_time, Bool pause_at_first_frame);
+/*connect URL and seek right away - only needed when reloading the complete player (avoids waiting
+for connection and post a seek..)*/
+void gf_term_connect_from_time(GF_Terminal *term, const char *URL, u64 time_in_ms, Bool pause_at_first_frame);
+
+/*same as gf_term_connect but specifies a parent path*/
+void gf_term_connect_with_path(GF_Terminal *term, const char *URL, const char *parent_URL);
+
+/*returns current framerate
+	if @absoluteFPS is set, the return value is the absolute framerate, eg NbFrameCount/NbTimeSpent regardless of
+whether a frame has been drawn or not, which means the FPS returned can be much greater than the target rendering 
+framerate
+	if @absoluteFPS is not set, the return value is the FPS taking into account not drawn frames (eg, less than 
+	or equal to compositor FPS)
+*/
+Double gf_term_get_framerate(GF_Terminal *term, Bool absoluteFPS);
+/*get main scene current time in milliseconds*/
+u32 gf_term_get_time_in_ms(GF_Terminal *term);
+
+/*returns current URL address*/
+const char *gf_term_get_url(GF_Terminal *term);
+
+/*get viewpoints/viewports for main scene - idx is 1-based, and if greater than number of viewpoints return GF_EOS*/
+GF_Err gf_term_get_viewpoint(GF_Terminal *term, u32 viewpoint_idx, const char **outName, Bool *is_bound);
+/*set active viewpoints/viewports for main scene given its name - idx is 1-based, or 0 to set by viewpoint name
+if only one viewpoint is present in the scene, this will bind/unbind it*/
+GF_Err gf_term_set_viewpoint(GF_Terminal *term, u32 viewpoint_idx, const char *viewpoint_name);
+
+/*adds an object to the scene - only possible if scene has selectable streams (cf GF_OPT_CAN_SELECT_STREAMS option)*/
+GF_Err gf_term_add_object(GF_Terminal *term, const char *url, Bool auto_play);
+
+
+/*set/set option - most of the terminal cfg is done through options, please refer to user.h for details*/
+GF_Err gf_term_set_option(GF_Terminal *term, u32 opt_type, u32 opt_value);
+u32 gf_term_get_option(GF_Terminal *term, u32 opt_type);
+
+/*checks if given URL is understood by client.
+if use_parent_url is set, relative URLs are solved against the current presentation URL*/
+Bool gf_term_is_supported_url(GF_Terminal *term, const char *fileName, Bool use_parent_url, Bool no_mime_check);
+
+/*sets simulation frame rate*/
+GF_Err gf_term_set_simulation_frame_rate(GF_Terminal * term, Double frame_rate);
+/*gets simulation frame rate*/
+Double gf_term_get_simulation_frame_rate(GF_Terminal *term);
+
+/*sends a set of scene commands (BT, XMT, X3D, LASeR+XML) to the scene
+type indicates the language used - accepted values are 
+	"model/x3d+xml" or "x3d": commands is an X3D+XML scene
+	"model/x3d+vrml" or  "xrdv": commands is an X3D+VRML scene
+	"model/vrml" or "vrml": commands is an VRML scene
+	"application/x-xmt" or "xmt": commands is an XMT-A scene or a list of XMT-A updates
+	"application/x-bt" or "bt": commands is a BT scene or a list of BT updates
+	"image/svg+xml" or "svg": commands is an SVG scene
+	"application/x-laser+xml" or "laser": commands is an SVG/LASeR+XML  scene or a list of LASeR+XML updates
+	if not specified, the type will be guessed from the current root node if any
+*/
+GF_Err gf_term_scene_update(GF_Terminal *term, char *type, char *com);
+
+
+/*request visual output size change:
+	* NOT NEEDED WHEN THE TERMINAL IS HANDLING THE DISPLAY WINDOW (cf user.h)
+	* if the user app manages the output window it shall resize it before calling this
+*/
+GF_Err gf_term_set_size(GF_Terminal *term, u32 NewWidth, u32 NewHeight);
+
+/*returns current text selection if any, or NULL otherwise. If probe mode is set, returns a non-NULL string ("") 
+if some text is selected*/
+const char *gf_term_get_text_selection(GF_Terminal *term, Bool probe_only);
+/*pastes text into current selection if any. If probe mode is set, only check if text is currently edited
+if some text is selected*/
+GF_Err gf_term_paste_text(GF_Terminal *term, const char *txt, Bool probe_only);
+
+
+/*decodes pending media and render frame. 
+NOTE: This can only be used when the terminal runs without visual thread (GF_TERM_NO_VISUAL_THREAD flag set)
+*/
+GF_Err gf_term_process_step(GF_Terminal *term);
+
+/*decodes all pending media and render frame until no scene changes are detected.
+NOTE: This can only be used when the terminal runs without visual thread (GF_TERM_NO_VISUAL_THREAD flag set)
+*/
+GF_Err gf_term_process_flush(GF_Terminal *term);
+
+/*post user interaction to terminal*/
+/*NOT NEEDED WHEN THE TERMINAL IS HANDLING THE DISPLAY WINDOW (cf user.h)*/
+Bool gf_term_user_event(GF_Terminal *term, GF_Event *event);
+
+/*post extended user mouse interaction to terminal 
+	X and Y are point coordinates in the display expressed in 2D coord system top-left (0,0), Y increasing towards bottom
+	@xxx_but_down: specifiy whether the mouse button is down(2) or up (1), 0 if unchanged
+	@wheel: specifiy current wheel inc (0: unchanged , +1 for one wheel delta forward, -1 for one wheel delta backward)
+*/
+/*NOT NEEDED WHEN THE TERMINAL IS HANDLING THE DISPLAY WINDOW (cf user.h)*/
+void gf_term_mouse_input(GF_Terminal *term, GF_EventMouse *event);
+
+/*post extended user key interaction to terminal 
+	@key_code: GPAC DOM code of input key
+	@hw_code: hardware code of input key
+	@isKeyUp: set if key is released
+*/
+/*NOT NEEDED WHEN THE TERMINAL IS HANDLING THE DISPLAY WINDOW (cf user.h)*/
+void gf_term_keyboard_input(GF_Terminal *term, u32 key_code, u32 hw_code, Bool isKeyUp);
+
+/*post extended user character interaction to terminal 
+	@character: unicode character input
+*/
+/*NOT NEEDED WHEN THE TERMINAL IS HANDLING THE DISPLAY WINDOW (cf user.h)*/
+void gf_term_string_input(GF_Terminal *term, u32 character);
+
+
+
+/*framebuffer access*/
+#include <gpac/color.h>
+
+/*gets screen buffer - this locks the scene graph too until released is called*/
+GF_Err gf_term_get_screen_buffer(GF_Terminal *term, GF_VideoSurface *framebuffer);
+/*releases screen buffer and unlocks graph*/
+GF_Err gf_term_release_screen_buffer(GF_Terminal *term, GF_VideoSurface *framebuffer);
+
+
+/*ObjectManager used by both terminal and object browser (term_info.h)*/
+typedef struct _od_manager GF_ObjectManager;
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif	/*_GF_TERMINAL_H_*/
diff --git a/tstools/DtsEdit/src/gpac/thread.h b/tstools/DtsEdit/src/gpac/thread.h
new file mode 100644
index 0000000..ee3a1b6
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/thread.h
@@ -0,0 +1,271 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / common tools sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _GF_THREAD_H_
+#define _GF_THREAD_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!
+ *	\file <gpac/thread.h>
+ *	\brief threading functions.
+ */
+
+ /*!
+ *	\addtogroup thr_grp threading
+ *	\ingroup utils_grp
+ *	\brief Threading and Mutual Exclusion Functions
+ *
+ *This section documents the threading of the GPAC framework. These provide an easy way to implement
+ *safe multithreaded tools.
+ *	@{
+ */
+
+#include <gpac/tools.h>
+
+/*!
+ *\brief Thread states
+ *
+ *Inidcates the execution status of a thread
+ */
+enum
+{
+	/*! the thread has been initialized but is not started yet*/
+	GF_THREAD_STATUS_STOP = 0,
+	/*! the thread is running*/
+	GF_THREAD_STATUS_RUN = 1,
+	/*! the thread has exited its body function*/
+	GF_THREAD_STATUS_DEAD = 2
+};
+
+/*!
+ *\brief abstracted thread object
+ *
+ *The abstracted thread object allows you to execute some code independently of the main process of your application.
+*/
+typedef struct __tag_thread GF_Thread;
+
+/*!
+ *\brief thread constructor
+ *
+ *Constructs a new thread object
+ *\param log name of the thread if any
+ */
+GF_Thread *gf_th_new(const char *name);
+/*!
+ *\brief thread destructor
+ *
+ * Kills the thread if running and destroys the object
+ *\param th the thread object
+ */
+void gf_th_del(GF_Thread *th);
+
+/*!
+ *	\brief thread run function callback
+ *
+ *The gf_thread_run type is the type for the callback of the \ref gf_thread_run function
+ *\param par opaque user data
+ *\return exit code of the thread, usually 1 for error and 0 if normal execution
+ *
+ */
+typedef u32 (*gf_thread_run)(void *par);
+
+/*!
+ *\brief thread execution
+ *
+ *Executes the thread with the given function
+ *\param th the thread object
+ *\param run the function this thread will call
+ *\param par the argument to the function the thread will call
+ *\note A thread may be run several times but cannot be run twice in the same time.
+ */
+GF_Err gf_th_run(GF_Thread *th, gf_thread_run run, void *par);
+/*!
+ *\brief thread stoping
+ *
+ *Waits for the thread exit until return
+ *\param th the thread object
+ */
+void gf_th_stop(GF_Thread *th);
+/*!
+ *\brief thread status query
+ *
+ *Gets the thread status
+ *\param th the thread object
+ */
+u32 gf_th_status(GF_Thread *th);
+
+/*!
+ * thread priorities
+ */
+enum
+{
+	/*!Idle Priority*/
+	GF_THREAD_PRIORITY_IDLE=0,
+	/*!Less Idle Priority*/
+	GF_THREAD_PRIORITY_LESS_IDLE,
+	/*!Lowest Priority*/
+	GF_THREAD_PRIORITY_LOWEST,
+	/*!Low Priority*/
+	GF_THREAD_PRIORITY_LOW,
+	/*!Normal Priority (the default one)*/
+	GF_THREAD_PRIORITY_NORMAL,
+	/*!High Priority*/
+	GF_THREAD_PRIORITY_HIGH,
+	/*!Highest Priority*/
+	GF_THREAD_PRIORITY_HIGHEST,
+	/*!First real-time priority*/
+	GF_THREAD_PRIORITY_REALTIME,
+	/*!Last real-time priority*/
+	GF_THREAD_PRIORITY_REALTIME_END=255
+};
+
+/*!
+ *\brief thread priority
+ *
+ *Sets the thread execution priority level.
+ *\param th the thread object
+ *\param priority the desired priority
+ *\note this should be used with caution, especially use of real-time priorities.
+ */
+void gf_th_set_priority(GF_Thread *th, s32 priority);
+/*!
+ *\brief current thread ID 
+ *
+ *Gets the ID of the current thread the caller is in.
+*/
+u32 gf_th_id();
+
+
+
+/*!
+ *\brief abstracted mutex object
+ *
+ *The abstracted mutex object allows you to make sure that portions of the code (typically access to variables) cannot be executed
+ *by two threads (or a thread and the main process) at the same time.
+*/
+typedef struct __tag_mutex GF_Mutex;
+/*
+ *\brief mutex constructor
+ *
+ *Contructs a new mutex object
+ *\param log name of the thread if any
+*/
+GF_Mutex *gf_mx_new(const char *name);
+/*
+ *\brief mutex denstructor
+ *
+ *Destroys a mutex object. This will wait for the mutex to be released if needed.
+ *\param mx the mutex object
+*/
+void gf_mx_del(GF_Mutex *mx);
+/*
+ *\brief mutex locking
+ *
+ *Locks the mutex object, making sure that another thread locking this mutex cannot exectute until the mutex is unlocked.
+ *\param mx the mutex object
+ *\return 1 if success, 0 if error locking the mutex (which should never happen)
+*/
+u32 gf_mx_p(GF_Mutex *mx);
+/*
+ *\brief mutex unlocking
+ *
+ *Unlocks the mutex object, allowing other threads waiting on this mutex to continue their execution
+ *\param mx the mutex object
+*/
+void gf_mx_v(GF_Mutex *mx);
+/*
+ *\brief mutex non-blocking lock
+ *
+ *Attemps to lock the mutex object without blocking until the object is released.
+ *\param mx the mutex object
+ *\return 1 if the mutex has been successfully locked, in which case it shall then be unlocked, or 0 if the mutex is locked by another thread.
+*/
+Bool gf_mx_try_lock(GF_Mutex *mx);
+
+
+/*********************************************************************
+					Semaphore Object
+**********************************************************************/
+/*!
+ *\brief abstracted semaphore object
+ *
+ *The abstracted semaphore object allows you to control how portions of the code (typically access to variables) are executed
+ *by two threads (or a thread and the main process) at the same time. The best image for a semaphore is a limited set 
+ *of money coins (always easy to understand hmm?). If no money is in the set, nobody can buy anything until a coin is 
+ *put back in the set. When the set is full, the money is wasted (call it "the bank"...).
+*/
+typedef struct __tag_semaphore GF_Semaphore;
+/*
+ *\brief semaphore constructor
+ *
+ *Constructs a new semaphore object
+ *\param MaxCount the maximum notification count of this semaphore
+ *\param InitCount the initial notification count of this semaphore upon construction
+ *\return the semaphore object
+ */
+GF_Semaphore *gf_sema_new(u32 MaxCount, u32 InitCount);
+/*
+ *\brief semaphore destructor
+ *
+ *Destructs the semaphore object. This will wait for the semaphore to be released if needed.
+ */
+void gf_sema_del(GF_Semaphore *sm);
+/*
+ *\brief semaphore notifivation
+ *
+ *Notifies the semaphore of a certain amount of releases.
+ *\param sm the semaphore object
+ *\param nb_rel sm the number of release to notify
+ *\return the number of previous notification count in the semaphore 
+*/
+u32 gf_sema_notify(GF_Semaphore *sm, u32 nb_rel);
+/*
+ *\brief semaphore wait
+ *
+ *Waits for the semaphore to be accessible (eg, may wait an infinite time).
+ *\param sm the semaphore object
+*/
+void gf_sema_wait(GF_Semaphore *sm);
+/*
+ *\brief semaphore time wait
+ *
+ *Waits for a certain for the semaphore to be accessible, and returns when semaphore is accessible or wait time has passed.
+ *\param sm the semaphore object
+ *\param time_out the amount of time to wait for the release in milliseconds
+ *\return returns 1 if the semaphore was released before the timeout, 0 if the semaphore is still not released after the timeout.
+*/
+Bool gf_sema_wait_for(GF_Semaphore *sm, u32 time_out);
+
+/*! @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif		/*_GF_THREAD_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/token.h b/tstools/DtsEdit/src/gpac/token.h
new file mode 100644
index 0000000..0d5ecde
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/token.h
@@ -0,0 +1,106 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / common tools sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _GF_TOKEN_H_
+#define _GF_TOKEN_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!
+ *	\file <gpac/token.h>
+ *	\brief tokenizer functions.
+ */
+
+ /*!
+ *	\addtogroup tok_grp tokenizer
+ *	\ingroup utils_grp
+ *	\brief String Tokenizer Functions
+ *
+ *This section documents the basic string tokenizer of the GPAC framework.
+ *	@{
+ */
+
+#include <gpac/tools.h>
+
+/*!
+ *\brief get string component 
+ *
+ *Gets the next string component comprised in a given set of characters
+ *\param buffer source string to scan
+ *\param start char offset from begining of buffer where tokenization shall start
+ *\param separators separator characters to use
+ *\param token output buffer location
+ *\param token_size output buffer allocated size
+ *\return position of the first char in the buffer after the last terminating separator, or -1 if token could not be found
+ */
+s32 gf_token_get(char *buffer, s32 start, char *separators, char *token, s32 token_size);
+/*!
+ *\brief get string component without delimitting characters
+ *
+ *Gets the next string component comprised in a given set of characters, removing surrounding characters
+ *\param buffer source string to scan
+ *\param start char offset from begining of buffer where tokenization shall start
+ *\param separators separator characters to use
+ *\param strip_set surrounding characters to remove
+ *\param token output buffer location
+ *\param token_size output buffer allocated size
+ *\return position of the first char in the buffer after the last terminating separator, or -1 if token could not be found
+ */
+s32 gf_token_get_strip(char *buffer, s32 start, char *separators, char *strip_set, char *token, s32 token_size);
+/*!
+ *\brief line removal
+ *
+ *Gets one line from buffer and remove delimiters CR, LF and CRLF
+ *\param buffer source string to scan
+ *\param start char offset from begining of buffer where tokenization shall start
+ *\param size size of the input buffer to analyze
+ *\param line_buffer output buffer location
+ *\param line_buffer_size output buffer allocated size
+ *\return position of the first char in the buffer after the last line delimiter, or -1 if no line could be found
+ */
+s32 gf_token_get_line(char	*buffer, u32 start, u32 size, char *line_buffer, u32 line_buffer_size);
+/*!
+ *\brief pattern location
+ *
+ *Locates a pattern in the buffer
+ *\param buffer source string to scan
+ *\param start char offset from begining of buffer where tokenization shall start
+ *\param size size of the input buffer to analyze
+ *\param pattern pattern to locate
+ *\return position of the first char in the buffer after the pattern, or -1 if pattern could not be found
+ */
+s32 gf_token_find(char *buffer, u32 start, u32 size, char *pattern);
+
+
+/*! @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif		/*_GF_TOKEN_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/tools.h b/tstools/DtsEdit/src/gpac/tools.h
new file mode 100644
index 0000000..99714fb
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/tools.h
@@ -0,0 +1,655 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / common tools sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _GF_TOOLS_H_
+#define _GF_TOOLS_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/setup.h>
+
+
+/*! \file "gpac/tools.h"
+ *	\brief Base definitions and functions of GPAC.
+ *
+ * This file contains basic functions and core definitions of the GPAC framework. This file is
+ * usually included by all GPAC header files since it contains the error definitions.
+*/
+
+/*! \defgroup utils_grp utils
+ *	You will find in this module the documentation of all tools used in GPAC.
+*/
+
+/*! \addtogroup tools_grp base utils
+ *	\ingroup utils_grp
+ *	\brief Base definitions and functions of GPAC.
+ *
+ *	This section documents some very basic functions and core definitions of the GPAC framework.
+ *	@{
+ */
+
+/*!
+ *	\brief GPAC Version
+ *	\hideinitializer
+ *
+ *	Macro giving GPAC version expressed as a printable string
+*/
+/*KEEP SPACE SEPARATORS FOR MAKE / GREP (SEE MAIN MAKEFILE)!!!, and NO SPACE in GPAC_VERSION for proper install*/
+#define GPAC_VERSION       "0.4.6-DEV"
+
+#define GPAC_BUILD_NUMBER	"1"
+#define GPAC_FULL_VERSION       GPAC_VERSION" (build "GPAC_BUILD_NUMBER")"
+
+/*!
+ *	\brief GPAC Version
+ *	\hideinitializer
+ *
+ *	Macro giving GPAC version expressed as an integer, where version X.Y.Z is coded as 0x00XXYYZZ
+*/
+#define GPAC_VERSION_INT	0x00000406
+
+/*!
+ *	\brief Memory allocation
+ *	\hideinitializer
+ *
+ *	Macro allocating memory and zero-ing it
+*/
+#define GF_SAFEALLOC(__ptr, __struct) { __ptr = (__struct *) malloc(sizeof(__struct)); if (__ptr) memset((void *) __ptr, 0, sizeof(__struct)); }
+
+/*!
+ *	\brief 4CC Formatting
+ *	\hideinitializer
+ *
+ *	Macro formating a 4-character code (or 4CC) "abcd" as 0xAABBCCDD
+*/
+#define GF_4CC(a,b,c,d) (((a)<<24)|((b)<<16)|((c)<<8)|(d))
+/*!
+ *	\brief 4CC Printing
+ *
+ *	returns a 4CC printable form
+*/
+const char *gf_4cc_to_str(u32 type);
+
+/*!
+ *	\brief large file opening
+ *
+ *	Opens a large file (>4GB)
+ *	\param file_name Same semantics as fopen
+ *	\param mode Same semantics as fopen
+ *	\return stream handle of the file object
+ *	\note You only need to call this function if you're suspecting the file to be a large one (usually only media files), otherwise use regular stdio.
+*/
+FILE *gf_f64_open(const char *file_name, const char *mode);
+/*!
+ *	\brief large file position query
+ *
+ *	Queries the current read/write position in a large file
+ *	\param f Same semantics as ftell
+ *	\return position in the file
+ *	\note You only need to call this function if you're suspecting the file to be a large one (usually only media files), otherwise use regular stdio.
+*/
+u64 gf_f64_tell(FILE *f);
+/*!
+ *	\brief large file seeking
+ *
+ *	Seeks the current read/write position in a large file
+ *	\param f Same semantics as fseek
+ *	\param pos Same semantics as fseek
+ *	\param whence Same semantics as fseek
+ *	\return new position in the file
+ *	\note You only need to call this function if you're suspecting the file to be a large one (usually only media files), otherwise use regular stdio.
+*/
+u64 gf_f64_seek(FILE *f, s64 pos, s32 whence);
+
+/*! @} */
+
+
+/*! \addtogroup errors_grp error codes
+ *	\ingroup utils_grp
+ *	\brief Errors used in GPAC.
+ *
+ *	This section documents all error codes used in the GPAC framework. Most of the GPAC's functions will use these as 
+ * return values, and some of these errors are also used for state communication with the different modules of the framework.
+ *	@{
+ */
+
+/*!
+ * GPAC Error
+ *	\hideinitializer
+ *
+ *	positive values are warning and info, 0 means no error and negative values are errors
+ */
+typedef enum
+{
+	/*!Message from any scripting engine used in the presentation (ECMAScript, MPEG-J, ...) (Info).*/
+	GF_SCRIPT_INFO						= 3,
+	/*!Indicates an data frame has several AU packed (not MPEG-4 compliant). This is used by decoders to force 
+	multiple decoding of the same data frame (Info).*/
+	GF_PACKED_FRAMES					= 2,
+	/*!Indicates the end of a stream or of a file (Info).*/
+	GF_EOS								= 1,
+	/*!
+	\n\n
+	*/
+	/*!Operation success (no error).*/
+	GF_OK								= 0,
+	/*!\n*/
+	/*!One of the input parameter is not correct or cannot be used in the current operating mode of the framework.*/
+	GF_BAD_PARAM							= -1,
+	/*! Memory allocation failure.*/
+	GF_OUT_OF_MEM							= -2,
+	/*! Input/Output failure (disk access, system call failures)*/
+	GF_IO_ERR								= -3,
+	/*! The desired feature or operation is not supported by the framework*/
+	GF_NOT_SUPPORTED						= -4,
+	/*! Input data has been corrupted*/
+	GF_CORRUPTED_DATA						= -5,
+	/*! A modification was attempted on a scene node which could not be found*/
+	GF_SG_UNKNOWN_NODE						= -6,
+	/*! The PROTO node interface does not match the nodes using it*/
+	GF_SG_INVALID_PROTO						= -7,
+	/*! An error occured in the scripting engine*/
+	GF_SCRIPT_ERROR							= -8,
+	/*! Buffer is too small to contain decoded data. Decoders shall use this error whenever they need to resize their output memory buffers*/
+	GF_BUFFER_TOO_SMALL						= -9,
+	/*! Bitstream is not compliant to the specfication it refers to*/
+	GF_NON_COMPLIANT_BITSTREAM				= -10,
+	/*! No decoders could be found to handle the desired media type*/
+	GF_CODEC_NOT_FOUND						= -11,
+	/*! The URL is not properly formatted or cannot be found*/
+	GF_URL_ERROR							= -12,
+	/*! An service error has occured at the local side*/
+	GF_SERVICE_ERROR						= -13,
+	/*! A service error has occured at the remote (server) side*/
+	GF_REMOTE_SERVICE_ERROR					= -14,
+	/*! The desired stream could not be found in the service*/
+	GF_STREAM_NOT_FOUND						= -15,
+	/*! The IsoMedia file is not a valid one*/
+	GF_ISOM_INVALID_FILE					= -20,
+	/*! The IsoMedia file is not complete. Either the file is being downloaded, or it has been truncated*/
+	GF_ISOM_INCOMPLETE_FILE					= -21,
+	/*! The media in this IsoMedia track is not valid (usually due to a broken stream description)*/
+	GF_ISOM_INVALID_MEDIA					= -22,
+	/*! The requested operation cannot happen in the current opening mode of the IsoMedia file*/
+	GF_ISOM_INVALID_MODE					= -23,
+	/*! This IsoMedia track refers to media outside the file in an unknown way*/
+	GF_ISOM_UNKNOWN_DATA_REF				= -24,
+
+	/*! An invalid MPEG-4 Object Descriptor was found*/
+	GF_ODF_INVALID_DESCRIPTOR				= -30,
+	/*! An MPEG-4 Object Descriptor was found or added to a forbidden descriptor*/
+	GF_ODF_FORBIDDEN_DESCRIPTOR				= -31,
+	/*! An invalid MPEG-4 BIFS command was detected*/
+	GF_ODF_INVALID_COMMAND					= -32,
+	/*! The scene has been encoded using an unknown BIFS version*/
+	GF_BIFS_UNKNOWN_VERSION					= -33,
+
+	/*! The remote IP address could not be solved*/
+	GF_IP_ADDRESS_NOT_FOUND					= -40,
+	/*! The connection to the remote peer has failed*/
+	GF_IP_CONNECTION_FAILURE				= -41,
+	/*! The network operation has failed*/
+	GF_IP_NETWORK_FAILURE					= -42,
+	/*! The network connection has been closed*/
+	GF_IP_CONNECTION_CLOSED					= -43,
+	/*! The network operation has failed because no data is available*/
+	GF_IP_NETWORK_EMPTY						= -44,
+	/*! The network operation has been discarded because it would be a blocking one*/
+	GF_IP_SOCK_WOULD_BLOCK					= -45,
+	/*! UDP connection did not receive any data at all. Signaled by client services to reconfigure network if possible*/
+	GF_IP_UDP_TIMEOUT						= -46,
+
+	/*! Authentication with the remote host has failed*/
+	GF_AUTHENTICATION_FAILURE				= -50,
+	/*! Script not ready for playback */
+	GF_SCRIPT_NOT_READY						= -51,
+} GF_Err;
+
+/*!
+ *	\brief Error Printing
+ *
+ *	Returns a printable version of a given error
+ *	\param e Error code requested
+ *	\return String representing the error
+*/
+const char *gf_error_to_string(GF_Err e);
+
+/*! @} */
+
+/*! \addtogroup log_grp logging tools
+ *	\ingroup utils_grp
+ *	@{
+ */
+
+/*!
+ * GPAC Log Levels
+ *	\hideinitializer
+ * 
+ * These levels describes messages priority used when filtering logs
+ */
+enum
+{
+	/*! Log message describes an error*/
+	GF_LOG_ERROR = 1,
+	/*! Log message describes a warning*/
+	GF_LOG_WARNING,
+	/*! Log message is informational (state, etc..)*/
+	GF_LOG_INFO,
+	/*! Log message is a debug info*/
+	GF_LOG_DEBUG,
+};
+
+/*!
+ *	\brief Log level assignment
+ *
+ * Sets the level used for log filtering. By default no log is performed
+ *	\param level log level used.
+ *
+ */
+void gf_log_set_level(u32 level);
+
+
+/*!
+ * GPAC Log tools
+ *	\hideinitializer
+ *
+ * These flags describes which sub-part of GPAC generates the log and are used when filtering logs
+ */
+enum
+{
+	/*! Log message from the core library (init, threads, network calls, etc)*/
+	GF_LOG_CORE = 1,
+	/*! Log message from a raw media parser (BIFS, LASeR, A/V formats)*/
+	GF_LOG_CODING= 1<<1,
+	/*! Log message from a bitstream parser (IsoMedia, MPEG-2 TS, OGG, ...)*/
+	GF_LOG_CONTAINER = 1<<2,
+	/*! Log message from the network/service stack (messages & co)*/
+	GF_LOG_NETWORK = 1<<3,
+	/*! Log message from the RTP/RTCP stack (TS info) and packet structure & hinting (debug)*/
+	GF_LOG_RTP = 1<<4,
+	/*! Log message from authoring subsystem (file manip, import/export)*/
+	GF_LOG_AUTHOR = 1<<5,
+	/*! Log message from the sync layer of the terminal*/
+	GF_LOG_SYNC = 1<<6,
+	/*! Log message from a codec*/
+	GF_LOG_CODEC = 1<<7,
+	/*! Log message from any XML parser (context loading, etc)*/
+	GF_LOG_PARSER = 1<<8,
+	/*! Log message from the terminal/compositor, indicating media object state*/
+	GF_LOG_MEDIA = 1<<9,
+	/*! Log message from the scene graph/scene manager (handling of nodes and attribute modif, DOM core)*/
+	GF_LOG_SCENE = 1<<10,
+	/*! Log message from the scripting engine*/
+	GF_LOG_SCRIPT = 1<<11,
+	/*! Log message from event handling*/
+	GF_LOG_INTERACT = 1<<12,
+	/*! Log message from compositor*/
+	GF_LOG_COMPOSE = 1<<13,
+	/*! Log for video object cache */
+	GF_LOG_CACHE = 1<<14,
+	/*! Log message from multimedia I/O devices (audio/video input/output, ...)*/
+	GF_LOG_MMIO = 1<<15,
+	/*! Log for runtime info (times, memory, CPU usage)*/
+	GF_LOG_RTI = 1<<16,
+	/*! Log for SMIL timing and animation*/
+	GF_LOG_SMIL = 1<<17,
+
+};
+
+/*!
+ *	\brief Log modules assignment
+ *
+ * Sets the modules to be checked for log filtering. By default no modules are logged.
+ *	\param tools log tools filtered. This is an OR'ed combinaison of log module flags
+ *
+ */
+void gf_log_set_tools(u32 tools);
+
+/*!
+ *	\brief Log Message Callback
+ *
+ * The gf_log_cbk type is the type for the callback of the \ref gf_log_set_callback function. By default all logs are redirected to stdout
+ *	\param cbck Opaque user data.
+ *	\param log_level level of the log. This value is not guaranteed in multi-threaded context.
+ *	\param log_tool tool emitting the log. This value is not guaranteed in multi-threaded context.
+ *	\param fmt message log format.
+ *	\param vlist message log param.
+ *
+ */
+typedef void (*gf_log_cbk)(void *cbck, u32 log_level, u32 log_tool, const char* fmt, va_list vlist);
+
+/*!
+ *	\brief Log overwrite
+ *
+ *	Assigns a user-defined callback for printing log messages. By default all logs are redirected to stdout
+ *	\param usr_cbk Opaque user data 
+ *	\param cbk  callback log function
+ *	\return previous callback function
+*/
+gf_log_cbk gf_log_set_callback(void *usr_cbk, gf_log_cbk cbk);
+
+/*!
+ \cond DUMMY_DOXY_SECTION
+*/
+
+#ifndef GPAC_DISABLE_LOG
+/*note: 
+		to turn log on, change to GPAC_ENABLE_LOG
+		to turn log off, change to GPAC_DISABLE_LOG
+	this is needed by configure+sed to modify this file directly
+*/
+#define GPAC_ENABLE_LOG
+#endif
+
+/*!
+ \endcond
+*/
+
+
+/*this is all a bit ugly, but most compilers don't properly handle variadic macros...*/
+void gf_log(const char *fmt, ...);
+void gf_log_lt(u32 ll, u32 lt);
+
+u32 gf_log_get_level();
+u32 gf_log_get_tools();
+
+#ifdef GPAC_DISABLE_LOG
+#define GF_LOG(_ll, _lm, __args) 
+#else
+/*!
+ *	\brief Message logging
+ *	\hideinitializer
+ *
+ *	Macro for logging messages. Usage is GF_LOG(log_lev, log_module, (fmt, ...)). The log function is only called if log filtering allows it. This avoids fetching logged parameters when the tool is not being logged.
+*/
+#define GF_LOG(_log_level, _log_tools, __args) if ((gf_log_get_level() >= (_log_level)) && (gf_log_get_tools() & (_log_tools))) { gf_log_lt(_log_level, _log_tools); gf_log __args ;}
+#endif
+
+
+/*! @} */
+
+/*! \addtogroup tools_grp
+ *	@{
+ */
+
+
+/*!
+ *	\brief PseudoRandom Integer Generation Initialization
+ *
+ *	Sets the starting point for generating a series of pseudorandom integers.
+ *	\param Reset Re-initializes the random number generator
+*/
+void gf_rand_init(Bool Reset);
+/*!
+ *	\brief PseudoRandom Integer Generation
+ *
+ *	Returns a pseudorandom integer.
+*/
+u32 gf_rand();
+
+/*!
+ *	\brief user name 
+ *
+ *	Gets current user (login) name.
+*/
+void gf_get_user_name(char *buf, u32 buf_size);
+
+/*!
+ *	\brief Directory Enumeration Callback
+ *
+ * The gf_enum_dir_item type is the type for the callback of the \ref gf_enum_directory function
+ *	\param cbck Opaque user data.
+ *	\param item_name File or directory name.
+ *	\param item_path File or directory full path and name from filesystem root.
+ *	\return 1 to abort enumeration, 0 to continue enumeration.
+ *
+ */
+typedef Bool (*gf_enum_dir_item)(void *cbck, char *item_name, char *item_path);
+/*!
+ *	\brief Directory enumeration
+ *
+ *	Enumerates a directory content. Feedback is provided by the enum_dir_item function
+ *	\param dir Directory to enumerate
+ *	\param enum_directory If set, only directories will be enumerated, otherwise only files are.
+ *	\param enum_dir \ref gf_enum_dir_item callback function for enumeration. 
+ *	\param cbck Opaque user data passed to callback function.
+ *	\param filter optional filter for file extensions. If a file extension without the dot '.' character is not found in the
+ *	filter the file will be skipped.
+*/
+GF_Err gf_enum_directory(const char *dir, Bool enum_directory, gf_enum_dir_item enum_dir, void *cbck, const char *filter);
+
+
+/*!
+ *	\brief File Deletion
+ *
+ *	Deletes a file from the disk.
+ *	\param fileName absolute name of the file or name relative to the current working directory.
+*/
+void gf_delete_file(char *fileName);
+/*!
+ *	\brief File Deletion
+ *
+ *	Creates a new temporary file in binary mode
+ *	\return stream handle to the new file ressoucre
+ */
+FILE *gf_temp_file_new();
+
+
+/*!
+ *	\brief Progress formatting
+ *
+ *	Signals progress in GPAC's operations. Note that progress signaling with this function is not thread-safe, the main purpose is to use it for authoring tools only.
+ *	\param title title string of the progress, or NULL for no progress
+ *	\param done Current amount performed of the action.
+ *	\param total Total amount of the action.
+ */
+void gf_set_progress(char *title, u32 done, u32 total);
+
+/*!
+ *	\brief Progress Callback
+ *
+ * The gf_on_progress_cbk type is the type for the callback of the \ref gf_set_progress_callback function
+ *	\param cbck Opaque user data.
+ *	\param title preogress title.
+ *	\param done Current amount performed of the action
+ *	\param total Total amount of the action.
+ *
+ */
+typedef void (*gf_on_progress_cbk)(void *cbck, char *title, u32 done, u32 total);
+
+/*!
+ *	\brief Progress overwriting
+ *
+ *	Iverwrites the progress signaling function by a user-defined one.
+ *	\param user_cbk Opaque user data
+ *	\param prog_cbk new callback function to use. Passing NULL restore default GPAC stdout notification.
+ */
+void gf_set_progress_callback(void *user_cbk, gf_on_progress_cbk prog_cbk);
+
+
+/*!
+ *	\brief Prompt checking 
+ *
+ *	Checks if a character is pending in the prompt buffer.
+ *	\return 1 if a character is ready to be fetched, 0 otherwise.
+ *	\note Function not available under WindowsCE nor SymbianOS
+*/
+Bool gf_prompt_has_input();
+
+/*!
+ *	\brief Prompt character flush
+ *
+ *	Returns the current character entered at prompt if any.
+ *	\return value of the character.
+ *	\note Function not available under WindowsCE nor SymbianOS
+*/
+char gf_prompt_get_char();
+
+
+/*!
+ *	\brief turns prompt echo on/off
+ *
+ *	Turns the prompt character echo on/off - this is usefull when entering passwords.
+ *	\param echo_off indicates whether echo should be turned on or off.
+ *	\note Function not available under WindowsCE nor SymbianOS
+*/
+void gf_prompt_set_echo_off(Bool echo_off);
+
+/*!
+ *\addtogroup cpu_grp Time tools
+ *\ingroup utils_grp
+ *\brief System time and CPU functions
+ *
+ *This section documents time functionalities and CPU management in GPAC.
+  *	@{
+ */
+
+
+/*!
+ *	\brief System setup
+ *
+ *	Inits the system high-resolution clock if any, and CPU usage manager. It is strongly recommended to call this 
+ * function before calling any other GPAC functions, since on some systems (like winCE) it may result in a better memory usage estimation.
+ *	\note This can be called several times but only the first call will result in system setup. 
+ */
+void gf_sys_init();
+/*!
+ *	\brief System closing
+ *
+ *	Closes the system high-resolution clock and any CPU associated ressources.
+ *	\note This can be called several times but the system will be closed when no more users are counted.
+ */
+void gf_sys_close();
+/*!
+ *	\brief System clock query
+ *
+ *	Gets the system clock time.
+ *	\return System clock value since initialization in milliseconds.
+ */
+u32 gf_sys_clock();
+
+/*!
+ *	\brief Sleeps thread/process
+ *
+ *	Locks calling thread/process execution for a given time.
+ *	\param ms Amount of time to sleep in milliseconds.
+ */
+void gf_sleep(u32 ms);
+
+/*!
+ *	\brief CRC32 compute
+ *
+ *	Computes the CRC32 value of a buffer.
+ *	\param data buffer
+ *	\param size buffer size
+ *	\return computed CRC32
+ */
+u32 gf_crc_32(char *data, u32 size);
+
+
+/*!\brief run-time system info object
+ *
+ *The Run-Time Info object is used to get CPU and memory occupation of the calling process. 
+ *All time values are expressed in milliseconds (accuracy is not guaranteed).
+*/
+typedef struct
+{
+	/*!start of the sampling period*/
+	u32 sampling_instant;
+	/*!duration of the sampling period*/
+	u32 sampling_period_duration;
+	/*!total amount of time (User+kernel) spent in CPU for all processes as evaluated at the end of the sampling period*/
+	u32 total_cpu_time;
+	/*!total amount of time (User+kernel) spent in CPU for the calling process as evaluated at the end of the sampling period*/
+	u32 process_cpu_time;
+	/*!amount of time (User+kernel) spent in CPU for all processes during the sampling period*/
+	u32 total_cpu_time_diff;
+	/*!total amount of time (User+kernel) spent in CPU for the calling process during the sampling period*/
+	u32 process_cpu_time_diff;
+	/*!total amount of idle time during the sampling period.*/
+	u32 cpu_idle_time;
+	/*!percentage (from 0 to 100) of CPU usage during the sampling period.*/
+	u32 total_cpu_usage;
+	/*!percentage (from 0 to 100) of the CPU usage by the calling process during the sampling period.*/
+	u32 process_cpu_usage;
+	/*!calling process ID*/
+	u32 pid;
+	/*!calling process thread count if known*/
+	u32 thread_count;
+	/*!size of calling process allocated heaps*/
+	u64 process_memory;
+	/*!total physical memory in system*/
+	u64 physical_memory;
+	/*!available physical memory in system*/
+	u64 physical_memory_avail;
+	/*!total memory currently allocated by gpac*/
+	u64 gpac_memory;
+} GF_SystemRTInfo;
+
+/*!
+ * Selection flags for run-time info retrieval
+ *	\hideinitializer
+ */
+enum
+{
+	/*!Indicates all processes' times must be fetched. If not set, only the current process times will be retrieved, and the
+	thread count and total times won't be available*/
+	GF_RTI_ALL_PROCESSES_TIMES = 1,
+	/*!Indicates the process allocated heap size must be fetch. If not set, only the system physical memory is fetched. 
+	Fetching the entire ocess  allocated memory can have a large impact on performances*/
+	GF_RTI_PROCESS_MEMORY = 1<<1,
+	/*!Indicates that only system memory should be fetched. When set, all refreshing info is ignored*/
+	GF_RTI_SYSTEM_MEMORY_ONLY = 1<<2,
+};
+
+/*!
+ *	\brief Gets Run-Time info
+ *
+ *	Gets CPU and memory usage info for the calling process and the system. Information gathering
+ * is controled through timeout values.
+ *	\param refresh_time_ms refresh time period in milliseconds. If the last sampling was done less than this period ago, the run-time info is not refreshed.
+ *	\param rti holder to the run-time info structure to update.
+ *	\param flags specify which info is to be retrieved.
+ *	\return 1 if info has been updated, 0 otherwise.
+ *	\note You should not try to use a too small refresh time. Typical values are 500 ms or one second.
+ */
+Bool gf_sys_get_rti(u32 refresh_time_ms, GF_SystemRTInfo *rti, u32 flags);
+
+
+Bool gf_sys_get_battery_state(Bool *onBattery, u32 *onCharge, u32 *level);
+
+/*! @} */
+
+
+/*! @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif		/*_GF_CORE_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/user.h b/tstools/DtsEdit/src/gpac/user.h
new file mode 100644
index 0000000..1be847d
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/user.h
@@ -0,0 +1,111 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Stream Management sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+
+#ifndef _GF_USER_H_
+#define _GF_USER_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//#include <gpac/math.h>
+#include <gpac/events.h>
+#include <gpac/module.h>
+
+/*GPAC client terminal*/
+typedef struct _tag_terminal GF_Terminal;
+
+	
+
+enum
+{
+	/*display should be hidden upon initialization*/
+	GF_TERM_INIT_HIDE = 1,
+	/*no audio renderer will be created*/
+	GF_TERM_NO_AUDIO = 1<<1,
+	/*terminal is used without visual threading: 
+		* media codecs are not threaded
+		* all composition memories are filled before rendering
+		* rendering is done after media decoding
+		* the user is responsible for updating the terminal
+	*/
+	GF_TERM_NO_VISUAL_THREAD = 1<<2,
+	/*disables frame-rate regulation (used when dumping content)*/
+	GF_TERM_NO_REGULATION = 1<<3,
+	/*lets the main user handle window events (neede for browser plugins)*/
+	GF_TERM_NO_WINDOWPROC_OVERRIDE = 1<<4,
+	/*works in windowless mode - experimental, only supported on Win32*/
+	GF_TERM_WINDOWLESS = 1<<5
+};
+
+/*user object for all callbacks*/
+typedef struct 
+{
+	/*user defined callback for all functions - cannot be NULL*/
+	void *opaque;
+	/*the event proc. Return value depend on the event type, usually 0
+	cannot be NULL if os_window_handler is specified and dont_override_window_proc is set
+	may be NULL otherwise*/
+	Bool (*EventProc)(void *opaque, GF_Event *event);
+
+	/*config file of client - cannot be NULL*/
+	GF_Config *config;
+	/*modules manager - cannot be NULL - owned by the user (to allow selection of module directory)*/
+	GF_ModuleManager *modules;
+	/*optional os window handler (HWND on win32/winCE, XWindow for X11) 
+	if not set the video outut will create and manage the display window.*/
+	void *os_window_handler;
+	/*for now, only used by X11 (indicates display the window is on)*/
+	void *os_display;
+
+	/*init flags bypassing GPAC config file	*/
+	u32 init_flags;
+} GF_User;
+
+
+/*macro for event forwarding*/
+#define GF_USER_SENDEVENT(_user, _evt)	(_user->EventProc ? _user->EventProc(_user->opaque, _evt) : 0)
+
+/*macro for message event format/send*/
+#define GF_USER_MESSAGE(_user, _serv, _msg, _e)	\
+	{	\
+		GF_Event evt;	\
+		if (_user->EventProc) {	\
+			evt.type = GF_EVENT_MESSAGE;	\
+			evt.message.service = _serv;	\
+			evt.message.message = _msg;	\
+			evt.message.error = _e;	\
+			_user->EventProc(_user->opaque, &evt);	\
+		}	\
+	}
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/*_GF_USER_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/utf.h b/tstools/DtsEdit/src/gpac/utf.h
new file mode 100644
index 0000000..aa67f5e
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/utf.h
@@ -0,0 +1,99 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / common tools sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _GF_UTF_H_
+#define _GF_UTF_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!
+ *	\file <gpac/utf.h>
+ *	\brief UTF functions.
+ */
+
+/*!
+ *	\addtogroup utf_grp UTF
+ *	\ingroup utils_grp
+ *	\brief UTF encoding functions
+ *
+ *This section documents the UTF functions of the GPAC framework.\n
+ *The wide characters in GPAC are unsignad shorts, in other words GPAC only supports UTF8 and UTF16 coding styles.
+ *\note these functions are just ports of libutf8 library tools into GPAC.
+ *	@{
+ */
+
+#include <gpac/tools.h>
+
+/*!
+ *\brief wide-char to multibyte conversion
+ *
+ *Converts a wide-char string to a multibyte string
+ *\param dst multibyte destination buffer
+ *\param dst_len multibyte destination buffer size
+ *\param srcp address of the wide-char string. This will be set to the next char to be converted in the input buffer if not enough space in the destination, or NULL if conversion was completed.
+ *\return length (in byte) of the multibyte string or -1 if error.
+ */
+size_t gf_utf8_wcstombs(char* dst, size_t dst_len, const unsigned short** srcp);
+/*converts UTF8 string to wide char string - returns (-1) if error. set @srcp to next char to be
+converted if not enough space*/
+/*!
+ *\brief multibyte to wide-char conversion
+ *
+ *Converts a multibyte string to a wide-char string 
+ *\param dst wide-char destination buffer
+ *\param dst_len wide-char destination buffer size
+ *\param srcp address of the multibyte character buffer. This will be set to the next char to be converted in the input buffer if not enough space in the destination, or NULL if conversion was completed.
+ *\return length (in unsigned short) of the wide-char string or -1 if error.
+ */
+size_t gf_utf8_mbstowcs(unsigned short* dst, size_t dst_len, const char** srcp);
+/*!
+ *\brief wide-char string length
+ *
+ *Returns the length in character of a wide-char string
+ *\param s the wide-char string
+ *\return the wide-char string length
+ */
+size_t gf_utf8_wcslen(const unsigned short *s);
+
+/*!
+ *\brief string bidi reordering
+ *
+ *Performs a simple reordering of words in the string based on each word direction, so that glyphs are sorted in display order.
+ *\param utf_string the wide-char string
+ *\param len the len of the wide-char string
+ *\return 1 if the main direction is right-to-left, 0 otherwise
+ */
+Bool gf_utf8_reorder_bidi(u16 *utf_string, u32 len);
+
+/*! @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif		/*_GF_UTF_H_*/
+
diff --git a/tstools/DtsEdit/src/gpac/xml.h b/tstools/DtsEdit/src/gpac/xml.h
new file mode 100644
index 0000000..092dbba
--- /dev/null
+++ b/tstools/DtsEdit/src/gpac/xml.h
@@ -0,0 +1,158 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Copyright (c) Jean Le Feuvre 2000-2005 
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / common tools sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _XML_PARSER_H_
+#define _XML_PARSER_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/tools.h>
+#include <gpac/list.h>
+
+/*!
+ *	\file <gpac/xml.h>
+ *	\brief XML functions.
+ */
+
+/*!
+ *	\addtogroup xml_grp XML
+ *	\ingroup utils_grp
+ *	\brief XML Parsing functions
+ *
+ *This section documents the XML functions of the GPAC framework.\n
+ *	@{
+ */
+
+
+
+typedef struct
+{
+	/*name or namespace:name*/
+	char *name;
+	/*value*/
+	char *value;
+} GF_XMLAttribute;
+
+/*XML node types*/
+enum
+{
+	GF_XML_NODE_TYPE = 0,
+	GF_XML_TEXT_TYPE,
+	GF_XML_CDATA_TYPE,
+};
+
+typedef struct _xml_node
+{
+	u32 type;
+	/*
+	For DOM nodes: name
+	For other (text, css, cdata), element content
+	*/
+	char *name;
+
+	/*for DOM nodes only*/
+	char *ns;	/*namespace*/
+	GF_List *attributes;
+	GF_List *content;
+} GF_XMLNode;
+
+
+
+/*
+	SAX XML Parser
+*/
+
+typedef struct _tag_sax_parser GF_SAXParser;
+typedef	void (*gf_xml_sax_node_start)(void *sax_cbck, const char *node_name, const char *name_space, const GF_XMLAttribute *attributes, u32 nb_attributes);
+typedef	void (*gf_xml_sax_node_end)(void *sax_cbck, const char *node_name, const char *name_space);
+typedef	void (*gf_xml_sax_text_content)(void *sax_cbck, const char *content, Bool is_cdata);
+
+typedef	void (*gf_xml_sax_progress)(void *cbck, u32 done, u32 tot);
+
+/*creates new sax parser - all callbacks are optionals*/
+GF_SAXParser *gf_xml_sax_new(gf_xml_sax_node_start on_node_start, 
+							 gf_xml_sax_node_end on_node_end,
+							 gf_xml_sax_text_content on_text_content,
+							 void *cbck);
+
+/*destroys sax parser */
+void gf_xml_sax_del(GF_SAXParser *parser);
+/*inits parser with BOM. BOM must be 4 char string with 0 terminaison. If BOM is NULL, parsing will
+assume UTF-8 compatible coding*/
+GF_Err gf_xml_sax_init(GF_SAXParser *parser, unsigned char *BOM);
+/*parses input string data. string data MUST be terminated by the 0 character (eg 2 0s for UTF-16)*/
+GF_Err gf_xml_sax_parse(GF_SAXParser *parser, void *string_bytes);
+/*suspends/resume sax parsing. 
+	When resuming on file, the function will run until suspended/end of file/error
+	When resuming on steram, the function will simply return
+*/
+GF_Err gf_xml_sax_suspend(GF_SAXParser *parser, Bool do_suspend);
+/*parses file (potentially gzipped). OnProgress is optional, used to get progress callback*/
+GF_Err gf_xml_sax_parse_file(GF_SAXParser *parser, const char *fileName, gf_xml_sax_progress OnProgress);
+/*get current line number*/
+u32 gf_xml_sax_get_line(GF_SAXParser *parser);
+/*get file size - may be inaccurate if gzipped (only compressed file size is known)*/
+u32 gf_xml_sax_get_file_size(GF_SAXParser *parser);
+/*get current file position*/
+u32 gf_xml_sax_get_file_pos(GF_SAXParser *parser);
+
+/*peeks a node forward in the file. May be used to pick the attribute of the first node found matching a given (attributeName, attributeValue) couple*/
+char *gf_xml_sax_peek_node(GF_SAXParser *parser, char *att_name, char *att_value, char *substitute, char *get_attr, char *end_pattern, Bool *is_substitute);
+
+/*file mode only, returns 1 if file is compressed, 0 otherwise*/
+Bool gf_xml_sax_binary_file(GF_SAXParser *parser);
+
+const char *gf_xml_sax_get_error(GF_SAXParser *parser);
+
+char *gf_xml_get_root_type(const char *file, GF_Err *ret_code);
+
+u32 gf_xml_sax_get_node_start_pos(GF_SAXParser *parser);
+u32 gf_xml_sax_get_node_end_pos(GF_SAXParser *parser);
+
+
+typedef struct _tag_dom_parser GF_DOMParser;
+GF_DOMParser *gf_xml_dom_new();
+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_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);
+
+char *gf_xml_dom_serialize(GF_XMLNode *node, Bool content_only);
+
+
+GF_XMLNode *gf_xml_dom_detach_root(GF_DOMParser *parser);
+void gf_xml_dom_node_del(GF_XMLNode *node);
+
+/*! @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif		/*_XML_PARSER_H_*/
+
diff --git a/tstools/DtsEdit/src/stdafx.cpp b/tstools/DtsEdit/src/stdafx.cpp
new file mode 100644
index 0000000..cfeea92
--- /dev/null
+++ b/tstools/DtsEdit/src/stdafx.cpp
@@ -0,0 +1,8 @@
+// stdafx.cpp : •W€ƒCƒ“ƒNƒ‹[ƒh DTSRepair.pch ‚Ì‚Ý‚ð
+// ŠÜ‚Þƒ\[ƒX ƒtƒ@ƒCƒ‹‚́AƒvƒŠƒRƒ“ƒpƒCƒ‹Ï‚݃wƒbƒ_[‚É‚È‚è‚Ü‚·B
+// stdafx.obj ‚ɂ̓vƒŠƒRƒ“ƒpƒCƒ‹Ï‚ÝŒ^î•ñ‚ªŠÜ‚Ü‚ê‚Ü‚·B
+
+#include "stdafx.h"
+
+// TODO: ‚±‚̃tƒ@ƒCƒ‹‚Å‚Í‚È‚­ASTDAFX.H ‚Å•K—v‚È
+// ’ljÁƒwƒbƒ_[‚ðŽQÆ‚µ‚Ä‚­‚¾‚³‚¢B
diff --git a/tstools/DtsEdit/src/stdafx.h b/tstools/DtsEdit/src/stdafx.h
new file mode 100644
index 0000000..63e2ff2
--- /dev/null
+++ b/tstools/DtsEdit/src/stdafx.h
@@ -0,0 +1,19 @@
+// stdafx.h : •W€‚̃VƒXƒeƒ€ ƒCƒ“ƒNƒ‹[ƒh ƒtƒ@ƒCƒ‹‚̃Cƒ“ƒNƒ‹[ƒh ƒtƒ@ƒCƒ‹A‚Ü‚½‚Í
+// ŽQÆ‰ñ”‚ª‘½‚­A‚©‚‚ ‚Ü‚è•ÏX‚³‚ê‚È‚¢AƒvƒƒWƒFƒNƒgê—p‚̃Cƒ“ƒNƒ‹[ƒh ƒtƒ@ƒCƒ‹
+// ‚ð‹Lq‚µ‚Ü‚·B
+//
+
+#pragma once
+
+#ifndef _WIN32_WINNT		// Windows XP ˆÈ~‚̃o[ƒWƒ‡ƒ“‚ɌŗL‚Ì‹@”\‚ÌŽg—p‚ð‹–‰Â‚µ‚Ü‚·B                   
+#define _WIN32_WINNT 0x0501	// ‚±‚ê‚ð Windows ‚Ì‘¼‚̃o[ƒWƒ‡ƒ“Œü‚¯‚É“KØ‚È’l‚ɕύX‚µ‚Ä‚­‚¾‚³‚¢B
+#endif						
+
+#include <windows.h>
+//#include <stdio.h>
+//#include <tchar.h>
+
+// TODO: ƒvƒƒOƒ‰ƒ€‚É•K—v‚ȒljÁƒwƒbƒ_[‚ð‚±‚±‚ÅŽQÆ‚µ‚Ä‚­‚¾‚³‚¢B
+#include <gpac/isomedia.h>
+#include <gpac/internal/isomedia_dev.h>
+#include "common.h"
diff --git a/tstools/DtsEdit/src/stdint.h b/tstools/DtsEdit/src/stdint.h
new file mode 100644
index 0000000..92dfa88
--- /dev/null
+++ b/tstools/DtsEdit/src/stdint.h
@@ -0,0 +1,186 @@
+/* ISO C9x  7.18  Integer types <stdint.h>
+ * Based on ISO/IEC SC22/WG14 9899 Committee draft (SC22 N2794)
+ *
+ *  THIS SOFTWARE IS NOT COPYRIGHTED
+ *
+ *  Contributor: Danny Smith <danny_r_smith_2001@yahoo.co.nz>
+ *
+ *  This source code is offered for use in the public domain. You may
+ *  use, modify or distribute it freely.
+ *
+ *  This code is distributed in the hope that it will be useful but
+ *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
+ *  DISCLAIMED. This includes but is not limited to warranties of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *  Date: 2000-12-02
+ */
+
+
+#ifndef _STDINT_H
+#define _STDINT_H
+#define __need_wint_t
+#define __need_wchar_t
+#include <stddef.h>
+
+/* 7.18.1.1  Exact-width integer types */
+typedef signed char int8_t;
+typedef unsigned char   uint8_t;
+typedef short  int16_t;
+typedef unsigned short  uint16_t;
+typedef int  int32_t;
+typedef unsigned   uint32_t;
+typedef __int64  int64_t;
+typedef unsigned __int64 uint64_t;
+
+/* 7.18.1.2  Minimum-width integer types */
+typedef signed char int_least8_t;
+typedef unsigned char   uint_least8_t;
+typedef short  int_least16_t;
+typedef unsigned short  uint_least16_t;
+typedef int  int_least32_t;
+typedef unsigned   uint_least32_t;
+typedef __int64  int_least64_t;
+typedef unsigned __int64   uint_least64_t;
+
+/*  7.18.1.3  Fastest minimum-width integer types 
+ *  Not actually guaranteed to be fastest for all purposes
+ *  Here we use the exact-width types for 8 and 16-bit ints. 
+ */
+typedef char int_fast8_t;
+typedef unsigned char uint_fast8_t;
+typedef short  int_fast16_t;
+typedef unsigned short  uint_fast16_t;
+typedef int  int_fast32_t;
+typedef unsigned  int  uint_fast32_t;
+typedef __int64  int_fast64_t;
+typedef unsigned __int64   uint_fast64_t;
+
+/* 7.18.1.4  Integer types capable of holding object pointers */
+/*typedef int intptr_t;
+typedef unsigned uintptr_t;*/
+
+/* 7.18.1.5  Greatest-width integer types */
+typedef __int64  intmax_t;
+typedef unsigned __int64   uintmax_t;
+
+/* 7.18.2  Limits of specified-width integer types */
+#if !defined ( __cplusplus) || defined (__STDC_LIMIT_MACROS)
+
+/* 7.18.2.1  Limits of exact-width integer types */
+#define INT8_MIN (-128) 
+#define INT16_MIN (-32768)
+#define INT32_MIN (-2147483647 - 1)
+#define INT64_MIN  (-9223372036854775807LL - 1)
+
+#define INT8_MAX 127
+#define INT16_MAX 32767
+#define INT32_MAX 2147483647
+#define INT64_MAX 9223372036854775807LL
+
+#define UINT8_MAX 0xff /* 255U */
+#define UINT16_MAX 0xffff /* 65535U */
+#define UINT32_MAX 0xffffffff  /* 4294967295U */
+#define UINT64_MAX 0xffffffffffffffffULL /* 18446744073709551615ULL */
+
+/* 7.18.2.2  Limits of minimum-width integer types */
+#define INT_LEAST8_MIN INT8_MIN
+#define INT_LEAST16_MIN INT16_MIN
+#define INT_LEAST32_MIN INT32_MIN
+#define INT_LEAST64_MIN INT64_MIN
+
+#define INT_LEAST8_MAX INT8_MAX
+#define INT_LEAST16_MAX INT16_MAX
+#define INT_LEAST32_MAX INT32_MAX
+#define INT_LEAST64_MAX INT64_MAX
+
+#define UINT_LEAST8_MAX UINT8_MAX
+#define UINT_LEAST16_MAX UINT16_MAX
+#define UINT_LEAST32_MAX UINT32_MAX
+#define UINT_LEAST64_MAX UINT64_MAX
+
+/* 7.18.2.3  Limits of fastest minimum-width integer types */
+#define INT_FAST8_MIN INT8_MIN
+#define INT_FAST16_MIN INT16_MIN
+#define INT_FAST32_MIN INT32_MIN
+#define INT_FAST64_MIN INT64_MIN
+
+#define INT_FAST8_MAX INT8_MAX
+#define INT_FAST16_MAX INT16_MAX
+#define INT_FAST32_MAX INT32_MAX
+#define INT_FAST64_MAX INT64_MAX
+
+#define UINT_FAST8_MAX UINT8_MAX
+#define UINT_FAST16_MAX UINT16_MAX
+#define UINT_FAST32_MAX UINT32_MAX
+#define UINT_FAST64_MAX UINT64_MAX
+
+/* 7.18.2.4  Limits of integer types capable of holding
+    object pointers */ 
+#define INTPTR_MIN INT32_MIN
+#define INTPTR_MAX INT32_MAX
+#define UINTPTR_MAX UINT32_MAX
+
+/* 7.18.2.5  Limits of greatest-width integer types */
+#define INTMAX_MIN INT64_MIN
+#define INTMAX_MAX INT64_MAX
+#define UINTMAX_MAX UINT64_MAX
+
+/* 7.18.3  Limits of other integer types */
+#define PTRDIFF_MIN INT32_MIN
+#define PTRDIFF_MAX INT32_MAX
+
+#define SIG_ATOMIC_MIN INT32_MIN
+#define SIG_ATOMIC_MAX INT32_MAX
+
+#define SIZE_MAX UINT32_MAX
+
+#ifndef WCHAR_MIN  /* also in wchar.h */ 
+#define WCHAR_MIN 0
+#define WCHAR_MAX ((wchar_t)-1) /* UINT16_MAX */
+#endif
+
+/*
+ * wint_t is unsigned short for compatibility with MS runtime
+ */
+#define WINT_MIN 0
+#define WINT_MAX ((wint_t)-1) /* UINT16_MAX */
+
+#endif /* !defined ( __cplusplus) || defined __STDC_LIMIT_MACROS */
+
+
+/* 7.18.4  Macros for integer constants */
+#if !defined ( __cplusplus) || defined (__STDC_CONSTANT_MACROS)
+
+/* 7.18.4.1  Macros for minimum-width integer constants
+
+    Accoding to Douglas Gwyn <gwyn@arl.mil>:
+	"This spec was changed in ISO/IEC 9899:1999 TC1; in ISO/IEC
+	9899:1999 as initially published, the expansion was required
+	to be an integer constant of precisely matching type, which
+	is impossible to accomplish for the shorter types on most
+	platforms, because C99 provides no standard way to designate
+	an integer constant with width less than that of type int.
+	TC1 changed this to require just an integer constant
+	*expression* with *promoted* type."
+
+	The trick used here is from Clive D W Feather.
+*/
+
+#define INT8_C(val) (INT_LEAST8_MAX-INT_LEAST8_MAX+(val))
+#define INT16_C(val) (INT_LEAST16_MAX-INT_LEAST16_MAX+(val))
+#define INT32_C(val) (INT_LEAST32_MAX-INT_LEAST32_MAX+(val))
+#define INT64_C(val) (INT_LEAST64_MAX-INT_LEAST64_MAX+(val))
+
+#define UINT8_C(val) (UINT_LEAST8_MAX-UINT_LEAST8_MAX+(val))
+#define UINT16_C(val) (UINT_LEAST16_MAX-UINT_LEAST16_MAX+(val))
+#define UINT32_C(val) (UINT_LEAST32_MAX-UINT_LEAST32_MAX+(val))
+#define UINT64_C(val) (UINT_LEAST64_MAX-UINT_LEAST64_MAX+(val))
+
+/* 7.18.4.2  Macros for greatest-width integer constants */
+#define INTMAX_C(val) (INTMAX_MAX-INTMAX_MAX+(val))
+#define UINTMAX_C(val) (UINTMAX_MAX-UINTMAX_MAX+(val))
+
+#endif  /* !defined ( __cplusplus) || defined __STDC_CONSTANT_MACROS */
+
+#endif
diff --git a/tstools/DtsEdit/ディレイカット.bat b/tstools/DtsEdit/ディレイカット.bat
new file mode 100644
index 0000000..182371a
--- /dev/null
+++ b/tstools/DtsEdit/ディレイカット.bat
@@ -0,0 +1,21 @@
+@ECHO OFF
+SETLOCAL ENABLEDELAYEDEXPANSION
+
+IF EXIST "%~dp0" CD /D "%~dp0"
+
+rem •¡”ƒtƒ@ƒCƒ‹‚̃‹[ƒvˆ—
+SET ARGV=%*
+FOR %%I IN (!ARGV!) DO CALL :DTSEDIT "%%~I"
+GOTO :EOF
+
+
+:DTSEDIT
+SET OUT_FILE=%~dpn1.nodelay%~x1
+SET TC_FILE=%~dpn1.timecode.txt
+
+DtsEdit "%~dpnx1" -o "%TC_FILE%"
+DtsEdit "%~dpnx1" -tc "%TC_FILE%" -o "%OUT_FILE%" -mlt 4
+
+del "%TC_FILE%"
+GOTO :EOF
+
diff --git a/tstools/Makefile b/tstools/Makefile
new file mode 100755
index 0000000..03d2141
--- /dev/null
+++ b/tstools/Makefile
@@ -0,0 +1,22 @@
+PREFIX = /usr/local/share
+MAJOR = 0
+MINOR = 9
+REVISION = 0
+VER = $(MAJOR).$(MINOR).$(REVISION)
+
+DEST = $(PREFIX)/rec10/tstools
+
+all: 
+	cd epgdump;make all
+clean:
+	cd epgdump;make clean
+install: 
+	mkdir $(DEST)
+	cd BonTsDemux;cp ./*.* $(DEST)/
+	cd jTsSplitter;cp ./*.* $(DEST)/
+	cd cfr2tc;cp ./cfr2tc.exe $(DEST)/
+	cd DtsEdit;cp ./DtsEdit.exe $(DEST)/
+	cd epgdump;make install
+uninstall:
+	rm -r $(DEST)
+	cd epgdump;make uninstall
diff --git a/tstools/cfr2tc/cfr2tc-README.txt b/tstools/cfr2tc/cfr2tc-README.txt
new file mode 100644
index 0000000..5edd07c
--- /dev/null
+++ b/tstools/cfr2tc/cfr2tc-README.txt
@@ -0,0 +1,103 @@
+       cfr2tc v1.4 by tritical - Help File  --  July 26, 2006
+--------------------------------------------------------------------------
+
+
+INFO:
+
+      This program takes an avi file with a video stream containing null
+   frames and outputs a new avi file containing the same video stream, but
+   with all null frames removed and a v1 or v2 timecode file.  It also has
+   timecode file only modes that create the timecode file but do not create
+   a new avi file.  As of v1.4 there is also the option to output an avs
+   script instead of a new avi file.
+
+
+SYNTAX/EXAMPLE:
+
+
+   cfr2tc input_avi_file output_avi_or_avs_file timecode_file mode
+
+
+   cfr2tc c:\test.avi c:\video.avi c:\timecodes.txt 1
+
+   cfr2tc c:\test.avi c:\script.avs c:\timecodes.txt 5
+
+
+PARAMETERS:
+
+
+   input_avi_file -
+
+      The name and path of the input avi file.  The avi file can have
+      multiple streams, but only one of which can be a video stream.
+      The avi file must also use an "idx1" index.
+
+
+   output_avi_or_avs_file -
+
+      The name and path of the destination (output) avi or avs file
+      that will be created.  If using avi output, the resulting avi
+      file will contain only the video stream with null frames
+      removed.  If using avs output, the resulting avs file will
+      contain trim().selectevery().assumefps() statements to exactly
+      replicate the video you would get using avi output.  The main
+      reason for avs output is to eliminate the need for creating a new
+      avi file.  The "mode" parameter can be used to switch between
+      avi output, avs output, and timecode only output.
+
+
+   timecode_file -
+
+      The name and path of the timecode file that will be created.
+      The type of timecode file created (v1 or v2) is controlled
+      via the "mode" parameter.
+
+
+   mode -
+
+      Controls whether a v1 or v2 timecode file is created. Possible
+      settings:
+
+         1 - v1 timecode file, avi output
+         2 - v2 timecode file, avi output
+         3 - v1 timecode file, no avi output
+         4 - v2 timecode file, no avi output
+         5 - v1 timecode file, avs output
+         6 - v2 timecode file, avs output
+
+
+CHANGE LIST:
+
+
+   26/07/2006  v1.4
+
+      + Added avs output modes (modes 5 and 6)
+      + A few minor internal changes
+      + update copyright
+
+
+   29/12/2005  v1.3
+
+      + Use a larger io buffer for avi file reading/writing
+      - Fixed a few typos in output messages
+
+
+   26/12/2005  v1.2
+
+      + v1 timecode format output cosmetics
+
+
+   26/12/2005  v1.1
+
+      + Add timecode only output ability (modes 3/4)
+      + Print elapsed process time
+      + Optimizations and efficiency improvements
+
+
+   25/12/2005  v1.0
+
+      - initial release
+
+
+
+contact:   forum.doom9.org  nick = tritical  or  email:  kes25c@mizzou.edu
diff --git a/tstools/cfr2tc/cfr2tc.exe b/tstools/cfr2tc/cfr2tc.exe
new file mode 100644
index 0000000..e33deda
Binary files /dev/null and b/tstools/cfr2tc/cfr2tc.exe differ
diff --git a/tstools/cfr2tc/cfr2tc/cfr2tc.cpp b/tstools/cfr2tc/cfr2tc/cfr2tc.cpp
new file mode 100644
index 0000000..ac013eb
--- /dev/null
+++ b/tstools/cfr2tc/cfr2tc/cfr2tc.cpp
@@ -0,0 +1,1043 @@
+/*
+**                   cfr2tc v1.4 - July 26, 2006
+**
+**   This program takes an avi file with a video stream containing null
+**   frames and outputs a new avi file containing the same video stream
+**   but with all null frames removed and a v1 or v2 timecode file.
+**
+**   Copyright (C) 2005-2006 Kevin Stone
+**
+**   This program is free software; you can redistribute it and/or modify
+**   it under the terms of the GNU General Public License as published by
+**   the Free Software Foundation; either version 2 of the License, or
+**   (at your option) any later version.
+**
+**   This program is distributed in the hope that it will be useful,
+**   but WITHOUT ANY WARRANTY; without even the implied warranty of
+**   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**   GNU General Public License for more details.
+**
+**   You should have received a copy of the GNU General Public License
+**   along with this program; if not, write to the Free Software
+**   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#include <windows.h>
+#include <stdio.h>
+#include <time.h>
+#include <malloc.h>
+
+#define VERSION "v1.4"
+
+typedef DWORD FOURCC;
+
+typedef struct
+{
+	FOURCC riff;
+	DWORD fileSize;
+	DWORD fileType;
+} RIFFHEADER;
+
+class CHUNKHEADER
+{
+public:
+	FOURCC ckID;
+	DWORD ckSize;
+	DWORD ckDataSize;
+	void *ckData;
+	CHUNKHEADER::CHUNKHEADER() : ckID(0), ckSize(0), ckData(0), ckDataSize(0) {};
+	CHUNKHEADER::~CHUNKHEADER() { if (ckData) free(ckData); }
+};
+
+class LISTHEADER
+{
+public:
+	FOURCC lstID;
+	DWORD lstSize;
+	FOURCC lstType;
+	CHUNKHEADER *chkHd;
+	LISTHEADER::LISTHEADER() : lstID(0), lstSize(0), lstType(0), chkHd(0) {};
+	LISTHEADER::~LISTHEADER() { if (chkHd) delete chkHd; }
+	LISTHEADER& LISTHEADER::operator=(LISTHEADER& ob2)
+	{
+		lstID = ob2.lstID;
+		lstSize = ob2.lstSize;
+		lstType = ob2.lstType;
+		if (chkHd) delete chkHd;
+		chkHd = new CHUNKHEADER();
+		chkHd->ckID = ob2.chkHd->ckID;
+		chkHd->ckSize = ob2.chkHd->ckSize;
+		chkHd->ckDataSize = ob2.chkHd->ckDataSize;
+		if (chkHd->ckData) free(chkHd->ckData);
+		chkHd->ckData = malloc(chkHd->ckDataSize);
+		memcpy(chkHd->ckData,ob2.chkHd->ckData,chkHd->ckDataSize);
+		return *this;
+	}
+};
+
+class TBUF
+{
+public:
+	DWORD size;
+	void *data;
+	TBUF::TBUF() : data(0), size(0) {};
+	TBUF::~TBUF() { if (data) free(data); }
+};
+
+typedef struct 
+{
+	FOURCC fccType;
+	FOURCC fccHandler;
+	DWORD  dwFlags;
+	WORD   wPriority;
+	WORD   wLanguage;
+	DWORD  dwInitialFrames;
+	DWORD  dwScale;
+	DWORD  dwRate;
+	DWORD  dwStart;
+	DWORD  dwLength;
+	DWORD  dwSuggestedBufferSize;
+	DWORD  dwQuality;
+	DWORD  dwSampleSize;
+	struct {
+		short int left;
+		short int top;
+		short int right;
+		short int bottom;
+	}  rcFrame;
+} AVISTREAMHEADER;
+
+typedef struct 
+{
+	DWORD  dwMicroSecPerFrame;
+	DWORD  dwMaxBytesPerSec;
+	DWORD  dwPaddingGranularity;
+	DWORD  dwFlags;
+	DWORD  dwTotalFrames;
+	DWORD  dwInitialFrames;
+	DWORD  dwStreams;
+	DWORD  dwSuggestedBufferSize;
+	DWORD  dwWidth;
+	DWORD  dwHeight;
+	DWORD  dwReserved[4];
+} AVIMAINHEADER;
+
+typedef struct 
+{
+	DWORD   dwGrandFrames;
+	DWORD   dwFuture[61];
+} AVIEXTHEADER;
+
+typedef struct
+{
+	DWORD   dwChunkId;
+	DWORD   dwFlags;
+	DWORD   dwOffset;
+	DWORD   dwSize;
+} AVIOLDINDEX;
+
+// globals
+TBUF tbuf;
+DWORD wpos = 0;
+
+DWORD MAKE_FOURCC(char* fourCC)
+{
+	return (fourCC[0]|(fourCC[1]<<8)|(fourCC[2]<<16)|(fourCC[3]<<24));
+}
+
+bool checkRiffHeader(FILE *f, FILE *o, RIFFHEADER *rh, bool write)
+{
+	if (!fread(rh,1,12,f)) return false;
+	if (rh->riff != MAKE_FOURCC("RIFF")) return false;
+	if (rh->fileType != MAKE_FOURCC("AVI ")) return false;
+	if (write) { wpos += 12; if (!fwrite(rh,1,12,o)) return false; }
+	return true;
+}
+
+bool scanForList(FILE *f, FILE *o, LISTHEADER *lh, char *fourCC, char *fourCCStop,
+				 bool force, bool write, bool &stop)
+{
+	lh->lstID = 0;
+	stop = false;
+repeat:
+	if (!fread(&lh->lstID,1,2,f)) return false;
+	while(1)
+	{
+		if (!fread(((unsigned char*)&lh->lstID)+2,1,2,f)) return false;
+		if (lh->lstID == 0x5453494C) break;
+		if (write) { wpos += 2; if (!fwrite(&lh->lstID,1,2,o)) return false; }
+		lh->lstID = lh->lstID>>16;
+	}
+	if (!fread(&lh->lstSize,4,1,f)) return false;
+	if (!fread(&lh->lstType,4,1,f)) return false;
+	if (lh->lstType != MAKE_FOURCC(fourCC)) 
+	{
+		if (force) return false;
+		if (lh->lstType == MAKE_FOURCC(fourCCStop))
+		{
+			if (fseek(f,-12,SEEK_CUR)) return false;
+			stop = true;
+			return false;
+		}
+		DWORD fsize = lh->lstSize-4-(lh->lstSize&1);
+		if (write)
+		{
+			if (tbuf.size <= fsize+12)
+			{
+				if (tbuf.data) free(tbuf.data);
+				tbuf.data = malloc(fsize+12);
+				if (!tbuf.data) return false;
+				tbuf.size = fsize+12;
+			}
+			if (!fread(tbuf.data,fsize,1,f)) return false;
+			if (!fwrite(&lh->lstID,4,1,o)) return false;
+			if (!fwrite(&lh->lstSize,4,1,o)) return false;
+			if (!fwrite(&lh->lstType,4,1,o)) return false;
+			if (!fwrite(tbuf.data,fsize,1,o)) return false;
+			wpos += 12+fsize;
+		}
+		else
+		{
+			if (fseek(f,fsize,SEEK_CUR)) 
+				return false;
+		}
+		goto repeat;
+	}
+	if (fseek(f,-12,SEEK_CUR)) return false;
+	return true;
+}
+
+bool readLH(FILE *f, LISTHEADER *lh)
+{
+	if (!fread(&lh->lstID,4,1,f)) return false;
+	if (!fread(&lh->lstSize,4,1,f)) return false;
+	if (!fread(&lh->lstType,4,1,f)) return false;
+	return true;
+}
+
+bool writeLH(FILE *o, LISTHEADER *lh)
+{
+	if (!fwrite(&lh->lstID,4,1,o)) return false;
+	if (!fwrite(&lh->lstSize,4,1,o)) return false;
+	if (!fwrite(&lh->lstType,4,1,o)) return false;
+	wpos += 12;
+	return true;
+}
+
+bool readLHChunk(FILE *f, LISTHEADER *lh, char *fourCC, DWORD size)
+{
+	if (lh->chkHd) delete lh->chkHd;
+	lh->chkHd = new CHUNKHEADER();
+	if (!lh->chkHd) return false;
+	if (!fread(&lh->chkHd->ckID,4,1,f)) return false;
+	if (lh->chkHd->ckID != MAKE_FOURCC(fourCC)) return false;
+	if (!fread(&lh->chkHd->ckSize,4,1,f)) return false;
+	if (lh->chkHd->ckSize != size) return false;
+	if (lh->chkHd->ckData) free(lh->chkHd->ckData);
+	lh->chkHd->ckDataSize = lh->chkHd->ckSize+(lh->chkHd->ckSize&1);
+	lh->chkHd->ckData = malloc(lh->chkHd->ckDataSize);
+	if (!lh->chkHd->ckData) return false;
+	if (!fread(lh->chkHd->ckData,lh->chkHd->ckSize,1,f)) return false;
+	return true;
+}
+
+bool writeLHChunk(FILE *o, LISTHEADER *lh)
+{
+	if (!fwrite(&lh->chkHd->ckID,4,1,o)) return false;
+	if (!fwrite(&lh->chkHd->ckSize,4,1,o)) return false;
+	if (!fwrite(lh->chkHd->ckData,lh->chkHd->ckDataSize,1,o)) return false;
+	wpos += 8+lh->chkHd->ckDataSize;
+	return true;
+}
+
+bool scanForChunk(FILE *f, FILE *o, CHUNKHEADER *ch, char *fourCC, bool force, bool write)
+{
+repeat:
+	if (!fread(&ch->ckID,4,1,f)) return false;
+	if (!fread(&ch->ckSize,4,1,f)) return false;
+	if (ch->ckID == MAKE_FOURCC(fourCC) ||
+		((MAKE_FOURCC(fourCC)&0xFFFF0000) == 0x63640000 && (ch->ckID&0xFFFF0000) == 0x62640000) ||
+		((MAKE_FOURCC(fourCC)&0xFFFF0000) == 0x62640000 && (ch->ckID&0xFFFF0000) == 0x63640000))
+	{
+		if (fseek(f, -8, SEEK_CUR)) return false;
+		return true;
+	}
+	else
+	{
+		if (force) return false;
+		DWORD pad_size = ch->ckSize+(ch->ckSize&1);
+		if (write) 
+		{
+			if (tbuf.size <= pad_size+12)
+			{
+				if (tbuf.data) free(tbuf.data);
+				tbuf.data = malloc(pad_size+12);
+				if (!tbuf.data) return false;
+				tbuf.size = pad_size+12;
+			}
+			if (!fread(tbuf.data,pad_size,1,f)) return false;
+			if (!fwrite(&ch->ckID,4,1,o)) return false;
+			if (!fwrite(&ch->ckSize,4,1,o)) return false;
+			if (!fwrite(tbuf.data,pad_size,1,o)) return false;
+			wpos += 8+pad_size;
+		}
+		else
+		{
+			if (fseek(f,pad_size,SEEK_CUR))
+				return false;
+		}
+		goto repeat;
+	}
+	return false;
+}
+
+bool readChunk(FILE *f, CHUNKHEADER *ch)
+{
+	if (!fread(&ch->ckID,4,1,f)) return false;
+	if (!fread(&ch->ckSize,4,1,f)) return false;
+	DWORD pad_size = ch->ckSize+(ch->ckSize&1);
+	if (ch->ckDataSize <= pad_size+12)
+	{
+		if (ch->ckData) free(ch->ckData);
+		ch->ckData = malloc(pad_size+12);
+		if (!ch->ckData) return false;
+		ch->ckDataSize = pad_size+12;
+	}
+	if (!fread(ch->ckData,pad_size,1,f) && pad_size != 0) return false;
+	return true;
+}
+
+bool readChunkHD(FILE *f, CHUNKHEADER *ch, bool seek)
+{
+	if (!fread(&ch->ckID,4,1,f)) return false;
+	if (!fread(&ch->ckSize,4,1,f)) return false;
+	if (seek) { if (fseek(f,ch->ckSize+(ch->ckSize&1),SEEK_CUR)) return false; }
+	return true;
+}
+
+bool writeChunk(FILE *o, CHUNKHEADER *ch)
+{
+	if (!fwrite(&ch->ckID,4,1,o)) return false;
+	if (!fwrite(&ch->ckSize,4,1,o)) return false;
+	DWORD pad_size = ch->ckSize+(ch->ckSize&1);
+	if (!fwrite(ch->ckData,pad_size,1,o)) return false;
+	wpos += 8+pad_size;
+	return true;
+}
+
+bool writeChunkHD(FILE *o, CHUNKHEADER *ch)
+{
+	if (!fwrite(&ch->ckID,4,1,o)) return false;
+	if (!fwrite(&ch->ckSize,4,1,o)) return false;
+	wpos += 8;
+	return true;
+}
+
+bool readIndexChunk(FILE *f, AVIOLDINDEX *index, int size)
+{
+	if (!fread(index,size,1,f)) return false;
+	return true;
+}
+
+bool writeIndexChunk(FILE *o, AVIOLDINDEX *index, int size)
+{
+	if (!fwrite(index,size,1,o)) return false;
+	wpos += size;
+	return true;
+}
+
+void closeFiles(FILE *f, FILE *o, FILE *tcf, DWORD *repCount, DWORD *offsets, 
+				bool ul, char *oname, char *tcfname, char *fbuf, char *obuf)
+{
+	if (f) fclose(f);
+	if (o) 
+	{
+		fclose(o);
+		if (ul && oname) unlink(oname);
+	}
+	if (tcf) 
+	{
+		fclose(tcf);
+		if (ul && tcfname) unlink(tcfname);
+	}
+	if (repCount) free(repCount);
+	if (offsets) free(offsets);
+	if (fbuf) _aligned_free(fbuf);
+	if (obuf) _aligned_free(obuf);
+}
+
+bool getInfo(FILE *f, DWORD &frameCount, DWORD &newFrameCount, double &fps, DWORD *&repCount,
+			 DWORD *&offsets, DWORD &nmovi_size, DWORD &nhdrl_size)
+{
+	bool stop;
+
+	/* Check for valid RIFF header. */
+	RIFFHEADER rh;
+	if (!checkRiffHeader(f, NULL, &rh, false))
+	{
+		printf("Invalid RIFF header (not an avi file).\n");
+		return false;
+	}
+
+	/* Scan until first "LIST" fourcc.  The first one should be "hdrl" type. */
+	LISTHEADER hdrl;
+	if (!scanForList(f, NULL, &hdrl, "hdrl", "FFFF", true, false, stop))
+	{
+		printf("First LIST is invalid.\n");
+		return false;
+	}
+	if (!readLH(f, &hdrl)) return false;
+	nhdrl_size = hdrl.lstSize;
+
+	/* Next should be the "avih" chunk with the main AVI Header. */
+	if (!readLHChunk(f, &hdrl, "avih", sizeof(AVIMAINHEADER)))
+	{
+		printf("Error reading avih CHUNK.\n");
+		return false;
+	}
+	AVIMAINHEADER* am = (AVIMAINHEADER*)hdrl.chkHd->ckData;
+	frameCount = am->dwTotalFrames;
+	DWORD streamCount = am->dwStreams;
+
+	/* Make sure that the file has an "idx1" index. */
+	if (!(am->dwFlags&0x00000010))
+	{
+		printf("File has no \"idx1\" index (dwFlags).\n");
+		return false;
+	}
+
+	/* Make sure that AVIF_MUSTUSEINDEX is not set. */
+	if (am->dwFlags&0x00000020)
+	{
+		printf("Cannot use a file with AVIF_MUSTUSEINDEX flag set.\n");
+		return false;
+	}
+
+	/* Next should be an "strl" list for each stream. */
+	LISTHEADER strl;
+	int count = 0, vstream = -20;
+	for (DWORD j=0; j<streamCount; ++j)
+	{
+		LISTHEADER tstrl;
+		if (!scanForList(f, NULL, &tstrl, "strl", "FFFF", true, false, stop))
+		{
+			printf("strl LIST is invalid or was not found.\n");
+			return false;
+		}
+		if (!readLH(f, &tstrl)) return false;
+		/* Next should be the "strh" chunk which is an AVISTREAMHEADER structure. */
+		if (!readLHChunk(f, &tstrl, "strh", sizeof(AVISTREAMHEADER)))
+		{
+			printf("Error reading strh CHUNK.\n");
+			return false;
+		}
+		/* See if it is a video stream. */
+		if (((AVISTREAMHEADER*)tstrl.chkHd->ckData)->fccType == MAKE_FOURCC("vids"))
+		{
+			++count;
+			vstream = j;
+			if (count > 1)
+			{
+				printf("More than 1 video stream present.\n");
+				return false;
+			}
+			strl = tstrl;
+		}
+		else nhdrl_size -= 8+tstrl.lstSize;
+		if (fseek(f,tstrl.lstSize-12-sizeof(AVISTREAMHEADER),SEEK_CUR)) 
+			return false;
+	}
+	if (!count)
+	{
+		printf("No video stream present.\n");
+		return false;
+	}
+	AVISTREAMHEADER* ash = (AVISTREAMHEADER*)strl.chkHd->ckData;
+	fps = double(ash->dwRate)/double(ash->dwScale);
+	
+	/* Make sure that AVISF_VIDEO_PALCHANGES is not set. */
+	if (ash->dwFlags&0x00010000)
+	{
+		printf("Cannot use a stream with AVISF_VIDEO_PALCHANGES flag set.\n");
+		return false;
+	}
+
+	/* Next grab the AVI2 "odml" LIST. */
+	LISTHEADER odml;
+	if (!scanForList(f, NULL, &odml, "odml", "movi", false, false, stop))
+	{
+		if (stop) { goto noodml; }
+		printf("odml LIST was invalid or was not found.\n");
+		return false;
+	}
+	if (!readLH(f, &odml)) return false;
+
+	/* Now should be the "dmlh" CHUNK. */
+	if (!readLHChunk(f, &odml, "dmlh", sizeof(AVIEXTHEADER)))
+	{
+		printf("Error reading dmlh CHUNK.\n");
+		return false;
+	}
+
+	/* Make sure frame counts match. */
+	if (frameCount != ((AVIEXTHEADER*)odml.chkHd->ckData)->dwGrandFrames)
+	{
+		printf("Frame counts don't match.\n");
+		return false;
+	}
+
+	/* Next scan to the "movi" list. */
+noodml:
+	LISTHEADER movi;
+	if (!scanForList(f, NULL, &movi, "movi", "FFFF", false, false, stop))
+	{
+		printf("movi LIST was invalid or was not found.\n");
+		return false;
+	}
+	if (!readLH(f, &movi)) return false;
+
+	/* Allocate repCount/offsets array */
+	repCount = (DWORD*)malloc(frameCount*sizeof(DWORD));
+	if (!repCount)
+	{
+		printf("malloc failure (repCount).\n");
+		return false;
+	}
+	memset(repCount, 0, frameCount*sizeof(DWORD));
+	offsets = (DWORD*)malloc(frameCount*sizeof(DWORD));
+	if (!offsets)
+	{
+		printf("malloc failure (offsets).\n");
+		return false;
+	}
+	memset(offsets, 0, frameCount*sizeof(DWORD));
+
+	/* Seek to "idx1" index and parse info. */
+	if (fseek(f,movi.lstSize-4,SEEK_CUR)) return false;
+	CHUNKHEADER idx1;
+	AVIOLDINDEX index;
+	if (!scanForChunk(f, NULL, &idx1, "idx1", false, false))
+	{
+		printf("idx1 index chunk was not found or invalid.\n");
+		return false;
+	}
+	if (!readChunkHD(f, &idx1, false)) return false;
+	DWORD i = 0, v = 0, ncount = 0, sum = 4;
+	nmovi_size = 0;
+	char buf1[5], buf2[5];
+	sprintf(buf1,"%2.2d%s", vstream, "dc");
+	sprintf(buf2,"%2.2d%s", vstream, "db");
+	while(1)
+	{
+		if (!readIndexChunk(f, &index, sizeof(AVIOLDINDEX))) break;
+		if (index.dwChunkId != MAKE_FOURCC(buf1) && index.dwChunkId != MAKE_FOURCC(buf2)) 
+			continue;
+		if (index.dwSize == 0) { repCount[v-1]++; ++ncount; }
+		else 
+		{
+			offsets[v] = sum;
+			sum += 8+index.dwSize+(index.dwSize&1);
+			++v;
+		}
+		if (!(i&15))
+			printf("\rFrame Parsing Progress: %3.2f%c (%d)", 
+				double(i)*100.0/double(frameCount), '%', ncount); 
+		++i;
+	}
+	printf("\rFrame Parsing Progress: %3.2f%c (%d)\n", 
+		double(i)*100.0/double(frameCount), '%', ncount);
+	if (i != frameCount)
+	{
+		printf("Number of data chunks does not match frame count.\n");
+		return false;
+	}
+	nmovi_size = sum;
+	newFrameCount = v;
+	if (newFrameCount == frameCount)
+	{
+		printf("Video stream does not contain any NULL frames.\n");
+		return false;
+	}
+	return true;
+}
+
+bool createTCFile(FILE *tcf, DWORD newFrameCount, double fps, DWORD *repCount, int mode)
+{
+	if (mode == 1 || mode == 3 || mode == 5)
+	{
+		fprintf(tcf, "# timecode format v1\n");
+		int mfps;
+		bool tfr = int(fps*1000000+0.5f) == 119880120 ? true : false; 
+		if (tfr) 
+		{
+			mfps = 29970030;
+			fprintf(tcf, "Assume 29.970030\n");
+		}
+		else 
+		{
+			mfps = 29970000;
+			fprintf(tcf, "Assume 29.970000\n");
+		}
+		DWORD i = 0;
+		int crep, prep = -20, last = 0;
+		double rate;
+		while (i < newFrameCount)
+		{
+			crep = repCount[i];
+			if (crep != prep && prep != -20)
+			{
+				if (int(rate*1000000+0.5f) != mfps)
+					fprintf(tcf, "%d,%d,%4.6f\n", last, i-1, rate);
+				last = i;
+			}
+			rate = fps/double(repCount[i]+1);
+			prep = crep;
+			++i;
+		}
+		if (int(rate*1000000+0.5f) != mfps)
+			fprintf(tcf, "%d,%d,%4.6f\n", last, newFrameCount-1, rate);
+		fprintf(tcf, "# Total Frames:  %d\n", newFrameCount);
+	}
+	else if (mode == 2 || mode == 4 || mode == 6)
+	{
+		fprintf(tcf, "# timecode format v2\n");
+		DWORD i = 0, sum = 0;
+		while (i < newFrameCount)
+		{
+			fprintf(tcf, "%3.6f\n", double(sum)*1000.0/fps);
+			sum += repCount[i]+1;
+			++i;
+		}
+	}
+	else
+	{
+		printf("Invalid mode value.\n");
+		return false;
+	}
+	fclose(tcf);
+	tcf = NULL;
+	printf("Timecode file created successfully.\n");
+	return true;
+}
+
+bool createAVIFile(FILE *f, FILE *o, DWORD newFrameCount, DWORD frameCount, DWORD *offsets,
+				   DWORD nmovi_size, DWORD nhdrl_size)
+{
+	bool stop;
+
+	/* Reset file pointers to beginning. */
+	if (fseek(f,0,SEEK_SET)) return false;
+	if (fseek(o,0,SEEK_SET)) return false;
+
+	/* Check for valid RIFF header. */
+	RIFFHEADER rh;
+	if (!checkRiffHeader(f, o, &rh, true))
+	{
+		printf("Invalid RIFF header (not an avi file).\n");
+		return false;
+	}
+
+	/* Scan until first "LIST" fourcc.  The first one should be "hdrl" type. */
+	LISTHEADER hdrl;
+	if (!scanForList(f, o, &hdrl, "hdrl", "FFFF", true, true, stop))
+	{
+		printf("First LIST is invalid.\n");
+		return false;
+	}
+	if (!readLH(f, &hdrl)) return false;
+	hdrl.lstSize = nhdrl_size;
+	if (!writeLH(o, &hdrl)) return false;
+
+	/* Next should be the "avih" chunk with the main AVI Header. */
+	if (!readLHChunk(f, &hdrl, "avih", sizeof(AVIMAINHEADER)))
+	{
+		printf("Error reading avih CHUNK.\n");
+		return false;
+	}
+	AVIMAINHEADER* am = (AVIMAINHEADER*)hdrl.chkHd->ckData;
+	DWORD streamCount = am->dwStreams;
+	am->dwMicroSecPerFrame = 33367;
+	am->dwStreams = 1;
+	am->dwTotalFrames = newFrameCount;
+	if (!writeLHChunk(o, &hdrl)) return false;
+
+	/* Next should be an "strl" list for each stream. */
+	LISTHEADER strl;
+	int count = 0, vstream = -20;
+	DWORD tsize = 0;
+	for (DWORD j=0; j<streamCount; ++j)
+	{
+		LISTHEADER tstrl;
+		if (!scanForList(f, o, &tstrl, "strl", "FFFF", true, false, stop))
+		{
+			printf("strl LIST is invalid or was not found.\n");
+			return false;
+		}
+		if (!readLH(f, &tstrl)) return false;
+		/* Next should be the "strh" chunk which is an AVISTREAMHEADER structure. */
+		if (!readLHChunk(f, &tstrl, "strh", sizeof(AVISTREAMHEADER)))
+		{
+			printf("Error reading strh CHUNK.\n");
+			return false;
+		}
+		/* See if it is a video stream. */
+		if (((AVISTREAMHEADER*)tstrl.chkHd->ckData)->fccType == MAKE_FOURCC("vids"))
+		{
+			++count;
+			vstream = j;
+			if (count > 1)
+			{
+				printf("More than 1 video stream present.\n");
+				return false;
+			}
+			strl = tstrl;
+			tsize = strl.lstSize-12-sizeof(AVISTREAMHEADER);
+			if (tbuf.size <= tsize+12)
+			{
+				if (tbuf.data) free(tbuf.data);
+				tbuf.data = malloc(tsize+12);
+				if (!tbuf.data) return false;
+				tbuf.size = tsize+12;
+			}
+			if (!fread(tbuf.data,tsize,1,f)) return false;
+		}
+		else
+		{
+			if (fseek(f,tstrl.lstSize-12-sizeof(AVISTREAMHEADER),SEEK_CUR)) 
+				return false;
+		}
+	}
+	if (!count)
+	{
+		printf("No video stream present.\n");
+		return false;
+	}
+	AVISTREAMHEADER* ash = (AVISTREAMHEADER*)strl.chkHd->ckData;
+	ash->dwLength = newFrameCount;
+	ash->dwRate = 30000;
+	ash->dwScale = 1001;
+	if (!writeLH(o, &strl)) return false;
+	if (!writeLHChunk(o, &strl)) return false;
+	if (!fwrite(tbuf.data,tsize,1,o)) return false;
+	wpos += tsize;
+
+	/* Next grab the AVI2 "odml" LIST. */
+	LISTHEADER odml;
+	if (!scanForList(f, o, &odml, "odml", "movi", false, true, stop))
+	{
+		if (stop) { goto noodml; }
+		printf("odml LIST was invalid or was not found.\n");
+		return false;
+	}
+	if (!readLH(f, &odml)) return false;
+	if (!writeLH(o, &odml)) return false;
+
+	/* Now should be the "dmlh" CHUNK. */
+	if (!readLHChunk(f, &odml, "dmlh", sizeof(AVIEXTHEADER)))
+	{
+		printf("Error reading dmlh CHUNK.\n");
+		return false;
+	}
+	AVIEXTHEADER *aeh = (AVIEXTHEADER*)odml.chkHd->ckData;
+	aeh->dwGrandFrames = newFrameCount;
+	if (!writeLHChunk(o, &odml)) return false;
+
+	/* Next scan to the "movi" list. */
+noodml:
+	LISTHEADER movi;
+	if (!scanForList(f, o, &movi, "movi", "FFFF", false, true, stop))
+	{
+		printf("movi LIST was invalid or was not found.\n");
+		return false;
+	}
+	if (!readLH(f, &movi)) return false;
+	movi.lstSize = nmovi_size;
+	if (!writeLH(o, &movi)) return false;
+
+	/* Read all data chunks in the stream and count drop frames. */
+	CHUNKHEADER ch;
+	DWORD i = 0, v = 0, sum = 0;
+	char buf1[5], buf2[5];
+	sprintf(buf1,"%2.2d%s", vstream, "dc");
+	sprintf(buf2,"%2.2d%s", vstream, "db");
+	while (i < frameCount)
+	{
+		if (!scanForChunk(f, o, &ch, buf1, false, false)) break;
+		if (!readChunk(f, &ch)) return false;
+		if (ch.ckSize != 0) 
+		{
+			ch.ckID &= 0xFFFF0000;
+			ch.ckID |= 0x00003030;
+			if (!writeChunk(o, &ch)) return false; 
+		}
+		if (!(i&15))
+			printf("\rFrame Modification Progress: %3.2f%c", 
+				double(i)*100.0/double(frameCount), '%'); 
+		++i;
+	}
+	printf("\rFrame Modification Progress: %3.2f%c\n", 
+		double(i)*100.0/double(frameCount), '%');
+	if (i != frameCount)
+	{
+		printf("Number of data chunks does not match frame count.\n");
+		return false;
+	}
+
+	/* Read the "idx1" index and modify the entries as required. */
+	i = 0, sum = 0;
+	CHUNKHEADER idx1;
+	AVIOLDINDEX index;
+	if (!scanForChunk(f, o, &idx1, "idx1", false, true))
+	{
+		printf("idx1 index chunk was not found or invalid.\n");
+		return false;
+	}
+	if (!readChunkHD(f, &idx1, false)) return false;
+	idx1.ckSize = newFrameCount*sizeof(AVIOLDINDEX);
+	if (!writeChunkHD(o, &idx1)) return false;
+	while(1)
+	{
+		if (!readIndexChunk(f, &index, sizeof(AVIOLDINDEX))) break;
+		if (index.dwChunkId == MAKE_FOURCC(buf1) || index.dwChunkId == MAKE_FOURCC(buf2)) 
+		{
+			if (index.dwSize == 0) continue;
+			index.dwOffset = offsets[i];
+			index.dwChunkId &= 0xFFFF0000;
+			index.dwChunkId |= 0x00003030;
+			if (!writeIndexChunk(o, &index, sizeof(AVIOLDINDEX))) return false;
+			if (!(i&15))
+				printf("\rIndex Modification Progress: %3.2f%c", 
+					double(i)*100.0/double(newFrameCount), '%');
+			++i;
+		}
+	}
+	printf("\rIndex Modification Progress: %3.2f%c\n", 
+		double(i)*100.0/double(newFrameCount), '%');
+	if (i != newFrameCount)
+	{
+		printf("Number of index chunks does not match frame count.\n");
+		return false;
+	}
+
+	/* flush the end bits */
+	while (1)
+	{
+		DWORD ret = (DWORD)fread(tbuf.data,1,tbuf.size,f);
+		if (!ret) break;
+		if (!fwrite(tbuf.data,1,ret,o)) return false;
+		wpos += ret;
+	}
+
+	/* Modify the size value of the RIFF Header at the
+		beginning of the file. */
+	if (fseek(o, 0, SEEK_SET)) return false;
+	rh.fileSize = wpos-8;
+	if (!fwrite(&rh,1,12,o))
+	{
+		printf("Error writing to output file.\n");
+		return false;
+	}
+	return true;
+}
+
+bool createAVSFile(FILE *avsf, char *filename, DWORD newFrameCount, DWORD *repCount)
+{
+	DWORD *startFrames = (DWORD*)malloc(newFrameCount*sizeof(DWORD));
+	if (!startFrames)
+		return false;
+	DWORD *endFrames = (DWORD*)malloc(newFrameCount*sizeof(DWORD));
+	if (!endFrames)
+	{
+		free(startFrames);
+		return false;
+	}
+	DWORD *frameCounts = (DWORD*)malloc(newFrameCount*sizeof(DWORD));
+	if (!frameCounts)
+	{
+		free(startFrames);
+		free(endFrames);
+		return false;
+	}
+	memset(startFrames,0,newFrameCount*sizeof(DWORD));
+	memset(endFrames,0,newFrameCount*sizeof(DWORD));
+	memset(frameCounts,0,newFrameCount*sizeof(DWORD));
+	DWORD sectionCount = 0;
+	DWORD frameSum = 0;
+	long last = -1;
+	for (DWORD i=0; i<newFrameCount-1; ++i)
+	{
+		if (repCount[i] != repCount[i+1])
+		{
+			startFrames[sectionCount] = frameSum;
+			frameCounts[sectionCount] = repCount[i]+1;
+			frameSum += (repCount[i]+1)*(i-last);
+			endFrames[sectionCount] = frameSum-1;
+			last = i;
+			++sectionCount;
+		}
+	}
+	startFrames[sectionCount] = frameSum;
+	frameCounts[sectionCount] = repCount[i]+1;
+	frameSum += (repCount[i]+1)*(i-last);
+	endFrames[sectionCount] = frameSum-1;
+	++sectionCount;
+	fprintf(avsf, "Avisource(\"%s\")\n", filename);
+	char abuf[4096], tbuf[40];
+	sprintf(abuf,"");
+	for (DWORD j=0; j<sectionCount; ++j)
+	{
+		fprintf(avsf, "cfr%03d = Trim(%d,%d).SelectEvery(%d,0).AssumeFPS(30000,1001)\n", j,
+			startFrames[j], endFrames[j], frameCounts[j]);
+		if (j == 0) sprintf(tbuf,"cfr%03d",j);
+		else sprintf(tbuf,"+cfr%03d",j);
+		strcat(abuf,tbuf);
+	}
+	fprintf(avsf, "%s\n", abuf);
+	free(startFrames);
+	free(endFrames);
+	free(frameCounts);
+	return true;
+}
+
+int main(int argc, char *argv[])
+{
+	DWORD frameCount, newFrameCount;
+	DWORD nmovi_size, nhdrl_size;
+	DWORD *repCount = 0, *offsets = 0;
+	clock_t start, finish;
+	double fps;
+	char *fbuf = 0, *obuf = 0;
+
+	printf("\ncfr2tc %s by tritical.\n", VERSION);
+
+	/* Check for valid syntax. */
+	if (argc != 5)
+	{
+		printf("Invalid syntax used.\n");
+		printf("Usage:    cfr2tc input_avi_file output_avi_or_avs_file timecode_file mode\n");
+		printf("Example:  cfr2tc c:\\test.avi c:\\video.avi c:\\timecodes.txt 1\n");
+		printf("Mode settings:  1 - v1 timecode file, avi output\n");
+		printf("                2 - v2 timecode file, avi output\n");
+		printf("                3 - v1 timecode file, no video output\n");
+		printf("                4 - v2 timecode file, no video output\n");
+		printf("                5 - v1 timecode file, avs output\n");
+		printf("                6 - v2 timecode file, avs output\n");
+		return 1;
+	}
+	start = clock();
+
+	/* Check for valid mode setting. */
+	int mode = atoi(argv[4]);
+	if (mode < 1 || mode > 6)
+	{
+		printf("Invalid mode setting (%d).\n", mode);
+		return 2;
+	}
+
+	/* Open the specified avi file. */
+	FILE *f = fopen(argv[1],"rb");
+	if (!f)
+	{
+		printf("Error opening input avi file.\n");
+		return 3;
+	}
+	fbuf = (char*)_aligned_malloc(65536*sizeof(char),32);
+	if (!fbuf)
+	{
+		printf("Error allocating file buffer for input avi file.\n");
+		closeFiles(f, NULL, NULL, repCount, offsets, false, NULL, NULL, fbuf, obuf);
+		return 4;
+	}
+	if (setvbuf(f,fbuf,_IOFBF,65536))
+	{
+		printf("Error setting input avi file buffer.\n");
+		closeFiles(f, NULL, NULL, repCount, offsets, false, NULL, NULL, fbuf, obuf);
+		return 5;
+	}
+
+	/* Open the output avi file. */
+	FILE *o = NULL;
+	if (mode < 3)
+	{
+		o = fopen(argv[2],"wb");
+		if (!o)
+		{
+			printf("Error opening output avi file.\n");
+			closeFiles(f, NULL, NULL, repCount, offsets, false, NULL, NULL, fbuf, obuf);
+			return 6;
+		}
+		obuf = (char*)_aligned_malloc(65536*sizeof(char),32);
+		if (!obuf)
+		{
+			printf("Error allocating file buffer for output avi file.\n");
+			closeFiles(f, o, NULL, repCount, offsets, true, argv[2], NULL, fbuf, obuf);
+			return 7;
+		}
+		if (setvbuf(o,obuf,_IOFBF,65536))
+		{
+			printf("Error setting output avi file buffer.\n");
+			closeFiles(f, o, NULL, repCount, offsets, true, argv[2], NULL, fbuf, obuf);
+			return 8;
+		}
+	}
+
+	/* Open the timecode file. */
+	FILE *tcf = fopen(argv[3],"w");
+	if (!tcf)
+	{
+		printf("Error opening timecode file.\n");
+		closeFiles(f, o, NULL, repCount, offsets, true, argv[2], NULL, fbuf, obuf);
+		return 9;
+	}
+
+	/* Find fps and number of null frames. */
+	if (!getInfo(f, frameCount, newFrameCount, fps, repCount, offsets, nmovi_size, nhdrl_size))
+	{
+		closeFiles(f, o, tcf, repCount, offsets, true, argv[2], argv[3], fbuf, obuf);
+		return 10;
+	}
+
+	/* Create the timecode file. */
+	if (!createTCFile(tcf, newFrameCount, fps, repCount, mode))
+	{
+		closeFiles(f, o, tcf, repCount, offsets, true, argv[2], argv[3], fbuf, obuf);
+		return 11;
+	}
+
+	/* Create the output avi file with NULL frames removed. */
+	if (mode < 3)
+	{
+		if (!createAVIFile(f, o, newFrameCount, frameCount, offsets, nmovi_size, nhdrl_size))
+		{
+			closeFiles(f, o, tcf, repCount, offsets, true, argv[2], argv[3], fbuf, obuf);
+			return 12;
+		}
+	}
+
+	/* Create avs script */
+	if (mode > 4)
+	{
+		FILE *avsf = fopen(argv[2],"w");
+		if (!avsf)
+		{
+			printf("Error creating avs file.\n");
+			closeFiles(f, o, tcf, repCount, offsets, true, argv[2], argv[3], fbuf, obuf);
+			return 13;
+		}
+		if (!createAVSFile(avsf, argv[1], newFrameCount, repCount))
+		{
+			fclose(avsf);
+			unlink(argv[2]);
+			closeFiles(f, o, tcf, repCount, offsets, true, argv[2], argv[3], fbuf, obuf);
+			return 14;
+		}
+		fclose(avsf);
+	}
+
+	/* Cleanup and finish. */
+	finish = clock();
+	printf("All processing completed successfully.\n");
+	printf("Time elapsed:  %3.3f seconds.\n", (double)(finish-start)/CLOCKS_PER_SEC);
+	closeFiles(f, o, tcf, repCount, offsets, false, NULL, NULL, fbuf, obuf);
+	return 0;
+}
\ No newline at end of file
diff --git a/tstools/cfr2tc/cfr2tc/cfr2tc.rc b/tstools/cfr2tc/cfr2tc/cfr2tc.rc
new file mode 100644
index 0000000..0746be5
--- /dev/null
+++ b/tstools/cfr2tc/cfr2tc/cfr2tc.rc
@@ -0,0 +1,98 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,4,0,0
+ PRODUCTVERSION 1,4,0,0
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "FileDescription", "cfr2tc v1.4"
+            VALUE "FileVersion", "1, 4, 0, 0"
+            VALUE "LegalCopyright", "Copyright (C) 2005-2006  Kevin Stone"
+            VALUE "ProductVersion", "1, 4, 0, 0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/tstools/cfr2tc/cfr2tc/cfr2tc.sln b/tstools/cfr2tc/cfr2tc/cfr2tc.sln
new file mode 100644
index 0000000..e7f42c6
--- /dev/null
+++ b/tstools/cfr2tc/cfr2tc/cfr2tc.sln
@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cfr2tc", "cfr2tc.vcproj", "{704D6D1C-F126-416E-9303-F62F4C8D7886}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{704D6D1C-F126-416E-9303-F62F4C8D7886}.Debug.ActiveCfg = Debug|Win32
+		{704D6D1C-F126-416E-9303-F62F4C8D7886}.Debug.Build.0 = Debug|Win32
+		{704D6D1C-F126-416E-9303-F62F4C8D7886}.Release.ActiveCfg = Release|Win32
+		{704D6D1C-F126-416E-9303-F62F4C8D7886}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/tstools/cfr2tc/cfr2tc/cfr2tc.vcproj b/tstools/cfr2tc/cfr2tc/cfr2tc.vcproj
new file mode 100644
index 0000000..c24c970
--- /dev/null
+++ b/tstools/cfr2tc/cfr2tc/cfr2tc.vcproj
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="cfr2tc"
+	ProjectGUID="{704D6D1C-F126-416E-9303-F62F4C8D7886}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				BufferSecurityCheck="TRUE"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/cfr2tc.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/cfr2tc.pdb"
+				SubSystem="1"
+				OptimizeReferences="1"
+				EnableCOMDATFolding="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				ImproveFloatingPointConsistency="TRUE"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/cfr2tc.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath=".\cfr2tc.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\resource.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+			<File
+				RelativePath=".\cfr2tc.rc">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/tstools/cfr2tc/cfr2tc/resource.h b/tstools/cfr2tc/cfr2tc/resource.h
new file mode 100644
index 0000000..6ce7548
--- /dev/null
+++ b/tstools/cfr2tc/cfr2tc/resource.h
@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by cfr2tc.rc
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/tstools/cfr2tc/gpl.txt b/tstools/cfr2tc/gpl.txt
new file mode 100644
index 0000000..45645b4
--- /dev/null
+++ b/tstools/cfr2tc/gpl.txt
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/tstools/epgdump/Makefile b/tstools/epgdump/Makefile
new file mode 100755
index 0000000..ab2ce18
--- /dev/null
+++ b/tstools/epgdump/Makefile
@@ -0,0 +1,28 @@
+PREFIX		= /usr/local
+TARGETS	= epgdump
+OBJ_TARGETS	= epgdump.o aribstr.o eit.o ts.o util.o sdt.o
+HEDDERDEPEND	= eit.h sdt.h aribstr.h ts.h util.h
+
+LANG		= C
+CC		= gcc
+CFLAGS		= -std=c99 -O2 -Wall -g
+LIBS		= 
+
+.c.o:			${CC} ${CFLAGS} -c $<
+
+all:			${TARGETS}
+
+${TARGETS}:		${OBJ_TARGETS}
+			${CC} ${CFLAGS} ${OBJ_TARGETS} -o $@ ${LDFLAGS} ${LIBS}
+
+${OBJ_TARGETS}:	${HEDDERDEPEND}
+
+clean:
+			rm -f core ${TARGETS} *.o
+
+install:		${TARGETS}
+			install -m755 ${TARGETS} ${PREFIX}/bin
+
+uninstall:		${TARGETS}
+			rm ${PREFIX}/bin/${TARGETS}
+
diff --git a/tstools/epgdump/aribstr.c b/tstools/epgdump/aribstr.c
new file mode 100755
index 0000000..1e736ea
--- /dev/null
+++ b/tstools/epgdump/aribstr.c
@@ -0,0 +1,599 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <iconv.h>
+
+#include "aribstr.h"
+
+#define CODE_UNKNOWN 		0	// ÉÔÌÀ¤Ê¥°¥é¥Õ¥£¥Ã¥¯¥»¥Ã¥È(ÈóÂбþ)
+#define CODE_KANJI 		1	// Kanji
+#define CODE_ALPHANUMERIC 	2	// Alphanumeric
+#define CODE_HIRAGANA 		3	// Hiragana
+#define CODE_KATAKANA 		4	// Katakana
+#define CODE_MOSAIC_A 		5	// Mosaic A
+#define CODE_MOSAIC_B 		6	// Mosaic B
+#define CODE_MOSAIC_C 		7	// Mosaic C
+#define CODE_MOSAIC_D 		8	// Mosaic D
+#define CODE_PROP_ALPHANUMERIC 	9	// Proportional Alphanumeric
+#define CODE_PROP_HIRAGANA 	10	// Proportional Hiragana
+#define CODE_PROP_KATAKANA 	11	// Proportional Katakana
+#define CODE_JIS_X0201_KATAKANA 12	// JIS X 0201 Katakana
+#define CODE_JIS_KANJI_PLANE_1 	13	// JIS compatible Kanji Plane 1
+#define CODE_JIS_KANJI_PLANE_2 	14	// JIS compatible Kanji Plane 2
+#define CODE_ADDITIONAL_SYMBOLS	15	// Additional symbols
+
+
+#define TCHAR char
+#define BYTE  char
+#define WORD  int
+#define DWORD int
+#define bool  int
+#define true  1
+#define false 0
+#define TEXT(a) a
+#define _T(a) a
+#define CODE_SET int
+
+static int m_CodeG[4];
+static int *m_pLockingGL;
+static int *m_pLockingGR;
+static int *m_pSingleGL;
+	
+static	BYTE m_byEscSeqCount;
+static	BYTE m_byEscSeqIndex;
+static	bool m_bIsEscSeqDrcs;
+
+
+static	const DWORD AribToStringInternal(TCHAR *lpszDst, const BYTE *pSrcData, const DWORD dwSrcLen);
+static	const DWORD ProcessCharCode(TCHAR *lpszDst, const WORD wCode, const CODE_SET CodeSet);
+
+static	const DWORD PutKanjiChar(TCHAR *lpszDst, const WORD wCode);
+static	const DWORD PutAlphanumericChar(TCHAR *lpszDst, const WORD wCode);
+static	const DWORD PutHiraganaChar(TCHAR *lpszDst, const WORD wCode);
+static	const DWORD PutKatakanaChar(TCHAR *lpszDst, const WORD wCode);
+static	const DWORD PutJisKatakanaChar(TCHAR *lpszDst, const WORD wCode);
+static	const DWORD PutSymbolsChar(TCHAR *lpszDst, const WORD wCode);
+
+static	void ProcessEscapeSeq(const BYTE byCode);
+
+static	void LockingShiftGL(const BYTE byIndexG);
+static	void LockingShiftGR(const BYTE byIndexG);
+static	void SingleShiftGL(const BYTE byIndexG);
+
+static	const bool DesignationGSET(const BYTE byIndexG, const BYTE byCode);
+static	const bool DesignationDRCS(const BYTE byIndexG, const BYTE byCode);
+
+static WORD convertjis(DWORD);
+
+static const bool abCharSizeTable[] =
+{
+	false,	// CODE_UNKNOWN					ÉÔÌÀ¤Ê¥°¥é¥Õ¥£¥Ã¥¯¥»¥Ã¥È(ÈóÂбþ)
+	true,	// CODE_KANJI					Kanji
+	false,	// CODE_ALPHANUMERIC			Alphanumeric
+	false,	// CODE_HIRAGANA				Hiragana
+	false,	// CODE_KATAKANA				Katakana
+	false,	// CODE_MOSAIC_A				Mosaic A
+	false,	// CODE_MOSAIC_B				Mosaic B
+	false,	// CODE_MOSAIC_C				Mosaic C
+	false,	// CODE_MOSAIC_D				Mosaic D
+	false,	// CODE_PROP_ALPHANUMERIC		Proportional Alphanumeric
+	false,	// CODE_PROP_HIRAGANA			Proportional Hiragana
+	false,	// CODE_PROP_KATAKANA			Proportional Katakana
+	false,	// CODE_JIS_X0201_KATAKANA		JIS X 0201 Katakana
+	true,	// CODE_JIS_KANJI_PLANE_1		JIS compatible Kanji Plane 1
+	true,	// CODE_JIS_KANJI_PLANE_2		JIS compatible Kanji Plane 2
+	true	// CODE_ADDITIONAL_SYMBOLS		Additional symbols
+};
+
+int AribToString(
+	char *lpszDst, 
+	const char *pSrcData, 
+	const int dwSrcLen) {
+  
+	return AribToStringInternal(lpszDst, pSrcData, dwSrcLen);
+}
+
+
+const DWORD AribToStringInternal(TCHAR *lpszDst, 
+								 const BYTE *pSrcData, const DWORD dwSrcLen)
+{
+	if(!pSrcData || !dwSrcLen || !lpszDst)return 0UL;
+  
+	DWORD dwSrcPos = 0UL;
+	DWORD dwDstLen = 0UL;
+	int   dwSrcData;
+  
+	// ¾õÂÖ½é´üÀßÄê
+	m_byEscSeqCount = 0U;
+	m_pSingleGL = NULL;
+
+	m_CodeG[0] = CODE_KANJI;
+	m_CodeG[1] = CODE_ALPHANUMERIC;
+	m_CodeG[2] = CODE_HIRAGANA;
+	m_CodeG[3] = CODE_KATAKANA;
+
+	m_pLockingGL = &m_CodeG[0];
+	m_pLockingGR = &m_CodeG[2];
+
+	while(dwSrcPos < dwSrcLen){
+		dwSrcData = pSrcData[dwSrcPos] & 0xFF;
+
+		if(!m_byEscSeqCount){
+      
+			// GL/GRÎΰè
+			if((dwSrcData >= 0x21U) && (dwSrcData <= 0x7EU)){
+				// GLÎΰè
+				const CODE_SET CurCodeSet = (m_pSingleGL)? *m_pSingleGL : *m_pLockingGL;
+				m_pSingleGL = NULL;
+				
+				if(abCharSizeTable[CurCodeSet]){
+					// 2¥Ð¥¤¥È¥³¡¼¥É
+					if((dwSrcLen - dwSrcPos) < 2UL)break;
+					
+					dwDstLen += ProcessCharCode(&lpszDst[dwDstLen], ((WORD)pSrcData[dwSrcPos + 0] << 8) | (WORD)pSrcData[dwSrcPos + 1], CurCodeSet);
+					dwSrcPos++;
+				}
+				else{
+					// 1¥Ð¥¤¥È¥³¡¼¥É
+					dwDstLen += ProcessCharCode(&lpszDst[dwDstLen], (WORD)dwSrcData, CurCodeSet);
+				}
+			}
+			else if((dwSrcData >= 0xA1U) && (dwSrcData <= 0xFEU)){
+				// GRÎΰè
+				const CODE_SET CurCodeSet = *m_pLockingGR;
+				
+				if(abCharSizeTable[CurCodeSet]){
+					// 2¥Ð¥¤¥È¥³¡¼¥É
+					if((dwSrcLen - dwSrcPos) < 2UL)break;
+					
+					dwDstLen += ProcessCharCode(&lpszDst[dwDstLen], ((WORD)(pSrcData[dwSrcPos + 0] & 0x7FU) << 8) | (WORD)(pSrcData[dwSrcPos + 1] & 0x7FU), CurCodeSet);
+					dwSrcPos++;
+				}
+				else{
+					// 1¥Ð¥¤¥È¥³¡¼¥É
+					dwDstLen += ProcessCharCode(&lpszDst[dwDstLen], (WORD)(dwSrcData & 0x7FU), CurCodeSet);
+				}
+			}
+			else{
+				// À©¸æ¥³¡¼¥É
+				switch(dwSrcData){
+				case 0x0FU	: LockingShiftGL(0U);				break;	// LS0
+				case 0x0EU	: LockingShiftGL(1U);				break;	// LS1
+				case 0x19U	: SingleShiftGL(2U);				break;	// SS2
+				case 0x1DU	: SingleShiftGL(3U);				break;	// SS3
+				case 0x1BU	: m_byEscSeqCount = 1U;				break;	// ESC
+				case 0x20U	:
+				case 0xA0U	: lpszDst[dwDstLen++] = TEXT(' ');	break;	// SP
+				default		: break;	// ÈóÂбþ
+				}
+			}
+		}
+		else{
+			// ¥¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹½èÍý
+			ProcessEscapeSeq(dwSrcData);
+		}
+		
+		dwSrcPos++;
+	}
+
+	// ½ªÃ¼Ê¸»ú
+	lpszDst[dwDstLen] = TEXT('\0');
+
+	return dwDstLen;
+}
+
+const DWORD ProcessCharCode(TCHAR *lpszDst, const WORD wCode, const CODE_SET CodeSet)
+{
+	switch(CodeSet){
+	case CODE_KANJI	:
+	case CODE_JIS_KANJI_PLANE_1 :
+	case CODE_JIS_KANJI_PLANE_2 :
+		// ´Á»ú¥³¡¼¥É½ÐÎÏ
+		return PutKanjiChar(lpszDst, wCode);
+
+	case CODE_ALPHANUMERIC :
+	case CODE_PROP_ALPHANUMERIC :
+		// ±Ñ¿ô»ú¥³¡¼¥É½ÐÎÏ
+		return PutAlphanumericChar(lpszDst, wCode);
+
+	case CODE_HIRAGANA :
+	case CODE_PROP_HIRAGANA :
+		// ¤Ò¤é¤¬¤Ê¥³¡¼¥É½ÐÎÏ
+		return PutHiraganaChar(lpszDst, wCode);
+
+	case CODE_PROP_KATAKANA :
+	case CODE_KATAKANA :
+		// ¥«¥¿¥«¥Ê¥³¡¼¥É½ÐÎÏ
+		return PutKatakanaChar(lpszDst, wCode);
+
+	case CODE_JIS_X0201_KATAKANA :
+		// JIS¥«¥¿¥«¥Ê¥³¡¼¥É½ÐÎÏ
+		return PutJisKatakanaChar(lpszDst, wCode);
+#if 1
+	case CODE_ADDITIONAL_SYMBOLS :
+		// Äɲå·¥ó¥Ü¥ë¥³¡¼¥É½ÐÎÏ
+		return PutSymbolsChar(lpszDst, wCode);
+#endif
+	default :
+		return 0UL;
+	}
+}
+
+const DWORD PutKanjiChar(TCHAR *lpszDst, const WORD wCode)
+{
+	// JIS¢ªShift-JIS´Á»ú¥³¡¼¥ÉÊÑ´¹
+	const WORD wShiftJIS = convertjis(wCode);
+
+#ifdef _UNICODE
+	// Shift-JIS ¢ª UNICODE
+	const char szShiftJIS[3] = {(char)(wShiftJIS >> 8), (char)(wShiftJIS & 0x00FFU), '\0'};
+	::MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, szShiftJIS, 2, lpszDst, 2);
+
+	return 1UL;
+#else
+	// Shift-JIS ¢ª Shift-JIS
+	lpszDst[0] = (wShiftJIS >> 8) & 0xFF;
+	lpszDst[1] = (char)(wShiftJIS & 0x00FFU);
+  
+	return 2UL;
+#endif
+}
+
+const DWORD PutAlphanumericChar(TCHAR *lpszDst, const WORD wCode)
+{
+	// ±Ñ¿ô»úʸ»ú¥³¡¼¥ÉÊÑ´¹
+	static const TCHAR *acAlphanumericTable = 
+		TEXT("¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡")
+		TEXT("¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡")
+		TEXT("¡¡¡ª¡É¡ô¡ð¡ó¡õ¡Ç¡Ê¡Ë¡ö¡Ü¡¤¡Ý¡¥¡¿")
+		TEXT("£°£±£²£³£´£µ£¶£·£¸£¹¡§¡¨¡ã¡á¡ä¡©")
+		TEXT("¡÷£Á£Â£Ã£Ä£Å£Æ£Ç£È£É£Ê£Ë£Ì£Í£Î£Ï")
+		TEXT("£Ð£Ñ£Ò£Ó£Ô£Õ£Ö£×£Ø£Ù£Ú¡Î¡ï¡Ï¡°¡²")
+		TEXT("¡¡£á£â£ã£ä£å£æ£ç£è£é£ì£ë£ì£í£î£ï")
+		TEXT("£ð£ñ£ò£ó£ô£õ£ö£÷£ø£ù£ú¡Ð¡Ã¡Ñ¡±¡¡");
+
+#ifdef _UNICODE
+	lpszDst[0] = acAlphanumericTable[wCode];
+
+	return 1UL;
+#else
+	lpszDst[0] = acAlphanumericTable[wCode * 2U + 0U];
+	lpszDst[1] = acAlphanumericTable[wCode * 2U + 1U];
+
+	return 2UL;
+#endif
+}
+
+const DWORD PutHiraganaChar(TCHAR *lpszDst, const WORD wCode)
+{
+	// ¤Ò¤é¤¬¤Êʸ»ú¥³¡¼¥ÉÊÑ´¹
+	static const TCHAR *acHiraganaTable = 
+		TEXT("¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡")
+		TEXT("¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡")
+		TEXT("¡¡¤¡¤¢¤£¤¤¤¥¤¦¤§¤¨¤©¤ª¤«¤¬¤­¤®¤¯")
+		TEXT("¤°¤±¤²¤³¤´¤µ¤¶¤·¤¸¤¹¤º¤»¤¼¤½¤¾¤¿")
+		TEXT("¤À¤Á¤Â¤Ã¤Ä¤Å¤Æ¤Ç¤È¤É¤Ê¤Ë¤Ì¤Í¤Î¤Ï")
+		TEXT("¤Ð¤Ñ¤Ò¤Ó¤Ô¤Õ¤Ö¤×¤Ø¤Ù¤Ú¤Û¤Ü¤Ý¤Þ¤ß")
+		TEXT("¤à¤á¤â¤ã¤ä¤å¤æ¤ç¤è¤é¤ê¤ë¤ì¤í¤î¤ï")
+		TEXT("¤ð¤ñ¤ò¤ó¡¡¡¡¡¡¡µ¡¶¡¼¡£¡Ö¡×¡¢¡¦¡¡");
+	
+#ifdef _UNICODE
+	lpszDst[0] = acHiraganaTable[wCode];
+
+	return 1UL;
+#else
+	lpszDst[0] = acHiraganaTable[wCode * 2U + 0U];
+	lpszDst[1] = acHiraganaTable[wCode * 2U + 1U];
+
+	return 2UL;
+#endif
+}
+
+const DWORD PutKatakanaChar(TCHAR *lpszDst, const WORD wCode)
+{
+	// ¥«¥¿¥«¥Ê±Ñ¿ô»úʸ»ú¥³¡¼¥ÉÊÑ´¹
+	static const TCHAR *acKatakanaTable = 
+		TEXT("¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡")
+		TEXT("¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡")
+		TEXT("¡¡¥¡¥¢¥£¥¤¥¥¥¦¥§¥¨¥©¥ª¥«¥¬¥­¥®¥¯")
+		TEXT("¥°¥±¥²¥³¥´¥µ¥¶¥·¥¸¥¹¥º¥»¥¼¥½¥¾¥¿")
+		TEXT("¥À¥Á¥Â¥Ã¥Ä¥Å¥Æ¥Ç¥È¥É¥Ê¥Ë¥Ì¥Í¥Î¥Ï")
+		TEXT("¥Ð¥Ñ¥Ò¥Ó¥Ô¥Õ¥Ö¥×¥Ø¥Ù¥Ú¥Û¥Ü¥Ý¥Þ¥ß")
+		TEXT("¥à¥á¥â¥ã¥ä¥å¥æ¥ç¥è¥é¥ê¥ë¥ì¥í¥î¥ï")
+		TEXT("¥ð¥ñ¥ò¥ó¥ô¥õ¥ö¡³¡´¡¼¡£¡Ö¡×¡¢¡¦¡¡");
+	
+#ifdef _UNICODE
+	lpszDst[0] = acKatakanaTable[wCode];
+
+	return 1UL;
+#else
+	lpszDst[0] = acKatakanaTable[wCode * 2U + 0U];
+	lpszDst[1] = acKatakanaTable[wCode * 2U + 1U];
+
+	return 2UL;
+#endif
+}
+
+const DWORD PutJisKatakanaChar(TCHAR *lpszDst, const WORD wCode)
+{
+	// JIS¥«¥¿¥«¥Êʸ»ú¥³¡¼¥ÉÊÑ´¹
+	static const TCHAR *acJisKatakanaTable = 
+		TEXT("¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡")
+		TEXT("¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡")
+		TEXT("¡¡¡£¡Ö¡×¡¢¡¦¥ò¥¡¥£¥¥¥§¥©¥ã¥å¥ç¥Ã")
+		TEXT("¡¼¥¢¥¤¥¦¥¨¥ª¥«¥­¥¯¥±¥³¥µ¥·¥¹¥»¥½")
+		TEXT("¥¿¥Á¥Ä¥Æ¥È¥Ê¥Ë¥Ì¥Í¥Î¥Ï¥Ò¥Õ¥Ø¥Û¥Þ")
+		TEXT("¥ß¥à¥á¥â¥ä¥æ¥è¥é¥ê¥ë¥ì¥í¥ï¥ó¡«¡¬")
+		TEXT("¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡")
+		TEXT("¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡");
+	
+#ifdef _UNICODE
+	lpszDst[0] = acJisKatakanaTable[wCode];
+
+	return 1UL;
+#else
+	lpszDst[0] = acJisKatakanaTable[wCode * 2U + 0U];
+	lpszDst[1] = acJisKatakanaTable[wCode * 2U + 1U];
+
+	return 2UL;
+#endif
+}
+
+const DWORD PutSymbolsChar(TCHAR *lpszDst, const WORD wCode)
+{
+	// Äɲå·¥ó¥Ü¥ëʸ»ú¥³¡¼¥ÉÊÑ´¹(¤È¤ê¤¢¤¨¤ºÉ¬Íפ½¤¦¤Ê¤â¤Î¤À¤±)
+	static const TCHAR *aszSymbolsTable1[] =
+		{
+			_T("[HV]"),		_T("[SD]"),		_T("[£Ð]"),		_T("[£×]"),		_T("[MV]"),		_T("[¼ê]"),		_T("[»ú]"),		_T("[ÁÐ]"),			// 0x7A50 - 0x7A57	90/48 - 90/55
+			_T("[¥Ç]"),		_T("[£Ó]"),		_T("[Æó]"),		_T("[¿]"),		_T("[²ò]"),		_T("[SS]"),		_T("[£Â]"),		_T("[£Î]"),			// 0x7A58 - 0x7A5F	90/56 - 90/63
+			_T("¢£"),		_T("¡ü"),		_T("[Å·]"),		_T("[¸ò]"),		_T("[±Ç]"),		_T("[̵]"),		_T("[ÎÁ]"),		_T("[ǯÎðÀ©¸Â]"),	// 0x7A60 - 0x7A67	90/64 - 90/71
+			_T("[Á°]"),		_T("[¸å]"),		_T("[ºÆ]"),		_T("[¿·]"),		_T("[½é]"),		_T("[½ª]"),		_T("[À¸]"),		_T("[ÈÎ]"),			// 0x7A68 - 0x7A6F	90/72 - 90/79
+			_T("[À¼]"),		_T("[¿á]"),		_T("[PPV]"),	_T("(Èë)"),		_T("¤Û¤«")															// 0x7A70 - 0x7A74	90/80 - 90/84
+		};
+
+	static const TCHAR *aszSymbolsTable2[] =
+		{
+			_T("¢ª"),		_T("¢«"),		_T("¢¬"),		_T("¢­"),		_T("¡ü"),		_T("¡û"),		_T("ǯ"),		_T("·î"),			// 0x7C21 - 0x7C28	92/01 - 92/08
+			_T("Æü"),		_T("±ß"),		_T("­Ö"),		_T("ΩÊý£í"),	_T("­Ñ"),		_T("Ê¿Êý­Ñ"),	_T("ΩÊý­Ñ"),	_T("£°."),			// 0x7C29 - 0x7C30	92/09 - 92/16
+			_T("£±."),		_T("£²."),		_T("£³."),		_T("£´."),		_T("£µ."),		_T("£¶."),		_T("£·."),		_T("£¸."),			// 0x7C31 - 0x7C38	92/17 - 92/24
+			_T("£¹."),		_T("»á"),		_T("Éû"),		_T("¸µ"),		_T("¸Î"),		_T("Á°"),		_T("¿·"),		_T("£°,"),			// 0x7C39 - 0x7C40	92/25 - 92/32
+			_T("£±,"),		_T("£²,"),		_T("£³,"),		_T("£´,"),		_T("£µ,"),		_T("£¶,"),		_T("£·,"),		_T("£¸,"),			// 0x7C41 - 0x7C48	92/33 - 92/40
+			_T("£¹,"),		_T("(¼Ò)"),		_T("(ºâ)"),		_T("(Í­)"),		_T("(³ô)"),		_T("(Âå)"),		_T("(Ìä)"),		_T("¡ä"),			// 0x7C49 - 0x7C50	92/41 - 92/48
+			_T("¡ã"),		_T("¡Ú"),		_T("¡Û"),		_T("¡þ"),		_T("^2"),		_T("^3"),		_T("(CD)"),		_T("(vn)"),			// 0x7C51 - 0x7C58	92/49 - 92/56
+			_T("(ob)"),		_T("(cb)"),		_T("(ce"),		_T("mb)"),		_T("(hp)"),		_T("(br)"),		_T("(p)"),		_T("(s)"),			// 0x7C59 - 0x7C60	92/57 - 92/64
+			_T("(ms)"),		_T("(t)"),		_T("(bs)"),		_T("(b)"),		_T("(tb)"),		_T("(tp)"),		_T("(ds)"),		_T("(ag)"),			// 0x7C61 - 0x7C68	92/65 - 92/72
+			_T("(eg)"),		_T("(vo)"),		_T("(fl)"),		_T("(ke"),		_T("y)"),		_T("(sa"),		_T("x)"),		_T("(sy"),			// 0x7C69 - 0x7C70	92/73 - 92/80
+			_T("n)"),		_T("(or"),		_T("g)"),		_T("(pe"),		_T("r)"),		_T("(R)"),		_T("(C)"),		_T("(ä·)"),			// 0x7C71 - 0x7C78	92/81 - 92/88
+			_T("DJ"),		_T("[±é]"),		_T("Fax")																							// 0x7C79 - 0x7C7B	92/89 - 92/91
+		};
+
+	static const TCHAR *aszSymbolsTable3[] =
+		{
+			_T("(·î)"),		_T("(²Ð)"),		_T("(¿å)"),		_T("(ÌÚ)"),		_T("(¶â)"),		_T("(ÅÚ)"),		_T("(Æü)"),		_T("(½Ë)"),			// 0x7D21 - 0x7D28	93/01 - 93/08
+			_T("­í"),		_T("­î"),		_T("­ï"),		_T("­ß"),		_T("­â"),		_T("­ä"),		_T("(¢©)"),		_T("¡û"),			// 0x7D29 - 0x7D30	93/09 - 93/16
+			_T("¡ÌËÜ¡Í"),	_T("¡Ì»°¡Í"),	_T("¡ÌÆó¡Í"),	_T("¡Ì°Â¡Í"),	_T("¡ÌÅÀ¡Í"),	_T("¡ÌÂÇ¡Í"),	_T("¡ÌÅð¡Í"),	_T("¡Ì¾¡¡Í"),		// 0x7D31 - 0x7D38	93/17 - 93/24
+			_T("¡ÌÇÔ¡Í"),	_T("¡Ì£Ó¡Í"),	_T("¡ÎÅê¡Ï"),	_T("¡ÎÊá¡Ï"),	_T("¡Î°ì¡Ï"),	_T("¡ÎÆó¡Ï"),	_T("¡Î»°¡Ï"),	_T("¡ÎÍ·¡Ï"),		// 0x7D39 - 0x7D40	93/25 - 93/32
+			_T("¡Îº¸¡Ï"),	_T("¡ÎÃæ¡Ï"),	_T("¡Î±¦¡Ï"),	_T("¡Î»Ø¡Ï"),	_T("¡ÎÁö¡Ï"),	_T("¡ÎÂÇ¡Ï"),	_T("­È"),		_T("­Ô"),			// 0x7D41 - 0x7D48	93/33 - 93/40
+			_T("Hz"),		_T("ha"),		_T("km"),		_T("Ê¿Êýkm"),	_T("hPa"),		_T("¡¦"),		_T("¡¦"),		_T("1/2"),			// 0x7D49 - 0x7D50	93/41 - 93/48
+			_T("0/3"),		_T("1/3"),		_T("2/3"),		_T("1/4"),		_T("3/4"),		_T("1/5"),		_T("2/5"),		_T("3/5"),			// 0x7D51 - 0x7D58	93/49 - 93/56
+			_T("4/5"),		_T("1/6"),		_T("5/6"),		_T("1/7"),		_T("1/8"),		_T("1/9"),		_T("1/10"),		_T("À²¤ì"),			// 0x7D59 - 0x7D60	93/57 - 93/64
+			_T("ÆÞ¤ê"),		_T("±«"),		_T("Àã"),		_T("¢¤"),		_T("¢¥"),		_T("¢¦"),		_T("¢§"),		_T("¢¡"),			// 0x7D61 - 0x7D68	93/65 - 93/72
+			_T("¡¦"),		_T("¡¦"),		_T("¡¦"),		_T("¡þ"),		_T("¡ý"),		_T("!!"),		_T("!?"),		_T("ÆÞ/À²"),		// 0x7D69 - 0x7D70	93/73 - 93/80
+			_T("±«"),		_T("±«"),		_T("Àã"),		_T("ÂçÀã"),		_T("Íë"),		_T("Í뱫"),		_T("¡¡"),		_T("¡¦"),			// 0x7D71 - 0x7D78	93/81 - 93/88
+			_T("¡¦"),		_T("¢ö"),		_T("­ä")																							// 0x7D79 - 0x7D7B	93/89 - 93/91
+		};
+
+	static const TCHAR *aszSymbolsTable4[] =
+		{
+			_T("­µ"),		_T("­¶"),		_T("­·"),		_T("­¸"),		_T("­¹"),		_T("­º"),		_T("­»"),		_T("­¼"),			// 0x7E21 - 0x7E28	94/01 - 94/08
+			_T("­½"),		_T("­¾"),		_T("XI"),		_T("X­¶"),		_T("­±"),		_T("­²"),		_T("­³"),		_T("­´"),			// 0x7E29 - 0x7E30	94/09 - 94/16
+			_T("(1)"),		_T("(2)"),		_T("(3)"),		_T("(4)"),		_T("(5)"),		_T("(6)"),		_T("(7)"),		_T("(8)"),			// 0x7E31 - 0x7E38	94/17 - 94/24
+			_T("(9)"),		_T("(10)"),		_T("(11)"),		_T("(12)"),		_T("(21)"),		_T("(22)"),		_T("(23)"),		_T("(24)"),			// 0x7E39 - 0x7E40	94/25 - 94/32
+			_T("(A)"),		_T("(B)"),		_T("(C)"),		_T("(D)"),		_T("(E)"),		_T("(F)"),		_T("(G)"),		_T("(H)"),			// 0x7E41 - 0x7E48	94/33 - 94/40
+			_T("(I)"),		_T("(J)"),		_T("(K)"),		_T("(L)"),		_T("(M)"),		_T("(N)"),		_T("(O)"),		_T("(P)"),			// 0x7E49 - 0x7E50	94/41 - 94/48
+			_T("(Q)"),		_T("(R)"),		_T("(S)"),		_T("(T)"),		_T("(U)"),		_T("(V)"),		_T("(W)"),		_T("(X)"),			// 0x7E51 - 0x7E58	94/49 - 94/56
+			_T("(Y)"),		_T("(Z)"),		_T("(25)"),		_T("(26)"),		_T("(27)"),		_T("(28)"),		_T("(29)"),		_T("(30)"),			// 0x7E59 - 0x7E60	94/57 - 94/64
+			_T("­¡"),		_T("­¢"),		_T("­£"),		_T("­¤"),		_T("­¥"),		_T("­¦"),		_T("­§"),		_T("­¨"),			// 0x7E61 - 0x7E68	94/65 - 94/72
+			_T("­©"),		_T("­ª"),		_T("­«"),		_T("­¬"),		_T("­­"),		_T("­®"),		_T("­¯"),		_T("­°"),			// 0x7E69 - 0x7E70	94/73 - 94/80
+			_T("­¡"),		_T("­¢"),		_T("­£"),		_T("­¤"),		_T("­¥"),		_T("­¦"),		_T("­§"),		_T("­¨"),			// 0x7E71 - 0x7E78	94/81 - 94/88
+			_T("­©"),		_T("­ª"),		_T("­«"),		_T("­¬"),		_T("(31)")															// 0x7E79 - 0x7E7D	94/89 - 94/93
+		};
+
+	// ¥·¥ó¥Ü¥ë¤òÊÑ´¹¤¹¤ë
+	if((wCode >= 0x7A50U) && (wCode <= 0x7A74U)){
+		strcpy(lpszDst, aszSymbolsTable1[wCode - 0x7A50U]);
+	}
+	else if((wCode >= 0x7C21U) && (wCode <= 0x7C7BU)){
+		strcpy(lpszDst, aszSymbolsTable2[wCode - 0x7C21U]);
+	}
+	else if((wCode >= 0x7D21U) && (wCode <= 0x7D7BU)){
+		strcpy(lpszDst, aszSymbolsTable3[wCode - 0x7D21U]);
+	}
+	else if((wCode >= 0x7E21U) && (wCode <= 0x7E7DU)){
+		strcpy(lpszDst, aszSymbolsTable4[wCode - 0x7E21U]);
+	}
+	else{
+		strcpy(lpszDst, TEXT("¡¦"));
+	}
+
+	return strlen(lpszDst);
+}
+
+void ProcessEscapeSeq(const BYTE byCode)
+{
+	// ¥¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹½èÍý
+	switch(m_byEscSeqCount){
+		// 1¥Ð¥¤¥ÈÌÜ
+	case 1U	:
+		switch(byCode){
+			// Invocation of code elements
+		case 0x6EU	: LockingShiftGL(2U);	m_byEscSeqCount = 0U;	return;		// LS2
+		case 0x6FU	: LockingShiftGL(3U);	m_byEscSeqCount = 0U;	return;		// LS3
+		case 0x7EU	: LockingShiftGR(1U);	m_byEscSeqCount = 0U;	return;		// LS1R
+		case 0x7DU	: LockingShiftGR(2U);	m_byEscSeqCount = 0U;	return;		// LS2R
+		case 0x7CU	: LockingShiftGR(3U);	m_byEscSeqCount = 0U;	return;		// LS3R
+
+			// Designation of graphic sets
+		case 0x24U	:	
+		case 0x28U	: m_byEscSeqIndex = 0U;		break;
+		case 0x29U	: m_byEscSeqIndex = 1U;		break;
+		case 0x2AU	: m_byEscSeqIndex = 2U;		break;
+		case 0x2BU	: m_byEscSeqIndex = 3U;		break;
+		default		: m_byEscSeqCount = 0U;		return;		// ¥¨¥é¡¼
+		}
+		break;
+
+		// 2¥Ð¥¤¥ÈÌÜ
+	case 2U	:
+		if(DesignationGSET(m_byEscSeqIndex, byCode)){
+			m_byEscSeqCount = 0U;
+			return;
+		}
+			
+		switch(byCode){
+		case 0x20	: m_bIsEscSeqDrcs = true;	break;
+		case 0x28	: m_bIsEscSeqDrcs = true;	m_byEscSeqIndex = 0U;	break;
+		case 0x29	: m_bIsEscSeqDrcs = false;	m_byEscSeqIndex = 1U;	break;
+		case 0x2A	: m_bIsEscSeqDrcs = false;	m_byEscSeqIndex = 2U;	break;
+		case 0x2B	: m_bIsEscSeqDrcs = false;	m_byEscSeqIndex = 3U;	break;
+		default		: m_byEscSeqCount = 0U;		return;		// ¥¨¥é¡¼
+		}
+		break;
+
+		// 3¥Ð¥¤¥ÈÌÜ
+	case 3U	:
+		if(!m_bIsEscSeqDrcs){
+			if(DesignationGSET(m_byEscSeqIndex, byCode)){
+				m_byEscSeqCount = 0U;
+				return;
+			}
+		}
+		else{
+			if(DesignationDRCS(m_byEscSeqIndex, byCode)){
+				m_byEscSeqCount = 0U;
+				return;
+			}
+		}
+
+		if(byCode == 0x20U){
+			m_bIsEscSeqDrcs = true;
+		}
+		else{
+			// ¥¨¥é¡¼
+			m_byEscSeqCount = 0U;
+			return;
+		}
+		break;
+
+		// 4¥Ð¥¤¥ÈÌÜ
+	case 4U	:
+		DesignationDRCS(m_byEscSeqIndex, byCode);
+		m_byEscSeqCount = 0U;
+		return;
+	}
+
+	m_byEscSeqCount++;
+}
+
+void LockingShiftGL(const BYTE byIndexG)
+{
+	// LSx
+	m_pLockingGL = &m_CodeG[byIndexG];
+}
+
+void LockingShiftGR(const BYTE byIndexG)
+{
+	// LSxR
+	m_pLockingGR = &m_CodeG[byIndexG];
+}
+
+void SingleShiftGL(const BYTE byIndexG)
+{
+	// SSx
+	m_pSingleGL  = &m_CodeG[byIndexG];
+}
+
+const bool DesignationGSET(const BYTE byIndexG, const BYTE byCode)
+{
+	// G¤Î¥°¥é¥Õ¥£¥Ã¥¯¥»¥Ã¥È¤ò³ä¤êÅö¤Æ¤ë
+	switch(byCode){
+	case 0x42U	: m_CodeG[byIndexG] = CODE_KANJI;				return true;	// Kanji
+	case 0x4AU	: m_CodeG[byIndexG] = CODE_ALPHANUMERIC;		return true;	// Alphanumeric
+	case 0x30U	: m_CodeG[byIndexG] = CODE_HIRAGANA;			return true;	// Hiragana
+	case 0x31U	: m_CodeG[byIndexG] = CODE_KATAKANA;			return true;	// Katakana
+	case 0x32U	: m_CodeG[byIndexG] = CODE_MOSAIC_A;			return true;	// Mosaic A
+	case 0x33U	: m_CodeG[byIndexG] = CODE_MOSAIC_B;			return true;	// Mosaic B
+	case 0x34U	: m_CodeG[byIndexG] = CODE_MOSAIC_C;			return true;	// Mosaic C
+	case 0x35U	: m_CodeG[byIndexG] = CODE_MOSAIC_D;			return true;	// Mosaic D
+	case 0x36U	: m_CodeG[byIndexG] = CODE_PROP_ALPHANUMERIC;	return true;	// Proportional Alphanumeric
+	case 0x37U	: m_CodeG[byIndexG] = CODE_PROP_HIRAGANA;		return true;	// Proportional Hiragana
+	case 0x38U	: m_CodeG[byIndexG] = CODE_PROP_KATAKANA;		return true;	// Proportional Katakana
+	case 0x49U	: m_CodeG[byIndexG] = CODE_JIS_X0201_KATAKANA;	return true;	// JIS X 0201 Katakana
+	case 0x39U	: m_CodeG[byIndexG] = CODE_JIS_KANJI_PLANE_1;	return true;	// JIS compatible Kanji Plane 1
+	case 0x3AU	: m_CodeG[byIndexG] = CODE_JIS_KANJI_PLANE_2;	return true;	// JIS compatible Kanji Plane 2
+	case 0x3BU	: m_CodeG[byIndexG] = CODE_ADDITIONAL_SYMBOLS;	return true;	// Additional symbols
+	default		: return false;		// ÉÔÌÀ¤Ê¥°¥é¥Õ¥£¥Ã¥¯¥»¥Ã¥È
+	}
+}
+
+const bool DesignationDRCS(const BYTE byIndexG, const BYTE byCode)
+{
+	// DRCS¤Î¥°¥é¥Õ¥£¥Ã¥¯¥»¥Ã¥È¤ò³ä¤êÅö¤Æ¤ë
+	switch(byCode){
+	case 0x40U	: m_CodeG[byIndexG] = CODE_UNKNOWN;				return true;	// DRCS-0
+	case 0x41U	: m_CodeG[byIndexG] = CODE_UNKNOWN;				return true;	// DRCS-1
+	case 0x42U	: m_CodeG[byIndexG] = CODE_UNKNOWN;				return true;	// DRCS-2
+	case 0x43U	: m_CodeG[byIndexG] = CODE_UNKNOWN;				return true;	// DRCS-3
+	case 0x44U	: m_CodeG[byIndexG] = CODE_UNKNOWN;				return true;	// DRCS-4
+	case 0x45U	: m_CodeG[byIndexG] = CODE_UNKNOWN;				return true;	// DRCS-5
+	case 0x46U	: m_CodeG[byIndexG] = CODE_UNKNOWN;				return true;	// DRCS-6
+	case 0x47U	: m_CodeG[byIndexG] = CODE_UNKNOWN;				return true;	// DRCS-7
+	case 0x48U	: m_CodeG[byIndexG] = CODE_UNKNOWN;				return true;	// DRCS-8
+	case 0x49U	: m_CodeG[byIndexG] = CODE_UNKNOWN;				return true;	// DRCS-9
+	case 0x4AU	: m_CodeG[byIndexG] = CODE_UNKNOWN;				return true;	// DRCS-10
+	case 0x4BU	: m_CodeG[byIndexG] = CODE_UNKNOWN;				return true;	// DRCS-11
+	case 0x4CU	: m_CodeG[byIndexG] = CODE_UNKNOWN;				return true;	// DRCS-12
+	case 0x4DU	: m_CodeG[byIndexG] = CODE_UNKNOWN;				return true;	// DRCS-13
+	case 0x4EU	: m_CodeG[byIndexG] = CODE_UNKNOWN;				return true;	// DRCS-14
+	case 0x4FU	: m_CodeG[byIndexG] = CODE_UNKNOWN;				return true;	// DRCS-15
+	case 0x70U	: m_CodeG[byIndexG] = CODE_UNKNOWN;				return true;	// Macro
+	default		: return false;		// ÉÔÌÀ¤Ê¥°¥é¥Õ¥£¥Ã¥¯¥»¥Ã¥È
+	}
+}
+
+WORD convertjis(DWORD jiscode) {
+	char code[3];
+	char xcode[4];
+	iconv_t cd;
+  
+	size_t inbyte = 2;
+	size_t outbyte = 4;
+
+	const char *fptr;
+	char *tptr;
+
+	WORD rtn;
+
+	code[0] = jiscode >> 8;
+	code[1] = jiscode & 0xFF;
+	code[3] = '\0';
+
+	/*
+	  cd = iconv_open("ISO-2022-JP","UTF-8");
+
+	  fptr = code;
+	  tptr = xcode;
+	  iconv(cd, &fptr, &inbyte, &tptr, &outbyte);
+
+	  iconv_close(cd);
+	*/
+
+	xcode[0] = code[0] | 0x80;
+	xcode[1] = code[1] | 0x80;
+
+	rtn = ((xcode[0] << 8) & 0xFF00) | (xcode[1] & 0xFF);
+
+	return rtn;
+
+}
diff --git a/tstools/epgdump/aribstr.h b/tstools/epgdump/aribstr.h
new file mode 100755
index 0000000..6178525
--- /dev/null
+++ b/tstools/epgdump/aribstr.h
@@ -0,0 +1,14 @@
+#ifndef ARIBSTR_H
+#define ARIBSTR_H 1
+
+#ifdef __cplusplus
+extern "C"{
+#endif /* __cplusplus */
+
+	int AribToString(char *lpszDst, const char *pSrcData, const int dwSrcLen);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif
diff --git a/tstools/epgdump/eit.c b/tstools/epgdump/eit.c
new file mode 100755
index 0000000..23857df
--- /dev/null
+++ b/tstools/epgdump/eit.c
@@ -0,0 +1,673 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "eit.h"
+
+char		*subtitle_cnv_str[] = {
+//	"¡¡Âè",
+//	"¡¼Âè",
+//	"-Âè",
+//	" Âè",
+//	"¡¡¡Ö",
+//	"¡¡¡ô",
+//	"¡Ê",
+//	"¡Ö",
+	NULL
+};
+static void timecmp(int *,int *,int *,
+					int, int, int);
+
+int parseEIThead(unsigned char *data, EIThead *h) {
+	int boff = 0;
+
+	memset(h, 0, sizeof(EIThead));
+
+	h->table_id = getBit(data, &boff, 8);
+	h->section_syntax_indicator = getBit(data, &boff, 1);
+	h->reserved_future_use = getBit(data, &boff, 1);
+	h->reserved1 = getBit(data, &boff, 2);
+	h->section_length =getBit(data, &boff,12);
+	h->service_id = getBit(data, &boff, 16);
+	h->reserved2 = getBit(data, &boff, 2);
+	h->version_number = getBit(data, &boff, 5);
+	h->current_next_indicator = getBit(data, &boff, 1);
+	h->section_number = getBit(data, &boff, 8);
+	h->last_section_number = getBit(data, &boff, 8);
+	h->transport_stream_id = getBit(data, &boff, 16);
+	h->original_network_id = getBit(data, &boff, 16);
+	h->segment_last_section_number = getBit(data, &boff, 8);
+	h->last_table_id = getBit(data, &boff, 8);
+  
+	return 14;
+}
+
+int parseEITbody(unsigned char *data, EITbody *b)
+{
+	int boff = 0;
+	int tnum;
+	char buf[4];
+
+	memset(b, 0, sizeof(EITbody));
+
+	b->event_id = getBit(data, &boff, 16);
+
+	memcpy(b->start_time, data + boff / 8, 5);
+	/* b->start_time = getBit(data, &boff, 40); */
+	boff += 40;
+	memcpy(b->duration, data + boff / 8, 3);
+	/* b->duration = getBit(data, &boff, 24); */
+	boff += 24;
+	b->running_status = getBit(data, &boff, 3);
+	b->free_CA_mode = getBit(data, &boff, 1);
+	b->descriptors_loop_length = getBit(data, &boff, 12);
+
+	/* ÆüÉÕÊÑ´¹ */
+	tnum = (b->start_time[0] & 0xFF) << 8 | (b->start_time[1] & 0xFF);
+  
+	b->yy = (tnum - 15078.2) / 365.25;
+	b->mm = ((tnum - 14956.1) - (int)(b->yy * 365.25)) / 30.6001;
+	b->dd = (tnum - 14956) - (int)(b->yy * 365.25) - (int)(b->mm * 30.6001);
+
+	if(b->dd == 0) {
+		printf("aa");
+	}
+
+	if(b->mm == 14 || b->mm == 15) {
+		b->yy += 1;
+		b->mm = b->mm - 1 - (1 * 12);
+	} else {
+		b->mm = b->mm - 1;
+	}
+
+	b->yy += 1900;
+  
+	memset(buf, '\0', sizeof(buf));
+	sprintf(buf, "%x", b->start_time[2]);
+	b->hh = atoi(buf);
+	memset(buf, '\0', sizeof(buf));
+	sprintf(buf, "%x", b->start_time[3]);
+	b->hm = atoi(buf);
+	memset(buf, '\0', sizeof(buf));
+	sprintf(buf, "%x", b->start_time[4]);
+	b->ss = atoi(buf);
+
+	if((b->duration[0] == 0xFF) && (b->duration[1] == 0xFF) && (b->duration[2] == 0xFF)){
+		b->dhh = b->dhm = b->dss = 0;
+	}else{
+		memset(buf, '\0', sizeof(buf));
+	sprintf(buf, "%x", b->duration[0]);
+	b->dhh = atoi(buf);
+		memset(buf, '\0', sizeof(buf));
+	sprintf(buf, "%x", b->duration[1]);
+	b->dhm = atoi(buf);
+		memset(buf, '\0', sizeof(buf));
+	sprintf(buf, "%x", b->duration[2]);
+	b->dss = atoi(buf);
+	}
+	return 12;
+}
+
+int parseSEVTdesc(unsigned char *data, SEVTdesc *desc) {
+	int boff = 0;
+  
+	memset(desc, 0, sizeof(SEVTdesc));
+
+	desc->descriptor_tag = getBit(data, &boff, 8);
+	if((desc->descriptor_tag & 0xFF) != 0x4D) {
+		return -1;
+	}
+	desc->descriptor_length = getBit(data, &boff, 8);
+	memcpy(desc->ISO_639_language_code, data + boff / 8, 3);
+	/* desc->ISO_639_language_code = getBit(data, &boff, 24); */
+	boff += 24;
+	desc->event_name_length = getBit(data, &boff, 8);
+	getStr(desc->event_name, data, &boff, desc->event_name_length);
+	desc->text_length = getBit(data, &boff, 8);
+	getStr(desc->text, data, &boff, desc->text_length);
+
+	return desc->descriptor_length + 2;
+}
+
+int parseContentDesc(unsigned char *data, ContentDesc *desc) {
+	int boff = 0;
+  
+	memset(desc, 0, sizeof(ContentDesc));
+
+	desc->descriptor_tag = getBit(data, &boff, 8);
+	if((desc->descriptor_tag & 0xFF) != 0x54) {
+		return -1;
+	}
+	desc->descriptor_length = getBit(data, &boff, 8);
+	memcpy(desc->content, data+(boff/8), desc->descriptor_length);
+	//getStr(desc->content, data, &boff, desc->descriptor_length);
+	return desc->descriptor_length + 2;
+}
+
+int parseSeriesDesc(unsigned char *data, SeriesDesc *desc) {
+	int boff = 0;
+  
+	memset(desc, 0, sizeof(SeriesDesc));
+
+	desc->descriptor_tag = getBit(data, &boff, 8);
+	if((desc->descriptor_tag & 0xFF) != 0xD5) {
+		return -1;
+	}
+	desc->descriptor_length = getBit(data, &boff, 8);
+	desc->series_id = getBit(data, &boff, 16);
+	desc->repeat_label = getBit(data, &boff, 4);
+	desc->program_pattern = getBit(data, &boff, 3);
+	desc->expire_date_valid_flag = getBit(data, &boff, 1);
+
+	desc->expire_date = getBit(data, &boff, 16);
+	//memcpy(desc->expire_date, data + boff / 8, 2);
+	//boff += 16;
+
+	desc->episode_number = getBit(data, &boff, 12);
+	desc->last_episode_number = getBit(data, &boff, 12);
+
+	getStr(desc->series_name_char, data, &boff, desc->descriptor_length - 8);
+	return desc->descriptor_length + 2;
+}
+
+int parseEEVTDhead(unsigned char *data, EEVTDhead *desc) {
+	int boff = 0;
+  
+	memset(desc, 0, sizeof(EEVTDhead));
+
+	desc->descriptor_tag = getBit(data, &boff, 8);
+	if((desc->descriptor_tag & 0xFF) != 0x4E) {
+		return -1;
+	}
+	desc->descriptor_length = getBit(data, &boff, 8);
+	desc->descriptor_number = getBit(data, &boff, 4);
+	desc->last_descriptor_number = getBit(data, &boff, 4);
+	memcpy(desc->ISO_639_language_code, data + boff / 8, 3);
+	/* desc->ISO_639_language_code = getBit(data, &boff, 24); */
+	boff += 24;
+
+	desc->length_of_items = getBit(data, &boff, 8);
+
+	return 7;
+}
+
+int parseEEVTDitem(unsigned char *data, EEVTDitem *desc) {
+	int boff = 0;
+  
+	memset(desc, 0, sizeof(EEVTDitem));
+
+	desc->item_description_length = getBit(data, &boff, 8);
+	getStr(desc->item_description, data, &boff, desc->item_description_length);
+
+	desc->item_length = getBit(data, &boff, 8);
+//	memcpy(desc->item, data + (boff / 8), desc->item_length);
+	getStr(desc->item, data, &boff, desc->item_length);
+
+	return desc->item_description_length + desc->item_length + 2;
+}
+
+int parseEEVTDtail(unsigned char *data, EEVTDtail *desc) {
+	int boff = 0;
+  
+	memset(desc, 0, sizeof(EEVTDtail));
+
+	desc->text_length = getBit(data, &boff, 8);
+	getStr(desc->text, data, &boff, desc->text_length);
+
+	return desc->text_length + 1;
+}
+
+int checkEEVTDitem(EEVTDitem *save, EEVTDitem *new, int descriptor_number) {
+
+	EEVTDitem swap;
+	int boff = 0;
+	if(new == NULL) {
+		if(save->item_length != 0) {
+			swap = *save;
+			getStr(save->item, (unsigned char*)swap.item, &boff, swap.item_length);
+
+
+                        //save->descriptor_number = descriptor_number;
+                        //*new = swap;
+			//*save = swap;
+                        if (swap.descriptor_number==1){
+//                            printf("descriptor_num %d   typeB\n",swap.descriptor_number);
+                        }
+
+			return 1;
+		} else {
+
+
+                        //printf("descriptor_num %d   typeC\n",swap.descriptor_number);
+
+
+
+			return 0;
+		}
+	}
+
+	if(new->item_description_length == 0) {
+		/* ³¤­ Êݸ */
+		memcpy(save->item + save->item_length, new->item, new->item_length);
+		save->item_length += new->item_length;
+
+
+                if (swap.descriptor_number==1){
+                            printf("descriptor_num %d   typeD\n",swap.descriptor_number);
+                        }
+
+
+		return 0;
+	} else {
+		/* ¥Ö¥ì¡¼¥¯¡£save¤ò°õºþÂоݤˤ¹¤ë¡£save¤ò¥¯¥ê¥¢? */
+		if(save->item_length != 0) {
+			/* ÂàÈòºÑ¤ß¤¬¤¢¤ê */
+			swap = *save;
+			getStr(save->item, (unsigned char*)swap.item, &boff, swap.item_length);
+			swap = *new;
+			*new = *save;
+			*save = swap;
+			save->descriptor_number = descriptor_number;
+                       
+
+
+
+                        if (swap.descriptor_number==1){
+                            printf("descriptor_num %d   typeE\n",swap.descriptor_number);
+                        }
+                        
+
+		} else {
+			*save = *new;
+			save->descriptor_number = descriptor_number;
+
+                        if (swap.descriptor_number==1){
+                            printf("descriptor_num %d   typeF\n",swap.descriptor_number);
+                        }
+
+
+			return 0;
+		}
+	}
+
+	return 1;
+}
+EIT_CONTROL	*searcheit(EIT_CONTROL *top, int servid, int eventid)
+{
+	EIT_CONTROL	*cur ;
+	cur = top ;
+
+	while(cur != NULL){
+		if((cur->event_id == eventid) && (cur->servid == servid)){
+			return cur ;
+		}
+
+		cur = cur->next ;
+	}
+	return NULL ;
+}
+void	conv_title_subtitle(EIT_CONTROL *eitptr)
+{
+	int		lp = 0 ;
+	size_t	addsize ;
+	char	*ptr ;
+	char	*newsubtitle ;
+
+	for(lp = 0 ; subtitle_cnv_str[lp] != NULL ; lp++){
+		ptr = strstr(eitptr->title, subtitle_cnv_str[lp]);
+		if(ptr == NULL){
+			continue ;
+		}
+		// ¥¿¥¤¥È¥ë¤¬¤Ê¤¯¤Ê¤é¤Ê¤¤¤è¤¦¤Ë
+		if(ptr == eitptr->title){
+			continue ;
+		}
+		newsubtitle = calloc(1, ((strlen(ptr) + 1) + (strlen(eitptr->subtitle) + 1)));
+		memcpy(newsubtitle, ptr, strlen(ptr));
+		newsubtitle[strlen(ptr)] = ' ';
+		*ptr = NULL ;
+		strcat(newsubtitle, eitptr->subtitle);
+		free(eitptr->subtitle);
+		eitptr->subtitle = newsubtitle ;
+		return ;
+	}
+}
+void	enqueue(EIT_CONTROL *top, EIT_CONTROL *eitptr)
+{
+	EIT_CONTROL	*cur ;
+	cur = top ;
+	int		rc ;
+
+	if(top->next == NULL){
+		top->next = eitptr ;
+		eitptr->prev = top ;
+		return ;
+	}
+	cur = top->next ;
+	while(cur != NULL){
+		rc = memcmp(&cur->yy, &eitptr->yy, (sizeof(int) * 3));
+		if(rc == 0){
+			rc = memcmp(&cur->hh, &eitptr->hh, (sizeof(int) * 3));
+			if(rc == 0){
+				free(eitptr->title);
+				free(eitptr->subtitle);
+				free(eitptr);
+				return ;
+			}
+			if(rc > 0){
+				if(cur->prev != 0){
+					cur->prev->next = eitptr ;
+					eitptr->prev = cur->prev ;
+				}
+				cur->prev = eitptr ;
+				eitptr->next = cur ;
+				conv_title_subtitle(eitptr);
+				return ;
+			}
+		}
+		if(rc > 0){
+			if(cur->prev != 0){
+				cur->prev->next = eitptr ;
+				eitptr->prev = cur->prev ;
+			}
+			cur->prev = eitptr ;
+			eitptr->next = cur ;
+			conv_title_subtitle(eitptr);
+			return ;
+		}
+		if(cur->next == NULL){
+			cur->next = eitptr ;
+			eitptr->prev = cur ;
+			conv_title_subtitle(eitptr);
+			return ;
+		}
+		cur = cur->next ;
+	}
+	return ;
+
+}
+
+void dumpEIT(unsigned char *ptr, int serv_id, int original_network_id, int transport_stream_id, EIT_CONTROL *eittop)
+{
+
+	EIThead  eith;
+	EITbody  eitb;
+	SEVTdesc sevtd;
+
+	EEVTDhead eevthead;
+	EEVTDitem eevtitem;
+	EEVTDtail eevttail;
+
+	EEVTDitem save_eevtitem;
+
+	EIT_CONTROL	*cur ;
+	EIT_CONTROL	*curtmp ;
+
+	int len = 0;
+	int loop_len = 0;
+	int loop_blen = 0;
+	int loop_elen = 0;
+	int str_alen = 0;
+
+	int ehh, emm, ess;
+
+	/* EIT */
+	len = parseEIThead(ptr, &eith); 
+
+	ptr += len;
+	loop_len = eith.section_length - (len - 3 + 4); // 3¤Ï¶¦Ḁ̈إåÀĹ 4¤ÏCRC
+	while(loop_len > 0) {
+		/* Ϣ³¤¹¤ë³ÈÄ¥¥¤¥Ù¥ó¥È¤Ï¡¢´Á»ú¥³¡¼¥É¤¬µã¤­Ê̤줷¤Æ
+		   ʬ³ä¤µ¤ì¤ë¤è¤¦¤À¡£Ï¢Â³¤«¤É¤¦¤«¤Ï¡¢item_description_length¤¬
+		   ÀßÄꤵ¤ì¤Æ¤¤¤ë¤«¤É¤¦¤«¤ÇȽÃǤǤ­¤ë¤è¤¦¤À¡£ */
+		memset(&save_eevtitem, 0, sizeof(EEVTDitem));
+
+		len = parseEITbody(ptr, &eitb);
+		ptr += len;
+		loop_len -= len;
+    
+		/* printf("evtid:%d\n", eitb.event_id); */
+    
+		loop_blen = eitb.descriptors_loop_length;
+		loop_len -= loop_blen;
+		while(loop_blen > 0) {
+
+			len = parseSEVTdesc(ptr, &sevtd);
+			if(len > 0) {
+
+				/*
+				  if(eith.service_id == 19304 && 
+				  eitb.event_id == 46564) {
+				  printf("aa");
+				  }
+				*/
+
+				ehh = eitb.hh;
+				emm = eitb.hm;
+				ess = eitb.ss;
+				if(eith.service_id != serv_id){
+					ptr += len;
+					loop_blen -= len;
+					continue ;
+				}
+
+				timecmp(&ehh, &emm, &ess,
+						eitb.dhh, eitb.dhm, eitb.dss);
+				cur = searcheit(eittop, eith.service_id, eitb.event_id);
+				if(cur == NULL){
+					curtmp = NULL;
+					cur = calloc(1, sizeof(EIT_CONTROL));
+				}
+				else {
+					curtmp = cur;
+				}
+				cur->event_id = eitb.event_id ;
+				cur->servid = eith.service_id ;
+				cur->title = calloc(1, (strlen(sevtd.event_name) + 1));
+
+				memcpy(cur->title, sevtd.event_name, strlen(sevtd.event_name));
+				cur->subtitle = calloc(1, (strlen(sevtd.text) + 1));
+				memcpy(cur->subtitle, sevtd.text, strlen(sevtd.text));
+				cur->yy = eitb.yy;
+				cur->mm = eitb.mm;
+				cur->dd = eitb.dd;
+				cur->hh = eitb.hh;
+				cur->hm = eitb.hm;
+				cur->ss = eitb.ss;
+				cur->ehh = eitb.dhh;
+				cur->emm = eitb.dhm;
+				cur->ess = eitb.dss ;
+				cur->table_id = eith.table_id ;
+				if ( !curtmp ) enqueue(eittop, cur);
+			} else {
+				len = parseEEVTDhead(ptr, &eevthead);
+
+				/*
+				  if(eith.service_id == 19304 && 
+				  eitb.event_id == 46564) {
+				  printf("aa");
+				  }
+				*/
+
+				if(len > 0) {
+					ptr += len;
+					loop_blen -= len;
+
+					loop_elen = eevthead.length_of_items;
+					loop_len -= loop_elen;
+					while(loop_elen > 0) {
+						len = parseEEVTDitem(ptr, &eevtitem);
+
+						ptr += len;
+						loop_elen -= len;
+						loop_blen -= len;
+                                                
+						if (1||checkEEVTDitem(&save_eevtitem, &eevtitem,
+										  eevthead.descriptor_number)) {
+#if 0
+							{
+                                                            if (eevtitem.descriptor_number>0){
+                                                                //printf("descriptor_num %d\n",eevtitem.descriptor_number);
+                                                            }
+
+                                                            /* long format */
+                                                            //printf("descriptor_num %d\n",eevtitem.descriptor_number);
+#if 1
+                                                            printf("EEVT,%d,%d,%d,%s,%s\n",
+										eith.service_id,
+                                                                			eitb.event_id,
+                                                                			eevtitem.descriptor_number, // ÂàÈò¹àÌÜ
+										eevtitem.item_description,
+										eevtitem.item);
+#endif
+
+							}
+#endif
+							cur = searcheit(eittop, eith.service_id, eitb.event_id);
+							if(cur == NULL){
+								curtmp = NULL;
+								cur = calloc(1, sizeof(EIT_CONTROL));
+							}
+							else {
+								curtmp = cur;
+							}
+
+#if 1
+							if ( cur->desc ) {
+								str_alen = strlen( cur->desc );
+							}
+							else {
+								str_alen = 0;
+							}
+							eevtitem.item_description_length = strlen(eevtitem.item_description);
+							eevtitem.item_length = strlen(eevtitem.item);
+							cur->desc = realloc(cur->desc, str_alen + eevtitem.item_description_length + eevtitem.item_length + 1000);
+							if ( !str_alen ) *cur->desc = '\0';
+
+							if ( eevtitem.item_description_length && !strstr(cur->desc, eevtitem.item_description) ) {
+								strcat(cur->desc, eevtitem.item_description);
+								strcat(cur->desc, "\t");
+							}
+
+							if ( eevtitem.item_length && !strstr(cur->desc, eevtitem.item)  ) {
+								strcat(cur->desc, eevtitem.item);
+								strcat(cur->desc, "\\n");
+							}
+#endif
+							if ( !curtmp ) enqueue(eittop, cur);
+						}
+					}
+
+					len = parseEEVTDtail(ptr, &eevttail);
+#if 0
+					{ /* long format */
+						printf("EEVTt,%d,%d,%d,%s\n", 
+								eith.service_id,
+								eitb.event_id,
+								eevthead.descriptor_number,
+								eevttail.text);
+					}
+#endif
+				} else {
+					ContentDesc contentDesc;
+					len = parseContentDesc(ptr, &contentDesc);
+					if (len > 0) {
+						int header_printed = 0;
+						for (int i = 0; i < contentDesc.descriptor_length - 1; i+=2) {
+							/*
+							if (0xff == (unsigned char)contentDesc.content[i])
+								continue;
+							*/
+#if 0
+							if (!header_printed) {
+								fprintf(out, "Content,%d,%d",
+									eith.service_id,
+									eitb.event_id);
+								header_printed = 1;
+							}
+#endif
+
+#if 0
+							fprintf(out, ",%02x%02x", (unsigned char)contentDesc.content[i], (unsigned char)contentDesc.content[i+1]);
+#endif
+						}
+						if((eith.original_network_id == original_network_id) && (eith.transport_stream_id == transport_stream_id)){
+							cur = searcheit(eittop, eith.service_id, eitb.event_id);
+							if(cur != NULL){
+								cur->content_type = (unsigned char)(contentDesc.content[0] >> 4);
+#if 0
+								fprintf(stdout, "%s:", cur->title);
+								fprintf(stdout, ",%02x%02x", (unsigned char)contentDesc.content[0], (unsigned char)contentDesc.content[1]);
+								fprintf(stdout, ",%02x%02x\n", (unsigned char)contentDesc.content[2], (unsigned char)contentDesc.content[3]);
+#endif
+
+							}
+#if 0
+							if (header_printed) {
+								fprintf(out, "\n");
+							}
+#endif
+						}
+					} else {
+						SeriesDesc seriesDesc;
+						len = parseSeriesDesc(ptr, &seriesDesc);
+						if (len > 0) {
+#if 0
+							printf("Series,%d,%d,series=%d,repeat=%01x,pattern=%d,expire_valid=%d,expire=%04x,epinum=%d,lastepinum=%d,%s\n",
+								eith.service_id,
+								eitb.event_id,
+								seriesDesc.series_id,
+								seriesDesc.repeat_label,
+								seriesDesc.program_pattern,
+								seriesDesc.expire_date_valid_flag,
+								seriesDesc.expire_date,
+								seriesDesc.episode_number,
+								seriesDesc.last_episode_number,
+								seriesDesc.series_name_char);
+#endif
+						} else {
+							len = parseOTHERdesc(ptr);
+						}
+					}
+				}
+			}
+			ptr += len;
+			loop_blen -= len;
+		}
+		/* ºÇ¸å¤Î¥Ö¥ì¡¼¥¯¥Á¥§¥Ã¥¯ */
+    
+		if(checkEEVTDitem(&save_eevtitem, NULL, 0)) {
+#if 0
+			if(mode == 1) { /* long format */
+				fprintf(out, "EEVT,%d,%d,%d,%s,%s\n", 
+						eith.service_id,
+						eitb.event_id,
+						save_eevtitem.descriptor_number,
+						save_eevtitem.item_description,
+						save_eevtitem.item);
+			}
+#endif
+		}
+	}
+
+	return;
+}
+
+void timecmp(int *thh, int *tmm, int *tss,
+			 int dhh, int dmm, int dss) {
+
+	int ama;
+
+	*tss += dss;
+	ama = *tss % 60;
+	*tmm += (*tss / 60);
+	*tss = ama;
+
+	*tmm += dmm;
+	ama   = *tmm % 60;
+	*thh += (*tmm / 60);
+	*tmm  = ama;
+
+	*thh += dhh;
+
+}
diff --git a/tstools/epgdump/eit.h b/tstools/epgdump/eit.h
new file mode 100755
index 0000000..15f910b
--- /dev/null
+++ b/tstools/epgdump/eit.h
@@ -0,0 +1,120 @@
+#ifndef EIT_H
+#define EIT_H 1
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "util.h"
+#include "ts_ctl.h"
+
+typedef struct _EIThead {
+	char table_id;
+	int section_syntax_indicator;
+	int reserved_future_use;
+	int reserved1;
+	int section_length;
+	int service_id;
+	int reserved2;
+	int version_number;
+	int current_next_indicator;
+	int section_number;
+	int last_section_number;
+	int transport_stream_id;
+	int original_network_id;
+	int segment_last_section_number;
+	int last_table_id;
+} EIThead;
+
+typedef struct _EITbody {
+	int event_id;
+	char start_time[5];
+	char duration[3];
+	int running_status;
+	int free_CA_mode;
+	int descriptors_loop_length;
+	/* °Ê²¼¤Ï²òÀÏ·ë²ÌÊݸÍÑ */
+	int yy;
+	int mm;
+	int dd;
+	int hh;
+	int hm;
+	int ss;
+	int dhh;
+	int dhm;
+	int dss;
+} EITbody;
+
+typedef struct _SEVTdesc {
+	int  descriptor_tag;
+	int  descriptor_length;
+	char ISO_639_language_code[3];
+	int  event_name_length;
+	char event_name[MAXSECLEN];
+	int  text_length;
+	char text[MAXSECLEN];
+} SEVTdesc;
+
+typedef struct _ContentDesc {
+	int descriptor_tag;
+	int descriptor_length;
+	char content[MAXSECLEN];
+} ContentDesc;
+
+typedef struct _SeriesDesc {
+	int descriptor_tag;
+	int descriptor_length;
+	int series_id;
+	int repeat_label;
+	int program_pattern;
+	int expire_date_valid_flag;
+	int expire_date;
+	int episode_number;
+	int last_episode_number;
+	char series_name_char[MAXSECLEN];
+} SeriesDesc;
+
+typedef struct _EEVTDhead {
+	int  descriptor_tag;
+	int  descriptor_length;
+	int  descriptor_number;
+	int  last_descriptor_number;
+	char ISO_639_language_code[3];
+	int  length_of_items;
+} EEVTDhead;
+
+typedef struct _EEVTDitem {
+	int  item_description_length;
+	char item_description[MAXSECLEN];
+	int  item_length;
+	char item[MAXSECLEN];
+	/* ÂàÈòÍÑ */
+	int  descriptor_number;
+} EEVTDitem;
+
+typedef struct _EEVTDtail {
+	int  text_length;
+	char text[MAXSECLEN];
+} EEVTDtail;
+
+#ifdef __cplusplus
+extern "C"{
+#endif /* __cplusplus */
+
+	int parseEIThead(unsigned char *data, EIThead *h);
+	int parseEITbody(unsigned char *data, EITbody *b);
+	int parseSEVTdesc(unsigned char *data, SEVTdesc *desc) ;
+
+	int parseContentDesc(unsigned char *data, ContentDesc *desc);
+	int parseSeriesDesc(unsigned char *data, SeriesDesc *desc);
+
+	int parseEEVTDhead(unsigned char *data, EEVTDhead *desc) ;
+	int parseEEVTDitem(unsigned char *data, EEVTDitem *desc) ;
+	int parseEEVTDtail(unsigned char *data, EEVTDtail *desc) ;
+
+	void dumpEIT(unsigned char *data, int serv_id, int original_network_id, int transport_stream_id, EIT_CONTROL *eittop);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif
diff --git a/tstools/epgdump/epgdump.c b/tstools/epgdump/epgdump.c
new file mode 100755
index 0000000..11f37ec
--- /dev/null
+++ b/tstools/epgdump/epgdump.c
@@ -0,0 +1,423 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <getopt.h>
+#include <iconv.h>
+#include <time.h>
+
+#include "ts.h"
+#include "sdt.h"
+#include "eit.h"
+#include "ts_ctl.h"
+
+typedef		struct	_ContentTYPE{
+	char	*japanese ;
+	char	*english ;
+}CONTENT_TYPE;
+
+#define		CAT_COUNT		16
+static  CONTENT_TYPE	ContentCatList[CAT_COUNT] = {
+	{ "¥Ë¥å¡¼¥¹¡¦ÊóÆ»", "news" },
+	{ "¥¹¥Ý¡¼¥Ä", "sports" },
+	{ "¾ðÊó", "information" },
+	{ "¥É¥é¥Þ", "drama" },
+	{ "²»³Ú", "music" },
+	{ "¥Ð¥é¥¨¥Æ¥£", "variety" },
+	{ "±Ç²è", "cinema" },
+	{ "¥¢¥Ë¥á¡¦Æû£", "anime" },
+	{ "¥É¥­¥å¥á¥ó¥¿¥ê¡¼¡¦¶µÍÜ", "documentary" },
+	{ "±é·à", "stage" },
+	{ "¼ñÌ£¡¦¼ÂÍÑ", "hobby" },
+	{ "Ê¡»ã", "etc" },			//Ê¡»ã
+	{ "ͽÈ÷", "etc" }, //ͽÈ÷
+	{ "ͽÈ÷", "etc" }, //ͽÈ÷
+	{ "ͽÈ÷", "etc" }, //ͽÈ÷
+	{ "¤½¤Î¾", "etc" } //¤½¤Î¾
+};
+typedef struct _TAG_STATION
+{
+	char	*name;
+	char	*ontv;
+	int		tsId;		// OriginalNetworkID
+	int		onId;		// TransportStreamID
+	int		svId;		// ServiceID
+} STATION;
+
+static STATION bsSta[] = {
+	{ "NHK BS1", "3001.ontvjapan.com", 16625, 4, 101},
+	{ "NHK BS2", "3002.ontvjapan.com", 16625, 4, 102},
+	{ "NHK BSh", "3003.ontvjapan.com", 16626, 4, 103},
+	{ "BSÆü¥Æ¥ì", "3004.ontvjapan.com", 16592, 4, 141},
+	{ "BSÄ«Æü", "3005.ontvjapan.com", 16400, 4, 151},
+	{ "BS-i", "3006.ontvjapan.com", 16401, 4, 161},
+	{ "BS¥¸¥ã¥Ñ¥ó", "3007.ontvjapan.com", 16433, 4, 171},
+	{ "BS¥Õ¥¸", "3008.ontvjapan.com", 16593, 4, 181},
+	{ "WOWOW", "3009.ontvjapan.com", 16432, 4, 191},
+	{ "WOWOW2", "3010.ontvjapan.com", 16432, 4, 192},
+	{ "WOWOW3", "3011.ontvjapan.com", 16432, 4, 193},
+	{ "BS11", "3013.ontvjapan.com", 16528, 4, 211},
+	{ "TwellV", "3014.ontvjapan.com", 16530, 4, 222},
+};
+
+static int bsStaCount = sizeof(bsSta) / sizeof (STATION);
+
+
+
+static STATION csSta[] = {
+	{ "¥¹¥¿¡¼£ã£è¥×¥é¥¹", "1002.ontvjapan.com", 24608, 6, 237},
+	{ "ÆüËܱDzèÀìÌç£ã£è£È£Ä", "1086.ontvjapan.com", 24608, 6, 239},
+	{ "¥Õ¥¸¥Æ¥ì¥Ó£Ã£Ó£È£Ä", "306ch.epgdata.ontvjapan", 24608, 6, 306},
+	{ "¥·¥ç¥Ã¥×¥Á¥ã¥ó¥Í¥ë", "1059.ontvjapan.com", 24704, 6, 55},
+	{ "¥¶¡¦¥·¥Í¥Þ", "1217.ontvjapan.com", 24736, 6, 228},
+	{ "¥¹¥«¥Á¥ã¥ó£È£Ä£¸£°£°", "800ch.epgdata.ontvjapan", 24736, 6, 800},
+	{ "¥¹¥«¥Á¥ã¥ó£¸£°£±", "801ch.epgdata.ontvjapan", 24736, 6, 801},
+	{ "¥¹¥«¥Á¥ã¥ó£¸£°£²", "802ch.epgdata.ontvjapan", 24736, 6, 802},
+	{ "£å£²¥×¥í¥â", "100ch.epgdata.ontvjapan", 28736, 7, 100},
+	{ "¥¤¥ó¥¿¡¼¥í¡¼¥«¥ë£Ô£Ö", "194ch.epgdata.ontvjapan", 28736, 7, 194},
+	{ "£Ê¥¹¥Ý¡¼¥Ä¡¡£Å£Ó£Ð£Î", "1025.ontvjapan.com", 28736, 7, 256},
+	{ "£Æ£Ï£Ø", "1016.ontvjapan.com", 28736, 7, 312},
+	{ "¥¹¥Ú¡¼¥¹¥·¥ã¥ï¡¼£Ô£Ö", "1018.ontvjapan.com", 28736, 7, 322},
+	{ "¥«¡¼¥È¥¥¡¼¥ó¡¡¥Í¥Ã¥È", "1046.ontvjapan.com", 28736, 7, 331},
+	{ "¥È¥¥¡¼¥ó¡¦¥Ç¥£¥º¥Ë¡¼", "1213.ontvjapan.com", 28736, 7, 334},
+	{ "Åì±Ç¥Á¥ã¥ó¥Í¥ë", "1010.ontvjapan.com", 28768, 7, 221},
+	{ "±ÒÀ±·à¾ì", "1005.ontvjapan.com", 28768, 7, 222},
+	{ "¥Á¥ã¥ó¥Í¥ë£Î£Å£Ã£Ï", "1008.ontvjapan.com", 28768, 7, 223},
+	{ "Íβè¡ú¥·¥Í¥Õ¥£¥ë", "1009.ontvjapan.com", 28768, 7, 224},
+	{ "¥¹¥¿¡¼¡¦¥¯¥é¥·¥Ã¥¯", "1003.ontvjapan.com", 28768, 7, 238},
+	{ "»þÂå·àÀìÌç¥Á¥ã¥ó¥Í¥ë", "1133.ontvjapan.com", 28768, 7, 292},
+	{ "¥¹¡¼¥Ñ¡¼¥É¥é¥Þ", "1006.ontvjapan.com", 28768, 7, 310},
+	{ "£Á£Ø£Î", "1014.ontvjapan.com", 28768, 7, 311},
+	{ "¥Ê¥·¥ç¥¸¥ª¥Á¥ã¥ó¥Í¥ë", "1204.ontvjapan.com", 28768, 7, 343},
+	{ "¥ï¥ó¥Æ¥ó¥Ý¡¼¥¿¥ë", "110ch.epgdata.ontvjapan", 28864, 7, 110},
+	{ "¥´¥ë¥Õ¥Á¥ã¥ó¥Í¥ë", "1028.ontvjapan.com", 28864, 7, 260},
+	{ "¥Æ¥ìÄ«¥Á¥ã¥ó¥Í¥ë", "1092.ontvjapan.com", 28864, 7, 303},
+	{ "£Í£Ô£Ö", "1019.ontvjapan.com", 28864, 7, 323},
+	{ "¥ß¥å¡¼¥¸¥Ã¥¯¡¦¥¨¥¢", "1024.ontvjapan.com", 28864, 7, 324},
+	{ "Ä«Æü¥Ë¥å¡¼¥¹¥¿¡¼", "1067.ontvjapan.com", 28864, 7, 352},
+	{ "£Â£Â£Ã¥ï¡¼¥ë¥É", "1070.ontvjapan.com", 28864, 7, 353},
+	{ "£Ã£Î£Î£ê", "1069.ontvjapan.com", 28864, 7, 354},
+	{ "¥¸¥ã¥¹¥È¡¦¥¢¥¤", "361ch.epgdata.ontvjapan", 28864, 7, 361},
+	{ "£Ê¥¹¥Ý¡¼¥Ä¡¡£±", "1041.ontvjapan.com", 28896, 7, 251},
+	{ "£Ê¥¹¥Ý¡¼¥Ä¡¡£²", "1042.ontvjapan.com", 28896, 7, 252},
+	{ "£Ê¥¹¥Ý¡¼¥Ä£Ð£ì£õ£ó£È", "1043.ontvjapan.com", 28896, 7, 253},
+	{ "£Ç£Á£Ï£Ò£Á", "1026.ontvjapan.com", 28896, 7, 254},
+	{ "£ó£ë£ù¡¦£Á¥¹¥Ý¡¼¥Ä¡Ü", "1040.ontvjapan.com", 28896, 7, 255},
+	{ "ÊõÄÍ¥×¥í¥â¥Á¥ã¥ó¥Í¥ë", "101ch.epgdata.ontvjapan", 28928, 7, 101},
+	{ "£Ó£Ë£Ù¡¦£Ó£Ô£Á£Ç£Å", "1207.ontvjapan.com", 28928, 7, 290},
+	{ "¥Á¥ã¥ó¥Í¥ë¶ä²Ï", "305ch.epgdata.ontvjapan", 28928, 7, 305},
+	{ "£Á£Ô-£Ø", "1201.ontvjapan.com", 28928, 7, 333},
+	{ "¥Ò¥¹¥È¥ê¡¼¥Á¥ã¥ó¥Í¥ë", "1050.ontvjapan.com", 28928, 7, 342},
+	{ "¥¹¥«¥Á¥ã¥ó£¸£°£³", "803ch.epgdata.ontvjapan", 28928, 7, 803},
+	{ "¥¹¥«¥Á¥ã¥ó£¸£°£´", "804ch.epgdata.ontvjapan", 28928, 7, 804},
+	{ "¥à¡¼¥Ó¡¼¥×¥é¥¹£È£Ä", "1007.ontvjapan.com", 28960, 7, 240},
+	{ "¥´¥ë¥Õ¥Í¥Ã¥È¥ï¡¼¥¯", "1027.ontvjapan.com", 28960, 7, 262},
+	{ "£Ì£á£Ì£á¡¡£È£Ä", "1074.ontvjapan.com", 28960, 7, 314},
+	{ "¥Õ¥¸¥Æ¥ì¥Ó£Ï£Î£Å", "1073.ontvjapan.com", 28992, 7, 307},
+	{ "¥Õ¥¸¥Æ¥ì¥Ó£Ô£×£Ï", "1072.ontvjapan.com", 28992, 7, 308},
+	{ "¥¢¥Ë¥Þ¥Ã¥¯¥¹", "1047.ontvjapan.com", 28992, 7, 332},
+	{ "¥Ç¥£¥¹¥«¥Ð¥ê¡¼", "1062.ontvjapan.com", 28992, 7, 340},
+	{ "¥¢¥Ë¥Þ¥ë¥×¥é¥Í¥Ã¥È", "1193.ontvjapan.com", 28992, 7, 341},
+	{ "£Ã-£Ô£Â£Ó¥¦¥¨¥ë¥«¥à", "160ch.epgdata.ontvjapan", 29024, 7, 160},
+	{ "£Ñ£Ö£Ã", "1120.ontvjapan.com", 29024, 7, 161},
+	{ "¥×¥é¥¤¥à£³£¶£µ¡¥£Ô£Ö", "185ch.epgdata.ontvjapan", 29024, 7, 185},
+	{ "¥Õ¥¡¥ß¥ê¡¼·à¾ì", "1015.ontvjapan.com", 29024, 7, 293},
+	{ "£Ô£Â£Ó¥Á¥ã¥ó¥Í¥ë", "3201.ontvjapan.com", 29024, 7, 301},
+	{ "¥Ç¥£¥º¥Ë¡¼¥Á¥ã¥ó¥Í¥ë", "1090.ontvjapan.com", 29024, 7, 304},
+	{ "MUSIC ON! TV", "1022.ontvjapan.com", 29024, 7, 325},
+	{ "¥­¥Ã¥º¥¹¥Æ¡¼¥·¥ç¥ó", "1045.ontvjapan.com", 29024, 7, 330},
+	{ "£Ô£Â£Ó¥Ë¥å¡¼¥¹¥Ð¡¼¥É", "1076.ontvjapan.com", 29024, 7, 351},
+	{ "£Ã£ÓÆüËÜÈÖÁÈ¥¬¥¤¥É", "147ch.epgdata.ontvjapan", 29056, 7, 147},
+	{ "Æü¥Æ¥ì£Ç¡Ü", "1068.ontvjapan.com", 29056, 7, 257},
+	{ "fashion TV", "5004.ontvjapan.com", 29056, 7, 291},
+	{ "Æü¥Æ¥ì¥×¥é¥¹", "300ch.epgdata.ontvjapan", 29056, 7, 300},
+	{ "¥¨¥³¥ß¥å¡¼¥¸¥Ã¥¯£Ô£Ö", "1023.ontvjapan.com", 29056, 7, 320},
+	{ "Music Japan TV", "1208.ontvjapan.com", 29056, 7, 321},
+	{ "Æü¥Æ¥ì£Î£Å£×£Ó£²£´", "2002.ontvjapan.com", 29056, 7, 350},
+};
+
+static int csStaCount = sizeof(csSta) / sizeof (STATION);
+SVT_CONTROL	*svttop = NULL;
+#define		SECCOUNT	4
+char	title[1024];
+char	subtitle[1024];
+char	desc[102400] = {0};
+char	Category[1024];
+char	ServiceName[1024];
+iconv_t	cd ;
+
+void	xmlspecialchars(char *str)
+{
+	strrep(str, "&", "&amp;");
+	strrep(str, "'", "&apos;");
+	strrep(str, "\"", "&quot;");
+	strrep(str, "<", "&lt;");
+	strrep(str, ">", "&gt;");
+}
+
+
+
+void	GetSDT(FILE *infile, SVT_CONTROL *svttop, SECcache *secs, int count)
+{
+	SECcache  *bsecs;
+
+	while((bsecs = readTS(infile, secs, count)) != NULL) {
+		/* SDT */
+		if((bsecs->pid & 0xFF) == 0x11) {
+			dumpSDT(bsecs->buf, svttop);
+		}
+	}
+}
+void	GetEIT(FILE *infile, FILE *outfile, STATION *psta, SECcache *secs, int count)
+{
+	SECcache  *bsecs;
+	EIT_CONTROL	*eitcur ;
+	EIT_CONTROL	*eitnext ;
+	EIT_CONTROL	*eittop = NULL;
+	char	*outptr ;
+	char	*inptr ;
+	size_t	ilen;
+	size_t	olen;
+	time_t	l_time ;
+	time_t	end_time ;
+	struct	tm	tl ;
+	struct	tm	*endtl ;
+	char	cendtime[32];
+	char	cstarttime[32];
+
+	eittop = calloc(1, sizeof(EIT_CONTROL));
+	eitcur = eittop ;
+	fseek(infile, 0, SEEK_SET);
+	while((bsecs = readTS(infile, secs, SECCOUNT)) != NULL) {
+		/* EIT */
+		if((bsecs->pid & 0xFF) == 0x12) {
+			dumpEIT(bsecs->buf, psta->svId, psta->onId, psta->tsId, eittop);
+		}else if((bsecs->pid & 0xFF) == 0x26) {
+			dumpEIT(bsecs->buf, psta->svId, psta->onId, psta->tsId, eittop);
+		}else if((bsecs->pid & 0xFF) == 0x27) {
+			dumpEIT(bsecs->buf, psta->svId, psta->onId, psta->tsId, eittop);
+		}
+	}
+	eitcur = eittop ;
+	while(eitcur != NULL){
+		if(!eitcur->servid){
+			eitcur = eitcur->next ;
+			continue ;
+		}
+		if(eitcur->content_type > CAT_COUNT){
+			eitcur->content_type = CAT_COUNT -1 ;
+		}
+		outptr = title ;
+		memset(title, '\0', sizeof(title));
+		ilen = strlen(eitcur->title);
+		olen = sizeof(title);
+		inptr = eitcur->title;
+		iconv(cd, &inptr, &ilen, &outptr, &olen);
+		xmlspecialchars(title);
+
+		memset(subtitle, '\0', sizeof(subtitle));
+		ilen = strlen(eitcur->subtitle);
+		olen = sizeof(subtitle);
+		outptr = subtitle ;
+		inptr = eitcur->subtitle;
+		iconv(cd, &inptr, &ilen, &outptr, &olen);
+		xmlspecialchars(subtitle);
+
+		memset(desc, '\0', sizeof(desc));
+		if ( eitcur->desc ) {
+			ilen = strlen(eitcur->desc);
+			olen = sizeof(desc);
+			outptr = desc ;
+			inptr = eitcur->desc;
+			iconv(cd, &inptr, &ilen, &outptr, &olen);
+			xmlspecialchars(desc);
+		}
+
+		memset(Category, '\0', sizeof(Category));
+		ilen = strlen(ContentCatList[eitcur->content_type].japanese);
+		olen = sizeof(Category);
+		outptr = Category ;
+		inptr = ContentCatList[eitcur->content_type].japanese;
+		iconv(cd, &inptr, &ilen, &outptr, &olen);
+		xmlspecialchars(Category);
+
+		tl.tm_sec = eitcur->ss ;
+		tl.tm_min = eitcur->hm ;
+		tl.tm_hour = eitcur->hh ;
+		tl.tm_mday = eitcur->dd ;
+		tl.tm_mon = (eitcur->mm - 1);
+		tl.tm_year = (eitcur->yy - 1900);
+		tl.tm_wday = 0;
+		tl.tm_isdst = 0;
+		tl.tm_yday = 0;
+		l_time = mktime(&tl);
+		if((eitcur->ehh == 0) && (eitcur->emm == 0) && (eitcur->ess == 0)){
+			(void)time(&l_time);
+			end_time = l_time + (60 * 5);		// £µÊ¬¸å¤ËÀßÄê
+		endtl = localtime(&end_time);
+		}else{
+			end_time = l_time + eitcur->ehh * 3600 + eitcur->emm * 60 + eitcur->ess;
+			endtl = localtime(&end_time);
+		}
+		memset(cendtime, '\0', sizeof(cendtime));
+		memset(cstarttime, '\0', sizeof(cstarttime));
+		strftime(cendtime, (sizeof(cendtime) - 1), "%Y%m%d%H%M%S", endtl);
+		strftime(cstarttime, (sizeof(cstarttime) - 1), "%Y%m%d%H%M%S", &tl);
+#if 1
+		fprintf(outfile, "  <programme start=\"%s +0900\" stop=\"%s +0900\" channel=\"%s\">\n",	
+				cstarttime, cendtime, psta->ontv);
+		fprintf(outfile, "    <title lang=\"ja_JP\">%s</title>\n", title);
+		fprintf(outfile, "    <desc lang=\"ja_JP\">%s</desc>\n", subtitle);
+		fprintf(outfile, "    <longdesc lang=\"ja_JP\">%s</longdesc>\n", desc);
+		fprintf(outfile, "    <category lang=\"ja_JP\">%s</category>\n", Category);
+//		fprintf(outfile, "    <category lang=\"en\">%s</category>\n", ContentCatList[eitcur->content_type].english);
+		fprintf(outfile, "  </programme>\n");
+#else
+		fprintf(outfile, "(%x:%x:%x)%s,%s,%s,%s,%s,%s\n",
+					eitcur->servid, eitcur->table_id, eitcur->event_id,
+					cstarttime, cendtime,
+					title, subtitle,
+					Category,
+					ContentCatList[eitcur->content_type].english);
+#endif
+#if 0
+		fprintf(outfile, "(%x:%x)%04d/%02d/%02d,%02d:%02d:%02d,%02d:%02d:%02d,%s,%s,%s,%s\n",
+					eitcur->table_id, eitcur->event_id,
+					eitcur->yy, eitcur->mm, eitcur->dd,
+					eitcur->hh, eitcur->hm, eitcur->ss,
+					eitcur->ehh, eitcur->emm, eitcur->ess,
+					eitcur->title, eitcur->subtitle,
+					ContentCatList[eitcur->content_type].japanese,
+					ContentCatList[eitcur->content_type].english);
+#endif
+		eitnext = eitcur->next ;
+		free(eitcur->title);
+		free(eitcur->subtitle);
+		free(eitcur);
+		eitcur = eitnext ;
+	}
+	free(eittop);
+	eittop = NULL;
+}
+int main(int argc, char *argv[])
+{
+
+	FILE *infile = stdin;
+	FILE *outfile = stdout;
+	int		arg_maxcount = 1 ;
+	char	*arg_onTV ;
+	int   mode = 1;
+	int		staCount ;
+	int   eitcnt;
+	char *file;
+	int   inclose = 0;
+	int   outclose = 0;
+	int		flag = 0 ;
+	SVT_CONTROL	*svtcur ;
+	SVT_CONTROL	*svtsave ;
+	char	*outptr ;
+	char	*inptr ;
+	size_t	ilen;
+	size_t	olen;
+	SECcache   secs[SECCOUNT];
+	int rtn;
+	int		lp ;
+	STATION	*pStas ;
+	int		act ;
+
+	/* ¶½Ì£¤Î¤¢¤ëpid¤ò»ØÄê */
+	memset(secs, 0,  sizeof(SECcache) * SECCOUNT);
+	secs[0].pid = 0x11;
+	secs[1].pid = 0x12;
+	secs[2].pid = 0x26;
+	secs[3].pid = 0x27;
+
+	if(argc == 4){
+		arg_onTV = argv[1];
+		file = argv[2];
+		if(strcmp(file, "-")) {
+			infile = fopen(file, "r");
+			inclose = 1;
+		}
+		if(strcmp(argv[3], "-")) {
+			outfile = fopen(argv[3], "w+");
+			outclose = 1;
+		}
+	}else{
+		fprintf(stdout, "Usage : %s /BS <tsFile> <outfile>\n", argv[0]);
+		fprintf(stdout, "Usage : %s <ontvcode> <tsFile> <outfile>\n", argv[0]);
+		fprintf(stdout, "ontvcode ¥Á¥ã¥ó¥Í¥ë¼±Ê̻ҡ£****.ontvjapan.com ¤Ê¤É\n");
+		fprintf(stdout, "/BS      BS¥â¡¼¥É¡£°ì¤Ä¤ÎTS¤«¤éBSÁ´¶É¤Î¥Ç¡¼¥¿¤òÆɤ߹þ¤ß¤Þ¤¹¡£\n");
+		fprintf(stdout, "/CS      CS¥â¡¼¥É¡£°ì¤Ä¤ÎTS¤«¤éÊ£¿ô¶É¤Î¥Ç¡¼¥¿¤òÆɤ߹þ¤ß¤Þ¤¹¡£\n");
+		return 0;
+	}
+
+	if(strcmp(arg_onTV, "/BS") == 0){
+		pStas = bsSta;
+		staCount = bsStaCount;
+		act = 0 ;
+	}else if(strcmp(arg_onTV, "/CS") == 0){
+		pStas = csSta;
+		staCount = csStaCount;
+		act = 0 ;
+	}else{
+		act = 1 ;
+		svttop = calloc(1, sizeof(SVT_CONTROL));
+		GetSDT(infile, svttop, secs, SECCOUNT);
+		svtcur = svttop->next ;	//ÀèƬ
+		if(svtcur == NULL){
+			free(svttop);
+			return ;
+		}
+
+		pStas = calloc(1, sizeof(STATION));
+		pStas->tsId = svtcur->transport_stream_id ;
+		pStas->onId = svtcur->original_network_id ;
+		pStas->svId = svtcur->event_id ;
+		pStas->ontv = arg_onTV ;
+		pStas->name = svtcur->servicename ;
+		staCount = 1;
+	}
+
+	fprintf(outfile, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+	fprintf(outfile, "<!DOCTYPE tv SYSTEM \"xmltv.dtd\">\n\n");
+	fprintf(outfile, "<tv generator-info-name=\"tsEPG2xml\" generator-info-url=\"http://localhost/\">\n");
+
+	cd = iconv_open("UTF-8", "EUC-JP");
+	for(lp = 0 ; lp < staCount ; lp++){
+		memset(ServiceName, '\0', sizeof(ServiceName));
+		ilen = strlen(pStas[lp].name);
+		olen = sizeof(ServiceName);
+		outptr = ServiceName ;
+		inptr = pStas[lp].name ;
+		iconv(cd, &inptr, &ilen, &outptr, &olen);
+		xmlspecialchars(ServiceName);
+
+		fprintf(outfile, "  <channel id=\"%s\">\n", pStas[lp].ontv);
+		fprintf(outfile, "    <display-name lang=\"ja_JP\">%s</display-name>\n", ServiceName);
+		fprintf(outfile, "  </channel>\n");
+	}
+	for(lp = 0 ; lp < staCount ; lp++){
+		GetEIT(infile, outfile, &pStas[lp], secs, SECCOUNT);
+	}
+	fprintf(outfile, "</tv>\n");
+	if(inclose) {
+		fclose(infile);
+	}
+
+	if(outclose) {
+		fclose(outfile);
+	}
+	iconv_close(cd);
+	if(act){
+		free(pStas);
+		svtcur = svttop ;	//ÀèƬ
+		while(svtcur != NULL){
+			svtsave = svtcur->next ;
+			free(svtcur);
+			svtcur = svtsave ;
+		}
+	}
+
+	return 0;
+}
diff --git a/tstools/epgdump/epgdump_segfault_fix_patch(last).txt b/tstools/epgdump/epgdump_segfault_fix_patch(last).txt
new file mode 100755
index 0000000..e402651
--- /dev/null
+++ b/tstools/epgdump/epgdump_segfault_fix_patch(last).txt
@@ -0,0 +1,30 @@
+diff -Nur epgdumpr2_orig/ts.c epgdumpr2/ts.c
+--- epgdumpr2_orig/ts.c	2009-03-15 21:35:57.000000000 +0900
++++ epgdumpr2/ts.c	2009-07-19 18:38:17.000000000 +0900
+@@ -202,6 +202,11 @@
+ 			pk.payloadlen -= 1;
+ 		}
+ 		memset(pk.payload, 0xFF, sizeof(pk.payload));
++#if 1	/* 07/07/2009 add: */
++		if( pk.payloadlen > sizeof(pk.payload) ){
++			continue;
++		}
++#endif
+ 		memcpy(pk.payload, payptr, pk.payloadlen);
+     
+ 		/*
+@@ -307,6 +312,14 @@
+ 
+ int checkcrc(SECcache *secs) {
+ 
++#if 1	/* 07/07/2009 add: °Û¾ï¾õÂÖ²óÈò¤Î¤¿¤á */
++	/* ¥»¥¯¥·¥ç¥óºÇÂçŤòĶ¤¨¤ë¤³¤È¤Ê¤É¤¢¤êÆÀ¤Ê¤¤¤Ï¤º¤À¤¬... */
++	if( secs->seclen > MAXSECLEN ){
++		/* ¤è¤¯Ê¬¤«¤é¤ó¤Î¤ÇÇË´þ¤·¤Æ¤ä¤ë */
++		return 0;
++	}
++#endif
++
+ 	/* ¥»¥¯¥·¥ç¥ó¤Î½ª¤ê¤ËÃÖ¤«¤ì¤ë4¥Ð¥¤¥È¤ÎCRC32¤Ï¡¢
+ 	   CRC·×»»¤Î·ë²Ì0¤Ë¤Ê¤ë¤è¤¦¤ËÀßÄꤵ¤ì¤ë¡£
+ 	   Ãͤ¬È¯À¸¤·¤¿¾ì¹ç¤Ï¡¢¥¨¥é¡¼¤Ê¤Î¤ÇÂоݳ°¤Ë¤¹¤ë */
diff --git a/tstools/epgdump/patch2ch b/tstools/epgdump/patch2ch
new file mode 100755
index 0000000..e9bd2c7
--- /dev/null
+++ b/tstools/epgdump/patch2ch
@@ -0,0 +1,18 @@
+begin-base64 644 t1.uuc
+H4sIAFTfZkoAA+2TTU8TQRjHe91+ikm80G63ndltu1AiqSFwUg568dY0223Z
+AG2zu01AwocBnzVESSCgVkBLAwQq1cIJD8YYExOEkphAvBpnaA1WkRPBg88v
+m3nb5+U//+yaxVymNFZMOWYumy6NuqmsNZ4qpl1jOOyOu74rgXLi0aiYmR7X
+WnOMnp2LdVTXfYypGo3TmM5UH2XxmE59hF5N+8spOW7aJsSXL+RKxrB1SZxp
+O9ch6HrJWNksUYZKNjFbX4Ktpgq2lYu4Ttg4Pzvb+hVFuShMUintUaimsBhR
+WUKLJWJ6mP6EyLSHUr8sy7+Va6fpCushrDuhdSfYn2nJJFFUqobiRBYTYySZ
+9BNJkooj4WJ6YrSQzoyaeaLcJKxXnE+JYcwcc0y36zwkROj44GCIONYDs5D9
+5UUg0OuXb1hZwqRIkFA9wh8hi6QzmQQJRvyyJFnZLtLZre+CQiQwKYIlo5B3
+rXzJ7BW7KV7czHOP26qM4kSHKr4ounaoszyXRAQiJxI8c0CjunBAY9yB6JkD
+fmLlXWIMm8aIYRtd9wb6jTTfkaBjGk6ATPKIv99r4X3la+Xb+v7iae0EGrAG
+n1pX5aHeqjfvlb0D73Rle/1gcxlONp/DLDRhCWqwA69hBo62qnwFsAsrUIW5
+cDjcyhY+ie5KHx9bNt25dZ8ruz0w1HaHN4AvML8zB0/gEE557+3t+tPvUIYt
++AzNtuG26ZbsPKHCwnMHZe5Hh0BovHoMR1Df2OfVjqEZ9fY88GrQ6L/br6mw
+Oz3DM7iPfFt+t7oKjXJz8Q2FOhff5CoeQb36cfMInonc6Yet2I23MFebr77g
+itYqx8sHooo36x1Ov+RZXO36XuXD0gKvsdxS+69/XwRBEARBEARBEARBEARB
+EARBEARBEARBEOQ/5wfnyBSoACgAAA==
+==== 
diff --git a/tstools/epgdump/patch_r2 b/tstools/epgdump/patch_r2
new file mode 100755
index 0000000..6d59eb9
--- /dev/null
+++ b/tstools/epgdump/patch_r2
@@ -0,0 +1,145 @@
+diff -rcw epgdumpr2.old/eit.c epgdumpr2/eit.c
+*** epgdumpr2.old/eit.c	2009-03-15 19:02:33.000000000 +0900
+--- epgdumpr2/eit.c	2009-03-24 20:45:25.961750270 +0900
+***************
+*** 6,11 ****
+--- 6,14 ----
+  
+  char		*subtitle_cnv_str[] = {
+  	"¡¡Âè",
++ 	"¡¼Âè",
++ 	"-Âè",
++ 	" Âè",
+  	"¡¡¡Ö",
+  	"¡¡¡ô",
+  	"¡Ê",
+***************
+*** 39,45 ****
+  	return 14;
+  }
+  
+! int parseEITbody(unsigned char *data, EITbody *b) {
+  	int boff = 0;
+  	int tnum;
+  	char buf[4];
+--- 42,49 ----
+  	return 14;
+  }
+  
+! int parseEITbody(unsigned char *data, EITbody *b)
+! {
+  	int boff = 0;
+  	int tnum;
+  	char buf[4];
+***************
+*** 78,97 ****
+  
+  	b->yy += 1900;
+    
+  	sprintf(buf, "%x", b->start_time[2]);
+  	b->hh = atoi(buf);
+  	sprintf(buf, "%x", b->start_time[3]);
+  	b->hm = atoi(buf);
+  	sprintf(buf, "%x", b->start_time[4]);
+  	b->ss = atoi(buf);
+  
+  	sprintf(buf, "%x", b->duration[0]);
+  	b->dhh = atoi(buf);
+  	sprintf(buf, "%x", b->duration[1]);
+  	b->dhm = atoi(buf);
+  	sprintf(buf, "%x", b->duration[2]);
+  	b->dss = atoi(buf);
+!   
+  	return 12;
+  }
+  
+--- 82,110 ----
+  
+  	b->yy += 1900;
+    
++ 	memset(buf, '\0', sizeof(buf));
+  	sprintf(buf, "%x", b->start_time[2]);
+  	b->hh = atoi(buf);
++ 	memset(buf, '\0', sizeof(buf));
+  	sprintf(buf, "%x", b->start_time[3]);
+  	b->hm = atoi(buf);
++ 	memset(buf, '\0', sizeof(buf));
+  	sprintf(buf, "%x", b->start_time[4]);
+  	b->ss = atoi(buf);
+  
++ 	if((b->duration[0] == 0xFF) && (b->duration[1] == 0xFF) && (b->duration[2] == 0xFF)){
++ 		b->dhh = b->dhm = b->dss = 0;
++ 	}else{
++ 		memset(buf, '\0', sizeof(buf));
+  		sprintf(buf, "%x", b->duration[0]);
+  		b->dhh = atoi(buf);
++ 		memset(buf, '\0', sizeof(buf));
+  		sprintf(buf, "%x", b->duration[1]);
+  		b->dhm = atoi(buf);
++ 		memset(buf, '\0', sizeof(buf));
+  		sprintf(buf, "%x", b->duration[2]);
+  		b->dss = atoi(buf);
+! 	}
+  	return 12;
+  }
+  
+***************
+*** 269,274 ****
+--- 282,291 ----
+  		if(ptr == NULL){
+  			continue ;
+  		}
++ 		// ¥¿¥¤¥È¥ë¤¬¤Ê¤¯¤Ê¤é¤Ê¤¤¤è¤¦¤Ë
++ 		if(ptr == eitptr->title){
++ 			continue ;
++ 		}
+  		newsubtitle = calloc(1, ((strlen(ptr) + 1) + (strlen(eitptr->subtitle) + 1)));
+  		memcpy(newsubtitle, ptr, strlen(ptr));
+  		newsubtitle[strlen(ptr)] = ' ';
+diff -rcw epgdumpr2.old/epgdump.c epgdumpr2/epgdump.c
+*** epgdumpr2.old/epgdump.c	2009-03-15 21:29:33.000000000 +0900
+--- epgdumpr2/epgdump.c	2009-03-24 20:55:30.885022486 +0900
+***************
+*** 177,183 ****
+  	char	*inptr ;
+  	size_t	ilen;
+  	size_t	olen;
+! 	time_t	time ;
+  	time_t	end_time ;
+  	struct	tm	tl ;
+  	struct	tm	*endtl ;
+--- 177,183 ----
+  	char	*inptr ;
+  	size_t	ilen;
+  	size_t	olen;
+! 	time_t	l_time ;
+  	time_t	end_time ;
+  	struct	tm	tl ;
+  	struct	tm	*endtl ;
+***************
+*** 239,247 ****
+  		tl.tm_wday = 0;
+  		tl.tm_isdst = 0;
+  		tl.tm_yday = 0;
+! 		time = mktime(&tl);
+! 		end_time = time + eitcur->ehh * 3600 + eitcur->emm * 60 + eitcur->ess;
+  		endtl = localtime(&end_time);
+  		memset(cendtime, '\0', sizeof(cendtime));
+  		memset(cstarttime, '\0', sizeof(cstarttime));
+  		strftime(cendtime, (sizeof(cendtime) - 1), "%Y%m%d%H%M%S", endtl);
+--- 239,253 ----
+  		tl.tm_wday = 0;
+  		tl.tm_isdst = 0;
+  		tl.tm_yday = 0;
+! 		l_time = mktime(&tl);
+! 		if((eitcur->ehh == 0) && (eitcur->emm == 0) && (eitcur->ess == 0)){
+! 			(void)time(&l_time);
+! 			end_time = l_time + (60 * 5);		// £µÊ¬¸å¤ËÀßÄê
+  			endtl = localtime(&end_time);
++ 		}else{
++ 			end_time = l_time + eitcur->ehh * 3600 + eitcur->emm * 60 + eitcur->ess;
++ 			endtl = localtime(&end_time);
++ 		}
+  		memset(cendtime, '\0', sizeof(cendtime));
+  		memset(cstarttime, '\0', sizeof(cstarttime));
+  		strftime(cendtime, (sizeof(cendtime) - 1), "%Y%m%d%H%M%S", endtl);
diff --git a/tstools/epgdump/readme.txt b/tstools/epgdump/readme.txt
new file mode 100755
index 0000000..7727058
--- /dev/null
+++ b/tstools/epgdump/readme.txt
@@ -0,0 +1,57 @@
+xmltv-epg
+
+MPEG-TS‚ÉŠÜ‚Ü‚ê‚éepg‚ðxml‚ŏo—Í‚·‚éƒvƒƒOƒ‰ƒ€‚Å‚·B
+ŸN/E9PqspSkŽ‚ªrecfriio Solaris”Å(http://2sen.dip.jp/cgi-bin/friioup/source/up0737.zip)‚ÉŠÜ‚Ü‚ê‚éepgdump‚ð
+Linux”Å‚ð‰ü‘¢‚µ‚½‚à‚Ì‚ðƒx[ƒX‚Éxmltv—p‚Ìxmlƒtƒ@ƒCƒ‹‚ðì¬‚µ‚Ü‚·B
+
+‚Ü‚½Aƒ^ƒCƒgƒ‹“à‚ÉŠÜ‚Ü‚ê‚é
+    "@‘æ"‚âA"@u"A"@”"A"i"A"u"A‚ðƒTƒuƒ^ƒCƒgƒ‹‚Æ‚µ‚Ĉµ‚¤—l‚ɏC³‚µ‚Ä‚¢‚Ü‚·B
+—áF
+
+ƒ^ƒCƒgƒ‹‚ªA
+–¾“ú‚Ì‚æ‚¢‚¿Iu‚ ‚ÌŽžŒN‚̓ƒ‹‚©‚Á‚½v
+‚̏ꍇ
+–¾“ú‚Ì‚æ‚¢‚¿I‚ªƒ^ƒCƒgƒ‹‚ɁAu‚ ‚ÌŽžŒN‚̓ƒ‹‚©‚Á‚½v‚ªƒTƒuƒ^ƒCƒgƒ‹‚ɒljÁ‚³‚ê‚Ü‚·B
+
+ƒTƒuƒ^ƒCƒgƒ‹‚Æ‚µ‚Ĉµ‚¤‚à‚̂𑝂₷ê‡‚́Aeit.c‚É‚ ‚ésubtitle_cnv_str‚ɒljÁ‚µ‚Ä‚­‚¾‚³‚¢B
+
+Žg—p•û–@‚͈ȉº‚Ì’Ê‚è‚Å‚·B
+
+Usage : ./epgdump /BS <tsFile> <outfile>
+Usage : ./epgdump <ontvcode> <tsFile> <outfile>
+ontvcode ƒ`ƒƒƒ“ƒlƒ‹Ž¯•ÊŽqB****.ontvjapan.com ‚È‚Ç
+/BS      BSƒ‚[ƒhBˆê‚‚ÌTS‚©‚çBS‘S‹Ç‚̃f[ƒ^‚ð“ǂݍž‚Ý‚Ü‚·B
+/CS      CSƒ‚[ƒhBˆê‚‚ÌTS‚©‚ç•¡”‹Ç‚̃f[ƒ^‚ð“ǂݍž‚Ý‚Ü‚·B
+
+make‚·‚é‚Æepgdump‚ªƒrƒ‹ƒh‚³‚ê‚Ü‚·B
+
+epgdumpƒ‰ƒCƒZƒ“ƒX(Solaris”Å‚æ‚èˆø—p):
+>epgdump‚ÉŠÖ‚µ‚ẮABonTest Ver.1.40‚©‚ç‚»‚̂܂܃\[ƒX‚ðŽ‚Á‚Ä‚«‚Ä‚¢‚é•”•ª‚à
+>‚ ‚邽‚߁A‚»‚̃‰ƒCƒZƒ“ƒX‚ɏ]‚¢‚µ‚Ü‚·B
+>BonTest‚ÌReadme.txt‚æ‚è
+>>
+>>‚RDƒ‰ƒCƒZƒ“ƒX‚ɂ‚¢‚Ä
+>>@@E–{ƒpƒbƒP[ƒW‚ÉŠÜ‚Ü‚ê‚é‘S‚Ẵ\[ƒXƒR[ƒhAƒoƒCƒiƒŠ‚ɂ‚¢‚Ä’˜ìŒ ‚͈êØŽå’£‚µ‚Ü‚¹‚ñB
+>>@@EƒIƒŠƒWƒiƒ‹‚Ì‚Ü‚Ü–”‚͉ü•Ï‚µAŠeŽ©‚̃\ƒtƒgƒEƒFƒA‚ÉŽ©—R‚É“Y•tA‘g‚ݍž‚Þ‚±‚Æ‚ª‚Å‚«‚Ü‚·B
+>>@@E’A‚µGPL‚ɏ]‚¤‚±‚Æ‚ð—v‹‚µ‚Ü‚·‚Ì‚Å‚±‚ê‚ç‚ðs‚¤ê‡‚̓\[ƒXƒR[ƒh‚ÌŠJŽ¦‚ª•K{‚Æ‚È‚è‚Ü‚·B
+>>@@E‚±‚Ì‚Æ‚«–{ƒ\ƒtƒgƒEƒFƒA‚Ì’˜ìŒ •\Ž¦‚ðs‚¤‚©‚Ç‚¤‚©‚Í”CˆÓ‚Å‚·B
+>>@@E–{ƒ\ƒtƒgƒEƒFƒA‚ÍFAAD2‚̃‰ƒCƒuƒ‰ƒŠ”ŃoƒCƒiƒŠ‚ðŽg—p‚µ‚Ä‚¢‚Ü‚·B
+>>
+>>@@@"Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
+>>
+>>@@Eƒrƒ‹ƒh‚É•K—v‚Ȋ‹«
+>>@@@- Microsoft Visual Studio 2005 ˆÈã@¦MFC‚ª•K—v
+>>@@@- Microsoft Windows SDK v6.0 ˆÈã@@¦DirectShowŠî’êƒNƒ‰ƒX‚̃Rƒ“ƒpƒCƒ‹Ï‚݃‰ƒCƒuƒ‰ƒŠ‚ª•K—v
+>>@@@- Microsoft DirectX 9.0 SDK ˆÈã
+
+Special Thanks:
+ESolaris”ÅŠJ”­ŽÒ‚Ì•û
+EŠg’£ƒc[ƒ‹’†‚̐l
+EŸN/E9PqspSkŽ
+EARIB(Ž‘—¿‚Ì–³—¿ƒ_ƒEƒ“ƒ[ƒh‚ɑ΂µ‚Ä)
+
+“®ìŠm”FŠÂ‹«:
+  Debian GNU/Linux sid
+  Linux 2.6.27.19 SMP PREEMPT x86_64
+
+tomy ŸCfWlfzSGyg
diff --git a/tstools/epgdump/sdt.c b/tstools/epgdump/sdt.c
new file mode 100755
index 0000000..46a74ff
--- /dev/null
+++ b/tstools/epgdump/sdt.c
@@ -0,0 +1,166 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "sdt.h"
+#include "ts_ctl.h"
+
+int parseSDThead(unsigned char *data, SDThead *h) {
+	int boff = 0;
+
+	memset(h, 0, sizeof(SDThead));
+
+	boff = 0;
+	h->table_id = getBit(data, &boff, 8);
+	h->section_syntax_indicator = getBit(data, &boff, 1);
+	h->reserved_future_use1 = getBit(data, &boff, 1);
+	h->reserved1 = getBit(data, &boff, 2);
+	h->section_length = getBit(data, &boff, 12);
+	h->transport_stream_id = getBit(data, &boff, 16);
+	h->reserved2 = getBit(data, &boff, 2);
+	h->version_number = getBit(data, &boff, 5);
+	h->current_next_indicator = getBit(data, &boff, 1);
+	h->section_number = getBit(data, &boff, 8);
+	h->last_section_number = getBit(data, &boff, 8);
+	h->original_network_id = getBit(data, &boff, 16);
+	h->reserved_future_use2 = getBit(data, &boff, 8);
+
+	return 11;
+}
+
+int parseSDTbody(unsigned char *data, SDTbody *b) {
+	int boff = 0;
+
+	memset(b, 0, sizeof(SDTbody));
+
+	b->service_id = getBit(data, &boff, 16);
+	b->reserved_future_use1 = getBit(data, &boff, 3);
+	b->EIT_user_defined_flags = getBit(data, &boff, 3);
+	b->EIT_schedule_flag = getBit(data, &boff, 1);
+	b->EIT_present_following_flag = getBit(data, &boff, 1);
+	b->running_status = getBit(data, &boff, 3);
+	b->free_CA_mode = getBit(data, &boff, 1);
+	b->descriptors_loop_length = getBit(data, &boff, 12);
+
+	return 5;
+}
+
+int parseSVCdesc(unsigned char *data, SVCdesc *desc) {
+	int boff = 0;
+  
+	memset(desc, 0, sizeof(SVCdesc));
+
+	desc->descriptor_tag = getBit(data, &boff, 8);
+	desc->descriptor_length = getBit(data, &boff, 8);
+	desc->service_type = getBit(data, &boff, 8);
+	desc->service_provider_name_length = getBit(data, &boff, 8);
+	getStr(desc->service_provider_name, data, &boff, desc->service_provider_name_length);
+	desc->service_name_length = getBit(data, &boff, 8);
+	getStr(desc->service_name, data, &boff, desc->service_name_length);
+
+	return desc->descriptor_length + 2;
+}
+int		serachid(SVT_CONTROL *top, int service_id)
+{
+	SVT_CONTROL	*cur = top ;
+	while(cur != NULL){
+		if(cur->event_id == service_id){
+			return 1 ;
+		}
+		cur = cur->next ;
+	}
+	return 0 ;
+}
+
+void	enqueue_sdt(SVT_CONTROL *top, SVT_CONTROL *sdtptr)
+{
+	SVT_CONTROL	*cur ;
+
+	if(top->next == NULL){
+		top->next = sdtptr ;
+		top->prev = top ;
+		return ;
+	}
+	cur = top->next ;
+	while(cur != NULL){
+		if(sdtptr->event_id < cur->event_id){
+			if(cur->prev != NULL){
+				cur->prev->next = sdtptr ;
+				sdtptr->prev = cur->prev ;
+			}
+			cur->prev = sdtptr ;
+			sdtptr->next = cur ;
+			return ;
+		}
+		if(cur->next == NULL){
+			cur->next = sdtptr ;
+			sdtptr->prev = cur ;
+			return ;
+		}
+		cur = cur->next ;
+	}
+	return ;
+
+}
+
+void dumpSDT(unsigned char *ptr, SVT_CONTROL *top)
+{
+
+	SDThead  sdth;
+	SDTbody  sdtb;
+	SVCdesc  desc;
+	SVT_CONTROL	*svtptr ;
+	int		rc ;
+
+	int len = 0;
+	int loop_len = 0;
+
+	/* SDT */
+	len = parseSDThead(ptr, &sdth); 
+	ptr += len;
+	loop_len = sdth.section_length - (len - 3 + 4); // 3¤Ï¶¦Ḁ̈إåÀĹ 4¤ÏCRC
+	while(loop_len > 0) {
+		len = parseSDTbody(ptr, &sdtb);
+		ptr += len;
+		loop_len -= len;
+		parseSVCdesc(ptr, &desc);
+
+		rc = serachid(top, sdtb.service_id);
+		if(rc == 0){
+			svtptr = calloc(1, sizeof(SVT_CONTROL));
+			svtptr->event_id = sdtb.service_id;
+			svtptr->original_network_id = sdth.original_network_id;
+			svtptr->transport_stream_id = sdth.transport_stream_id;
+			svtptr->event_id = sdtb.service_id;
+			memcpy(svtptr->servicename, desc.service_name, strlen(desc.service_name));
+			enqueue_sdt(top, svtptr);
+#if 0
+			printf("SDT=%s,%d,%x,%x,%x,%x,%x,%x,%x\n",
+				desc.service_name, sdtb.service_id, sdtb.reserved_future_use1,
+				sdtb.EIT_user_defined_flags, sdtb.EIT_schedule_flag, sdtb.EIT_present_following_flag,
+				sdtb.running_status, sdtb.free_CA_mode, sdtb.descriptors_loop_length);
+/*
+#else
+0x01:ƒfƒWƒ^ƒ‹TVƒT[ƒrƒX
+0xA5:ƒvƒƒ‚[ƒVƒ‡ƒ“‰f‘œƒT[ƒrƒX
+0x0C:ƒf[ƒ^ƒT[ƒrƒX
+ */
+			printf("SDT=(%x:%x)%s,%d,%d,%d,%d,%d(%d,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x)\n",
+					sdth.table_id, desc.service_type, 
+					desc.service_name, sdtb.service_id,
+					desc.descriptor_tag, desc.descriptor_length, desc.service_type,
+					desc.service_provider_name_length, desc.service_name_length,
+					sdth.table_id, sdth.section_syntax_indicator, sdth.reserved_future_use1,
+					sdth.reserved1, sdth.section_length, sdth.transport_stream_id,
+					sdth.reserved2, sdth.version_number, sdth.current_next_indicator,
+					sdth.section_number, sdth.last_section_number, sdth.original_network_id,
+					sdth.reserved_future_use2);
+#endif
+		}
+
+		ptr += sdtb.descriptors_loop_length;
+		loop_len -= sdtb.descriptors_loop_length;
+	}
+  
+	return;
+}
diff --git a/tstools/epgdump/sdt.h b/tstools/epgdump/sdt.h
new file mode 100755
index 0000000..81f7335
--- /dev/null
+++ b/tstools/epgdump/sdt.h
@@ -0,0 +1,61 @@
+#ifndef SDT_H
+#define SDT_H 1
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "util.h"
+#include "ts_ctl.h"
+
+typedef struct _SDThead {
+	char table_id;
+	int  section_syntax_indicator;
+	int  reserved_future_use1;
+	int  reserved1;
+	int  section_length;
+	int  transport_stream_id;
+	int  reserved2;
+	int  version_number;
+	int  current_next_indicator;
+	int  section_number;
+	int  last_section_number;
+	int  original_network_id;
+	int  reserved_future_use2;
+} SDThead;
+
+typedef struct _SDTbody {
+	int  service_id;
+	int  reserved_future_use1;
+	int  EIT_user_defined_flags;
+	int  EIT_schedule_flag;
+	int  EIT_present_following_flag;
+	int  running_status;
+	int  free_CA_mode;
+	int  descriptors_loop_length;
+} SDTbody;
+
+typedef struct _SVCdesc {
+	int  descriptor_tag;
+	int  descriptor_length;
+	int  service_type;
+	int  service_provider_name_length;
+	char service_provider_name[MAXSECLEN];
+	int  service_name_length;
+	char service_name[MAXSECLEN];
+} SVCdesc;
+
+
+#ifdef __cplusplus
+extern "C"{
+#endif /* __cplusplus */
+
+	int parseSDThead(unsigned char *data, SDThead *h);
+	int parseSDTbody(unsigned char *data, SDTbody *b);
+	int parseSVCdesc(unsigned char *data, SVCdesc *desc);
+	void dumpSDT(unsigned char *data, SVT_CONTROL *top);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif
diff --git a/tstools/epgdump/ts.c b/tstools/epgdump/ts.c
new file mode 100755
index 0000000..c6cac1c
--- /dev/null
+++ b/tstools/epgdump/ts.c
@@ -0,0 +1,332 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "ts.h"
+
+static unsigned int CalcCrc(unsigned int crc, unsigned char *buf, int len);
+static int checkcrc(SECcache *secs);
+
+SECcache *readTS(FILE *in, SECcache secs[], int size) {
+	static int rcount = 0;
+	static int ridx = -1;
+
+	TSpacket pk;
+  
+	unsigned char buf[1024];
+
+	int boff;
+	int len;
+	unsigned char *payptr;
+
+	int inchar;
+	int i;
+
+	/* sync¥Ð¥¤¥È¤Þ¤ÇÆɤßÈô¤Ð¤· */
+	if(rcount == 0) {
+		while((inchar = fgetc(in)) != EOF) {
+			if((inchar & 0xFF) == 0x47) {
+				//fseek(in, -1, SEEK_CUR);
+				ungetc(inchar, in);
+				break;
+			}
+		}
+		if(inchar == EOF) {
+			return NULL;
+		}
+	}
+
+retry:
+  
+	/* Ì᤹¤Ù¤­»Ä¤ê¤¬¤¢¤ë¤«? */
+	if(ridx >= 0 && secs[ridx].cont) {
+		/* ¥Ð¥Ã¥Õ¥¡¥Á¥§¥Ã¥¯ */
+		if((secs[ridx].cur.payload[secs[ridx].curlen] & 0xFF) == 0xFF) {
+			secs[ridx].cont = 0;
+			secs[ridx].seclen = 0;
+			secs[ridx].setlen = 0;
+			secs[ridx].curlen = 0;
+		} else {
+			len = secs[ridx].cur.payloadlen - secs[ridx].curlen;
+			/* Á´ÉôÀßÄêºÑ¤ß¥Á¥§¥Ã¥¯ */
+			if(len == 0) {
+				secs[ridx].cont = 0;
+				secs[ridx].seclen = 0;
+				secs[ridx].setlen = 0;
+				secs[ridx].curlen = 0;
+			} else {
+				/* ¤³¤³¤Çseclen¤¬¸Ù¤ë¤è¤¦¤ËTSʬ³ä¤µ¤ì¤Æ¤¤¤ë¤Èº¤¤ë¤Ê @@
+				   if(secs[ridx].pid == 0x12) {
+				   int check = secs[ridx].cur.payload[secs[ridx].curlen] & 0xFF;
+				   if(!(check == 0x4E ||
+				   check == 0x4F ||
+				   (check >= 0x50 && check <= 0x6F))) {
+				   secs[ridx].curlen -= 3;
+				   }
+				   }
+				*/
+	
+				boff = 12;
+				secs[ridx].seclen = getBit(&secs[ridx].cur.payload[secs[ridx].curlen], &boff, 12) + 3; // ¥Ø¥Ã¥À
+	
+				/*
+				  if(secs[ridx].seclen == 2334) {
+				  printf("aa");
+				  }
+				*/
+	
+				/* TS¥Ç¡¼¥¿Ä¹-ÀßÄêºÑ¤ß¥Ç¡¼¥¿Ä¹ */
+				if(secs[ridx].seclen > len) {
+					memcpy(secs[ridx].buf, &secs[ridx].cur.payload[secs[ridx].curlen], len);
+					secs[ridx].setlen = len;
+					secs[ridx].curlen = 0;
+					secs[ridx].cont   = 1;
+					/* ¼¡¤Î¥ì¥³¡¼¥ÉÆɤ߹þ¤ß */
+				} else {
+					memcpy(secs[ridx].buf, 
+						   &secs[ridx].cur.payload[secs[ridx].curlen], secs[ridx].seclen);
+					secs[ridx].setlen  = secs[ridx].seclen;
+					secs[ridx].curlen += secs[ridx].seclen;
+					secs[ridx].cont = 1;
+
+					/* CRC¤Î¥Á¥§¥Ã¥¯ */
+					if(checkcrc(&(secs[ridx]))) {
+						return &(secs[ridx]); /* Ìá¤ë */
+					}
+					goto retry; /* ¤â¤¦°ì²ó */
+				}
+			}
+		}
+	}
+
+	int roffset = 0;
+	while(1) {
+		if(fread(buf+roffset, 188-roffset, 1, in) != 1) {
+			/* »Ä¤ê¤Î½èÍý? */
+			return NULL;
+		}
+		roffset = 0;
+		rcount++;
+
+		if((buf[0] & 0xFF) != 0x47) {
+			/* ºÇ½é¤ÏbufÃæ¤Ë0x47¤¬¤¢¤ë¤«¥Á¥§¥Ã¥¯ */
+			for(i = 1; i < 188; i++) {
+				if((buf[i] & 0xFF) == 0x47) {
+					break;
+				}
+			}
+
+			if(i < 188) {
+				/* ¤½¤³¤«¤éºÆÆɤ߹þ¤ß¤·¤ÆÍߤ·¤¤¤Î¤Çseek */
+				//fseek(in, (188 - i) * -1, SEEK_CUR);
+				roffset = i;
+				memmove(buf, buf + i, 188 - i);
+				continue;
+			}
+
+			while((inchar = fgetc(in)) != EOF) {
+				if((inchar & 0xFF) == 0x47) {
+					//fseek(in, -1, SEEK_CUR);
+					ungetc(inchar, in);
+					break;
+				}
+			}
+			if(inchar == EOF) {
+				return NULL;
+			}
+			continue;
+		}
+
+		/*
+		  if(rcount == 406502) {
+		  printf("aa");
+		  }
+		*/
+
+    
+		pk.rcount = rcount;
+    
+		boff = 0;
+		pk.sync = getBit(buf, &boff, 8);
+		pk.transport_error_indicator = getBit(buf, &boff, 1);
+		pk.payload_unit_start_indicator = getBit(buf, &boff, 1);
+		pk.transport_priority = getBit(buf, &boff, 1);
+		pk.pid = getBit(buf, &boff, 13);
+		pk.transport_scrambling_control = getBit(buf, &boff, 2);
+		pk.adaptation_field_control = getBit(buf, &boff, 2);
+		pk.continuity_counter = getBit(buf, &boff, 4);
+
+		/*
+		  adaptation_field_control 2 bslbf
+		  continuity_counter 4 uimsbf
+		  if(adaptation_field_control = = '10' || adaptation_field_control = = '11'){
+		  adaptation_field()
+		  }
+		  ...
+		  adaptation_field() {
+		  adaptation_field_length 8 uimsbf
+		  if (adaptation_field_length > 0) {
+		  discontinuity_indicator....
+
+		  00 Reserved for future use by ISO/IEC
+		  01 No adaptation_field, payload only
+		  10 Adaptation_field only, no payload
+		  11 Adaptation_field followed by payload
+
+		*/
+
+		pk.payloadlen = 184;
+
+		if(pk.adaptation_field_control == 2) {
+			continue;
+		}
+
+		if(pk.adaptation_field_control == 3) {
+			len = getBit(buf, &boff, 8);
+			payptr = buf + (boff / 8) + len;
+			pk.payloadlen -= (len + 1);
+		} else {
+			payptr = buf + (boff / 8);
+		}
+		if(pk.payloadlen < 0){
+			continue ;
+		}
+
+		/* 
+		   if the Transport Stream packet carries the first byte of a PSI section, the payload_unit_start_indicator value
+		   shall be '1', indicating that the first byte of the payload of this Transport Stream packet carries the pointer_field.
+		*/
+		if(pk.payload_unit_start_indicator == 1) {
+			/* pointer_field¤Ï¤¤¤é¤Ê¤¤ */
+			payptr += 1;
+			pk.payloadlen -= 1;
+		}
+		memset(pk.payload, 0xFF, sizeof(pk.payload));
+#if 1	/* 07/07/2009 add: */
+		if( pk.payloadlen > sizeof(pk.payload) ){
+			continue;
+		}
+#endif
+		memcpy(pk.payload, payptr, pk.payloadlen);
+    
+		/*
+		  if(pk.rcount == 62) {
+		  printf("62\n");
+		  }
+
+		  if(pk.rcount == 63) {
+		  printf("63\n");
+		  }
+		*/
+    
+		/* ¶½Ì£¤Î¤¢¤ëpid¤«³Îǧ */
+		for(int i = 0;i < size; i++) {
+			if(secs[i].pid == pk.pid) {
+				secs[i].cur = pk;
+				/* ÅÓÃæ½èÍýÃ椫ºÇ½é¤«? */
+				if(!secs[i].cont) {
+					/* ºÇ½é ¥»¥¯¥·¥ç¥óŤòÄ´¤Ù¤ë */
+					boff = 12;
+					secs[i].seclen = getBit(secs[i].cur.payload, &boff, 12) + 3; // ¥Ø¥Ã¥À;
+					/*
+					  if(secs[i].seclen == 2334) {
+					  printf("aa");
+					  }
+					*/
+
+					if(secs[i].seclen > secs[i].cur.payloadlen) {
+						memcpy(secs[i].buf, secs[i].cur.payload, secs[i].cur.payloadlen);
+						secs[i].setlen = secs[i].cur.payloadlen;
+						secs[i].cont = 1;
+						continue;
+					} 
+					memcpy(secs[i].buf, secs[i].cur.payload, secs[i].seclen);
+					secs[i].setlen = secs[i].seclen;
+					secs[i].curlen = secs[i].seclen;
+					secs[i].cont = 1;
+					ridx = i;
+					/* CRC¤Î¥Á¥§¥Ã¥¯ */
+					if(checkcrc(&(secs[ridx]))) {
+						return &(secs[i]); /* ¼è¤ê¹ç¤¨¤ºÌá¤ë */
+					}
+					goto retry; /* »Ä¤ê½èÍý¤Ø */
+				}
+				/* ¥»¥¯¥·¥ç¥óĹ-ÀßÄêºÑ¤ßĹ */
+				len = secs[i].seclen - secs[i].setlen;
+				if(len > secs[i].cur.payloadlen) {
+					/* Á´ÂΞÁ÷ */
+					memcpy(&secs[i].buf[secs[i].setlen], 
+						   secs[i].cur.payload, secs[i].cur.payloadlen);
+					secs[i].setlen += secs[i].cur.payloadlen;
+					continue;
+				}
+				/* ¥»¥¯¥·¥ç¥óŤλĤê¤òÀßÄê */
+				memcpy(&secs[i].buf[secs[i].setlen], secs[i].cur.payload, len);
+				secs[i].setlen  = secs[i].seclen;
+				secs[i].curlen += len;
+				secs[i].cont    = 1;
+				ridx = i;
+				/* CRC¤Î¥Á¥§¥Ã¥¯ */
+				if(checkcrc(&(secs[ridx]))) {
+					return &(secs[i]);
+				}
+				goto retry; /* »Ä¤ê½èÍý¤Ø */
+			}
+		}
+	}
+
+	//return NULL;
+}
+
+/* BonTest/TsStream.cpp¤«¤é¤Î¥Ñ¥¯¥ê */
+unsigned int CalcCrc(unsigned int crc, unsigned char *buf, int len) {
+	unsigned int c = crc;
+	int n;
+
+	static const unsigned int CrcTable[256] = {
+		0x00000000UL, 0x04C11DB7UL, 0x09823B6EUL, 0x0D4326D9UL,	0x130476DCUL, 0x17C56B6BUL, 0x1A864DB2UL, 0x1E475005UL,	0x2608EDB8UL, 0x22C9F00FUL, 0x2F8AD6D6UL, 0x2B4BCB61UL,	0x350C9B64UL, 0x31CD86D3UL, 0x3C8EA00AUL, 0x384FBDBDUL,
+		0x4C11DB70UL, 0x48D0C6C7UL, 0x4593E01EUL, 0x4152FDA9UL,	0x5F15ADACUL, 0x5BD4B01BUL, 0x569796C2UL, 0x52568B75UL,	0x6A1936C8UL, 0x6ED82B7FUL, 0x639B0DA6UL, 0x675A1011UL,	0x791D4014UL, 0x7DDC5DA3UL, 0x709F7B7AUL, 0x745E66CDUL,
+		0x9823B6E0UL, 0x9CE2AB57UL, 0x91A18D8EUL, 0x95609039UL,	0x8B27C03CUL, 0x8FE6DD8BUL, 0x82A5FB52UL, 0x8664E6E5UL,	0xBE2B5B58UL, 0xBAEA46EFUL, 0xB7A96036UL, 0xB3687D81UL,	0xAD2F2D84UL, 0xA9EE3033UL, 0xA4AD16EAUL, 0xA06C0B5DUL,
+		0xD4326D90UL, 0xD0F37027UL, 0xDDB056FEUL, 0xD9714B49UL,	0xC7361B4CUL, 0xC3F706FBUL, 0xCEB42022UL, 0xCA753D95UL,	0xF23A8028UL, 0xF6FB9D9FUL, 0xFBB8BB46UL, 0xFF79A6F1UL,	0xE13EF6F4UL, 0xE5FFEB43UL, 0xE8BCCD9AUL, 0xEC7DD02DUL,
+		0x34867077UL, 0x30476DC0UL, 0x3D044B19UL, 0x39C556AEUL,	0x278206ABUL, 0x23431B1CUL, 0x2E003DC5UL, 0x2AC12072UL,	0x128E9DCFUL, 0x164F8078UL, 0x1B0CA6A1UL, 0x1FCDBB16UL,	0x018AEB13UL, 0x054BF6A4UL, 0x0808D07DUL, 0x0CC9CDCAUL,
+		0x7897AB07UL, 0x7C56B6B0UL, 0x71159069UL, 0x75D48DDEUL,	0x6B93DDDBUL, 0x6F52C06CUL, 0x6211E6B5UL, 0x66D0FB02UL,	0x5E9F46BFUL, 0x5A5E5B08UL, 0x571D7DD1UL, 0x53DC6066UL,	0x4D9B3063UL, 0x495A2DD4UL, 0x44190B0DUL, 0x40D816BAUL,
+		0xACA5C697UL, 0xA864DB20UL, 0xA527FDF9UL, 0xA1E6E04EUL,	0xBFA1B04BUL, 0xBB60ADFCUL, 0xB6238B25UL, 0xB2E29692UL,	0x8AAD2B2FUL, 0x8E6C3698UL, 0x832F1041UL, 0x87EE0DF6UL,	0x99A95DF3UL, 0x9D684044UL, 0x902B669DUL, 0x94EA7B2AUL,
+		0xE0B41DE7UL, 0xE4750050UL, 0xE9362689UL, 0xEDF73B3EUL,	0xF3B06B3BUL, 0xF771768CUL, 0xFA325055UL, 0xFEF34DE2UL,	0xC6BCF05FUL, 0xC27DEDE8UL, 0xCF3ECB31UL, 0xCBFFD686UL,	0xD5B88683UL, 0xD1799B34UL, 0xDC3ABDEDUL, 0xD8FBA05AUL,
+		0x690CE0EEUL, 0x6DCDFD59UL, 0x608EDB80UL, 0x644FC637UL,	0x7A089632UL, 0x7EC98B85UL, 0x738AAD5CUL, 0x774BB0EBUL,	0x4F040D56UL, 0x4BC510E1UL, 0x46863638UL, 0x42472B8FUL,	0x5C007B8AUL, 0x58C1663DUL, 0x558240E4UL, 0x51435D53UL,
+		0x251D3B9EUL, 0x21DC2629UL, 0x2C9F00F0UL, 0x285E1D47UL,	0x36194D42UL, 0x32D850F5UL, 0x3F9B762CUL, 0x3B5A6B9BUL,	0x0315D626UL, 0x07D4CB91UL, 0x0A97ED48UL, 0x0E56F0FFUL,	0x1011A0FAUL, 0x14D0BD4DUL, 0x19939B94UL, 0x1D528623UL,
+		0xF12F560EUL, 0xF5EE4BB9UL, 0xF8AD6D60UL, 0xFC6C70D7UL,	0xE22B20D2UL, 0xE6EA3D65UL, 0xEBA91BBCUL, 0xEF68060BUL,	0xD727BBB6UL, 0xD3E6A601UL, 0xDEA580D8UL, 0xDA649D6FUL,	0xC423CD6AUL, 0xC0E2D0DDUL, 0xCDA1F604UL, 0xC960EBB3UL,
+		0xBD3E8D7EUL, 0xB9FF90C9UL, 0xB4BCB610UL, 0xB07DABA7UL,	0xAE3AFBA2UL, 0xAAFBE615UL, 0xA7B8C0CCUL, 0xA379DD7BUL,	0x9B3660C6UL, 0x9FF77D71UL, 0x92B45BA8UL, 0x9675461FUL,	0x8832161AUL, 0x8CF30BADUL, 0x81B02D74UL, 0x857130C3UL,
+		0x5D8A9099UL, 0x594B8D2EUL, 0x5408ABF7UL, 0x50C9B640UL,	0x4E8EE645UL, 0x4A4FFBF2UL, 0x470CDD2BUL, 0x43CDC09CUL,	0x7B827D21UL, 0x7F436096UL, 0x7200464FUL, 0x76C15BF8UL,	0x68860BFDUL, 0x6C47164AUL, 0x61043093UL, 0x65C52D24UL,
+		0x119B4BE9UL, 0x155A565EUL, 0x18197087UL, 0x1CD86D30UL,	0x029F3D35UL, 0x065E2082UL, 0x0B1D065BUL, 0x0FDC1BECUL,	0x3793A651UL, 0x3352BBE6UL, 0x3E119D3FUL, 0x3AD08088UL,	0x2497D08DUL, 0x2056CD3AUL, 0x2D15EBE3UL, 0x29D4F654UL,
+		0xC5A92679UL, 0xC1683BCEUL, 0xCC2B1D17UL, 0xC8EA00A0UL,	0xD6AD50A5UL, 0xD26C4D12UL, 0xDF2F6BCBUL, 0xDBEE767CUL,	0xE3A1CBC1UL, 0xE760D676UL, 0xEA23F0AFUL, 0xEEE2ED18UL,	0xF0A5BD1DUL, 0xF464A0AAUL, 0xF9278673UL, 0xFDE69BC4UL,
+		0x89B8FD09UL, 0x8D79E0BEUL, 0x803AC667UL, 0x84FBDBD0UL,	0x9ABC8BD5UL, 0x9E7D9662UL, 0x933EB0BBUL, 0x97FFAD0CUL,	0xAFB010B1UL, 0xAB710D06UL, 0xA6322BDFUL, 0xA2F33668UL,	0xBCB4666DUL, 0xB8757BDAUL, 0xB5365D03UL, 0xB1F740B4UL
+	};		
+
+	for (n = 0; n < len; n++) {
+		c = (c << 8) ^ CrcTable[((((c >> 24) & 0xFF) ^ buf[n]) & 0XFF)];
+	}
+
+	return c;
+}
+
+
+int checkcrc(SECcache *secs) {
+
+#if 1	/* 07/07/2009 add: °Û¾ï¾õÂÖ²óÈò¤Î¤¿¤á */
+	/* ¥»¥¯¥·¥ç¥óºÇÂçŤòĶ¤¨¤ë¤³¤È¤Ê¤É¤¢¤êÆÀ¤Ê¤¤¤Ï¤º¤À¤¬... */
+	if( secs->seclen > MAXSECLEN ){
+		/* ¤è¤¯Ê¬¤«¤é¤ó¤Î¤ÇÇË´þ¤·¤Æ¤ä¤ë */
+		return 0;
+	}
+#endif
+
+	/* ¥»¥¯¥·¥ç¥ó¤Î½ª¤ê¤ËÃÖ¤«¤ì¤ë4¥Ð¥¤¥È¤ÎCRC32¤Ï¡¢
+	   CRC·×»»¤Î·ë²Ì0¤Ë¤Ê¤ë¤è¤¦¤ËÀßÄꤵ¤ì¤ë¡£
+	   Ãͤ¬È¯À¸¤·¤¿¾ì¹ç¤Ï¡¢¥¨¥é¡¼¤Ê¤Î¤ÇÂоݳ°¤Ë¤¹¤ë */
+	if(CalcCrc(0xffffffffU, secs->buf, secs->seclen)) {
+//		fprintf(stderr, "tblid:0x%x CRC error\n", secs->buf[0]);
+		return 0;
+	}
+	return 1;
+}
+
diff --git a/tstools/epgdump/ts.h b/tstools/epgdump/ts.h
new file mode 100755
index 0000000..da39812
--- /dev/null
+++ b/tstools/epgdump/ts.h
@@ -0,0 +1,46 @@
+#ifndef TS_H
+#define TS_H 1
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "util.h"
+
+#define TSPAYLOADMAX 184
+
+typedef struct _TSpacket { 
+	char     sync;
+	int      transport_error_indicator;
+	int      payload_unit_start_indicator;
+	int      transport_priority;
+	int      pid;
+	int      transport_scrambling_control;
+	int      adaptation_field_control;
+	int      continuity_counter;
+	int      adaptation_field;
+	unsigned char payload[TSPAYLOADMAX];
+	int      payloadlen;
+	int      rcount;
+} TSpacket;
+
+typedef struct _SECcache { 
+	int      pid;
+	unsigned char buf[MAXSECLEN];
+	int      seclen;
+	int      setlen;
+	TSpacket cur;
+	int      curlen;
+	int      cont;
+} SECcache;
+
+#ifdef __cplusplus
+extern "C"{
+#endif /* __cplusplus */
+
+	SECcache *readTS(FILE *in, SECcache secs[], int secscount);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif
diff --git a/tstools/epgdump/ts_ctl.h b/tstools/epgdump/ts_ctl.h
new file mode 100755
index 0000000..1d74dd0
--- /dev/null
+++ b/tstools/epgdump/ts_ctl.h
@@ -0,0 +1,40 @@
+#ifndef	__TS_CONTROL_H__
+#define	__TS_CONTROL_H__
+
+#include	"util.h"
+
+typedef	struct	_SVT_CONTROL	SVT_CONTROL;
+struct	_SVT_CONTROL{
+	SVT_CONTROL	*next ;
+	SVT_CONTROL	*prev ;
+	int		event_id ;			// ¥¤¥Ù¥ó¥ÈID
+	int		original_network_id ;			// OriginalNetworkID
+	int		transport_stream_id ;			// TransporrtStreamID
+	char	servicename[MAXSECLEN] ;		// ¥µ¡¼¥Ó¥¹Ì¾
+};
+
+typedef	struct	_EIT_CONTROL	EIT_CONTROL;
+struct	_EIT_CONTROL{
+	EIT_CONTROL	*next ;
+	EIT_CONTROL	*prev ;
+	int		table_id ;
+	int		servid ;
+	int		event_id ;			// ¥¤¥Ù¥ó¥ÈID
+	int		content_type ;		// ¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×
+    int		yy;
+    int		mm;
+    int		dd;
+    int		hh;
+    int		hm;
+	int		ss;
+	int		dhh;
+	int		dhm;
+	int		dss;
+	int		ehh;
+	int		emm;
+	int		ess;
+	char	*title ;			// ¥¿¥¤¥È¥ë
+	char	*subtitle ;			// ¥µ¥Ö¥¿¥¤¥È¥ë
+	char	*desc ;			// Description
+};
+#endif
diff --git a/tstools/epgdump/util.c b/tstools/epgdump/util.c
new file mode 100755
index 0000000..1dc39bb
--- /dev/null
+++ b/tstools/epgdump/util.c
@@ -0,0 +1,76 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "aribstr.h"
+#include "util.h"
+
+int strrep(char *buf, char *mae, char *ato)
+{
+    char *mituke;
+	size_t maelen, atolen;
+		    
+	maelen = strlen(mae);
+	atolen = strlen(ato);
+	if (maelen == 0 || (mituke = strstr(buf, mae)) == NULL) return 0;
+	memmove(mituke + atolen, mituke + maelen, strlen(buf) - (mituke + maelen - buf ) + 1);
+	memcpy(mituke, ato, atolen);
+	return 1;
+}
+int getBit(unsigned char *byte, int *pbit, int gbit) {
+	int pbyte = *pbit / 8;
+	unsigned char *fbyte = byte + pbyte;
+
+	int cutbit = *pbit - (pbyte * 8);
+	int lcutbit = 32 - (cutbit + gbit);
+
+	unsigned char tbuf[4]; /* int¤ÎºÇÂç32bit */
+	unsigned int tnum;
+
+	memcpy(tbuf, fbyte, sizeof(unsigned char) * 4);
+
+	/* ÀèƬ¥Ð¥¤¥È¤«¤éÉÔÍ×bit¤ò¥«¥Ã¥È */
+	tbuf[0] = tbuf[0] << cutbit;
+	tbuf[0] = tbuf[0] >> cutbit;
+
+	/* int¤Ë¤·¤Æ¤·¤Þ¤¦ */
+	tnum = tbuf[0] << 24 | tbuf[1] << 16 | tbuf[2] << 8 | tbuf[3];
+
+	/* ¸å¤í¤ÎÉÔÍץХ¤¥È¤ò¥«¥Ã¥È */
+	tnum = tnum >> lcutbit;
+
+	*pbit += gbit;
+
+	return tnum;
+  
+}
+
+void getStr(char *tostr, unsigned char *byte, int *pbit, int len) {
+	char str[MAXSECLEN];
+	int pbyte = *pbit / 8;
+	unsigned char *fbyte = byte + pbyte;
+
+	memset(str, 0, sizeof(char) * MAXSECLEN);
+	memcpy(str, fbyte, len);
+
+	*pbit += (len * 8);
+  
+	AribToString(tostr, str, len);
+
+	return;
+  
+}
+
+int parseOTHERdesc(unsigned char *data) {
+	int boff = 0;
+	int descriptor_tag;
+	int descriptor_length;
+
+	descriptor_tag = getBit(data, &boff, 8);
+	descriptor_length = getBit(data, &boff, 8);
+
+	/* printf("other desc_tag:0x%x\n", descriptor_tag); */
+
+	return descriptor_length + 2;
+}
+
diff --git a/tstools/epgdump/util.h b/tstools/epgdump/util.h
new file mode 100755
index 0000000..483f624
--- /dev/null
+++ b/tstools/epgdump/util.h
@@ -0,0 +1,18 @@
+#ifndef UTIL_H
+#define UTILH 1
+
+#define MAXSECLEN 4096
+
+#ifdef __cplusplus
+extern "C"{
+#endif /* __cplusplus */
+
+	int   getBit(unsigned char *byte, int *pbit, int gbit);
+	void  getStr(char *tostr, unsigned char *byte, int *pbit, int len);
+	int   parseOTHERdesc(unsigned char *data);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif
diff --git a/tstools/epgdump/xmldata.c b/tstools/epgdump/xmldata.c
new file mode 100755
index 0000000..56e087b
--- /dev/null
+++ b/tstools/epgdump/xmldata.c
@@ -0,0 +1,93 @@
+static STATION bsSta[] = {
+	{ "NHK BS1", "3001.ontvjapan.com", 16625, 4, 101},
+	{ "NHK BS2", "3002.ontvjapan.com", 16625, 4, 102},
+	{ "NHK BSh", "3003.ontvjapan.com", 16626, 4, 103},
+	{ "BSÆü¥Æ¥ì", "3004.ontvjapan.com", 16592, 4, 141},
+	{ "BSÄ«Æü", "3005.ontvjapan.com", 16400, 4, 151},
+	{ "BS-i", "3006.ontvjapan.com", 16401, 4, 161},
+	{ "BS¥¸¥ã¥Ñ¥ó", "3007.ontvjapan.com", 16433, 4, 171},
+	{ "BS¥Õ¥¸", "3008.ontvjapan.com", 16593, 4, 181},
+	{ "WOWOW", "3009.ontvjapan.com", 16432, 4, 191},
+	{ "WOWOW2", "3010.ontvjapan.com", 16432, 4, 192},
+	{ "WOWOW3", "3011.ontvjapan.com", 16432, 4, 193},
+	{ "BS11", "3013.ontvjapan.com", 16528, 4, 211},
+	{ "TwellV", "3014.ontvjapan.com", 16530, 4, 222},
+};
+
+static int bsStaCount = sizeof(bsSta) / sizeof (STATION);
+
+
+
+static STATION csSta[] = {
+	{ "¥¹¥¿¡¼£ã£è¥×¥é¥¹", "1002.ontvjapan.com", 24608, 6, 237},
+	{ "ÆüËܱDzèÀìÌç£ã£è£È£Ä", "1086.ontvjapan.com", 24608, 6, 239},
+	{ "¥Õ¥¸¥Æ¥ì¥Ó£Ã£Ó£È£Ä", "306ch.epgdata.ontvjapan", 24608, 6, 306},
+	{ "¥·¥ç¥Ã¥×¥Á¥ã¥ó¥Í¥ë", "1059.ontvjapan.com", 24704, 6, 55},
+	{ "¥¶¡¦¥·¥Í¥Þ", "1217.ontvjapan.com", 24736, 6, 228},
+	{ "¥¹¥«¥Á¥ã¥ó£È£Ä£¸£°£°", "800ch.epgdata.ontvjapan", 24736, 6, 800},
+	{ "¥¹¥«¥Á¥ã¥ó£¸£°£±", "801ch.epgdata.ontvjapan", 24736, 6, 801},
+	{ "¥¹¥«¥Á¥ã¥ó£¸£°£²", "802ch.epgdata.ontvjapan", 24736, 6, 802},
+	{ "£å£²¥×¥í¥â", "100ch.epgdata.ontvjapan", 28736, 7, 100},
+	{ "¥¤¥ó¥¿¡¼¥í¡¼¥«¥ë£Ô£Ö", "194ch.epgdata.ontvjapan", 28736, 7, 194},
+	{ "£Ê¥¹¥Ý¡¼¥Ä¡¡£Å£Ó£Ð£Î", "1025.ontvjapan.com", 28736, 7, 256},
+	{ "£Æ£Ï£Ø", "1016.ontvjapan.com", 28736, 7, 312},
+	{ "¥¹¥Ú¡¼¥¹¥·¥ã¥ï¡¼£Ô£Ö", "1018.ontvjapan.com", 28736, 7, 322},
+	{ "¥«¡¼¥È¥¥¡¼¥ó¡¡¥Í¥Ã¥È", "1046.ontvjapan.com", 28736, 7, 331},
+	{ "¥È¥¥¡¼¥ó¡¦¥Ç¥£¥º¥Ë¡¼", "1213.ontvjapan.com", 28736, 7, 334},
+	{ "Åì±Ç¥Á¥ã¥ó¥Í¥ë", "1010.ontvjapan.com", 28768, 7, 221},
+	{ "±ÒÀ±·à¾ì", "1005.ontvjapan.com", 28768, 7, 222},
+	{ "¥Á¥ã¥ó¥Í¥ë£Î£Å£Ã£Ï", "1008.ontvjapan.com", 28768, 7, 223},
+	{ "Íβè¡ú¥·¥Í¥Õ¥£¥ë", "1009.ontvjapan.com", 28768, 7, 224},
+	{ "¥¹¥¿¡¼¡¦¥¯¥é¥·¥Ã¥¯", "1003.ontvjapan.com", 28768, 7, 238},
+	{ "»þÂå·àÀìÌç¥Á¥ã¥ó¥Í¥ë", "1133.ontvjapan.com", 28768, 7, 292},
+	{ "¥¹¡¼¥Ñ¡¼¥É¥é¥Þ", "1006.ontvjapan.com", 28768, 7, 310},
+	{ "£Á£Ø£Î", "1014.ontvjapan.com", 28768, 7, 311},
+	{ "¥Ê¥·¥ç¥¸¥ª¥Á¥ã¥ó¥Í¥ë", "1204.ontvjapan.com", 28768, 7, 343},
+	{ "¥ï¥ó¥Æ¥ó¥Ý¡¼¥¿¥ë", "110ch.epgdata.ontvjapan", 28864, 7, 110},
+	{ "¥´¥ë¥Õ¥Á¥ã¥ó¥Í¥ë", "1028.ontvjapan.com", 28864, 7, 260},
+	{ "¥Æ¥ìÄ«¥Á¥ã¥ó¥Í¥ë", "1092.ontvjapan.com", 28864, 7, 303},
+	{ "£Í£Ô£Ö", "1019.ontvjapan.com", 28864, 7, 323},
+	{ "¥ß¥å¡¼¥¸¥Ã¥¯¡¦¥¨¥¢", "1024.ontvjapan.com", 28864, 7, 324},
+	{ "Ä«Æü¥Ë¥å¡¼¥¹¥¿¡¼", "1067.ontvjapan.com", 28864, 7, 352},
+	{ "£Â£Â£Ã¥ï¡¼¥ë¥É", "1070.ontvjapan.com", 28864, 7, 353},
+	{ "£Ã£Î£Î£ê", "1069.ontvjapan.com", 28864, 7, 354},
+	{ "¥¸¥ã¥¹¥È¡¦¥¢¥¤", "361ch.epgdata.ontvjapan", 28864, 7, 361},
+	{ "£Ê¥¹¥Ý¡¼¥Ä¡¡£±", "1041.ontvjapan.com", 28896, 7, 251},
+	{ "£Ê¥¹¥Ý¡¼¥Ä¡¡£²", "1042.ontvjapan.com", 28896, 7, 252},
+	{ "£Ê¥¹¥Ý¡¼¥Ä£Ð£ì£õ£ó£È", "1043.ontvjapan.com", 28896, 7, 253},
+	{ "£Ç£Á£Ï£Ò£Á", "1026.ontvjapan.com", 28896, 7, 254},
+	{ "£ó£ë£ù¡¦£Á¥¹¥Ý¡¼¥Ä¡Ü", "1040.ontvjapan.com", 28896, 7, 255},
+	{ "ÊõÄÍ¥×¥í¥â¥Á¥ã¥ó¥Í¥ë", "101ch.epgdata.ontvjapan", 28928, 7, 101},
+	{ "£Ó£Ë£Ù¡¦£Ó£Ô£Á£Ç£Å", "1207.ontvjapan.com", 28928, 7, 290},
+	{ "¥Á¥ã¥ó¥Í¥ë¶ä²Ï", "305ch.epgdata.ontvjapan", 28928, 7, 305},
+	{ "£Á£Ô-£Ø", "1201.ontvjapan.com", 28928, 7, 333},
+	{ "¥Ò¥¹¥È¥ê¡¼¥Á¥ã¥ó¥Í¥ë", "1050.ontvjapan.com", 28928, 7, 342},
+	{ "¥¹¥«¥Á¥ã¥ó£¸£°£³", "803ch.epgdata.ontvjapan", 28928, 7, 803},
+	{ "¥¹¥«¥Á¥ã¥ó£¸£°£´", "804ch.epgdata.ontvjapan", 28928, 7, 804},
+	{ "¥à¡¼¥Ó¡¼¥×¥é¥¹£È£Ä", "1007.ontvjapan.com", 28960, 7, 240},
+	{ "¥´¥ë¥Õ¥Í¥Ã¥È¥ï¡¼¥¯", "1027.ontvjapan.com", 28960, 7, 262},
+	{ "£Ì£á£Ì£á¡¡£È£Ä", "1074.ontvjapan.com", 28960, 7, 314},
+	{ "¥Õ¥¸¥Æ¥ì¥Ó£·£³£¹", "1073.ontvjapan.com", 28992, 7, 258},
+	{ "¥Õ¥¸¥Æ¥ì¥Ó£·£²£±", "1072.ontvjapan.com", 28992, 7, 302},
+	{ "¥¢¥Ë¥Þ¥Ã¥¯¥¹", "1047.ontvjapan.com", 28992, 7, 332},
+	{ "¥Ç¥£¥¹¥«¥Ð¥ê¡¼", "1062.ontvjapan.com", 28992, 7, 340},
+	{ "¥¢¥Ë¥Þ¥ë¥×¥é¥Í¥Ã¥È", "1193.ontvjapan.com", 28992, 7, 341},
+	{ "£Ã-£Ô£Â£Ó¥¦¥¨¥ë¥«¥à", "160ch.epgdata.ontvjapan", 29024, 7, 160},
+	{ "£Ñ£Ö£Ã", "1120.ontvjapan.com", 29024, 7, 161},
+	{ "¥×¥é¥¤¥à£³£¶£µ¡¥£Ô£Ö", "185ch.epgdata.ontvjapan", 29024, 7, 185},
+	{ "¥Õ¥¡¥ß¥ê¡¼·à¾ì", "1015.ontvjapan.com", 29024, 7, 293},
+	{ "£Ô£Â£Ó¥Á¥ã¥ó¥Í¥ë", "3201.ontvjapan.com", 29024, 7, 301},
+	{ "¥Ç¥£¥º¥Ë¡¼¥Á¥ã¥ó¥Í¥ë", "1090.ontvjapan.com", 29024, 7, 304},
+	{ "MUSIC ON! TV", "1022.ontvjapan.com", 29024, 7, 325},
+	{ "¥­¥Ã¥º¥¹¥Æ¡¼¥·¥ç¥ó", "1045.ontvjapan.com", 29024, 7, 330},
+	{ "£Ô£Â£Ó¥Ë¥å¡¼¥¹¥Ð¡¼¥É", "1076.ontvjapan.com", 29024, 7, 351},
+	{ "£Ã£ÓÆüËÜÈÖÁÈ¥¬¥¤¥É", "147ch.epgdata.ontvjapan", 29056, 7, 147},
+	{ "Æü¥Æ¥ì£Ç¡Ü", "1068.ontvjapan.com", 29056, 7, 257},
+	{ "fashion TV", "5004.ontvjapan.com", 29056, 7, 291},
+	{ "Æü¥Æ¥ì¥×¥é¥¹", "300ch.epgdata.ontvjapan", 29056, 7, 300},
+	{ "¥¨¥³¥ß¥å¡¼¥¸¥Ã¥¯£Ô£Ö", "1023.ontvjapan.com", 29056, 7, 320},
+	{ "Music Japan TV", "1208.ontvjapan.com", 29056, 7, 321},
+	{ "Æü¥Æ¥ì£Î£Å£×£Ó£²£´", "2002.ontvjapan.com", 29056, 7, 350},
+};
+
+static int csStaCount = sizeof(csSta) / sizeof (STATION);
diff --git a/tstools/jTsSplitter/jTsSplitter.jar b/tstools/jTsSplitter/jTsSplitter.jar
new file mode 100644
index 0000000..3c231de
Binary files /dev/null and b/tstools/jTsSplitter/jTsSplitter.jar differ